diff --git a/Cargo.lock b/Cargo.lock
index 57665cbcdbe..02bb3189bad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,16 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "Inflector"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
+dependencies = [
+ "lazy_static",
+ "regex",
+]
+
 [[package]]
 name = "addchain"
 version = "0.2.0"
@@ -15,18 +25,18 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.24.1"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler2"
-version = "2.0.0"
+name = "adler"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "aead"
@@ -40,9 +50,9 @@ dependencies = [
 
 [[package]]
 name = "aes"
-version = "0.8.4"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
 dependencies = [
  "cfg-if",
  "cipher",
@@ -65,9 +75,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.7.8"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
+checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
 dependencies = [
  "getrandom",
  "once_cell",
@@ -76,9 +86,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.11"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -88,18 +98,18 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.18"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
 [[package]]
 name = "android-tzdata"
@@ -133,58 +143,57 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
- "is_terminal_polyfill",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.89"
+version = "1.0.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
 
 [[package]]
 name = "arr_macro"
@@ -203,15 +212,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0609c78bd572f4edc74310dfb63a01f5609d53fa8b4dd7c4d98aef3b3e8d72d1"
 dependencies = [
  "proc-macro-hack",
- "quote 1.0.37",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "arrayref"
-version = "0.3.9"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
 
 [[package]]
 name = "arrayvec"
@@ -230,9 +239,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.6"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "ascii-canvas"
@@ -265,7 +274,7 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
 dependencies = [
- "quote 1.0.37",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
@@ -383,9 +392,9 @@ dependencies = [
 
 [[package]]
 name = "async-process"
-version = "2.3.0"
+version = "2.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb"
+checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374"
 dependencies = [
  "async-channel 2.3.1",
  "async-io",
@@ -398,6 +407,7 @@ dependencies = [
  "futures-lite",
  "rustix",
  "tracing",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -407,8 +417,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -475,8 +485,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -487,13 +497,24 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.83"
+version = "0.1.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
+checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
+]
+
+[[package]]
+name = "async_io_stream"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c"
+dependencies = [
+ "futures 0.3.30",
+ "pharos",
+ "rustc_version",
 ]
 
 [[package]]
@@ -528,17 +549,28 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "auto_impl"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
+dependencies = [
+ "proc-macro2 1.0.86",
+ "quote 1.0.36",
+ "syn 2.0.72",
+]
+
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.9.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f95446d919226d587817a7d21379e6eb099b97b45110a7f272a444ca5c54070"
+checksum = "a8a47f2fb521b70c11ce7369a6c5fa4bd6af7e5d62ec06303875bafe7c6ba245"
 dependencies = [
  "aws-lc-sys",
  "mirai-annotations",
@@ -548,9 +580,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.21.2"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3ddc4a5b231dd6958b140ff3151b6412b3f4321fab354f399eec8f14b06df62"
+checksum = "2927c7af777b460b7ccd95f8b67acd7b4c04ec8896bf0c8e80ba30523cffc057"
 dependencies = [
  "bindgen 0.69.4",
  "cc",
@@ -563,18 +595,18 @@ dependencies = [
 
 [[package]]
 name = "axum"
-version = "0.7.6"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f43644eed690f5374f1af436ecd6aea01cd201f6fbdf0178adaf6907afb2cec"
+checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
 dependencies = [
  "async-trait",
  "axum-core",
  "bytes",
  "futures-util",
  "http 1.1.0",
- "http-body 1.0.1",
+ "http-body 1.0.0",
  "http-body-util",
- "hyper 1.4.1",
+ "hyper 1.3.1",
  "hyper-util",
  "itoa",
  "matchit",
@@ -590,7 +622,7 @@ dependencies = [
  "serde_urlencoded",
  "sync_wrapper 1.0.1",
  "tokio",
- "tower 0.5.1",
+ "tower",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -598,20 +630,20 @@ dependencies = [
 
 [[package]]
 name = "axum-core"
-version = "0.4.4"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6b8ba012a258d63c9adfa28b9ddcf66149da6f986c5b5452e629d5ee64bf00"
+checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3"
 dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
  "http 1.1.0",
- "http-body 1.0.1",
+ "http-body 1.0.0",
  "http-body-util",
  "mime",
  "pin-project-lite",
  "rustversion",
- "sync_wrapper 1.0.1",
+ "sync_wrapper 0.1.2",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -631,17 +663,17 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.74"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
 dependencies = [
  "addr2line",
+ "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
- "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -670,9 +702,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.7"
+version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
 
 [[package]]
 name = "base64"
@@ -697,6 +729,21 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "basic-toml"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bfc506e7a2370ec239e1d072507b2a80c833083699d3c6fa176fbb4de8448c6"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "bech32"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445"
+
 [[package]]
 name = "beef"
 version = "0.5.2"
@@ -742,11 +789,11 @@ dependencies = [
  "peeking_take_while",
  "prettyplease",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.77",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -758,17 +805,17 @@ dependencies = [
  "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
- "itertools 0.12.1",
+ "itertools 0.12.0",
  "lazy_static",
  "lazycell",
  "log",
  "prettyplease",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.77",
+ "syn 2.0.72",
  "which",
 ]
 
@@ -900,7 +947,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "constant_time_eq 0.3.1",
 ]
 
@@ -945,7 +992,7 @@ name = "block_reverter"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 4.5.18",
+ "clap 4.4.6",
  "serde_json",
  "tokio",
  "zksync_block_reverter",
@@ -990,13 +1037,13 @@ version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68ec2f007ff8f90cc459f03e9f30ca1065440170f013c868823646e2e48d0234"
 dependencies = [
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "bincode",
  "blake2 0.10.6",
  "const_format",
  "convert_case 0.6.0",
  "crossbeam",
- "crypto-bigint 0.5.5",
+ "crypto-bigint 0.5.3",
  "derivative",
  "ethereum-types",
  "firestorm",
@@ -1017,9 +1064,9 @@ dependencies = [
 
 [[package]]
 name = "borsh"
-version = "1.5.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed"
+checksum = "26d4d6dafc1a3bb54687538972158f07b2c948bc57d5890df22c0739098b3028"
 dependencies = [
  "borsh-derive",
  "cfg_aliases",
@@ -1027,15 +1074,15 @@ dependencies = [
 
 [[package]]
 name = "borsh-derive"
-version = "1.5.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b"
+checksum = "bf4918709cc4dd777ad2b6303ed03cb37f3ca0ccede8c1b0d28ac6db8f4710e0"
 dependencies = [
  "once_cell",
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 2.0.0",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
  "syn_derive",
 ]
 
@@ -1045,6 +1092,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
 dependencies = [
+ "sha2 0.10.8",
  "tinyvec",
 ]
 
@@ -1056,9 +1104,9 @@ checksum = "225eb82ce9e70dcc0cfa6e404d0f353326b6e163bf500ec4711cec317d11935c"
 
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
 
 [[package]]
 name = "byte-slice-cast"
@@ -1068,9 +1116,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
 
 [[package]]
 name = "bytecheck"
-version = "0.6.12"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2"
+checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627"
 dependencies = [
  "bytecheck_derive",
  "ptr_meta",
@@ -1079,20 +1127,20 @@ dependencies = [
 
 [[package]]
 name = "bytecheck_derive"
-version = "0.6.12"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
+checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "bytecount"
-version = "0.6.8"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
+checksum = "d1a12477b7237a01c11a80a51278165f9ba0edd28fa6db00a65ab230320dc58c"
 
 [[package]]
 name = "byteorder"
@@ -1102,9 +1150,12 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.2"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "bytesize"
@@ -1112,6 +1163,16 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc"
 
+[[package]]
+name = "bzip2"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
+dependencies = [
+ "bzip2-sys",
+ "libc",
+]
+
 [[package]]
 name = "bzip2-sys"
 version = "0.1.11+1.0.8"
@@ -1125,18 +1186,18 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.9"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
+checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cargo-platform"
-version = "0.1.8"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc"
+checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36"
 dependencies = [
  "serde",
 ]
@@ -1154,6 +1215,20 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "cargo_metadata"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
 [[package]]
 name = "cast"
 version = "0.3.0"
@@ -1162,9 +1237,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.1.21"
+version = "1.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0"
+checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932"
 dependencies = [
  "jobserver",
  "libc",
@@ -1194,9 +1269,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "cfg_aliases"
-version = "0.2.1"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
 [[package]]
 name = "chacha20"
@@ -1239,9 +1314,9 @@ dependencies = [
 
 [[package]]
 name = "ciborium"
-version = "0.2.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
+checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
 dependencies = [
  "ciborium-io",
  "ciborium-ll",
@@ -1250,15 +1325,15 @@ dependencies = [
 
 [[package]]
 name = "ciborium-io"
-version = "0.2.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
+checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
 
 [[package]]
 name = "ciborium-ll"
-version = "0.2.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
+checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
 dependencies = [
  "ciborium-io",
  "half",
@@ -1277,38 +1352,38 @@ dependencies = [
 
 [[package]]
 name = "circuit_encodings"
-version = "0.140.3"
+version = "0.140.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf6b7cc842eadb4c250cdc6a8bc1dd97624d9f08bbe54db3e11fb23c3a72be07"
+checksum = "b8438d7af992b730143b679e2c6938cb9e0193897ecaf668c59189af8ac296b7"
 dependencies = [
  "derivative",
  "serde",
  "zk_evm 0.140.0",
- "zkevm_circuits 0.140.3",
+ "zkevm_circuits 0.140.2",
 ]
 
 [[package]]
 name = "circuit_encodings"
-version = "0.141.2"
+version = "0.141.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7898ffbf3cd413576b4b674fe1545a35488c67eb16bd5a4148425e42c2a2b65b"
+checksum = "01a2fcc80e97682104f355dd819cb4972583828a6c0f65ec26889a78a84b0c56"
 dependencies = [
  "derivative",
  "serde",
  "zk_evm 0.141.0",
- "zkevm_circuits 0.141.2",
+ "zkevm_circuits 0.141.1",
 ]
 
 [[package]]
 name = "circuit_encodings"
-version = "0.142.2"
+version = "0.142.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8364ecafcc4b2c896023f8d3af952c52a500aa55f14fd268bb5d9ab07f837369"
+checksum = "94be7afb5ace6024d6e3c105d521b4b9b563bac14a92c2f59c4683e9169a25d8"
 dependencies = [
  "derivative",
  "serde",
  "zk_evm 0.141.0",
- "zkevm_circuits 0.141.2",
+ "zkevm_circuits 0.141.1",
 ]
 
 [[package]]
@@ -1342,7 +1417,7 @@ version = "0.140.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa5f22311ce609d852d7d9f4943535ea4610aeb785129ae6ff83d5201c4fb387"
 dependencies = [
- "circuit_encodings 0.140.3",
+ "circuit_encodings 0.140.1",
  "derivative",
  "rayon",
  "serde",
@@ -1356,7 +1431,7 @@ version = "0.141.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c47c71d6ba83a8beb0af13af70beffd627f5497caf3d44c6f96363e788b07ea"
 dependencies = [
- "circuit_encodings 0.141.2",
+ "circuit_encodings 0.141.1",
  "derivative",
  "rayon",
  "serde",
@@ -1370,7 +1445,7 @@ version = "0.142.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e264723359e6a1aad98110bdccf1ae3ad596e93e7d31da9e40f6adc07e4add54"
 dependencies = [
- "circuit_encodings 0.142.2",
+ "circuit_encodings 0.142.1",
  "derivative",
  "rayon",
  "serde",
@@ -1393,9 +1468,9 @@ dependencies = [
 
 [[package]]
 name = "clang-sys"
-version = "1.8.1"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
 dependencies = [
  "glob",
  "libc",
@@ -1426,14 +1501,14 @@ dependencies = [
  "bitflags 1.3.2",
  "clap_lex 0.2.4",
  "indexmap 1.9.3",
- "textwrap 0.16.1",
+ "textwrap 0.16.0",
 ]
 
 [[package]]
 name = "clap"
-version = "4.5.18"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3"
+checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1441,26 +1516,26 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.18"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b"
+checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
 dependencies = [
  "anstream",
  "anstyle",
- "clap_lex 0.7.2",
- "strsim 0.11.1",
+ "clap_lex 0.5.1",
+ "strsim 0.10.0",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.5.18"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
 dependencies = [
- "heck 0.5.0",
+ "heck 0.4.1",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1474,15 +1549,15 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.2"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
 
 [[package]]
 name = "cmake"
-version = "0.1.51"
+version = "0.1.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a"
+checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
 dependencies = [
  "cc",
 ]
@@ -1496,11 +1571,63 @@ dependencies = [
  "indexmap 1.9.3",
 ]
 
+[[package]]
+name = "coins-bip32"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b6be4a5df2098cd811f3194f64ddb96c267606bffd9689ac7b0160097b01ad3"
+dependencies = [
+ "bs58",
+ "coins-core",
+ "digest 0.10.7",
+ "hmac 0.12.1",
+ "k256 0.13.3",
+ "serde",
+ "sha2 0.10.8",
+ "thiserror",
+]
+
+[[package]]
+name = "coins-bip39"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3db8fba409ce3dc04f7d804074039eb68b960b0829161f8e06c95fea3f122528"
+dependencies = [
+ "bitvec",
+ "coins-bip32",
+ "hmac 0.12.1",
+ "once_cell",
+ "pbkdf2 0.12.2",
+ "rand 0.8.5",
+ "sha2 0.10.8",
+ "thiserror",
+]
+
+[[package]]
+name = "coins-core"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5286a0843c21f8367f7be734f89df9b822e0321d8bcce8d6e735aadff7d74979"
+dependencies = [
+ "base64 0.21.5",
+ "bech32",
+ "bs58",
+ "digest 0.10.7",
+ "generic-array",
+ "hex",
+ "ripemd",
+ "serde",
+ "serde_derive",
+ "sha2 0.10.8",
+ "sha3 0.10.8",
+ "thiserror",
+]
+
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
 name = "combine"
@@ -1529,40 +1656,53 @@ dependencies = [
 
 [[package]]
 name = "console"
-version = "0.15.8"
+version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
+checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
 dependencies = [
  "encode_unicode",
  "lazy_static",
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "const-hex"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94fb8a24a26d37e1ffd45343323dc9fe6654ceea44c12f2fcb3d7ac29e610bc6"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "hex",
+ "proptest",
+ "serde",
 ]
 
 [[package]]
 name = "const-oid"
-version = "0.9.6"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
 
 [[package]]
 name = "const_format"
-version = "0.2.33"
+version = "0.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b"
+checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673"
 dependencies = [
  "const_format_proc_macros",
 ]
 
 [[package]]
 name = "const_format_proc_macros"
-version = "0.2.33"
+version = "0.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1"
+checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "unicode-xid 0.2.6",
+ "quote 1.0.36",
+ "unicode-xid 0.2.4",
 ]
 
 [[package]]
@@ -1604,24 +1744,24 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.7"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.14"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
+checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "crc"
-version = "3.2.1"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
+checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe"
 dependencies = [
  "crc-catalog",
 ]
@@ -1634,9 +1774,9 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 
 [[package]]
 name = "crc32fast"
-version = "1.4.2"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
  "cfg-if",
 ]
@@ -1753,9 +1893,9 @@ dependencies = [
 
 [[package]]
 name = "crypto-bigint"
-version = "0.5.5"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
+checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124"
 dependencies = [
  "generic-array",
  "rand_core 0.6.4",
@@ -1784,14 +1924,26 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "cs_derive"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24cf603ca4299c6e20e644da88897f7b81d688510f4887e818b0bfe0b792081b"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2 1.0.86",
+ "quote 1.0.36",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "ctor"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f"
 dependencies = [
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1805,12 +1957,12 @@ dependencies = [
 
 [[package]]
 name = "ctrlc"
-version = "3.4.5"
+version = "3.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
+checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf"
 dependencies = [
  "nix",
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -1836,8 +1988,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1879,7 +2031,7 @@ dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "strsim 0.10.0",
  "syn 1.0.109",
 ]
@@ -1893,7 +2045,7 @@ dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "strsim 0.10.0",
  "syn 1.0.109",
 ]
@@ -1907,9 +2059,9 @@ dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "strsim 0.11.1",
- "syn 2.0.77",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1919,7 +2071,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
 dependencies = [
  "darling_core 0.13.4",
- "quote 1.0.37",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
@@ -1930,7 +2082,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
 dependencies = [
  "darling_core 0.14.4",
- "quote 1.0.37",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
@@ -1941,8 +2093,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core 0.20.10",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1958,6 +2110,12 @@ dependencies = [
  "parking_lot_core",
 ]
 
+[[package]]
+name = "data-encoding"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+
 [[package]]
 name = "debugid"
 version = "0.8.0"
@@ -1965,7 +2123,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
 dependencies = [
  "serde",
- "uuid",
+ "uuid 1.5.0",
 ]
 
 [[package]]
@@ -1980,9 +2138,9 @@ dependencies = [
 
 [[package]]
 name = "der"
-version = "0.7.9"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
+checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
 dependencies = [
  "const-oid",
  "pem-rfc7468",
@@ -1991,9 +2149,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.3.11"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
 dependencies = [
  "powerfmt",
  "serde",
@@ -2006,7 +2164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
@@ -2018,9 +2176,9 @@ checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
 dependencies = [
  "convert_case 0.4.0",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "rustc_version",
- "syn 2.0.77",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -2039,9 +2197,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
- "unicode-xid 0.2.6",
+ "quote 1.0.36",
+ "syn 2.0.72",
+ "unicode-xid 0.2.4",
 ]
 
 [[package]]
@@ -2071,6 +2229,15 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
 [[package]]
 name = "dirs-next"
 version = "2.0.0"
@@ -2081,6 +2248,18 @@ dependencies = [
  "dirs-sys-next",
 ]
 
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "dirs-sys-next"
 version = "0.1.2"
@@ -2112,9 +2291,9 @@ checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
 
 [[package]]
 name = "dunce"
-version = "1.0.5"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
 
 [[package]]
 name = "ecdsa"
@@ -2134,12 +2313,12 @@ version = "0.16.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
 dependencies = [
- "der 0.7.9",
+ "der 0.7.8",
  "digest 0.10.7",
  "elliptic-curve 0.13.8",
  "rfc6979 0.4.0",
  "signature 2.2.0",
- "spki 0.7.3",
+ "spki 0.7.2",
 ]
 
 [[package]]
@@ -2154,16 +2333,15 @@ dependencies = [
 
 [[package]]
 name = "ed25519-dalek"
-version = "2.1.1"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
+checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
 dependencies = [
  "curve25519-dalek",
  "ed25519",
  "rand_core 0.6.4",
  "serde",
  "sha2 0.10.8",
- "subtle",
  "zeroize",
 ]
 
@@ -2184,9 +2362,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.13.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 dependencies = [
  "serde",
 ]
@@ -2218,7 +2396,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
 dependencies = [
  "base16ct 0.2.0",
- "crypto-bigint 0.5.5",
+ "crypto-bigint 0.5.3",
  "digest 0.10.7",
  "ff 0.13.0",
  "generic-array",
@@ -2233,9 +2411,9 @@ dependencies = [
 
 [[package]]
 name = "elsa"
-version = "1.10.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d98e71ae4df57d214182a2e5cb90230c0192c6ddfcaa05c36453d46a54713e10"
+checksum = "714f766f3556b44e7e4776ad133fcc3445a489517c25c704ace411bb14790194"
 dependencies = [
  "stable_deref_trait",
 ]
@@ -2257,13 +2435,31 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.34"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
 dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "enr"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a3d8dc56e02f954cac8eb489772c552c473346fc34f67412bb6244fd647f7e4"
+dependencies = [
+ "base64 0.21.5",
+ "bytes",
+ "hex",
+ "k256 0.13.3",
+ "log",
+ "rand 0.8.5",
+ "rlp",
+ "serde",
+ "sha3 0.10.8",
+ "zeroize",
+]
+
 [[package]]
 name = "enum_dispatch"
 version = "0.3.13"
@@ -2272,27 +2468,25 @@ checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd"
 dependencies = [
  "once_cell",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "env_filter"
-version = "0.1.2"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
 dependencies = [
  "log",
 ]
 
 [[package]]
 name = "env_logger"
-version = "0.11.5"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
 dependencies = [
- "anstream",
- "anstyle",
  "env_filter",
  "log",
 ]
@@ -2342,6 +2536,28 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "eth-keystore"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fda3bf123be441da5260717e0661c25a2fd9cb2b2c1d20bf2e05580047158ab"
+dependencies = [
+ "aes",
+ "ctr",
+ "digest 0.10.7",
+ "hex",
+ "hmac 0.12.1",
+ "pbkdf2 0.11.0",
+ "rand 0.8.5",
+ "scrypt",
+ "serde",
+ "serde_json",
+ "sha2 0.10.8",
+ "sha3 0.10.8",
+ "thiserror",
+ "uuid 0.8.2",
+]
+
 [[package]]
 name = "ethabi"
 version = "18.0.0"
@@ -2360,30 +2576,282 @@ dependencies = [
 ]
 
 [[package]]
-name = "ethbloom"
-version = "0.13.0"
+name = "ethbloom"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60"
+dependencies = [
+ "crunchy",
+ "fixed-hash",
+ "impl-codec",
+ "impl-rlp",
+ "impl-serde",
+ "scale-info",
+ "tiny-keccak 2.0.2",
+]
+
+[[package]]
+name = "ethereum-types"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee"
+dependencies = [
+ "ethbloom",
+ "fixed-hash",
+ "impl-codec",
+ "impl-rlp",
+ "impl-serde",
+ "primitive-types",
+ "scale-info",
+ "uint",
+]
+
+[[package]]
+name = "ethers"
+version = "2.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "816841ea989f0c69e459af1cf23a6b0033b19a55424a1ea3a30099becdb8dec0"
+dependencies = [
+ "ethers-addressbook",
+ "ethers-contract",
+ "ethers-core",
+ "ethers-etherscan",
+ "ethers-middleware",
+ "ethers-providers",
+ "ethers-signers",
+ "ethers-solc",
+]
+
+[[package]]
+name = "ethers-addressbook"
+version = "2.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5495afd16b4faa556c3bba1f21b98b4983e53c1755022377051a975c3b021759"
+dependencies = [
+ "ethers-core",
+ "once_cell",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "ethers-contract"
+version = "2.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fceafa3578c836eeb874af87abacfb041f92b4da0a78a5edd042564b8ecdaaa"
+dependencies = [
+ "const-hex",
+ "ethers-contract-abigen",
+ "ethers-contract-derive",
+ "ethers-core",
+ "ethers-providers",
+ "futures-util",
+ "once_cell",
+ "pin-project",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "ethers-contract-abigen"
+version = "2.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04ba01fbc2331a38c429eb95d4a570166781f14290ef9fdb144278a90b5a739b"
+dependencies = [
+ "Inflector",
+ "const-hex",
+ "dunce",
+ "ethers-core",
+ "ethers-etherscan",
+ "eyre",
+ "prettyplease",
+ "proc-macro2 1.0.86",
+ "quote 1.0.36",
+ "regex",
+ "reqwest 0.11.22",
+ "serde",
+ "serde_json",
+ "syn 2.0.72",
+ "toml",
+ "walkdir",
+]
+
+[[package]]
+name = "ethers-contract-derive"
+version = "2.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87689dcabc0051cde10caaade298f9e9093d65f6125c14575db3fd8c669a168f"
+dependencies = [
+ "Inflector",
+ "const-hex",
+ "ethers-contract-abigen",
+ "ethers-core",
+ "proc-macro2 1.0.86",
+ "quote 1.0.36",
+ "serde_json",
+ "syn 2.0.72",
+]
+
+[[package]]
+name = "ethers-core"
+version = "2.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82d80cc6ad30b14a48ab786523af33b37f28a8623fc06afd55324816ef18fb1f"
+dependencies = [
+ "arrayvec 0.7.4",
+ "bytes",
+ "cargo_metadata 0.18.1",
+ "chrono",
+ "const-hex",
+ "elliptic-curve 0.13.8",
+ "ethabi",
+ "generic-array",
+ "k256 0.13.3",
+ "num_enum 0.7.2",
+ "once_cell",
+ "open-fastrlp",
+ "rand 0.8.5",
+ "rlp",
+ "serde",
+ "serde_json",
+ "strum",
+ "syn 2.0.72",
+ "tempfile",
+ "thiserror",
+ "tiny-keccak 2.0.2",
+ "unicode-xid 0.2.4",
+]
+
+[[package]]
+name = "ethers-etherscan"
+version = "2.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e79e5973c26d4baf0ce55520bd732314328cabe53193286671b47144145b9649"
+dependencies = [
+ "chrono",
+ "ethers-core",
+ "reqwest 0.11.22",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tracing",
+]
+
+[[package]]
+name = "ethers-middleware"
+version = "2.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48f9fdf09aec667c099909d91908d5eaf9be1bd0e2500ba4172c1d28bfaa43de"
+dependencies = [
+ "async-trait",
+ "auto_impl",
+ "ethers-contract",
+ "ethers-core",
+ "ethers-etherscan",
+ "ethers-providers",
+ "ethers-signers",
+ "futures-channel",
+ "futures-locks",
+ "futures-util",
+ "instant",
+ "reqwest 0.11.22",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "tracing-futures",
+ "url",
+]
+
+[[package]]
+name = "ethers-providers"
+version = "2.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6434c9a33891f1effc9c75472e12666db2fa5a0fec4b29af6221680a6fe83ab2"
+dependencies = [
+ "async-trait",
+ "auto_impl",
+ "base64 0.21.5",
+ "bytes",
+ "const-hex",
+ "enr",
+ "ethers-core",
+ "futures-core",
+ "futures-timer",
+ "futures-util",
+ "hashers",
+ "http 0.2.9",
+ "instant",
+ "jsonwebtoken 8.3.0",
+ "once_cell",
+ "pin-project",
+ "reqwest 0.11.22",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tokio-tungstenite",
+ "tracing",
+ "tracing-futures",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "ws_stream_wasm",
+]
+
+[[package]]
+name = "ethers-signers"
+version = "2.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60"
+checksum = "228875491c782ad851773b652dd8ecac62cda8571d3bc32a5853644dd26766c2"
 dependencies = [
- "crunchy",
- "fixed-hash",
- "impl-rlp",
- "impl-serde",
- "tiny-keccak 2.0.2",
+ "async-trait",
+ "coins-bip32",
+ "coins-bip39",
+ "const-hex",
+ "elliptic-curve 0.13.8",
+ "eth-keystore",
+ "ethers-core",
+ "rand 0.8.5",
+ "sha2 0.10.8",
+ "thiserror",
+ "tracing",
 ]
 
 [[package]]
-name = "ethereum-types"
-version = "0.14.1"
+name = "ethers-solc"
+version = "2.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee"
+checksum = "66244a771d9163282646dbeffe0e6eca4dda4146b6498644e678ac6089b11edd"
 dependencies = [
- "ethbloom",
- "fixed-hash",
- "impl-rlp",
- "impl-serde",
- "primitive-types",
- "uint",
+ "cfg-if",
+ "const-hex",
+ "dirs",
+ "dunce",
+ "ethers-core",
+ "glob",
+ "home",
+ "md-5",
+ "num_cpus",
+ "once_cell",
+ "path-slash",
+ "rayon",
+ "regex",
+ "semver",
+ "serde",
+ "serde_json",
+ "solang-parser",
+ "svm-rs",
+ "thiserror",
+ "tiny-keccak 2.0.2",
+ "tokio",
+ "tracing",
+ "walkdir",
+ "yansi",
 ]
 
 [[package]]
@@ -2423,11 +2891,21 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
 [[package]]
 name = "fastrand"
-version = "2.1.1"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
 [[package]]
 name = "ff"
@@ -2451,9 +2929,9 @@ dependencies = [
 
 [[package]]
 name = "fiat-crypto"
-version = "0.2.9"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
+checksum = "f69037fe1b785e84986b4f2cbcf647381876a00671d25ceef715d7812dd7e1dd"
 
 [[package]]
 name = "findshlibs"
@@ -2467,6 +2945,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "finl_unicode"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6"
+
 [[package]]
 name = "firestorm"
 version = "0.5.1"
@@ -2493,9 +2977,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.34"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -2509,7 +2993,7 @@ checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
 dependencies = [
  "futures-core",
  "futures-sink",
- "spin",
+ "spin 0.9.8",
 ]
 
 [[package]]
@@ -2608,6 +3092,16 @@ dependencies = [
  "zksync_bellman",
 ]
 
+[[package]]
+name = "fs2"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "fs_extra"
 version = "1.3.0"
@@ -2705,6 +3199,16 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "futures-locks"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45ec6fe3675af967e67c5536c0b9d44e34e6c52f86bedc4ea49c5317b8e94d06"
+dependencies = [
+ "futures-channel",
+ "futures-task",
+]
+
 [[package]]
 name = "futures-macro"
 version = "0.3.30"
@@ -2712,8 +3216,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -2730,12 +3234,12 @@ checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-timer"
-version = "3.0.3"
+version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
+checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
 dependencies = [
  "gloo-timers 0.2.6",
- "send_wrapper",
+ "send_wrapper 0.4.0",
 ]
 
 [[package]]
@@ -2757,6 +3261,15 @@ dependencies = [
  "slab",
 ]
 
+[[package]]
+name = "fxhash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
+dependencies = [
+ "byteorder",
+]
+
 [[package]]
 name = "generic-array"
 version = "0.14.7"
@@ -2773,7 +3286,7 @@ name = "genesis_generator"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 4.5.18",
+ "clap 4.4.6",
  "futures 0.3.30",
  "serde",
  "serde_json",
@@ -2794,9 +3307,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -2817,9 +3330,9 @@ dependencies = [
 
 [[package]]
 name = "ghash"
-version = "0.5.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
+checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40"
 dependencies = [
  "opaque-debug",
  "polyval",
@@ -2827,9 +3340,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.31.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
 
 [[package]]
 name = "glob"
@@ -2847,7 +3360,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "gloo-utils",
- "http 0.2.12",
+ "http 0.2.9",
  "js-sys",
  "pin-project",
  "serde",
@@ -2902,12 +3415,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1112c453c2e155b3e683204ffff52bcc6d6495d04b68d9e90cd24161270c5058"
 dependencies = [
  "async-trait",
- "base64 0.21.7",
+ "base64 0.21.5",
  "google-cloud-metadata",
  "google-cloud-token",
  "home",
- "jsonwebtoken",
- "reqwest 0.12.7",
+ "jsonwebtoken 9.3.0",
+ "reqwest 0.12.5",
  "serde",
  "serde_json",
  "thiserror",
@@ -2923,7 +3436,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04f945a208886a13d07636f38fb978da371d0abc3e34bad338124b9f8c135a8f"
 dependencies = [
- "reqwest 0.12.7",
+ "reqwest 0.12.5",
  "thiserror",
  "tokio",
 ]
@@ -2937,7 +3450,7 @@ dependencies = [
  "anyhow",
  "async-stream",
  "async-trait",
- "base64 0.21.7",
+ "base64 0.21.5",
  "bytes",
  "futures-util",
  "google-cloud-auth",
@@ -2948,9 +3461,9 @@ dependencies = [
  "percent-encoding",
  "pkcs8 0.10.2",
  "regex",
- "reqwest 0.12.7",
+ "reqwest 0.12.5",
  "reqwest-middleware",
- "ring",
+ "ring 0.17.7",
  "serde",
  "serde_json",
  "sha2 0.10.8",
@@ -3020,8 +3533,8 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "futures-util",
- "http 0.2.12",
- "indexmap 2.5.0",
+ "http 0.2.9",
+ "indexmap 2.1.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -3030,9 +3543,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.6"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -3040,7 +3553,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http 1.1.0",
- "indexmap 2.5.0",
+ "indexmap 2.1.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -3049,13 +3562,9 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "2.4.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
-dependencies = [
- "cfg-if",
- "crunchy",
-]
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
 
 [[package]]
 name = "handlebars"
@@ -3077,7 +3586,7 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash 0.7.8",
+ "ahash 0.7.7",
 ]
 
 [[package]]
@@ -3086,11 +3595,20 @@ version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
- "ahash 0.8.11",
+ "ahash 0.8.7",
  "allocator-api2",
  "serde",
 ]
 
+[[package]]
+name = "hashers"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2bca93b15ea5a746f220e56587f71e73c6165eab783df9e26590069953e3c30"
+dependencies = [
+ "fxhash",
+]
+
 [[package]]
 name = "hashlink"
 version = "0.9.1"
@@ -3150,9 +3668,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hkdf"
-version = "0.12.4"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
 dependencies = [
  "hmac 0.12.1",
 ]
@@ -3189,11 +3707,11 @@ dependencies = [
 
 [[package]]
 name = "home"
-version = "0.5.9"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -3209,9 +3727,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.12"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
+checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
 dependencies = [
  "bytes",
  "fnv",
@@ -3236,15 +3754,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
  "bytes",
- "http 0.2.12",
+ "http 0.2.9",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "http-body"
-version = "1.0.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
 dependencies = [
  "bytes",
  "http 1.1.0",
@@ -3259,15 +3777,15 @@ dependencies = [
  "bytes",
  "futures-util",
  "http 1.1.0",
- "http-body 1.0.1",
+ "http-body 1.0.0",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
 
 [[package]]
 name = "httpdate"
@@ -3285,12 +3803,12 @@ dependencies = [
  "async-object-pool",
  "async-std",
  "async-trait",
- "base64 0.21.7",
+ "base64 0.21.5",
  "basic-cookies",
  "crossbeam-utils",
  "form_urlencoded",
  "futures-util",
- "hyper 0.14.30",
+ "hyper 0.14.29",
  "lazy_static",
  "levenshtein",
  "log",
@@ -3305,16 +3823,16 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "0.14.30"
+version = "0.14.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
+checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
  "h2 0.3.26",
- "http 0.2.12",
+ "http 0.2.9",
  "http-body 0.4.6",
  "httparse",
  "httpdate",
@@ -3329,16 +3847,16 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.6",
+ "h2 0.4.5",
  "http 1.1.0",
- "http-body 1.0.1",
+ "http-body 1.0.0",
  "httparse",
  "httpdate",
  "itoa",
@@ -3355,8 +3873,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
  "futures-util",
- "http 0.2.12",
- "hyper 0.14.30",
+ "http 0.2.9",
+ "hyper 0.14.29",
  "log",
  "rustls 0.21.12",
  "rustls-native-certs 0.6.3",
@@ -3366,16 +3884,16 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.3"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
+checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
 dependencies = [
  "futures-util",
  "http 1.1.0",
- "hyper 1.4.1",
+ "hyper 1.3.1",
  "hyper-util",
  "log",
- "rustls 0.23.13",
+ "rustls 0.23.10",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls 0.26.0",
@@ -3388,7 +3906,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793"
 dependencies = [
- "hyper 1.4.1",
+ "hyper 1.3.1",
  "hyper-util",
  "pin-project-lite",
  "tokio",
@@ -3402,7 +3920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes",
- "hyper 0.14.30",
+ "hyper 0.14.29",
  "native-tls",
  "tokio",
  "tokio-native-tls",
@@ -3416,7 +3934,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
  "http-body-util",
- "hyper 1.4.1",
+ "hyper 1.3.1",
  "hyper-util",
  "native-tls",
  "tokio",
@@ -3426,19 +3944,20 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.9"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
+checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
  "http 1.1.0",
- "http-body 1.0.1",
- "hyper 1.4.1",
+ "http-body 1.0.0",
+ "hyper 1.3.1",
  "pin-project-lite",
  "socket2",
  "tokio",
+ "tower",
  "tower-service",
  "tracing",
 ]
@@ -3451,9 +3970,9 @@ checksum = "71a816c97c42258aa5834d07590b718b4c9a598944cd39a52dc25b351185d678"
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.61"
+version = "0.1.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -3536,10 +4055,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -3552,9 +4077,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.5",
@@ -3577,15 +4102,16 @@ dependencies = [
 
 [[package]]
 name = "insta"
-version = "1.40.0"
+version = "1.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60"
+checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc"
 dependencies = [
  "console",
  "lazy_static",
  "linked-hash-map",
  "serde",
  "similar",
+ "yaml-rust",
 ]
 
 [[package]]
@@ -3599,9 +4125,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.10.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
 [[package]]
 name = "ipnetwork"
@@ -3612,12 +4138,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
-
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -3638,27 +4158,18 @@ dependencies = [
 
 [[package]]
 name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.13.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0"
 dependencies = [
  "either",
 ]
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "jni"
@@ -3691,9 +4202,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -3735,10 +4246,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9f9ed46590a8d5681975f126e22531698211b926129a40a2db47cbca429220"
 dependencies = [
  "futures-util",
- "http 0.2.12",
+ "http 0.2.9",
  "jsonrpsee-core 0.21.0",
  "pin-project",
- "rustls-native-certs 0.7.3",
+ "rustls-native-certs 0.7.0",
  "rustls-pki-types",
  "soketto 0.7.1",
  "thiserror",
@@ -3762,7 +4273,7 @@ dependencies = [
  "http 1.1.0",
  "jsonrpsee-core 0.23.2",
  "pin-project",
- "rustls 0.23.13",
+ "rustls 0.23.10",
  "rustls-pki-types",
  "rustls-platform-verifier",
  "soketto 0.8.0",
@@ -3786,7 +4297,7 @@ dependencies = [
  "beef",
  "futures-timer",
  "futures-util",
- "hyper 0.14.30",
+ "hyper 0.14.29",
  "jsonrpsee-types 0.21.0",
  "pin-project",
  "rustc-hash",
@@ -3811,7 +4322,7 @@ dependencies = [
  "futures-timer",
  "futures-util",
  "http 1.1.0",
- "http-body 1.0.1",
+ "http-body 1.0.0",
  "http-body-util",
  "jsonrpsee-types 0.23.2",
  "parking_lot",
@@ -3834,7 +4345,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b7de9f3219d95985eb77fd03194d7c1b56c19bce1abfcc9d07462574b15572"
 dependencies = [
  "async-trait",
- "hyper 0.14.30",
+ "hyper 0.14.29",
  "hyper-rustls 0.24.2",
  "jsonrpsee-core 0.21.0",
  "jsonrpsee-types 0.21.0",
@@ -3842,7 +4353,7 @@ dependencies = [
  "serde_json",
  "thiserror",
  "tokio",
- "tower 0.4.13",
+ "tower",
  "tracing",
  "url",
 ]
@@ -3855,19 +4366,19 @@ checksum = "2d90064e04fb9d7282b1c71044ea94d0bbc6eff5621c66f1a0bce9e9de7cf3ac"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
- "http-body 1.0.1",
- "hyper 1.4.1",
- "hyper-rustls 0.27.3",
+ "http-body 1.0.0",
+ "hyper 1.3.1",
+ "hyper-rustls 0.27.2",
  "hyper-util",
  "jsonrpsee-core 0.23.2",
  "jsonrpsee-types 0.23.2",
- "rustls 0.23.13",
+ "rustls 0.23.10",
  "rustls-platform-verifier",
  "serde",
  "serde_json",
  "thiserror",
  "tokio",
- "tower 0.4.13",
+ "tower",
  "tracing",
  "url",
 ]
@@ -3879,10 +4390,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7895f186d5921065d96e16bd795e5ca89ac8356ec423fafc6e3d7cf8ec11aee4"
 dependencies = [
  "heck 0.5.0",
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -3894,9 +4405,9 @@ dependencies = [
  "anyhow",
  "futures-util",
  "http 1.1.0",
- "http-body 1.0.1",
+ "http-body 1.0.0",
  "http-body-util",
- "hyper 1.4.1",
+ "hyper 1.3.1",
  "hyper-util",
  "jsonrpsee-core 0.23.2",
  "jsonrpsee-types 0.23.2",
@@ -3909,7 +4420,7 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tokio-util",
- "tower 0.4.13",
+ "tower",
  "tracing",
 ]
 
@@ -3963,16 +4474,30 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "jsonwebtoken"
+version = "8.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378"
+dependencies = [
+ "base64 0.21.5",
+ "pem 1.1.1",
+ "ring 0.16.20",
+ "serde",
+ "serde_json",
+ "simple_asn1",
+]
+
 [[package]]
 name = "jsonwebtoken"
 version = "9.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.21.5",
  "js-sys",
- "pem",
- "ring",
+ "pem 3.0.4",
+ "ring 0.17.7",
  "serde",
  "serde_json",
  "simple_asn1",
@@ -3992,9 +4517,9 @@ dependencies = [
 
 [[package]]
 name = "k256"
-version = "0.13.4"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b"
+checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b"
 dependencies = [
  "cfg-if",
  "ecdsa 0.16.9",
@@ -4006,9 +4531,9 @@ dependencies = [
 
 [[package]]
 name = "keccak"
-version = "0.1.5"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
+checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
 dependencies = [
  "cpufeatures",
 ]
@@ -4036,11 +4561,11 @@ dependencies = [
  "petgraph",
  "pico-args",
  "regex",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.2",
  "string_cache",
  "term",
  "tiny-keccak 2.0.2",
- "unicode-xid 0.2.6",
+ "unicode-xid 0.2.4",
  "walkdir",
 ]
 
@@ -4059,7 +4584,7 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 dependencies = [
- "spin",
+ "spin 0.9.8",
 ]
 
 [[package]]
@@ -4082,18 +4607,18 @@ checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760"
 
 [[package]]
 name = "libc"
-version = "0.2.159"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libloading"
-version = "0.8.5"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "winapi",
 ]
 
 [[package]]
@@ -4189,9 +4714,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.20"
+version = "1.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472"
+checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b"
 dependencies = [
  "cc",
  "pkg-config",
@@ -4223,7 +4748,7 @@ dependencies = [
  "once_cell",
  "rand 0.8.5",
  "regex",
- "reqwest 0.12.7",
+ "reqwest 0.12.5",
  "serde",
  "serde_json",
  "static_assertions",
@@ -4244,9 +4769,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.12"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -4254,9 +4779,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 dependencies = [
  "value-bag",
 ]
@@ -4279,9 +4804,9 @@ dependencies = [
  "beef",
  "fnv",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "regex-syntax 0.6.29",
- "syn 2.0.77",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -4295,18 +4820,18 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.12.4"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904"
+checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7"
 dependencies = [
  "hashbrown 0.14.5",
 ]
 
 [[package]]
 name = "lz4-sys"
-version = "1.11.1+lz4-1.10.0"
+version = "1.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6"
+checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900"
 dependencies = [
  "cc",
  "libc",
@@ -4354,16 +4879,16 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 
 [[package]]
 name = "merkle_tree_consistency_checker"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 4.5.18",
+ "clap 4.4.6",
  "tracing",
  "zksync_config",
  "zksync_env_config",
@@ -4404,8 +4929,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -4416,9 +4941,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "mime_guess"
-version = "2.0.5"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
+checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
 dependencies = [
  "mime",
  "unicase",
@@ -4426,9 +4951,9 @@ dependencies = [
 
 [[package]]
 name = "mini-moka"
-version = "0.10.3"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c325dfab65f261f386debee8b0969da215b3fa0037e74c8a1234db7ba986d803"
+checksum = "23e0b72e7c9042467008b10279fc732326bd605459ae03bda88825909dd19b56"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-utils",
@@ -4447,18 +4972,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
 dependencies = [
- "adler2",
+ "adler",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
 dependencies = [
  "hermit-abi 0.3.9",
  "libc",
@@ -4485,22 +5010,23 @@ dependencies = [
  "httparse",
  "memchr",
  "mime",
- "spin",
+ "spin 0.9.8",
  "version_check",
 ]
 
 [[package]]
 name = "multimap"
-version = "0.10.0"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
+checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
 [[package]]
 name = "native-tls"
-version = "0.2.12"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
+checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
 dependencies = [
+ "lazy_static",
  "libc",
  "log",
  "openssl",
@@ -4520,13 +5046,12 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
 [[package]]
 name = "nix"
-version = "0.29.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
  "bitflags 2.6.0",
  "cfg-if",
- "cfg_aliases",
  "libc",
 ]
 
@@ -4727,11 +5252,11 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.7.3"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
+checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
 dependencies = [
- "num_enum_derive 0.7.3",
+ "num_enum_derive 0.7.2",
 ]
 
 [[package]]
@@ -4742,27 +5267,27 @@ checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
 dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.3"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
+checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
 dependencies = [
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
 dependencies = [
  "memchr",
 ]
@@ -4775,15 +5300,40 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "oorandom"
-version = "11.1.4"
+version = "11.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
+checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
 [[package]]
 name = "opaque-debug"
-version = "0.3.1"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+
+[[package]]
+name = "open-fastrlp"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "786393f80485445794f6043fd3138854dd109cc6c4bd1a6383db304c9ce9b9ce"
+dependencies = [
+ "arrayvec 0.7.4",
+ "auto_impl",
+ "bytes",
+ "ethereum-types",
+ "open-fastrlp-derive",
+]
+
+[[package]]
+name = "open-fastrlp-derive"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+checksum = "003b2be5c6c53c1cfeb0a238b8a1c3915cd410feb684457a36c10038f764bb1c"
+dependencies = [
+ "bytes",
+ "proc-macro2 1.0.86",
+ "quote 1.0.36",
+ "syn 1.0.109",
+]
 
 [[package]]
 name = "openssl"
@@ -4807,8 +5357,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -4865,7 +5415,7 @@ dependencies = [
  "bytes",
  "http 1.1.0",
  "opentelemetry",
- "reqwest 0.12.7",
+ "reqwest 0.12.5",
 ]
 
 [[package]]
@@ -4881,8 +5431,8 @@ dependencies = [
  "opentelemetry-http",
  "opentelemetry-proto",
  "opentelemetry_sdk",
- "prost 0.13.3",
- "reqwest 0.12.7",
+ "prost 0.13.1",
+ "reqwest 0.12.5",
  "thiserror",
  "tokio",
  "tonic",
@@ -4896,7 +5446,7 @@ checksum = "30ee9f20bff9c984511a02f082dc8ede839e4a9bf15cc2487c8d6fea5ad850d9"
 dependencies = [
  "opentelemetry",
  "opentelemetry_sdk",
- "prost 0.13.3",
+ "prost 0.13.1",
  "tonic",
 ]
 
@@ -4927,6 +5477,12 @@ dependencies = [
  "tokio-stream",
 ]
 
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
 [[package]]
 name = "ordered-float"
 version = "2.10.1"
@@ -4938,13 +5494,13 @@ dependencies = [
 
 [[package]]
 name = "os_info"
-version = "3.8.2"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092"
+checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e"
 dependencies = [
  "log",
  "serde",
- "windows-sys 0.52.0",
+ "winapi",
 ]
 
 [[package]]
@@ -4977,7 +5533,7 @@ version = "3.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee"
 dependencies = [
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "bitvec",
  "byte-slice-cast",
  "impl-trait-for-tuples",
@@ -4991,23 +5547,23 @@ version = "3.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c"
 dependencies = [
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "parking"
-version = "2.2.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -5015,22 +5571,51 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.10"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "password-hash"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
+dependencies = [
+ "base64ct",
+ "rand_core 0.6.4",
+ "subtle",
 ]
 
 [[package]]
 name = "paste"
-version = "1.0.15"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+
+[[package]]
+name = "path-slash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42"
+
+[[package]]
+name = "pbkdf2"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
+dependencies = [
+ "digest 0.10.7",
+ "hmac 0.12.1",
+ "password-hash",
+ "sha2 0.10.8",
+]
 
 [[package]]
 name = "pbkdf2"
@@ -5039,6 +5624,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
 dependencies = [
  "digest 0.10.7",
+ "hmac 0.12.1",
 ]
 
 [[package]]
@@ -5047,6 +5633,15 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
+[[package]]
+name = "pem"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8"
+dependencies = [
+ "base64 0.13.1",
+]
+
 [[package]]
 name = "pem"
 version = "3.0.4"
@@ -5074,9 +5669,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.13"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9"
+checksum = "1f200d8d83c44a45b21764d1916299752ca035d15ecd46faca3e9a2a2bf6ad06"
 dependencies = [
  "memchr",
  "thiserror",
@@ -5085,9 +5680,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.7.13"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d3a6e3394ec80feb3b6393c725571754c6188490265c61aaf260810d6b95aa0"
+checksum = "bcd6ab1236bbdb3a49027e920e693192ebfe8913f6d60e294de57463a493cfde"
 dependencies = [
  "pest",
  "pest_generator",
@@ -5095,22 +5690,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.13"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94429506bde1ca69d1b5601962c73f4172ab4726571a59ea95931218cb0e930e"
+checksum = "2a31940305ffc96863a735bef7c7994a00b325a7138fdbc5bda0f1a0476d3275"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.13"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac8a071862e93690b6e34e9a5fb8e33ff3734473ac0245b27232222c4906a33f"
+checksum = "a7ff62f5259e53b78d1af898941cdcdccfae7385cf7d793a6e55de5d05bb4b7d"
 dependencies = [
  "once_cell",
  "pest",
@@ -5118,13 +5713,56 @@ dependencies = [
 ]
 
 [[package]]
-name = "petgraph"
-version = "0.6.5"
+name = "petgraph"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
+dependencies = [
+ "fixedbitset",
+ "indexmap 2.1.0",
+]
+
+[[package]]
+name = "pharos"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414"
+dependencies = [
+ "futures 0.3.30",
+ "rustc_version",
+]
+
+[[package]]
+name = "phf"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
+dependencies = [
+ "phf_macros",
+ "phf_shared 0.11.2",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
+dependencies = [
+ "phf_shared 0.11.2",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
 dependencies = [
- "fixedbitset",
- "indexmap 2.5.0",
+ "phf_generator",
+ "phf_shared 0.11.2",
+ "proc-macro2 1.0.86",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -5136,6 +5774,15 @@ dependencies = [
  "siphasher 0.3.11",
 ]
 
+[[package]]
+name = "phf_shared"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
+dependencies = [
+ "siphasher 0.3.11",
+]
+
 [[package]]
 name = "pico-args"
 version = "0.5.0"
@@ -5144,29 +5791,29 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 
 [[package]]
 name = "pin-project"
-version = "1.1.5"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
 
 [[package]]
 name = "pin-utils"
@@ -5191,9 +5838,9 @@ version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
 dependencies = [
- "der 0.7.9",
+ "der 0.7.8",
  "pkcs8 0.10.2",
- "spki 0.7.3",
+ "spki 0.7.2",
 ]
 
 [[package]]
@@ -5212,21 +5859,21 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
 dependencies = [
- "der 0.7.9",
- "spki 0.7.3",
+ "der 0.7.8",
+ "spki 0.7.2",
 ]
 
 [[package]]
 name = "pkg-config"
-version = "0.3.31"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
 [[package]]
 name = "plotters"
-version = "0.3.7"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
+checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45"
 dependencies = [
  "num-traits",
  "plotters-backend",
@@ -5237,15 +5884,15 @@ dependencies = [
 
 [[package]]
 name = "plotters-backend"
-version = "0.3.7"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
+checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609"
 
 [[package]]
 name = "plotters-svg"
-version = "0.3.7"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
+checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab"
 dependencies = [
  "plotters-backend",
 ]
@@ -5278,9 +5925,9 @@ dependencies = [
 
 [[package]]
 name = "polyval"
-version = "0.6.2"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25"
+checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -5296,12 +5943,9 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.20"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
-dependencies = [
- "zerocopy",
-]
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "precomputed-hash"
@@ -5311,9 +5955,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
 [[package]]
 name = "pretty_assertions"
-version = "1.4.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
+checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
 dependencies = [
  "diff",
  "yansi",
@@ -5321,12 +5965,12 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.22"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
+checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
 dependencies = [
  "proc-macro2 1.0.86",
- "syn 2.0.77",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -5364,11 +6008,20 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.2.0"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
+dependencies = [
+ "toml_edit 0.20.2",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
 dependencies = [
- "toml_edit 0.22.22",
+ "toml_edit 0.21.1",
 ]
 
 [[package]]
@@ -5379,7 +6032,7 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "syn 1.0.109",
  "version_check",
 ]
@@ -5391,7 +6044,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "version_check",
 ]
 
@@ -5421,9 +6074,9 @@ dependencies = [
 
 [[package]]
 name = "prometheus-client"
-version = "0.22.3"
+version = "0.22.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "504ee9ff529add891127c4827eb481bd69dc0ebc72e9a682e187db4caa60c3ca"
+checksum = "c1ca959da22a332509f2a73ae9e5f23f9dcfc31fd3a54d71f159495bd5909baa"
 dependencies = [
  "dtoa",
  "itoa",
@@ -5438,75 +6091,92 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
+]
+
+[[package]]
+name = "proptest"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d"
+dependencies = [
+ "bitflags 2.6.0",
+ "lazy_static",
+ "num-traits",
+ "rand 0.8.5",
+ "rand_chacha",
+ "rand_xorshift",
+ "regex-syntax 0.8.2",
+ "unarray",
 ]
 
 [[package]]
 name = "prost"
-version = "0.12.6"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
+checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d"
 dependencies = [
  "bytes",
- "prost-derive 0.12.6",
+ "prost-derive 0.12.1",
 ]
 
 [[package]]
 name = "prost"
-version = "0.13.3"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f"
+checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc"
 dependencies = [
  "bytes",
- "prost-derive 0.13.3",
+ "prost-derive 0.13.1",
 ]
 
 [[package]]
 name = "prost-build"
-version = "0.12.6"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
+checksum = "8bdf592881d821b83d471f8af290226c8d51402259e9bb5be7f9f8bdebbb11ac"
 dependencies = [
  "bytes",
- "heck 0.5.0",
- "itertools 0.12.1",
+ "heck 0.4.1",
+ "itertools 0.11.0",
  "log",
  "multimap",
  "once_cell",
  "petgraph",
  "prettyplease",
- "prost 0.12.6",
+ "prost 0.12.1",
  "prost-types",
  "regex",
- "syn 2.0.77",
+ "syn 2.0.72",
  "tempfile",
+ "which",
 ]
 
 [[package]]
 name = "prost-derive"
-version = "0.12.6"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
+checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32"
 dependencies = [
  "anyhow",
- "itertools 0.12.1",
+ "itertools 0.11.0",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "prost-derive"
-version = "0.13.3"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5"
+checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca"
 dependencies = [
  "anyhow",
- "itertools 0.13.0",
+ "itertools 0.12.0",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -5515,11 +6185,11 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "057237efdb71cf4b3f9396302a3d6599a92fa94063ba537b66130980ea9909f3"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.21.5",
  "logos",
  "miette",
  "once_cell",
- "prost 0.12.6",
+ "prost 0.12.1",
  "prost-types",
  "serde",
  "serde-value",
@@ -5527,11 +6197,11 @@ dependencies = [
 
 [[package]]
 name = "prost-types"
-version = "0.12.6"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
+checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf"
 dependencies = [
- "prost 0.12.6",
+ "prost 0.12.1",
 ]
 
 [[package]]
@@ -5542,7 +6212,7 @@ checksum = "00bb76c5f6221de491fe2c8f39b106330bbd9762c6511119c07940e10eb9ff11"
 dependencies = [
  "bytes",
  "miette",
- "prost 0.12.6",
+ "prost 0.12.1",
  "prost-reflect",
  "prost-types",
  "protox-parse",
@@ -5577,17 +6247,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "pulldown-cmark"
-version = "0.9.6"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b"
+checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 1.3.2",
  "memchr",
  "unicase",
 ]
@@ -5634,9 +6304,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2 1.0.86",
 ]
@@ -5705,6 +6375,15 @@ dependencies = [
  "getrandom",
 ]
 
+[[package]]
+name = "rand_xorshift"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
+dependencies = [
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "rand_xoshiro"
 version = "0.6.0"
@@ -5754,11 +6433,11 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.6"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "355ae415ccd3a04315d3f8246e86d67689ea74d88d915576e1589a351062a13b"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -5781,7 +6460,7 @@ dependencies = [
  "aho-corasick",
  "memchr",
  "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -5801,7 +6480,7 @@ checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -5812,34 +6491,35 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "rend"
-version = "0.4.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c"
+checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd"
 dependencies = [
  "bytecheck",
 ]
 
 [[package]]
 name = "reqwest"
-version = "0.11.27"
+version = "0.11.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
+checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.21.5",
  "bytes",
  "encoding_rs",
  "futures-core",
  "futures-util",
  "h2 0.3.26",
- "http 0.2.12",
+ "http 0.2.9",
  "http-body 0.4.6",
- "hyper 0.14.30",
+ "hyper 0.14.29",
+ "hyper-rustls 0.24.2",
  "hyper-tls 0.5.0",
  "ipnet",
  "js-sys",
@@ -5849,27 +6529,29 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
+ "rustls 0.21.12",
  "rustls-pemfile 1.0.4",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper 0.1.2",
- "system-configuration 0.5.1",
+ "system-configuration",
  "tokio",
  "tokio-native-tls",
+ "tokio-rustls 0.24.1",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "winreg",
+ "webpki-roots 0.25.4",
+ "winreg 0.50.0",
 ]
 
 [[package]]
 name = "reqwest"
-version = "0.12.7"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -5877,12 +6559,12 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.4.6",
+ "h2 0.4.5",
  "http 1.1.0",
- "http-body 1.0.1",
+ "http-body 1.0.0",
  "http-body-util",
- "hyper 1.4.1",
- "hyper-rustls 0.27.3",
+ "hyper 1.3.1",
+ "hyper-rustls 0.27.2",
  "hyper-tls 0.6.0",
  "hyper-util",
  "ipnet",
@@ -5894,12 +6576,12 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls-pemfile 2.1.3",
+ "rustls-pemfile 2.0.0",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper 1.0.1",
- "system-configuration 0.6.1",
+ "system-configuration",
  "tokio",
  "tokio-native-tls",
  "tokio-util",
@@ -5909,19 +6591,19 @@ dependencies = [
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
- "windows-registry",
+ "winreg 0.52.0",
 ]
 
 [[package]]
 name = "reqwest-middleware"
-version = "0.3.3"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "562ceb5a604d3f7c885a792d42c199fd8af239d0a51b2fa6a78aafa092452b04"
+checksum = "39346a33ddfe6be00cbc17a34ce996818b97b230b87229f10114693becca1268"
 dependencies = [
  "anyhow",
  "async-trait",
  "http 1.1.0",
- "reqwest 0.12.7",
+ "reqwest 0.12.5",
  "serde",
  "thiserror",
  "tower-service",
@@ -5934,7 +6616,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "82900c877a0ba5362ac5756efbd82c5b795dc509011c1253e2389d8708f1389d"
 dependencies = [
  "addchain",
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "blake2 0.10.6",
  "byteorder",
  "derivative",
@@ -5975,24 +6657,47 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.8"
+version = "0.16.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+dependencies = [
+ "cc",
+ "libc",
+ "once_cell",
+ "spin 0.5.2",
+ "untrusted 0.7.1",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
 dependencies = [
  "cc",
- "cfg-if",
  "getrandom",
  "libc",
- "spin",
- "untrusted",
- "windows-sys 0.52.0",
+ "spin 0.9.8",
+ "untrusted 0.9.0",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "ripemd"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
+dependencies = [
+ "digest 0.10.7",
 ]
 
 [[package]]
 name = "rkyv"
-version = "0.7.45"
+version = "0.7.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
+checksum = "527a97cdfef66f65998b5f3b637c26f5a5ec09cc52a3f9932313ac645f4190f5"
 dependencies = [
  "bitvec",
  "bytecheck",
@@ -6003,17 +6708,17 @@ dependencies = [
  "rkyv_derive",
  "seahash",
  "tinyvec",
- "uuid",
+ "uuid 1.5.0",
 ]
 
 [[package]]
 name = "rkyv_derive"
-version = "0.7.45"
+version = "0.7.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0"
+checksum = "b5c462a1328c8e67e4d6dbad1eb0355dd43e8ab432c6e227a43657f16ade5033"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
@@ -6024,9 +6729,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec"
 dependencies = [
  "bytes",
+ "rlp-derive",
  "rustc-hex",
 ]
 
+[[package]]
+name = "rlp-derive"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a"
+dependencies = [
+ "proc-macro2 1.0.86",
+ "quote 1.0.36",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "rocksdb"
 version = "0.21.0"
@@ -6045,9 +6762,9 @@ checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746"
 
 [[package]]
 name = "rsa"
-version = "0.9.6"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc"
+checksum = "af6c4b23d99685a1408194da11270ef8e9809aff951cc70ec9b17350b087e474"
 dependencies = [
  "const-oid",
  "digest 0.10.7",
@@ -6058,18 +6775,18 @@ dependencies = [
  "pkcs8 0.10.2",
  "rand_core 0.6.4",
  "signature 2.2.0",
- "spki 0.7.3",
+ "spki 0.7.2",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "rust_decimal"
-version = "1.36.0"
+version = "1.33.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555"
+checksum = "06676aec5ccb8fc1da723cc8c0f9a46549f21ebb8753d3915c6c41db1e7f1dc4"
 dependencies = [
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "borsh",
  "bytes",
  "num-traits",
@@ -6081,9 +6798,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.24"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustc-hash"
@@ -6099,18 +6816,18 @@ checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
 
 [[package]]
 name = "rustc_version"
-version = "0.4.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
  "semver",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.38.37"
+version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
@@ -6126,7 +6843,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
  "log",
- "ring",
+ "ring 0.17.7",
  "rustls-webpki 0.101.7",
  "sct",
 ]
@@ -6138,25 +6855,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
 dependencies = [
  "log",
- "ring",
+ "ring 0.17.7",
  "rustls-pki-types",
- "rustls-webpki 0.102.8",
+ "rustls-webpki 0.102.4",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.13"
+version = "0.23.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
+checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402"
 dependencies = [
  "aws-lc-rs",
  "log",
  "once_cell",
- "ring",
+ "ring 0.17.7",
  "rustls-pki-types",
- "rustls-webpki 0.102.8",
+ "rustls-webpki 0.102.4",
  "subtle",
  "zeroize",
 ]
@@ -6175,12 +6892,12 @@ dependencies = [
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.7.3"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
+checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile 2.1.3",
+ "rustls-pemfile 2.0.0",
  "rustls-pki-types",
  "schannel",
  "security-framework",
@@ -6192,51 +6909,51 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.21.5",
 ]
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4"
 dependencies = [
- "base64 0.22.1",
+ "base64 0.21.5",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
 
 [[package]]
 name = "rustls-platform-verifier"
-version = "0.3.4"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490"
+checksum = "3e3beb939bcd33c269f4bf946cc829fcd336370267c4a927ac0399c84a3151a1"
 dependencies = [
  "core-foundation",
  "core-foundation-sys",
  "jni",
  "log",
  "once_cell",
- "rustls 0.23.13",
- "rustls-native-certs 0.7.3",
+ "rustls 0.23.10",
+ "rustls-native-certs 0.7.0",
  "rustls-platform-verifier-android",
- "rustls-webpki 0.102.8",
+ "rustls-webpki 0.102.4",
  "security-framework",
  "security-framework-sys",
- "webpki-roots",
+ "webpki-roots 0.26.0",
  "winapi",
 ]
 
 [[package]]
 name = "rustls-platform-verifier-android"
-version = "0.1.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
+checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad"
 
 [[package]]
 name = "rustls-webpki"
@@ -6244,27 +6961,27 @@ version = "0.101.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
 dependencies = [
- "ring",
- "untrusted",
+ "ring 0.17.7",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.8"
+version = "0.102.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
 dependencies = [
  "aws-lc-rs",
- "ring",
+ "ring 0.17.7",
  "rustls-pki-types",
- "untrusted",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.17"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
 [[package]]
 name = "ruzstd"
@@ -6279,9 +6996,18 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+
+[[package]]
+name = "salsa20"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213"
+dependencies = [
+ "cipher",
+]
 
 [[package]]
 name = "same-file"
@@ -6327,7 +7053,7 @@ dependencies = [
  "darling 0.14.4",
  "proc-macro-crate 1.3.1",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
@@ -6355,7 +7081,7 @@ dependencies = [
  "darling 0.14.4",
  "proc-macro-crate 1.3.1",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
@@ -6379,9 +7105,9 @@ version = "2.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62"
 dependencies = [
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
@@ -6392,9 +7118,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00860983481ac590ac87972062909bef0d6a658013b592ccc0f2feb272feab11"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "scale-info",
- "syn 2.0.77",
+ "syn 2.0.72",
  "thiserror",
 ]
 
@@ -6420,11 +7146,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -6435,7 +7161,7 @@ checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0"
 dependencies = [
  "aead",
  "arrayref",
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "curve25519-dalek",
  "getrandom_or_panic",
  "merlin",
@@ -6452,14 +7178,26 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "scrypt"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d"
+dependencies = [
+ "hmac 0.12.1",
+ "pbkdf2 0.11.0",
+ "salsa20",
+ "sha2 0.10.8",
+]
+
 [[package]]
 name = "sct"
 version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
 dependencies = [
- "ring",
- "untrusted",
+ "ring 0.17.7",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
@@ -6489,7 +7227,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
 dependencies = [
  "base16ct 0.2.0",
- "der 0.7.9",
+ "der 0.7.8",
  "generic-array",
  "pkcs8 0.10.2",
  "subtle",
@@ -6526,9 +7264,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.11.1"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
  "bitflags 2.6.0",
  "core-foundation",
@@ -6540,9 +7278,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.12.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
+checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -6553,7 +7291,7 @@ name = "selector_generator"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 4.5.18",
+ "clap 4.4.6",
  "ethabi",
  "glob",
  "hex",
@@ -6577,15 +7315,21 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
 
+[[package]]
+name = "send_wrapper"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
+
 [[package]]
 name = "sentry"
-version = "0.31.8"
+version = "0.31.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce4b57f1b521f674df7a1d200be8ff5d74e3712020ee25b553146657b5377d5"
+checksum = "0097a48cd1999d983909f07cb03b15241c5af29e5e679379efac1c06296abecc"
 dependencies = [
  "httpdate",
  "native-tls",
- "reqwest 0.11.27",
+ "reqwest 0.11.22",
  "sentry-backtrace",
  "sentry-contexts",
  "sentry-core",
@@ -6598,9 +7342,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-backtrace"
-version = "0.31.8"
+version = "0.31.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58cc8d4e04a73de8f718dc703943666d03f25d3e9e4d0fb271ca0b8c76dfa00e"
+checksum = "18a7b80fa1dd6830a348d38a8d3a9761179047757b7dca29aef82db0118b9670"
 dependencies = [
  "backtrace",
  "once_cell",
@@ -6610,9 +7354,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-contexts"
-version = "0.31.8"
+version = "0.31.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6436c1bad22cdeb02179ea8ef116ffc217797c028927def303bc593d9320c0d1"
+checksum = "7615dc588930f1fd2e721774f25844ae93add2dbe2d3c2f995ce5049af898147"
 dependencies = [
  "hostname",
  "libc",
@@ -6624,9 +7368,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-core"
-version = "0.31.8"
+version = "0.31.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901f761681f97db3db836ef9e094acdd8756c40215326c194201941947164ef1"
+checksum = "8f51264e4013ed9b16558cce43917b983fa38170de2ca480349ceb57d71d6053"
 dependencies = [
  "once_cell",
  "rand 0.8.5",
@@ -6637,9 +7381,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-debug-images"
-version = "0.31.8"
+version = "0.31.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afdb263e73d22f39946f6022ed455b7561b22ff5553aca9be3c6a047fa39c328"
+checksum = "2fe6180fa564d40bb942c9f0084ffb5de691c7357ead6a2b7a3154fae9e401dd"
 dependencies = [
  "findshlibs",
  "once_cell",
@@ -6648,9 +7392,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-panic"
-version = "0.31.8"
+version = "0.31.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74fbf1c163f8b6a9d05912e1b272afa27c652e8b47ea60cb9a57ad5e481eea99"
+checksum = "323160213bba549f9737317b152af116af35c0410f4468772ee9b606d3d6e0fa"
 dependencies = [
  "sentry-backtrace",
  "sentry-core",
@@ -6658,9 +7402,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-tracing"
-version = "0.31.8"
+version = "0.31.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82eabcab0a047040befd44599a1da73d3adb228ff53b5ed9795ae04535577704"
+checksum = "38033822128e73f7b6ca74c1631cef8868890c6cb4008a291cf73530f87b4eac"
 dependencies = [
  "sentry-backtrace",
  "sentry-core",
@@ -6670,9 +7414,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-types"
-version = "0.31.8"
+version = "0.31.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da956cca56e0101998c8688bc65ce1a96f00673a0e58e663664023d4c7911e82"
+checksum = "0e663b3eb62ddfc023c9cf5432daf5f1a4f6acb1df4d78dd80b740b32dd1a740"
 dependencies = [
  "debugid",
  "hex",
@@ -6682,7 +7426,7 @@ dependencies = [
  "thiserror",
  "time",
  "url",
- "uuid",
+ "uuid 1.5.0",
 ]
 
 [[package]]
@@ -6726,8 +7470,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -6744,9 +7488,9 @@ dependencies = [
 
 [[package]]
 name = "serde_path_to_error"
-version = "0.1.16"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
+checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335"
 dependencies = [
  "itoa",
  "serde",
@@ -6803,17 +7547,17 @@ checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
 dependencies = [
  "darling 0.13.4",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.34+deprecated"
+version = "0.9.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
+checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.1.0",
  "itoa",
  "ryu",
  "serde",
@@ -6928,9 +7672,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.2"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
 dependencies = [
  "libc",
 ]
@@ -6957,15 +7701,15 @@ dependencies = [
 
 [[package]]
 name = "simdutf8"
-version = "0.1.5"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
+checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
 
 [[package]]
 name = "similar"
-version = "2.6.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e"
+checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597"
 
 [[package]]
 name = "simple_asn1"
@@ -7008,7 +7752,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8"
 dependencies = [
  "bytecount",
- "cargo_metadata",
+ "cargo_metadata 0.14.2",
  "error-chain",
  "glob",
  "pulldown-cmark",
@@ -7027,9 +7771,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
 dependencies = [
  "serde",
 ]
@@ -7057,10 +7801,10 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6d1eaa97d77be4d026a1e7ffad1bb3b78448763b357ea6f8188d3e6f736a9b9"
 dependencies = [
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "async-lock",
  "atomic-take",
- "base64 0.21.7",
+ "base64 0.21.5",
  "bip39",
  "blake2-rfc",
  "bs58",
@@ -7076,7 +7820,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "hex",
  "hmac 0.12.1",
- "itertools 0.12.1",
+ "itertools 0.12.0",
  "libm",
  "libsecp256k1",
  "merlin",
@@ -7085,7 +7829,7 @@ dependencies = [
  "num-bigint 0.4.6",
  "num-rational",
  "num-traits",
- "pbkdf2",
+ "pbkdf2 0.12.2",
  "pin-project",
  "poly1305",
  "rand 0.8.5",
@@ -7114,7 +7858,7 @@ checksum = "5496f2d116b7019a526b1039ec2247dd172b8670633b1a64a614c9ea12c9d8c7"
 dependencies = [
  "async-channel 2.3.1",
  "async-lock",
- "base64 0.21.7",
+ "base64 0.21.5",
  "blake2-rfc",
  "derive_more 0.99.18",
  "either",
@@ -7125,7 +7869,7 @@ dependencies = [
  "futures-util",
  "hashbrown 0.14.5",
  "hex",
- "itertools 0.12.1",
+ "itertools 0.12.0",
  "log",
  "lru",
  "no-std-net",
@@ -7181,12 +7925,12 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -7220,6 +7964,20 @@ dependencies = [
  "sha1",
 ]
 
+[[package]]
+name = "solang-parser"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c425ce1c59f4b154717592f0bdf4715c3a1d55058883622d3157e1f0908a5b26"
+dependencies = [
+ "itertools 0.11.0",
+ "lalrpop",
+ "lalrpop-util",
+ "phf",
+ "thiserror",
+ "unicode-xid 0.2.4",
+]
+
 [[package]]
 name = "sp-core-hashing"
 version = "15.0.0"
@@ -7234,6 +7992,12 @@ dependencies = [
  "twox-hash",
 ]
 
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
 [[package]]
 name = "spin"
 version = "0.9.8"
@@ -7255,12 +8019,12 @@ dependencies = [
 
 [[package]]
 name = "spki"
-version = "0.7.3"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
 dependencies = [
  "base64ct",
- "der 0.7.9",
+ "der 0.7.8",
 ]
 
 [[package]]
@@ -7271,19 +8035,20 @@ checksum = "c85070f382340e8b23a75808e83573ddf65f9ad9143df9573ca37c1ed2ee956a"
 
 [[package]]
 name = "sqlformat"
-version = "0.2.6"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790"
+checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c"
 dependencies = [
+ "itertools 0.12.0",
  "nom",
  "unicode_categories",
 ]
 
 [[package]]
 name = "sqlx"
-version = "0.8.2"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93334716a037193fac19df402f8571269c84a00852f6a7066b5d2616dcd64d3e"
+checksum = "fcfa89bea9500db4a0d038513d7a060566bfc51d46d1c014847049a45cce85e8"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -7294,9 +8059,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.8.2"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d8060b456358185f7d50c55d9b5066ad956956fddec42ee2e8567134a8936e"
+checksum = "d06e2f2bd861719b1f3f0c7dbe1d80c30bf59e76cf019f07d9014ed7eefb8e08"
 dependencies = [
  "atoi",
  "bigdecimal",
@@ -7315,7 +8080,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "hashlink",
  "hex",
- "indexmap 2.5.0",
+ "indexmap 2.1.0",
  "ipnetwork",
  "log",
  "memchr",
@@ -7338,22 +8103,22 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros"
-version = "0.8.2"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cac0692bcc9de3b073e8d747391827297e075c7710ff6276d9f7a1f3d58c6657"
+checksum = "2f998a9defdbd48ed005a89362bd40dd2117502f15294f61c8d47034107dbbdc"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "sqlx-core",
  "sqlx-macros-core",
- "syn 2.0.77",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "sqlx-macros-core"
-version = "0.8.2"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1804e8a7c7865599c9c79be146dc8a9fd8cc86935fa641d3ea58e5f0688abaa5"
+checksum = "3d100558134176a2629d46cec0c8891ba0be8910f7896abfdb75ef4ab6f4e7ce"
 dependencies = [
  "dotenvy",
  "either",
@@ -7361,7 +8126,7 @@ dependencies = [
  "hex",
  "once_cell",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "serde",
  "serde_json",
  "sha2 0.10.8",
@@ -7369,7 +8134,7 @@ dependencies = [
  "sqlx-mysql",
  "sqlx-postgres",
  "sqlx-sqlite",
- "syn 2.0.77",
+ "syn 2.0.72",
  "tempfile",
  "tokio",
  "url",
@@ -7377,9 +8142,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-mysql"
-version = "0.8.2"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a"
+checksum = "936cac0ab331b14cb3921c62156d913e4c15b74fb6ec0f3146bd4ef6e4fb3c12"
 dependencies = [
  "atoi",
  "base64 0.22.1",
@@ -7422,9 +8187,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-postgres"
-version = "0.8.2"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8"
+checksum = "9734dbce698c67ecf67c442f768a5e90a49b2a4d61a9f1d59f73874bd4cf0710"
 dependencies = [
  "atoi",
  "base64 0.22.1",
@@ -7465,9 +8230,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-sqlite"
-version = "0.8.2"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5b2cf34a45953bfd3daaf3db0f7a7878ab9b7a6b91b422d24a7a9e4c857b680"
+checksum = "a75b419c3c1b1697833dd927bdc4c6545a620bc1bbafabd44e1efbe9afcd337e"
 dependencies = [
  "atoi",
  "chrono",
@@ -7508,19 +8273,19 @@ dependencies = [
  "new_debug_unreachable",
  "once_cell",
  "parking_lot",
- "phf_shared",
+ "phf_shared 0.10.0",
  "precomputed-hash",
 ]
 
 [[package]]
 name = "stringprep"
-version = "0.1.5"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1"
+checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6"
 dependencies = [
+ "finl_unicode",
  "unicode-bidi",
  "unicode-normalization",
- "unicode-properties",
 ]
 
 [[package]]
@@ -7561,7 +8326,7 @@ dependencies = [
  "heck 0.3.3",
  "proc-macro-error",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
@@ -7582,16 +8347,16 @@ checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "rustversion",
- "syn 2.0.77",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "subtle"
-version = "2.6.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
 [[package]]
 name = "subxt"
@@ -7641,11 +8406,11 @@ dependencies = [
  "jsonrpsee 0.21.0",
  "parity-scale-codec",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "scale-info",
  "scale-typegen",
  "subxt-metadata",
- "syn 2.0.77",
+ "syn 2.0.72",
  "thiserror",
  "tokio",
 ]
@@ -7676,10 +8441,10 @@ dependencies = [
  "darling 0.20.10",
  "parity-scale-codec",
  "proc-macro-error",
- "quote 1.0.37",
+ "quote 1.0.36",
  "scale-typegen",
  "subxt-codegen",
- "syn 2.0.77",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -7705,7 +8470,7 @@ dependencies = [
  "hex",
  "hmac 0.12.1",
  "parity-scale-codec",
- "pbkdf2",
+ "pbkdf2 0.12.2",
  "regex",
  "schnorrkel",
  "secrecy",
@@ -7716,6 +8481,26 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "svm-rs"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11297baafe5fa0c99d5722458eac6a5e25c01eb1b8e5cd137f54079093daa7a4"
+dependencies = [
+ "dirs",
+ "fs2",
+ "hex",
+ "once_cell",
+ "reqwest 0.11.22",
+ "semver",
+ "serde",
+ "serde_json",
+ "sha2 0.10.8",
+ "thiserror",
+ "url",
+ "zip",
+]
+
 [[package]]
 name = "syn"
 version = "0.15.44"
@@ -7734,18 +8519,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "unicode-ident",
 ]
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "unicode-ident",
 ]
 
@@ -7757,8 +8542,8 @@ checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
 dependencies = [
  "proc-macro-error",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -7772,9 +8557,6 @@ name = "sync_wrapper"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
-dependencies = [
- "futures-core",
-]
 
 [[package]]
 name = "system-configuration"
@@ -7784,18 +8566,7 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
- "system-configuration-sys 0.5.0",
-]
-
-[[package]]
-name = "system-configuration"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
-dependencies = [
- "bitflags 2.6.0",
- "core-foundation",
- "system-configuration-sys 0.6.0",
+ "system-configuration-sys",
 ]
 
 [[package]]
@@ -7808,16 +8579,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "system-configuration-sys"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "system-constants-generator"
 version = "0.1.0"
@@ -7846,15 +8607,14 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tempfile"
-version = "3.12.0"
+version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
  "fastrand",
- "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -7879,44 +8639,43 @@ dependencies = [
 
 [[package]]
 name = "test-casing"
-version = "0.1.3"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4d233764420cbfe244e6a50177798a01b20184df210eb626898cd1b20c06633"
+checksum = "b2378d657757969a2cec9ec4eb616be8f01be98c21c6467991f91cb182e4653b"
 dependencies = [
  "test-casing-macro",
 ]
 
 [[package]]
 name = "test-casing-macro"
-version = "0.1.3"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9b53c7124dd88026d5d98a1eb1fd062a578b7d783017c9298825526c7fb6427"
+checksum = "2cfbe7811249c4c914b06141b8ac0f2cee2733fb883d05eb19668a45fc60c3d5"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "test-log"
-version = "0.2.16"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93"
+checksum = "7b319995299c65d522680decf80f2c108d85b861d81dfe340a10d16cee29d9e6"
 dependencies = [
  "env_logger",
  "test-log-macros",
- "tracing-subscriber",
 ]
 
 [[package]]
 name = "test-log-macros"
-version = "0.2.16"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5"
+checksum = "c8f546451eaa38373f549093fe9fd05e7d2bade739e2ddf834b9968621d60107"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -7930,35 +8689,35 @@ dependencies = [
 
 [[package]]
 name = "textwrap"
-version = "0.16.1"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.64"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.64"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.8"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -8054,9 +8813,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.8.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -8082,9 +8841,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.39.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a"
 dependencies = [
  "backtrace",
  "bytes",
@@ -8105,8 +8864,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -8146,21 +8905,36 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls 0.23.13",
+ "rustls 0.23.10",
  "rustls-pki-types",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.16"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
+checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
 dependencies = [
  "futures-core",
  "pin-project-lite",
  "tokio",
- "tokio-util",
+ "tokio-util",
+]
+
+[[package]]
+name = "tokio-tungstenite"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
+dependencies = [
+ "futures-util",
+ "log",
+ "rustls 0.21.12",
+ "tokio",
+ "tokio-rustls 0.24.1",
+ "tungstenite",
+ "webpki-roots 0.25.4",
 ]
 
 [[package]]
@@ -8179,21 +8953,21 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.22",
+ "toml_edit 0.22.16",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.8"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
 dependencies = [
  "serde",
 ]
@@ -8204,18 +8978,40 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.1.0",
+ "toml_datetime",
+ "winnow 0.5.17",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
+dependencies = [
+ "indexmap 2.1.0",
+ "toml_datetime",
+ "winnow 0.5.17",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap 2.1.0",
  "toml_datetime",
- "winnow 0.5.40",
+ "winnow 0.5.17",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.22"
+version = "0.22.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.1.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -8224,29 +9020,29 @@ dependencies = [
 
 [[package]]
 name = "tonic"
-version = "0.12.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52"
+checksum = "38659f4a91aba8598d27821589f5db7dddd94601e7a01b1e485a50e5484c7401"
 dependencies = [
  "async-stream",
  "async-trait",
  "axum",
  "base64 0.22.1",
  "bytes",
- "h2 0.4.6",
+ "h2 0.4.5",
  "http 1.1.0",
- "http-body 1.0.1",
+ "http-body 1.0.0",
  "http-body-util",
- "hyper 1.4.1",
+ "hyper 1.3.1",
  "hyper-timeout",
  "hyper-util",
  "percent-encoding",
  "pin-project",
- "prost 0.13.3",
+ "prost 0.13.1",
  "socket2",
  "tokio",
  "tokio-stream",
- "tower 0.4.13",
+ "tower",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -8272,22 +9068,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "tower"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project-lite",
- "sync_wrapper 0.1.2",
- "tokio",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
 [[package]]
 name = "tower-http"
 version = "0.5.2"
@@ -8297,7 +9077,7 @@ dependencies = [
  "bitflags 2.6.0",
  "bytes",
  "http 1.1.0",
- "http-body 1.0.1",
+ "http-body 1.0.0",
  "http-body-util",
  "pin-project-lite",
  "tokio",
@@ -8307,15 +9087,15 @@ dependencies = [
 
 [[package]]
 name = "tower-layer"
-version = "0.3.3"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
 
 [[package]]
 name = "tower-service"
-version = "0.3.3"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
@@ -8336,8 +9116,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -8350,6 +9130,27 @@ 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.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
 [[package]]
 name = "tracing-log"
 version = "0.2.0"
@@ -8374,7 +9175,7 @@ dependencies = [
  "smallvec",
  "tracing",
  "tracing-core",
- "tracing-log",
+ "tracing-log 0.2.0",
  "tracing-subscriber",
  "web-time",
 ]
@@ -8391,9 +9192,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.18"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
 dependencies = [
  "matchers",
  "nu-ansi-term",
@@ -8407,34 +9208,55 @@ dependencies = [
  "time",
  "tracing",
  "tracing-core",
- "tracing-log",
+ "tracing-log 0.1.4",
  "tracing-serde",
 ]
 
 [[package]]
 name = "triomphe"
-version = "0.1.13"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369"
+checksum = "0eee8098afad3fb0c54a9007aab6804558410503ad676d4633f9c2559a00ac0f"
 
 [[package]]
 name = "try-lock"
-version = "0.2.5"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "trybuild"
-version = "1.0.99"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "207aa50d36c4be8d8c6ea829478be44a372c6a77669937bb39c698e52f1491e8"
+checksum = "8419ecd263363827c5730386f418715766f584e2f874d32c23c5b00bd9727e7e"
 dependencies = [
+ "basic-toml",
  "glob",
+ "once_cell",
  "serde",
  "serde_derive",
  "serde_json",
  "termcolor",
- "toml",
+]
+
+[[package]]
+name = "tungstenite"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9"
+dependencies = [
+ "byteorder",
+ "bytes",
+ "data-encoding",
+ "http 0.2.9",
+ "httparse",
+ "log",
+ "rand 0.8.5",
+ "rustls 0.21.12",
+ "sha1",
+ "thiserror",
+ "url",
+ "utf-8",
 ]
 
 [[package]]
@@ -8487,6 +9309,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "unarray"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
+
 [[package]]
 name = "unicase"
 version = "2.7.0"
@@ -8498,15 +9326,15 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.13"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
@@ -8517,23 +9345,17 @@ dependencies = [
  "tinyvec",
 ]
 
-[[package]]
-name = "unicode-properties"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524"
-
 [[package]]
 name = "unicode-segmentation"
-version = "1.12.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.14"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
 [[package]]
 name = "unicode-xid"
@@ -8543,9 +9365,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.6"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
 [[package]]
 name = "unicode_categories"
@@ -8569,15 +9391,21 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ad948c1cb799b1a70f836077721a92a35ac177d4daddf4c20a633786d4cf618"
 dependencies = [
- "quote 1.0.37",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.11"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b"
+
+[[package]]
+name = "untrusted"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "untrusted"
@@ -8587,11 +9415,11 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "ureq"
-version = "2.10.1"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
+checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3"
 dependencies = [
- "base64 0.22.1",
+ "base64 0.21.5",
  "log",
  "native-tls",
  "once_cell",
@@ -8616,17 +9444,33 @@ version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
+[[package]]
+name = "utf-8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+
 [[package]]
 name = "utf8parse"
-version = "0.2.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
+dependencies = [
+ "getrandom",
+ "serde",
+]
+
+[[package]]
+name = "uuid"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
 dependencies = [
  "serde",
 ]
@@ -8670,9 +9514,9 @@ dependencies = [
 
 [[package]]
 name = "version_check"
-version = "0.9.5"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "vise"
@@ -8694,7 +9538,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "671d3b894d5d0849f0a597f56bf071f42d4f2a1cbcf2f78ca21f870ab7c0cc2b"
 dependencies = [
- "hyper 0.14.30",
+ "hyper 0.14.29",
  "once_cell",
  "tokio",
  "tracing",
@@ -8708,8 +9552,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a511871dc5de990a3b2a0e715facfbc5da848c0c0395597a1415029fb7c250a"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -8732,9 +9576,9 @@ dependencies = [
 
 [[package]]
 name = "walkdir"
-version = "2.5.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -8769,35 +9613,34 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
 dependencies = [
  "cfg-if",
- "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -8807,32 +9650,32 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
 dependencies = [
- "quote 1.0.37",
+ "quote 1.0.36",
  "wasm-bindgen-macro-support",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
 
 [[package]]
 name = "wasm-streams"
@@ -8854,7 +9697,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77a8281d1d660cdf54c76a3efa9ddd0c270cada1383a995db3ccb43d166456c7"
 dependencies = [
  "smallvec",
- "spin",
+ "spin 0.9.8",
  "wasmi_arena",
  "wasmi_core",
  "wasmparser-nostd",
@@ -8889,9 +9732,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -8909,9 +9752,15 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.6"
+version = "0.25.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
+
+[[package]]
+name = "webpki-roots"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
+checksum = "0de2cfda980f21be5a7ed2eadb3e6fe074d56022bea2cdeb1a62eb220fc04188"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -8930,9 +9779,9 @@ dependencies = [
 
 [[package]]
 name = "whoami"
-version = "1.5.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
+checksum = "0fec781d48b41f8163426ed18e8fc2864c12937df9ce54c88ede7bd47270893e"
 dependencies = [
  "redox_syscall",
  "wasite",
@@ -8956,11 +9805,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.9"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
 dependencies = [
- "windows-sys 0.59.0",
+ "winapi",
 ]
 
 [[package]]
@@ -8971,41 +9820,20 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-registry"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
-dependencies = [
- "windows-result",
- "windows-strings",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.2.0"
+version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
-name = "windows-strings"
-version = "0.1.0"
+name = "windows-sys"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
 dependencies = [
- "windows-result",
- "windows-targets 0.52.6",
+ "windows-targets 0.42.2",
 ]
 
 [[package]]
@@ -9035,6 +9863,21 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -9066,6 +9909,12 @@ dependencies = [
  "windows_x86_64_msvc 0.52.6",
 ]
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -9078,6 +9927,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -9090,6 +9945,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -9108,6 +9969,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -9120,6 +9987,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -9132,6 +10005,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -9144,6 +10023,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -9158,9 +10043,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.5.40"
+version = "0.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c"
 dependencies = [
  "memchr",
 ]
@@ -9184,6 +10069,35 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "winreg"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "ws_stream_wasm"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7999f5f4217fe3818726b66257a4475f71e74ffd190776ad053fa159e50737f5"
+dependencies = [
+ "async_io_stream",
+ "futures 0.3.30",
+ "js-sys",
+ "log",
+ "pharos",
+ "rustc_version",
+ "send_wrapper 0.6.0",
+ "thiserror",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -9205,11 +10119,20 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "yaml-rust"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
+dependencies = [
+ "linked-hash-map",
+]
+
 [[package]]
 name = "yansi"
-version = "1.0.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
 
 [[package]]
 name = "yap"
@@ -9219,30 +10142,29 @@ checksum = "ff4524214bc4629eba08d78ceb1d6507070cc0bcbbed23af74e19e6e924a24cf"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.35"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
 dependencies = [
- "byteorder",
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.35"
+version = "0.7.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.8.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
 dependencies = [
  "zeroize_derive",
 ]
@@ -9254,8 +10176,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
+]
+
+[[package]]
+name = "zip"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
+dependencies = [
+ "aes",
+ "byteorder",
+ "bzip2",
+ "constant_time_eq 0.1.5",
+ "crc32fast",
+ "crossbeam-utils",
+ "flate2",
+ "hmac 0.12.1",
+ "pbkdf2 0.11.0",
+ "sha1",
+ "time",
+ "zstd",
 ]
 
 [[package]]
@@ -9380,13 +10322,14 @@ dependencies = [
 
 [[package]]
 name = "zkevm_circuits"
-version = "0.140.3"
+version = "0.140.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c365c801e0c6eda83fbd153df45575172beb406bfb663d386f9154b4325eda"
+checksum = "8beed4cc1ab1f9d99a694506d18705e10059534b30742832be49637c4775e1f8"
 dependencies = [
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "bincode",
  "boojum",
+ "cs_derive",
  "derivative",
  "hex",
  "itertools 0.10.5",
@@ -9397,18 +10340,18 @@ dependencies = [
  "serde_json",
  "smallvec",
  "zkevm_opcode_defs 0.132.0",
- "zksync_cs_derive",
 ]
 
 [[package]]
 name = "zkevm_circuits"
-version = "0.141.2"
+version = "0.141.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ccd0352e122a4e6f0046d2163b7e692e627b23fc3264faa77331a21b65833fd"
+checksum = "20f1a64d256cc5f5c58d19cf976cb45973df54e4e3010ca4a3e6fafe9f06075e"
 dependencies = [
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "bincode",
  "boojum",
+ "cs_derive",
  "derivative",
  "hex",
  "itertools 0.10.5",
@@ -9419,7 +10362,6 @@ dependencies = [
  "serde_json",
  "smallvec",
  "zkevm_opcode_defs 0.141.0",
- "zksync_cs_derive",
 ]
 
 [[package]]
@@ -9428,7 +10370,7 @@ version = "0.150.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "784fa7cfb51e17c5ced112bca43da30b3468b2347b7af0427ad9638759fb140e"
 dependencies = [
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "boojum",
  "derivative",
  "hex",
@@ -9478,7 +10420,7 @@ dependencies = [
  "bitflags 2.6.0",
  "blake2 0.10.6",
  "ethereum-types",
- "k256 0.13.4",
+ "k256 0.13.3",
  "lazy_static",
  "sha2 0.10.8",
  "sha3 0.10.8",
@@ -9493,7 +10435,7 @@ dependencies = [
  "bitflags 2.6.0",
  "blake2 0.10.6",
  "ethereum-types",
- "k256 0.13.4",
+ "k256 0.13.3",
  "lazy_static",
  "p256",
  "serde",
@@ -9533,7 +10475,7 @@ dependencies = [
  "chrono",
  "ethabi",
  "hex",
- "num_enum 0.7.3",
+ "num_enum 0.7.2",
  "secrecy",
  "serde",
  "serde_json",
@@ -9550,7 +10492,7 @@ version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ffa03efe9bdb137a4b36b97d1a74237e18c9ae42b755163d903a9d48c1a5d80"
 dependencies = [
- "arrayvec 0.7.6",
+ "arrayvec 0.7.4",
  "bit-vec",
  "blake2s_simd",
  "byteorder",
@@ -9708,7 +10650,7 @@ dependencies = [
  "ed25519-dalek",
  "elliptic-curve 0.13.8",
  "hex",
- "k256 0.13.4",
+ "k256 0.13.3",
  "num-bigint 0.4.6",
  "num-traits",
  "rand 0.8.5",
@@ -9752,12 +10694,12 @@ dependencies = [
  "build_html",
  "bytesize",
  "http-body-util",
- "hyper 1.4.1",
+ "hyper 1.3.1",
  "hyper-util",
  "im",
  "once_cell",
  "pin-project",
- "prost 0.12.6",
+ "prost 0.12.1",
  "rand 0.8.5",
  "semver",
  "snow",
@@ -9786,7 +10728,7 @@ dependencies = [
  "bit-vec",
  "hex",
  "num-bigint 0.4.6",
- "prost 0.12.6",
+ "prost 0.12.1",
  "rand 0.8.5",
  "serde",
  "thiserror",
@@ -9806,7 +10748,7 @@ checksum = "ff43cfd03ea205c763e74362dc6ec5a4d74b6b1baef0fb134dde92a8880397f7"
 dependencies = [
  "anyhow",
  "async-trait",
- "prost 0.12.6",
+ "prost 0.12.1",
  "rand 0.8.5",
  "thiserror",
  "tracing",
@@ -9970,7 +10912,7 @@ checksum = "5939e2df4288c263c706ff18ac718e984149223ad4289d6d957d767dcfc04c81"
 dependencies = [
  "proc-macro-error",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
@@ -9992,13 +10934,15 @@ dependencies = [
  "base58",
  "blake2 0.10.6",
  "blake2b_simd",
+ "ethers",
  "flate2",
  "futures 0.3.30",
  "hex",
  "http 1.1.0",
  "jsonrpsee 0.23.2",
  "parity-scale-codec",
- "reqwest 0.12.7",
+ "reqwest 0.12.5",
+ "rlp",
  "scale-encode",
  "serde",
  "serde_json",
@@ -10007,8 +10951,10 @@ dependencies = [
  "tokio",
  "tracing",
  "zksync_config",
+ "zksync_contracts",
  "zksync_da_client",
  "zksync_env_config",
+ "zksync_eth_client",
  "zksync_object_store",
  "zksync_types",
 ]
@@ -10041,7 +10987,7 @@ dependencies = [
  "chrono",
  "hex",
  "itertools 0.10.5",
- "prost 0.12.6",
+ "prost 0.12.1",
  "rand 0.8.5",
  "serde",
  "serde_json",
@@ -10185,7 +11131,7 @@ dependencies = [
  "anyhow",
  "assert_matches",
  "async-trait",
- "clap 4.5.18",
+ "clap 4.4.6",
  "envy",
  "futures 0.3.30",
  "rustc_version",
@@ -10245,7 +11191,7 @@ dependencies = [
  "fraction",
  "httpmock",
  "rand 0.8.5",
- "reqwest 0.12.7",
+ "reqwest 0.12.5",
  "serde",
  "tokio",
  "url",
@@ -10294,7 +11240,7 @@ dependencies = [
  "num-integer",
  "num-traits",
  "proc-macro2 1.0.86",
- "quote 1.0.37",
+ "quote 1.0.36",
  "serde",
  "syn 1.0.109",
 ]
@@ -10352,6 +11298,7 @@ version = "0.1.0"
 dependencies = [
  "hex",
  "once_cell",
+ "rlp",
  "serde",
  "serde_json",
  "serde_with",
@@ -10389,7 +11336,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "assert_matches",
- "clap 4.5.18",
+ "clap 4.4.6",
  "insta",
  "leb128",
  "once_cell",
@@ -10424,7 +11371,7 @@ dependencies = [
  "futures 0.3.30",
  "itertools 0.10.5",
  "once_cell",
- "reqwest 0.12.7",
+ "reqwest 0.12.5",
  "serde",
  "serde_json",
  "tempfile",
@@ -10517,7 +11464,7 @@ dependencies = [
  "thiserror",
  "thread_local",
  "tokio",
- "tower 0.4.13",
+ "tower",
  "tower-http",
  "tracing",
  "vise",
@@ -10696,8 +11643,8 @@ name = "zksync_node_framework_derive"
 version = "0.1.0"
 dependencies = [
  "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -10803,9 +11750,9 @@ dependencies = [
  "google-cloud-auth",
  "google-cloud-storage",
  "http 1.1.0",
- "prost 0.12.6",
+ "prost 0.12.1",
  "rand 0.8.5",
- "reqwest 0.12.7",
+ "reqwest 0.12.5",
  "serde_json",
  "tempfile",
  "tokio",
@@ -10836,10 +11783,10 @@ dependencies = [
  "anyhow",
  "axum",
  "chrono",
- "hyper 1.4.1",
+ "hyper 1.3.1",
  "serde_json",
  "tokio",
- "tower 0.4.13",
+ "tower",
  "tracing",
  "vise",
  "zksync_basic_types",
@@ -10861,7 +11808,7 @@ dependencies = [
  "anyhow",
  "bit-vec",
  "once_cell",
- "prost 0.12.6",
+ "prost 0.12.1",
  "prost-reflect",
  "quick-protobuf",
  "rand 0.8.5",
@@ -10886,8 +11833,8 @@ dependencies = [
  "prost-build",
  "prost-reflect",
  "protox",
- "quote 1.0.37",
- "syn 2.0.77",
+ "quote 1.0.36",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -10896,7 +11843,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "hex",
- "prost 0.12.6",
+ "prost 0.12.1",
  "rand 0.8.5",
  "secrecy",
  "serde_json",
@@ -10964,7 +11911,7 @@ name = "zksync_server"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "clap 4.5.18",
+ "clap 4.4.6",
  "futures 0.3.30",
  "serde_json",
  "tikv-jemallocator",
@@ -11135,7 +12082,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "envy",
- "reqwest 0.12.7",
+ "reqwest 0.12.5",
  "secp256k1",
  "serde",
  "thiserror",
@@ -11218,9 +12165,9 @@ dependencies = [
  "hex",
  "itertools 0.10.5",
  "num",
- "num_enum 0.7.3",
+ "num_enum 0.7.2",
  "once_cell",
- "prost 0.12.6",
+ "prost 0.12.1",
  "rlp",
  "secp256k1",
  "serde",
@@ -11254,7 +12201,7 @@ dependencies = [
  "num",
  "once_cell",
  "rand 0.8.5",
- "reqwest 0.12.7",
+ "reqwest 0.12.5",
  "serde",
  "serde_json",
  "thiserror",
@@ -11392,7 +12339,7 @@ dependencies = [
  "pin-project-lite",
  "rand 0.8.5",
  "rlp",
- "rustls 0.23.13",
+ "rustls 0.23.10",
  "serde",
  "serde_json",
  "test-casing",
@@ -11404,11 +12351,30 @@ dependencies = [
  "zksync_types",
 ]
 
+[[package]]
+name = "zstd"
+version = "0.11.2+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "5.0.2+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
+dependencies = [
+ "libc",
+ "zstd-sys",
+]
+
 [[package]]
 name = "zstd-sys"
-version = "2.0.13+zstd.1.5.6"
+version = "2.0.9+zstd.1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
+checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/Cargo.toml b/Cargo.toml
index 31f61f2b2d5..691341f71ba 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -185,7 +185,7 @@ tower-http = "0.5.2"
 tracing = "0.1"
 tracing-subscriber = "0.3"
 tracing-opentelemetry = "0.25.0"
-time = "0.3.36"                                                               # Has to be same as used by `tracing-subscriber`
+time = "0.3.36" # Has to be same as used by `tracing-subscriber`
 url = "2"
 web3 = "0.19.0"
 fraction = "0.15.3"
diff --git a/backup-ecosystem.sh b/backup-ecosystem.sh
index dbdf82e3a38..848884ae2d7 100755
--- a/backup-ecosystem.sh
+++ b/backup-ecosystem.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# This script backs up the Postgres databases and chain configuration files for a given ecosystem. 
+# With it you can make a testnet deployment and save the L2 state for later recovery.
+
 # Check if the ecosystem name was provided as an argument
 if [ -z "$1" ]; then
   echo "Usage: ./backup-ecosystem ECOSYSTEM_NAME"
diff --git a/contracts b/contracts
index 3ec30fa71cb..b3e1673b962 160000
--- a/contracts
+++ b/contracts
@@ -1 +1 @@
-Subproject commit 3ec30fa71cb123d2b25ade27a8248d0b320e505f
+Subproject commit b3e1673b962453dca5ad481dbf16474bd7f78e45
diff --git a/core/bin/genesis_generator/src/main.rs b/core/bin/genesis_generator/src/main.rs
index 4f8200b3af7..2a96cdc6c6c 100644
--- a/core/bin/genesis_generator/src/main.rs
+++ b/core/bin/genesis_generator/src/main.rs
@@ -87,6 +87,7 @@ async fn generate_new_config(
         genesis_commitment: None,
         bootloader_hash: Some(base_system_contracts.bootloader),
         default_aa_hash: Some(base_system_contracts.default_aa),
+        evm_emulator_hash: base_system_contracts.evm_emulator,
         ..genesis_config
     };
 
diff --git a/core/bin/system-constants-generator/src/utils.rs b/core/bin/system-constants-generator/src/utils.rs
index 43ac9841c40..8d36f734467 100644
--- a/core/bin/system-constants-generator/src/utils.rs
+++ b/core/bin/system-constants-generator/src/utils.rs
@@ -71,12 +71,14 @@ pub static GAS_TEST_SYSTEM_CONTRACTS: Lazy<BaseSystemContracts> = Lazy::new(|| {
 
     let bytecode = read_sys_contract_bytecode("", "DefaultAccount", ContractLanguage::Sol);
     let hash = hash_bytecode(&bytecode);
+
     BaseSystemContracts {
         default_aa: SystemContractCode {
             code: bytes_to_be_words(bytecode),
             hash,
         },
         bootloader,
+        evm_emulator: None,
     }
 });
 
@@ -221,6 +223,7 @@ pub(super) fn execute_internal_transfer_test() -> u32 {
     let base_system_smart_contracts = BaseSystemContracts {
         bootloader,
         default_aa,
+        evm_emulator: None,
     };
 
     let system_env = SystemEnv {
diff --git a/core/bin/zksync_server/src/node_builder.rs b/core/bin/zksync_server/src/node_builder.rs
index 894272dad84..3cb147ebf1b 100644
--- a/core/bin/zksync_server/src/node_builder.rs
+++ b/core/bin/zksync_server/src/node_builder.rs
@@ -524,7 +524,10 @@ impl MainNodeBuilder {
                     .add_layer(ObjectStorageClientWiringLayer::new(config));
             }
             (DAClientConfig::EigenDA(config), _) => {
-                self.node.add_layer(EigenDAWiringLayer::new(config));
+                self.node.add_layer(EigenDAWiringLayer::new(
+                    config,
+                    self.contracts_config.eigenda_verifier_addr.unwrap(),
+                ));
             }
         }
 
diff --git a/core/lib/config/src/configs/chain.rs b/core/lib/config/src/configs/chain.rs
index 7e33f6964bb..c117064dbc4 100644
--- a/core/lib/config/src/configs/chain.rs
+++ b/core/lib/config/src/configs/chain.rs
@@ -138,6 +138,8 @@ pub struct StateKeeperConfig {
     pub bootloader_hash: Option<H256>,
     #[deprecated(note = "Use GenesisConfig::default_aa_hash instead")]
     pub default_aa_hash: Option<H256>,
+    #[deprecated(note = "Use GenesisConfig::evm_emulator_hash instead")]
+    pub evm_emulator_hash: Option<H256>,
     #[deprecated(note = "Use GenesisConfig::l1_batch_commit_data_generator_mode instead")]
     #[serde(default)]
     pub l1_batch_commit_data_generator_mode: L1BatchCommitmentMode,
@@ -178,6 +180,7 @@ impl StateKeeperConfig {
             protective_reads_persistence_enabled: true,
             bootloader_hash: None,
             default_aa_hash: None,
+            evm_emulator_hash: None,
             l1_batch_commit_data_generator_mode: L1BatchCommitmentMode::Rollup,
         }
     }
diff --git a/core/lib/config/src/configs/contracts.rs b/core/lib/config/src/configs/contracts.rs
index b68720ebaef..fa99b4139ef 100644
--- a/core/lib/config/src/configs/contracts.rs
+++ b/core/lib/config/src/configs/contracts.rs
@@ -40,6 +40,7 @@ pub struct ContractsConfig {
     // Used by the RPC API and by the node builder in wiring the BaseTokenRatioProvider layer.
     pub base_token_addr: Option<Address>,
     pub chain_admin_addr: Option<Address>,
+    pub eigenda_verifier_addr: Option<Address>,
 }
 
 impl ContractsConfig {
@@ -61,6 +62,7 @@ impl ContractsConfig {
             base_token_addr: Some(Address::repeat_byte(0x14)),
             ecosystem_contracts: Some(EcosystemContracts::for_tests()),
             chain_admin_addr: Some(Address::repeat_byte(0x18)),
+            eigenda_verifier_addr: Some(Address::repeat_byte(0x19)),
         }
     }
 }
diff --git a/core/lib/config/src/configs/genesis.rs b/core/lib/config/src/configs/genesis.rs
index 6c4bacc3a6e..9e1ffbd87cb 100644
--- a/core/lib/config/src/configs/genesis.rs
+++ b/core/lib/config/src/configs/genesis.rs
@@ -17,6 +17,7 @@ pub struct GenesisConfig {
     pub genesis_commitment: Option<H256>,
     pub bootloader_hash: Option<H256>,
     pub default_aa_hash: Option<H256>,
+    pub evm_emulator_hash: Option<H256>,
     pub l1_chain_id: L1ChainId,
     pub sl_chain_id: Option<SLChainId>,
     pub l2_chain_id: L2ChainId,
@@ -49,6 +50,7 @@ impl GenesisConfig {
             genesis_commitment: Some(H256::repeat_byte(0x17)),
             bootloader_hash: Default::default(),
             default_aa_hash: Default::default(),
+            evm_emulator_hash: Default::default(),
             l1_chain_id: L1ChainId(9),
             sl_chain_id: None,
             protocol_version: Some(ProtocolSemanticVersion {
diff --git a/core/lib/config/src/testonly.rs b/core/lib/config/src/testonly.rs
index e25f67abb06..fbf33341bee 100644
--- a/core/lib/config/src/testonly.rs
+++ b/core/lib/config/src/testonly.rs
@@ -192,6 +192,7 @@ impl Distribution<configs::chain::StateKeeperConfig> for EncodeDist {
             fee_account_addr: None,
             bootloader_hash: None,
             default_aa_hash: None,
+            evm_emulator_hash: None,
             l1_batch_commit_data_generator_mode: Default::default(),
         }
     }
@@ -261,6 +262,7 @@ impl Distribution<configs::ContractsConfig> for EncodeDist {
             ecosystem_contracts: self.sample(rng),
             base_token_addr: self.sample_opt(|| rng.gen()),
             chain_admin_addr: self.sample_opt(|| rng.gen()),
+            eigenda_verifier_addr: self.sample_opt(|| rng.gen()),
         }
     }
 }
@@ -732,6 +734,7 @@ impl Distribution<configs::GenesisConfig> for EncodeDist {
             genesis_commitment: Some(rng.gen()),
             bootloader_hash: Some(rng.gen()),
             default_aa_hash: Some(rng.gen()),
+            evm_emulator_hash: Some(rng.gen()),
             fee_account: rng.gen(),
             l1_chain_id: L1ChainId(self.sample(rng)),
             sl_chain_id: None,
diff --git a/core/lib/constants/src/contracts.rs b/core/lib/constants/src/contracts.rs
index 73b4a0ffaaa..fe37ef6c69f 100644
--- a/core/lib/constants/src/contracts.rs
+++ b/core/lib/constants/src/contracts.rs
@@ -130,6 +130,11 @@ pub const CODE_ORACLE_ADDRESS: Address = H160([
     0x00, 0x00, 0x80, 0x12,
 ]);
 
+pub const EVM_GAS_MANAGER_ADDRESS: Address = H160([
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x80, 0x13,
+]);
+
 /// Note, that the `Create2Factory` is explicitly deployed on a non-system-contract address.
 pub const CREATE2_FACTORY_ADDRESS: Address = H160([
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/core/lib/contracts/src/lib.rs b/core/lib/contracts/src/lib.rs
index a72b5c95d1b..e3544b0c439 100644
--- a/core/lib/contracts/src/lib.rs
+++ b/core/lib/contracts/src/lib.rs
@@ -64,7 +64,8 @@ const LOADNEXT_CONTRACT_FILE: &str =
     "etc/contracts-test-data/artifacts-zk/contracts/loadnext/loadnext_contract.sol/LoadnextContract.json";
 const LOADNEXT_SIMPLE_CONTRACT_FILE: &str =
     "etc/contracts-test-data/artifacts-zk/contracts/loadnext/loadnext_contract.sol/Foo.json";
-
+const EIGENDA_VERIFIER_CONTRACT_FILE: (&str, &str) =
+    ("eigenda", "EigendaVerifier.sol/EigendaVerifier.json");
 fn home_path() -> PathBuf {
     Workspace::locate().core()
 }
@@ -163,6 +164,10 @@ pub fn verifier_contract() -> Contract {
     load_contract_for_both_compilers(VERIFIER_CONTRACT_FILE)
 }
 
+pub fn eigenda_verifier_contract() -> Contract {
+    load_contract_for_both_compilers(EIGENDA_VERIFIER_CONTRACT_FILE)
+}
+
 #[derive(Debug, Clone)]
 pub struct TestContract {
     /// Contract bytecode to be used for sending deploy transaction.
@@ -293,6 +298,7 @@ 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))
 }
+
 /// Hash of code and code which consists of 32 bytes words
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct SystemContractCode {
@@ -304,18 +310,23 @@ pub struct SystemContractCode {
 pub struct BaseSystemContracts {
     pub bootloader: SystemContractCode,
     pub default_aa: SystemContractCode,
+    /// Never filled in constructors for now. The only way to get the EVM emulator enabled is to call [`Self::with_evm_emulator()`].
+    pub evm_emulator: Option<SystemContractCode>,
 }
 
 #[derive(Debug, Clone, Copy, Default, Serialize, Deserialize, PartialEq)]
 pub struct BaseSystemContractsHashes {
     pub bootloader: H256,
     pub default_aa: H256,
+    pub evm_emulator: Option<H256>,
 }
 
 impl PartialEq for BaseSystemContracts {
     fn eq(&self, other: &Self) -> bool {
         self.bootloader.hash == other.bootloader.hash
             && self.default_aa.hash == other.default_aa.hash
+            && self.evm_emulator.as_ref().map(|contract| contract.hash)
+                == other.evm_emulator.as_ref().map(|contract| contract.hash)
     }
 }
 
@@ -339,14 +350,27 @@ impl BaseSystemContracts {
         BaseSystemContracts {
             bootloader,
             default_aa,
+            evm_emulator: None,
         }
     }
-    // BaseSystemContracts with proved bootloader - for handling transactions.
+
+    /// BaseSystemContracts with proved bootloader - for handling transactions.
     pub fn load_from_disk() -> Self {
         let bootloader_bytecode = read_proved_batch_bootloader_bytecode();
         BaseSystemContracts::load_with_bootloader(bootloader_bytecode)
     }
 
+    /// Loads the latest EVM emulator for these base system contracts. Logically, it only makes sense to do for the latest protocol version.
+    pub fn with_latest_evm_emulator(mut self) -> Self {
+        let bytecode = read_sys_contract_bytecode("", "EvmInterpreter", ContractLanguage::Yul);
+        let hash = hash_bytecode(&bytecode);
+        self.evm_emulator = Some(SystemContractCode {
+            code: bytes_to_be_words(bytecode),
+            hash,
+        });
+        self
+    }
+
     /// BaseSystemContracts with playground bootloader - used for handling eth_calls.
     pub fn playground() -> Self {
         let bootloader_bytecode = read_playground_batch_bootloader_bytecode();
@@ -475,6 +499,7 @@ impl BaseSystemContracts {
         BaseSystemContractsHashes {
             bootloader: self.bootloader.hash,
             default_aa: self.default_aa.hash,
+            evm_emulator: self.evm_emulator.as_ref().map(|contract| contract.hash),
         }
     }
 }
diff --git a/core/lib/dal/.sqlx/query-00c0389f4cde049078885cdf05bdb7dbe0bb23c4fc87a78be2d01b77da2ecbd3.json b/core/lib/dal/.sqlx/query-00c0389f4cde049078885cdf05bdb7dbe0bb23c4fc87a78be2d01b77da2ecbd3.json
deleted file mode 100644
index d83713192cb..00000000000
--- a/core/lib/dal/.sqlx/query-00c0389f4cde049078885cdf05bdb7dbe0bb23c4fc87a78be2d01b77da2ecbd3.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            WITH\n                available_batches AS (\n                    SELECT\n                        MAX(number) AS \"last_batch\"\n                    FROM\n                        l1_batches\n                ),\n                processed_batches AS (\n                    SELECT\n                        COALESCE(MAX(l1_batch_number), $1) + $2 AS \"last_ready_batch\"\n                    FROM\n                        vm_runner_protective_reads\n                    WHERE\n                        time_taken IS NOT NULL\n                )\n            SELECT\n                LEAST(last_batch, last_ready_batch) AS \"last_ready_batch!\"\n            FROM\n                available_batches\n                FULL JOIN processed_batches ON TRUE\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "last_ready_batch!",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int8"
-      ]
-    },
-    "nullable": [
-      true
-    ]
-  },
-  "hash": "00c0389f4cde049078885cdf05bdb7dbe0bb23c4fc87a78be2d01b77da2ecbd3"
-}
diff --git a/core/lib/dal/.sqlx/query-0124bad591f7ed156000c515cb0772b3002289a05ab23b7dafde2af10c7d88da.json b/core/lib/dal/.sqlx/query-0124bad591f7ed156000c515cb0772b3002289a05ab23b7dafde2af10c7d88da.json
new file mode 100644
index 00000000000..5cd56fee6b7
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-0124bad591f7ed156000c515cb0772b3002289a05ab23b7dafde2af10c7d88da.json
@@ -0,0 +1,24 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            base_token_ratios (\n                numerator, denominator, ratio_timestamp, created_at, updated_at\n            )\n            VALUES\n            ($1, $2, $3, NOW(), NOW())\n            RETURNING\n            id\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Numeric",
+        "Numeric",
+        "Timestamp"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "0124bad591f7ed156000c515cb0772b3002289a05ab23b7dafde2af10c7d88da"
+}
diff --git a/core/lib/dal/.sqlx/query-026ab7dd7407f10074a2966b5eac2563a3e061bcc6505d8c295b1b2517f85f1b.json b/core/lib/dal/.sqlx/query-026ab7dd7407f10074a2966b5eac2563a3e061bcc6505d8c295b1b2517f85f1b.json
deleted file mode 100644
index d98798241f7..00000000000
--- a/core/lib/dal/.sqlx/query-026ab7dd7407f10074a2966b5eac2563a3e061bcc6505d8c295b1b2517f85f1b.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                number\n            FROM\n                l1_batches\n                LEFT JOIN eth_txs_history AS prove_tx ON (l1_batches.eth_prove_tx_id = prove_tx.eth_tx_id)\n            WHERE\n                prove_tx.confirmed_at IS NOT NULL\n            ORDER BY\n                number DESC\n            LIMIT\n                1\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "number",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "026ab7dd7407f10074a2966b5eac2563a3e061bcc6505d8c295b1b2517f85f1b"
-}
diff --git a/core/lib/dal/.sqlx/query-0429f2fa683bdff6fc1ff5069de69d57dbfda4be1f70232afffca82a895d43e0.json b/core/lib/dal/.sqlx/query-0429f2fa683bdff6fc1ff5069de69d57dbfda4be1f70232afffca82a895d43e0.json
new file mode 100644
index 00000000000..5693bdf987e
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-0429f2fa683bdff6fc1ff5069de69d57dbfda4be1f70232afffca82a895d43e0.json
@@ -0,0 +1,36 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH\n            sl AS (\n                SELECT\n                    (\n                        SELECT\n                            ARRAY[hashed_key, value] AS kv\n                        FROM\n                            storage_logs\n                        WHERE\n                            storage_logs.miniblock_number = $1\n                            AND storage_logs.hashed_key >= u.start_key\n                            AND storage_logs.hashed_key <= u.end_key\n                        ORDER BY\n                            storage_logs.hashed_key\n                        LIMIT\n                            1\n                    )\n                FROM\n                    UNNEST($2::bytea [], $3::bytea []) AS u (start_key, end_key)\n            )\n            \n            SELECT\n                sl.kv[1] AS \"hashed_key?\",\n                sl.kv[2] AS \"value?\",\n                initial_writes.index\n            FROM\n                sl\n            LEFT OUTER JOIN initial_writes ON initial_writes.hashed_key = sl.kv[1]\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "hashed_key?",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 1,
+        "name": "value?",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 2,
+        "name": "index",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "ByteaArray",
+        "ByteaArray"
+      ]
+    },
+    "nullable": [
+      null,
+      null,
+      true
+    ]
+  },
+  "hash": "0429f2fa683bdff6fc1ff5069de69d57dbfda4be1f70232afffca82a895d43e0"
+}
diff --git a/core/lib/dal/.sqlx/query-046590a310cc7bbfa421d0d8e20c3bdae18b88c4c223e374df9a997c271b091b.json b/core/lib/dal/.sqlx/query-046590a310cc7bbfa421d0d8e20c3bdae18b88c4c223e374df9a997c271b091b.json
deleted file mode 100644
index 950d72a3e23..00000000000
--- a/core/lib/dal/.sqlx/query-046590a310cc7bbfa421d0d8e20c3bdae18b88c4c223e374df9a997c271b091b.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            WITH\n                soft AS (\n                    SELECT\n                        pruned_l1_batch,\n                        pruned_miniblock\n                    FROM\n                        pruning_log\n                    WHERE\n                    TYPE = 'Soft'\n                    ORDER BY\n                        pruned_l1_batch DESC\n                    LIMIT\n                        1\n                ),\n                hard AS (\n                    SELECT\n                        pruned_l1_batch,\n                        pruned_miniblock\n                    FROM\n                        pruning_log\n                    WHERE\n                    TYPE = 'Hard'\n                    ORDER BY\n                        pruned_l1_batch DESC\n                    LIMIT\n                        1\n                )\n            SELECT\n                soft.pruned_l1_batch AS last_soft_pruned_l1_batch,\n                soft.pruned_miniblock AS last_soft_pruned_miniblock,\n                hard.pruned_l1_batch AS last_hard_pruned_l1_batch,\n                hard.pruned_miniblock AS last_hard_pruned_miniblock\n            FROM\n                soft\n                FULL JOIN hard ON TRUE\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "last_soft_pruned_l1_batch",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "last_soft_pruned_miniblock",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 2,
-        "name": "last_hard_pruned_l1_batch",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 3,
-        "name": "last_hard_pruned_miniblock",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      true,
-      true,
-      true,
-      true
-    ]
-  },
-  "hash": "046590a310cc7bbfa421d0d8e20c3bdae18b88c4c223e374df9a997c271b091b"
-}
diff --git a/core/lib/dal/.sqlx/query-05891e039a54b70ac406a63b73b6f5521c888c5bc9050333dd18a88c098b2d12.json b/core/lib/dal/.sqlx/query-05891e039a54b70ac406a63b73b6f5521c888c5bc9050333dd18a88c098b2d12.json
new file mode 100644
index 00000000000..735d04d2053
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-05891e039a54b70ac406a63b73b6f5521c888c5bc9050333dd18a88c098b2d12.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH\n            new_logs AS MATERIALIZED (\n                SELECT DISTINCT\n                ON (hashed_key)\n                    hashed_key,\n                    miniblock_number,\n                    operation_number\n                FROM\n                    storage_logs\n                WHERE\n                    miniblock_number BETWEEN $1 AND $2\n                ORDER BY\n                    hashed_key,\n                    miniblock_number DESC,\n                    operation_number DESC\n            )\n            \n            DELETE FROM storage_logs USING new_logs\n            WHERE\n                storage_logs.hashed_key = new_logs.hashed_key\n                AND storage_logs.miniblock_number <= $2\n                AND (storage_logs.miniblock_number, storage_logs.operation_number)\n                < (new_logs.miniblock_number, new_logs.operation_number)\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "05891e039a54b70ac406a63b73b6f5521c888c5bc9050333dd18a88c098b2d12"
+}
diff --git a/core/lib/dal/.sqlx/query-05c2a77d9f65d435e2df63a300850e42abbaf365a1b041d0e7a809796ef0fe63.json b/core/lib/dal/.sqlx/query-05c2a77d9f65d435e2df63a300850e42abbaf365a1b041d0e7a809796ef0fe63.json
deleted file mode 100644
index f3c85b9b43d..00000000000
--- a/core/lib/dal/.sqlx/query-05c2a77d9f65d435e2df63a300850e42abbaf365a1b041d0e7a809796ef0fe63.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            UPDATE proof_generation_details\n            SET\n                status = 'picked_by_prover',\n                updated_at = NOW(),\n                prover_taken_at = NOW()\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        l1_batch_number\n                    FROM\n                        proof_generation_details\n                        LEFT JOIN l1_batches ON l1_batch_number = l1_batches.number\n                    WHERE\n                        (\n                            vm_run_data_blob_url IS NOT NULL\n                            AND proof_gen_data_blob_url IS NOT NULL\n                            AND l1_batches.hash IS NOT NULL\n                            AND l1_batches.aux_data_hash IS NOT NULL\n                            AND l1_batches.meta_parameters_hash IS NOT NULL\n                            AND status = 'unpicked'\n                        )\n                        OR (\n                            status = 'picked_by_prover'\n                            AND prover_taken_at < NOW() - $1::INTERVAL\n                        )\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                )\n            RETURNING\n                proof_generation_details.l1_batch_number\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "l1_batch_number",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Interval"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "05c2a77d9f65d435e2df63a300850e42abbaf365a1b041d0e7a809796ef0fe63"
-}
diff --git a/core/lib/dal/.sqlx/query-2b1aa207a058f66265acf2c21b8ed5d8007789c0fc1eab948f6d7339dfb69147.json b/core/lib/dal/.sqlx/query-08740b96c883fce75b6238bb6bdc95254f94dddb4ed84a675c2655421758b049.json
similarity index 80%
rename from core/lib/dal/.sqlx/query-2b1aa207a058f66265acf2c21b8ed5d8007789c0fc1eab948f6d7339dfb69147.json
rename to core/lib/dal/.sqlx/query-08740b96c883fce75b6238bb6bdc95254f94dddb4ed84a675c2655421758b049.json
index 96b48892516..51392a6ed8f 100644
--- a/core/lib/dal/.sqlx/query-2b1aa207a058f66265acf2c21b8ed5d8007789c0fc1eab948f6d7339dfb69147.json
+++ b/core/lib/dal/.sqlx/query-08740b96c883fce75b6238bb6bdc95254f94dddb4ed84a675c2655421758b049.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            DELETE FROM transactions\n            WHERE\n                miniblock_number IS NULL\n                AND received_at < NOW() - $1::INTERVAL\n                AND is_priority = FALSE\n                AND error IS NULL\n            RETURNING\n                hash\n            ",
+  "query": "\n            DELETE FROM transactions\n            WHERE\n                miniblock_number IS NULL\n                AND received_at < NOW() - $1::INTERVAL\n                AND is_priority = FALSE\n                AND error IS NULL\n            RETURNING\n            hash\n            ",
   "describe": {
     "columns": [
       {
@@ -18,5 +18,5 @@
       false
     ]
   },
-  "hash": "2b1aa207a058f66265acf2c21b8ed5d8007789c0fc1eab948f6d7339dfb69147"
+  "hash": "08740b96c883fce75b6238bb6bdc95254f94dddb4ed84a675c2655421758b049"
 }
diff --git a/core/lib/dal/.sqlx/query-0a0dd4a98128c2ef60d385f5c0674ddd4f2422089604768b19e0b6d948c0cf1b.json b/core/lib/dal/.sqlx/query-0a0dd4a98128c2ef60d385f5c0674ddd4f2422089604768b19e0b6d948c0cf1b.json
new file mode 100644
index 00000000000..0d4d8c0dc74
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-0a0dd4a98128c2ef60d385f5c0674ddd4f2422089604768b19e0b6d948c0cf1b.json
@@ -0,0 +1,100 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH\n            events_select AS (\n                SELECT\n                    address,\n                    topic1,\n                    topic2,\n                    topic3,\n                    topic4,\n                    value,\n                    miniblock_number,\n                    tx_hash,\n                    tx_index_in_block,\n                    event_index_in_block,\n                    event_index_in_tx\n                FROM\n                    events\n                WHERE\n                    miniblock_number > $1\n                ORDER BY\n                    miniblock_number ASC,\n                    event_index_in_block ASC\n            )\n            \n            SELECT\n                miniblocks.hash AS \"block_hash?\",\n                address AS \"address!\",\n                topic1 AS \"topic1!\",\n                topic2 AS \"topic2!\",\n                topic3 AS \"topic3!\",\n                topic4 AS \"topic4!\",\n                value AS \"value!\",\n                miniblock_number AS \"miniblock_number!\",\n                miniblocks.l1_batch_number AS \"l1_batch_number?\",\n                tx_hash AS \"tx_hash!\",\n                tx_index_in_block AS \"tx_index_in_block!\",\n                event_index_in_block AS \"event_index_in_block!\",\n                event_index_in_tx AS \"event_index_in_tx!\",\n                miniblocks.timestamp AS \"block_timestamp\"\n            FROM\n                events_select\n            INNER JOIN miniblocks ON events_select.miniblock_number = miniblocks.number\n            ORDER BY\n                miniblock_number ASC,\n                event_index_in_block ASC\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "block_hash?",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 1,
+        "name": "address!",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 2,
+        "name": "topic1!",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 3,
+        "name": "topic2!",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 4,
+        "name": "topic3!",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 5,
+        "name": "topic4!",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 6,
+        "name": "value!",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 7,
+        "name": "miniblock_number!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 8,
+        "name": "l1_batch_number?",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 9,
+        "name": "tx_hash!",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 10,
+        "name": "tx_index_in_block!",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 11,
+        "name": "event_index_in_block!",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 12,
+        "name": "event_index_in_tx!",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 13,
+        "name": "block_timestamp",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "0a0dd4a98128c2ef60d385f5c0674ddd4f2422089604768b19e0b6d948c0cf1b"
+}
diff --git a/core/lib/dal/.sqlx/query-0b5d5efeac95d429cf6a5be22153897edf8c868094ad029e2e8fcf286d44fd55.json b/core/lib/dal/.sqlx/query-0b5d5efeac95d429cf6a5be22153897edf8c868094ad029e2e8fcf286d44fd55.json
deleted file mode 100644
index 822a6967f6d..00000000000
--- a/core/lib/dal/.sqlx/query-0b5d5efeac95d429cf6a5be22153897edf8c868094ad029e2e8fcf286d44fd55.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                data_availability (l1_batch_number, blob_id, sent_at, created_at, updated_at)\n            VALUES\n                ($1, $2, $3, NOW(), NOW())\n            ON CONFLICT DO NOTHING\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Text",
-        "Timestamp"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "0b5d5efeac95d429cf6a5be22153897edf8c868094ad029e2e8fcf286d44fd55"
-}
diff --git a/core/lib/dal/.sqlx/query-dcfc3c0df11b923116af194a26c122dbdbf650edfec6d9c18f96c3bd0064d18d.json b/core/lib/dal/.sqlx/query-0bae50601f2dc3ea7ba9ab6b9f508275cef018c7060c49b9f7a387a14f6a5be8.json
similarity index 80%
rename from core/lib/dal/.sqlx/query-dcfc3c0df11b923116af194a26c122dbdbf650edfec6d9c18f96c3bd0064d18d.json
rename to core/lib/dal/.sqlx/query-0bae50601f2dc3ea7ba9ab6b9f508275cef018c7060c49b9f7a387a14f6a5be8.json
index 36e56da404e..ca0578f338f 100644
--- a/core/lib/dal/.sqlx/query-dcfc3c0df11b923116af194a26c122dbdbf650edfec6d9c18f96c3bd0064d18d.json
+++ b/core/lib/dal/.sqlx/query-0bae50601f2dc3ea7ba9ab6b9f508275cef018c7060c49b9f7a387a14f6a5be8.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                miniblocks.hash AS block_hash,\n                miniblocks.number,\n                miniblocks.l1_batch_number,\n                miniblocks.timestamp,\n                miniblocks.base_fee_per_gas,\n                miniblocks.gas_limit AS \"block_gas_limit?\",\n                miniblocks.logs_bloom,\n                prev_miniblock.hash AS \"parent_hash?\",\n                l1_batches.timestamp AS \"l1_batch_timestamp?\",\n                transactions.gas_limit AS \"transaction_gas_limit?\",\n                transactions.refunded_gas AS \"refunded_gas?\",\n                transactions.hash AS \"tx_hash?\"\n            FROM\n                miniblocks\n                LEFT JOIN miniblocks prev_miniblock ON prev_miniblock.number = miniblocks.number - 1\n                LEFT JOIN l1_batches ON l1_batches.number = miniblocks.l1_batch_number\n                LEFT JOIN transactions ON transactions.miniblock_number = miniblocks.number\n            WHERE\n                miniblocks.number = $1\n            ORDER BY\n                transactions.index_in_block ASC\n            ",
+  "query": "\n            SELECT\n                miniblocks.hash AS block_hash,\n                miniblocks.number,\n                miniblocks.l1_batch_number,\n                miniblocks.timestamp,\n                miniblocks.base_fee_per_gas,\n                miniblocks.gas_limit AS \"block_gas_limit?\",\n                miniblocks.logs_bloom,\n                prev_miniblock.hash AS \"parent_hash?\",\n                l1_batches.timestamp AS \"l1_batch_timestamp?\",\n                transactions.gas_limit AS \"transaction_gas_limit?\",\n                transactions.refunded_gas AS \"refunded_gas?\",\n                transactions.hash AS \"tx_hash?\"\n            FROM\n                miniblocks\n            LEFT JOIN\n                miniblocks prev_miniblock\n                ON prev_miniblock.number = miniblocks.number - 1\n            LEFT JOIN l1_batches ON l1_batches.number = miniblocks.l1_batch_number\n            LEFT JOIN transactions ON transactions.miniblock_number = miniblocks.number\n            WHERE\n                miniblocks.number = $1\n            ORDER BY\n                transactions.index_in_block ASC\n            ",
   "describe": {
     "columns": [
       {
@@ -84,5 +84,5 @@
       false
     ]
   },
-  "hash": "dcfc3c0df11b923116af194a26c122dbdbf650edfec6d9c18f96c3bd0064d18d"
+  "hash": "0bae50601f2dc3ea7ba9ab6b9f508275cef018c7060c49b9f7a387a14f6a5be8"
 }
diff --git a/core/lib/dal/.sqlx/query-1074d0a2e4a4afb9a92f3822e133db7a71aca15698bafba051a8d9a91a4dbc76.json b/core/lib/dal/.sqlx/query-1074d0a2e4a4afb9a92f3822e133db7a71aca15698bafba051a8d9a91a4dbc76.json
deleted file mode 100644
index 13e4cdb9431..00000000000
--- a/core/lib/dal/.sqlx/query-1074d0a2e4a4afb9a92f3822e133db7a71aca15698bafba051a8d9a91a4dbc76.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            WITH\n                mb AS (\n                    SELECT\n                        l1_gas_price,\n                        l2_fair_gas_price,\n                        fair_pubdata_price\n                    FROM\n                        miniblocks\n                    WHERE\n                        l1_batch_number = $1\n                    LIMIT\n                        1\n                )\n            SELECT\n                l1_batches.number,\n                l1_batches.timestamp,\n                l1_batches.l1_tx_count,\n                l1_batches.l2_tx_count,\n                l1_batches.hash AS \"root_hash?\",\n                commit_tx.tx_hash AS \"commit_tx_hash?\",\n                commit_tx.confirmed_at AS \"committed_at?\",\n                prove_tx.tx_hash AS \"prove_tx_hash?\",\n                prove_tx.confirmed_at AS \"proven_at?\",\n                execute_tx.tx_hash AS \"execute_tx_hash?\",\n                execute_tx.confirmed_at AS \"executed_at?\",\n                mb.l1_gas_price,\n                mb.l2_fair_gas_price,\n                mb.fair_pubdata_price,\n                l1_batches.bootloader_code_hash,\n                l1_batches.default_aa_code_hash\n            FROM\n                l1_batches\n                INNER JOIN mb ON TRUE\n                LEFT JOIN eth_txs_history AS commit_tx ON (\n                    l1_batches.eth_commit_tx_id = commit_tx.eth_tx_id\n                    AND commit_tx.confirmed_at IS NOT NULL\n                )\n                LEFT JOIN eth_txs_history AS prove_tx ON (\n                    l1_batches.eth_prove_tx_id = prove_tx.eth_tx_id\n                    AND prove_tx.confirmed_at IS NOT NULL\n                )\n                LEFT JOIN eth_txs_history AS execute_tx ON (\n                    l1_batches.eth_execute_tx_id = execute_tx.eth_tx_id\n                    AND execute_tx.confirmed_at IS NOT NULL\n                )\n            WHERE\n                l1_batches.number = $1\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "number",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "timestamp",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 2,
-        "name": "l1_tx_count",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 3,
-        "name": "l2_tx_count",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 4,
-        "name": "root_hash?",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 5,
-        "name": "commit_tx_hash?",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 6,
-        "name": "committed_at?",
-        "type_info": "Timestamp"
-      },
-      {
-        "ordinal": 7,
-        "name": "prove_tx_hash?",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 8,
-        "name": "proven_at?",
-        "type_info": "Timestamp"
-      },
-      {
-        "ordinal": 9,
-        "name": "execute_tx_hash?",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 10,
-        "name": "executed_at?",
-        "type_info": "Timestamp"
-      },
-      {
-        "ordinal": 11,
-        "name": "l1_gas_price",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 12,
-        "name": "l2_fair_gas_price",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 13,
-        "name": "fair_pubdata_price",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 14,
-        "name": "bootloader_code_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 15,
-        "name": "default_aa_code_hash",
-        "type_info": "Bytea"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      true,
-      false,
-      true,
-      false,
-      true,
-      false,
-      true,
-      false,
-      false,
-      true,
-      true,
-      true
-    ]
-  },
-  "hash": "1074d0a2e4a4afb9a92f3822e133db7a71aca15698bafba051a8d9a91a4dbc76"
-}
diff --git a/core/lib/dal/.sqlx/query-13701f55aab0a278a29e21ac2326852faf20600198aa78f66ad8ba9a37ac455f.json b/core/lib/dal/.sqlx/query-13701f55aab0a278a29e21ac2326852faf20600198aa78f66ad8ba9a37ac455f.json
deleted file mode 100644
index 86393dce8ab..00000000000
--- a/core/lib/dal/.sqlx/query-13701f55aab0a278a29e21ac2326852faf20600198aa78f66ad8ba9a37ac455f.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                MAX(l1_batches.number)\n            FROM\n                l1_batches\n                JOIN eth_txs ON (l1_batches.eth_commit_tx_id = eth_txs.id)\n                JOIN eth_txs_history AS commit_tx ON (eth_txs.confirmed_eth_tx_history_id = commit_tx.id)\n            WHERE\n                commit_tx.confirmed_at IS NOT NULL\n                AND eth_prove_tx_id IS NOT NULL\n                AND eth_execute_tx_id IS NULL\n                AND EXTRACT(\n                    EPOCH\n                    FROM\n                        commit_tx.confirmed_at\n                ) < $1\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "max",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Numeric"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "13701f55aab0a278a29e21ac2326852faf20600198aa78f66ad8ba9a37ac455f"
-}
diff --git a/core/lib/dal/.sqlx/query-150d0219cabbabcc9d0e97e3fd94032f3d900b74e62dfdec0c9f61bf2bacb595.json b/core/lib/dal/.sqlx/query-150d0219cabbabcc9d0e97e3fd94032f3d900b74e62dfdec0c9f61bf2bacb595.json
new file mode 100644
index 00000000000..e3a8399ca28
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-150d0219cabbabcc9d0e97e3fd94032f3d900b74e62dfdec0c9f61bf2bacb595.json
@@ -0,0 +1,21 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            snapshot_recovery (\n                l1_batch_number,\n                l1_batch_timestamp,\n                l1_batch_root_hash,\n                miniblock_number,\n                miniblock_timestamp,\n                miniblock_hash,\n                protocol_version,\n                storage_logs_chunks_processed,\n                updated_at,\n                created_at\n            )\n            VALUES\n            ($1, $2, $3, $4, $5, $6, $7, $8, NOW(), NOW())\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8",
+        "Bytea",
+        "Int8",
+        "Int8",
+        "Bytea",
+        "Int4",
+        "BoolArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "150d0219cabbabcc9d0e97e3fd94032f3d900b74e62dfdec0c9f61bf2bacb595"
+}
diff --git a/core/lib/dal/.sqlx/query-1767de83aa4ef34f080da6d30d6154185671d13f3b234ce1f16aaeeab54b2a16.json b/core/lib/dal/.sqlx/query-1767de83aa4ef34f080da6d30d6154185671d13f3b234ce1f16aaeeab54b2a16.json
new file mode 100644
index 00000000000..84fc44f7b5f
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-1767de83aa4ef34f080da6d30d6154185671d13f3b234ce1f16aaeeab54b2a16.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            commitments (\n                l1_batch_number,\n                events_queue_commitment,\n                bootloader_initial_content_commitment\n            )\n            VALUES\n            ($1, $2, $3)\n            ON CONFLICT (l1_batch_number) DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Bytea",
+        "Bytea"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "1767de83aa4ef34f080da6d30d6154185671d13f3b234ce1f16aaeeab54b2a16"
+}
diff --git a/core/lib/dal/.sqlx/query-1823e1ac602ce4ba1db06543af9cb2685cda1ae7ecca83062ede7320c3b4a427.json b/core/lib/dal/.sqlx/query-1823e1ac602ce4ba1db06543af9cb2685cda1ae7ecca83062ede7320c3b4a427.json
new file mode 100644
index 00000000000..1e20a9151b9
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-1823e1ac602ce4ba1db06543af9cb2685cda1ae7ecca83062ede7320c3b4a427.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            contracts_verification_info (address, verification_info)\n            VALUES\n            ($1, $2)\n            ON CONFLICT (address) DO\n            UPDATE\n            SET\n            verification_info = $2\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Bytea",
+        "Jsonb"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "1823e1ac602ce4ba1db06543af9cb2685cda1ae7ecca83062ede7320c3b4a427"
+}
diff --git a/core/lib/dal/.sqlx/query-18d507f6c9fe051da9899e2e4346e94d0b4f902c84e31fca606773cf4c9d17fc.json b/core/lib/dal/.sqlx/query-18d507f6c9fe051da9899e2e4346e94d0b4f902c84e31fca606773cf4c9d17fc.json
new file mode 100644
index 00000000000..dc913c57005
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-18d507f6c9fe051da9899e2e4346e94d0b4f902c84e31fca606773cf4c9d17fc.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            initial_writes (hashed_key, index, l1_batch_number, created_at, updated_at)\n            SELECT\n                u.hashed_key,\n                u.index,\n                $3,\n                NOW(),\n                NOW()\n            FROM\n                UNNEST($1::bytea [], $2::bigint []) AS u (hashed_key, index)\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "ByteaArray",
+        "Int8Array",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "18d507f6c9fe051da9899e2e4346e94d0b4f902c84e31fca606773cf4c9d17fc"
+}
diff --git a/core/lib/dal/.sqlx/query-1a6f4db7fb5ad9b54367c7f9d87ecbc877c8e04d47bf16b9c2e59ba652d2955f.json b/core/lib/dal/.sqlx/query-1a6f4db7fb5ad9b54367c7f9d87ecbc877c8e04d47bf16b9c2e59ba652d2955f.json
new file mode 100644
index 00000000000..a9ec3c77906
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-1a6f4db7fb5ad9b54367c7f9d87ecbc877c8e04d47bf16b9c2e59ba652d2955f.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            vm_runner_protective_reads (\n                l1_batch_number, created_at, updated_at, processing_started_at\n            )\n            VALUES\n            ($1, NOW(), NOW(), NOW())\n            ON CONFLICT (l1_batch_number) DO\n            UPDATE\n            SET\n            updated_at = NOW(),\n            processing_started_at = NOW()\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "1a6f4db7fb5ad9b54367c7f9d87ecbc877c8e04d47bf16b9c2e59ba652d2955f"
+}
diff --git a/core/lib/dal/.sqlx/query-1bbfac481c402bcb3bb888b84146d922fa1fc9c202072fbc04cae1bbf97195aa.json b/core/lib/dal/.sqlx/query-1bbfac481c402bcb3bb888b84146d922fa1fc9c202072fbc04cae1bbf97195aa.json
deleted file mode 100644
index f24a28ffdc2..00000000000
--- a/core/lib/dal/.sqlx/query-1bbfac481c402bcb3bb888b84146d922fa1fc9c202072fbc04cae1bbf97195aa.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                vm_runner_bwip (l1_batch_number, created_at, updated_at, processing_started_at)\n            VALUES\n                ($1, NOW(), NOW(), NOW())\n            ON CONFLICT (l1_batch_number) DO\n            UPDATE\n            SET\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "1bbfac481c402bcb3bb888b84146d922fa1fc9c202072fbc04cae1bbf97195aa"
-}
diff --git a/core/lib/dal/.sqlx/query-1c9468bead5b80f209c4e94ab652f75a4055a9c1e7c3b767455df804f09f7d4c.json b/core/lib/dal/.sqlx/query-1c9468bead5b80f209c4e94ab652f75a4055a9c1e7c3b767455df804f09f7d4c.json
new file mode 100644
index 00000000000..39eaca5a943
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-1c9468bead5b80f209c4e94ab652f75a4055a9c1e7c3b767455df804f09f7d4c.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                number\n            FROM\n                l1_batches\n            LEFT JOIN\n                eth_txs_history AS prove_tx\n                ON (l1_batches.eth_prove_tx_id = prove_tx.eth_tx_id)\n            WHERE\n                prove_tx.confirmed_at IS NOT NULL\n            ORDER BY\n                number DESC\n            LIMIT\n                1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "number",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "1c9468bead5b80f209c4e94ab652f75a4055a9c1e7c3b767455df804f09f7d4c"
+}
diff --git a/core/lib/dal/.sqlx/query-1ed6c99dcaa47f1525499362e316a12866726e1f3ca9cf9d89f61c4e97373361.json b/core/lib/dal/.sqlx/query-1ed6c99dcaa47f1525499362e316a12866726e1f3ca9cf9d89f61c4e97373361.json
new file mode 100644
index 00000000000..86256d4d0a0
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-1ed6c99dcaa47f1525499362e316a12866726e1f3ca9cf9d89f61c4e97373361.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            data_availability (l1_batch_number, blob_id, sent_at, created_at, updated_at)\n            VALUES\n            ($1, $2, $3, NOW(), NOW())\n            ON CONFLICT DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Text",
+        "Timestamp"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "1ed6c99dcaa47f1525499362e316a12866726e1f3ca9cf9d89f61c4e97373361"
+}
diff --git a/core/lib/dal/.sqlx/query-1f43731fa0736a91ba8da41f52b6b22abb03e2a9b2d3b53dc858e5c5a08bfb85.json b/core/lib/dal/.sqlx/query-1f43731fa0736a91ba8da41f52b6b22abb03e2a9b2d3b53dc858e5c5a08bfb85.json
deleted file mode 100644
index 3817369ecc1..00000000000
--- a/core/lib/dal/.sqlx/query-1f43731fa0736a91ba8da41f52b6b22abb03e2a9b2d3b53dc858e5c5a08bfb85.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                consensus_replica_state (fake_key, global_config, genesis, state)\n            VALUES\n                (TRUE, $1, $2, $3)\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Jsonb",
-        "Jsonb",
-        "Jsonb"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "1f43731fa0736a91ba8da41f52b6b22abb03e2a9b2d3b53dc858e5c5a08bfb85"
-}
diff --git a/core/lib/dal/.sqlx/query-2169cc7dfb074566ceb0bd5754d6e7a755c4bc6c25c7e6caff5fd6142813d349.json b/core/lib/dal/.sqlx/query-2169cc7dfb074566ceb0bd5754d6e7a755c4bc6c25c7e6caff5fd6142813d349.json
deleted file mode 100644
index e48fddcf617..00000000000
--- a/core/lib/dal/.sqlx/query-2169cc7dfb074566ceb0bd5754d6e7a755c4bc6c25c7e6caff5fd6142813d349.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                tee_proof_generation_details (l1_batch_number, tee_type, status, created_at, updated_at)\n            VALUES\n                ($1, $2, $3, NOW(), NOW())\n            ON CONFLICT (l1_batch_number, tee_type) DO NOTHING\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "2169cc7dfb074566ceb0bd5754d6e7a755c4bc6c25c7e6caff5fd6142813d349"
-}
diff --git a/core/lib/dal/.sqlx/query-3490fe0b778a03c73111bf8cbf426b0b3185a231bbf0b8b132a1a95bc157e827.json b/core/lib/dal/.sqlx/query-21acded689c24b653d149ff169f53b54a1965e100e0949006212f97e6d11a18b.json
similarity index 75%
rename from core/lib/dal/.sqlx/query-3490fe0b778a03c73111bf8cbf426b0b3185a231bbf0b8b132a1a95bc157e827.json
rename to core/lib/dal/.sqlx/query-21acded689c24b653d149ff169f53b54a1965e100e0949006212f97e6d11a18b.json
index 3275e94936a..b613aa8d71b 100644
--- a/core/lib/dal/.sqlx/query-3490fe0b778a03c73111bf8cbf426b0b3185a231bbf0b8b132a1a95bc157e827.json
+++ b/core/lib/dal/.sqlx/query-21acded689c24b653d149ff169f53b54a1965e100e0949006212f97e6d11a18b.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                hashed_key,\n                l1_batch_number,\n                INDEX\n            FROM\n                initial_writes\n            WHERE\n                hashed_key = ANY ($1::bytea[])\n            ",
+  "query": "\n            SELECT\n                hashed_key,\n                l1_batch_number,\n                index\n            FROM\n                initial_writes\n            WHERE\n                hashed_key = ANY($1::bytea [])\n            ",
   "describe": {
     "columns": [
       {
@@ -30,5 +30,5 @@
       false
     ]
   },
-  "hash": "3490fe0b778a03c73111bf8cbf426b0b3185a231bbf0b8b132a1a95bc157e827"
+  "hash": "21acded689c24b653d149ff169f53b54a1965e100e0949006212f97e6d11a18b"
 }
diff --git a/core/lib/dal/.sqlx/query-eab36591af61369e36e3dab79025ac6758a0a4e367f93a9bd48ec82c51e09755.json b/core/lib/dal/.sqlx/query-2234d7728d91cefaee792c900448aafe4b1aa2250fc535bfcdff39172551d42b.json
similarity index 81%
rename from core/lib/dal/.sqlx/query-eab36591af61369e36e3dab79025ac6758a0a4e367f93a9bd48ec82c51e09755.json
rename to core/lib/dal/.sqlx/query-2234d7728d91cefaee792c900448aafe4b1aa2250fc535bfcdff39172551d42b.json
index b9783f771a7..48fa673b2c9 100644
--- a/core/lib/dal/.sqlx/query-eab36591af61369e36e3dab79025ac6758a0a4e367f93a9bd48ec82c51e09755.json
+++ b/core/lib/dal/.sqlx/query-2234d7728d91cefaee792c900448aafe4b1aa2250fc535bfcdff39172551d42b.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                *\n            FROM\n                eth_txs\n            WHERE\n                from_addr IS NOT DISTINCT FROM $2 -- can't just use equality as NULL != NULL\n                AND is_gateway = $3\n                AND id > (\n                    SELECT\n                        COALESCE(MAX(eth_tx_id), 0)\n                    FROM\n                        eth_txs_history\n                        JOIN eth_txs ON eth_txs.id = eth_txs_history.eth_tx_id\n                    WHERE\n                        eth_txs_history.sent_at_block IS NOT NULL\n                        AND eth_txs.from_addr IS NOT DISTINCT FROM $2\n                        AND is_gateway = $3\n                )\n            ORDER BY\n                id\n            LIMIT\n                $1\n            ",
+  "query": "\n            SELECT\n                *\n            FROM\n                eth_txs\n            WHERE\n                from_addr IS NOT DISTINCT FROM $2 -- can't just use equality as NULL != NULL\n                AND is_gateway = $3\n                AND id > (\n                    SELECT\n                        COALESCE(MAX(eth_tx_id), 0)\n                    FROM\n                        eth_txs_history\n                    JOIN eth_txs ON eth_txs.id = eth_txs_history.eth_tx_id\n                    WHERE\n                        eth_txs_history.sent_at_block IS NOT NULL\n                        AND eth_txs.from_addr IS NOT DISTINCT FROM $2\n                        AND is_gateway = $3\n                )\n            ORDER BY\n                id\n            LIMIT\n                $1\n            ",
   "describe": {
     "columns": [
       {
@@ -110,5 +110,5 @@
       true
     ]
   },
-  "hash": "eab36591af61369e36e3dab79025ac6758a0a4e367f93a9bd48ec82c51e09755"
+  "hash": "2234d7728d91cefaee792c900448aafe4b1aa2250fc535bfcdff39172551d42b"
 }
diff --git a/core/lib/dal/.sqlx/query-c61682ed92c1a43855a991598d593639a63047f46dc8e605ff37b78f43f5cef5.json b/core/lib/dal/.sqlx/query-228aa5ec4c4eb56143823b96a8190ded732839b9f5bf16042205a730fac07c3a.json
similarity index 77%
rename from core/lib/dal/.sqlx/query-c61682ed92c1a43855a991598d593639a63047f46dc8e605ff37b78f43f5cef5.json
rename to core/lib/dal/.sqlx/query-228aa5ec4c4eb56143823b96a8190ded732839b9f5bf16042205a730fac07c3a.json
index b797ccb4604..b8d6482ea74 100644
--- a/core/lib/dal/.sqlx/query-c61682ed92c1a43855a991598d593639a63047f46dc8e605ff37b78f43f5cef5.json
+++ b/core/lib/dal/.sqlx/query-228aa5ec4c4eb56143823b96a8190ded732839b9f5bf16042205a730fac07c3a.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE processed_events\n            SET\n                next_block_to_process = $3\n            WHERE\n            TYPE = $1\n            AND chain_id = $2\n            ",
+  "query": "\n            UPDATE processed_events\n            SET\n                next_block_to_process = $3\n            WHERE\n                type = $1\n                AND chain_id = $2\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -22,5 +22,5 @@
     },
     "nullable": []
   },
-  "hash": "c61682ed92c1a43855a991598d593639a63047f46dc8e605ff37b78f43f5cef5"
+  "hash": "228aa5ec4c4eb56143823b96a8190ded732839b9f5bf16042205a730fac07c3a"
 }
diff --git a/core/lib/dal/.sqlx/query-040eaa878c3473f5edc73b77e572b5ea100f59295cd693d14ee0d5ee089c7981.json b/core/lib/dal/.sqlx/query-229db646c85461858689b81d80f5ddbee82a65c00c5740e9017382c57c279b18.json
similarity index 63%
rename from core/lib/dal/.sqlx/query-040eaa878c3473f5edc73b77e572b5ea100f59295cd693d14ee0d5ee089c7981.json
rename to core/lib/dal/.sqlx/query-229db646c85461858689b81d80f5ddbee82a65c00c5740e9017382c57c279b18.json
index c0e0c777cc5..3a21023c4da 100644
--- a/core/lib/dal/.sqlx/query-040eaa878c3473f5edc73b77e572b5ea100f59295cd693d14ee0d5ee089c7981.json
+++ b/core/lib/dal/.sqlx/query-229db646c85461858689b81d80f5ddbee82a65c00c5740e9017382c57c279b18.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                l1_batch_number\n            FROM\n                snapshots\n            WHERE\n                NOT (''::TEXT = ANY (storage_logs_filepaths))\n            ORDER BY\n                l1_batch_number DESC\n            ",
+  "query": "\n            SELECT\n                l1_batch_number\n            FROM\n                snapshots\n            WHERE\n                NOT (''::TEXT = ANY(storage_logs_filepaths))\n            ORDER BY\n                l1_batch_number DESC\n            ",
   "describe": {
     "columns": [
       {
@@ -16,5 +16,5 @@
       false
     ]
   },
-  "hash": "040eaa878c3473f5edc73b77e572b5ea100f59295cd693d14ee0d5ee089c7981"
+  "hash": "229db646c85461858689b81d80f5ddbee82a65c00c5740e9017382c57c279b18"
 }
diff --git a/core/lib/dal/.sqlx/query-24722ee4ced7f03e60b1b5ecaaa5234d536b064951a67d826ac49b7a3a095a1a.json b/core/lib/dal/.sqlx/query-24865315c100f495a6e2cefb3b0e84d2fcc5d436e52cc82ed2aba664bde3ee6b.json
similarity index 71%
rename from core/lib/dal/.sqlx/query-24722ee4ced7f03e60b1b5ecaaa5234d536b064951a67d826ac49b7a3a095a1a.json
rename to core/lib/dal/.sqlx/query-24865315c100f495a6e2cefb3b0e84d2fcc5d436e52cc82ed2aba664bde3ee6b.json
index 194f4faedb1..d343cd5a710 100644
--- a/core/lib/dal/.sqlx/query-24722ee4ced7f03e60b1b5ecaaa5234d536b064951a67d826ac49b7a3a095a1a.json
+++ b/core/lib/dal/.sqlx/query-24865315c100f495a6e2cefb3b0e84d2fcc5d436e52cc82ed2aba664bde3ee6b.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                hashed_key,\n                INDEX\n            FROM\n                initial_writes\n            WHERE\n                l1_batch_number = $1\n            ORDER BY\n                INDEX\n            ",
+  "query": "\n            SELECT\n                hashed_key,\n                index\n            FROM\n                initial_writes\n            WHERE\n                l1_batch_number = $1\n            ORDER BY\n                index\n            ",
   "describe": {
     "columns": [
       {
@@ -24,5 +24,5 @@
       false
     ]
   },
-  "hash": "24722ee4ced7f03e60b1b5ecaaa5234d536b064951a67d826ac49b7a3a095a1a"
+  "hash": "24865315c100f495a6e2cefb3b0e84d2fcc5d436e52cc82ed2aba664bde3ee6b"
 }
diff --git a/core/lib/dal/.sqlx/query-86dbcf93abdd4206d2d62b140cf5dd11537925d02f5a7f2bae23c8dc48204e3f.json b/core/lib/dal/.sqlx/query-2589f98459979f776ce5fd6e3ff94ec52b3eb68c346492a8fed98f20f2a0381d.json
similarity index 62%
rename from core/lib/dal/.sqlx/query-86dbcf93abdd4206d2d62b140cf5dd11537925d02f5a7f2bae23c8dc48204e3f.json
rename to core/lib/dal/.sqlx/query-2589f98459979f776ce5fd6e3ff94ec52b3eb68c346492a8fed98f20f2a0381d.json
index 42cf55bd939..9d8cc36189f 100644
--- a/core/lib/dal/.sqlx/query-86dbcf93abdd4206d2d62b140cf5dd11537925d02f5a7f2bae23c8dc48204e3f.json
+++ b/core/lib/dal/.sqlx/query-2589f98459979f776ce5fd6e3ff94ec52b3eb68c346492a8fed98f20f2a0381d.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                proofs.l1_batch_number\n            FROM\n                tee_proof_generation_details AS proofs\n                JOIN tee_verifier_input_producer_jobs AS inputs ON proofs.l1_batch_number = inputs.l1_batch_number\n            WHERE\n                inputs.status = $1\n                AND proofs.status = $2\n            ORDER BY\n                proofs.l1_batch_number ASC\n            LIMIT\n                1\n            ",
+  "query": "\n            SELECT\n                proofs.l1_batch_number\n            FROM\n                tee_proof_generation_details AS proofs\n            JOIN\n                tee_verifier_input_producer_jobs AS inputs\n                ON proofs.l1_batch_number = inputs.l1_batch_number\n            WHERE\n                inputs.status = $1\n                AND proofs.status = $2\n            ORDER BY\n                proofs.l1_batch_number ASC\n            LIMIT\n                1\n            ",
   "describe": {
     "columns": [
       {
@@ -32,5 +32,5 @@
       false
     ]
   },
-  "hash": "86dbcf93abdd4206d2d62b140cf5dd11537925d02f5a7f2bae23c8dc48204e3f"
+  "hash": "2589f98459979f776ce5fd6e3ff94ec52b3eb68c346492a8fed98f20f2a0381d"
 }
diff --git a/core/lib/dal/.sqlx/query-25fb31277591dd7d5d783bd8777f1a855e76b37b6ed36ae612b551f9a6a55633.json b/core/lib/dal/.sqlx/query-25fb31277591dd7d5d783bd8777f1a855e76b37b6ed36ae612b551f9a6a55633.json
deleted file mode 100644
index ee88bcdf39b..00000000000
--- a/core/lib/dal/.sqlx/query-25fb31277591dd7d5d783bd8777f1a855e76b37b6ed36ae612b551f9a6a55633.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                protocol_versions (\n                    id,\n                    timestamp,\n                    bootloader_code_hash,\n                    default_account_code_hash,\n                    upgrade_tx_hash,\n                    created_at\n                )\n            VALUES\n                ($1, $2, $3, $4, $5, NOW())\n            ON CONFLICT DO NOTHING\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int4",
-        "Int8",
-        "Bytea",
-        "Bytea",
-        "Bytea"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "25fb31277591dd7d5d783bd8777f1a855e76b37b6ed36ae612b551f9a6a55633"
-}
diff --git a/core/lib/dal/.sqlx/query-1e3c88b41bc02cb6a116fa930ae85b8b60165ed757ae1044e83fdc877d95cbd8.json b/core/lib/dal/.sqlx/query-2719fa6e4f282535526ef6c3c7c73dcb740d1d2750fe17fb5330e50323b96b49.json
similarity index 90%
rename from core/lib/dal/.sqlx/query-1e3c88b41bc02cb6a116fa930ae85b8b60165ed757ae1044e83fdc877d95cbd8.json
rename to core/lib/dal/.sqlx/query-2719fa6e4f282535526ef6c3c7c73dcb740d1d2750fe17fb5330e50323b96b49.json
index 206d2f91e3b..0fcc6b45700 100644
--- a/core/lib/dal/.sqlx/query-1e3c88b41bc02cb6a116fa930ae85b8b60165ed757ae1044e83fdc877d95cbd8.json
+++ b/core/lib/dal/.sqlx/query-2719fa6e4f282535526ef6c3c7c73dcb740d1d2750fe17fb5330e50323b96b49.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                miniblock_number,\n                log_index_in_miniblock,\n                log_index_in_tx,\n                tx_hash,\n                NULL::BIGINT AS \"l1_batch_number?\",\n                shard_id,\n                is_service,\n                tx_index_in_miniblock,\n                tx_index_in_l1_batch,\n                sender,\n                key,\n                value\n            FROM\n                l2_to_l1_logs\n            WHERE\n                tx_hash = ANY ($1)\n            ORDER BY\n                tx_index_in_l1_batch ASC,\n                log_index_in_tx ASC\n            ",
+  "query": "\n            SELECT\n                miniblock_number,\n                log_index_in_miniblock,\n                log_index_in_tx,\n                tx_hash,\n                NULL::BIGINT AS \"l1_batch_number?\",\n                shard_id,\n                is_service,\n                tx_index_in_miniblock,\n                tx_index_in_l1_batch,\n                sender,\n                key,\n                value\n            FROM\n                l2_to_l1_logs\n            WHERE\n                tx_hash = ANY($1)\n            ORDER BY\n                tx_index_in_l1_batch ASC,\n                log_index_in_tx ASC\n            ",
   "describe": {
     "columns": [
       {
@@ -84,5 +84,5 @@
       false
     ]
   },
-  "hash": "1e3c88b41bc02cb6a116fa930ae85b8b60165ed757ae1044e83fdc877d95cbd8"
+  "hash": "2719fa6e4f282535526ef6c3c7c73dcb740d1d2750fe17fb5330e50323b96b49"
 }
diff --git a/core/lib/dal/.sqlx/query-69c885498b186f3b7cbb215112ec86783d7da0ec1d008680872f3619cf217923.json b/core/lib/dal/.sqlx/query-28c5a9f99af4d2857346e0df73c9b9086ba42bac53629793a42d67b353c30210.json
similarity index 60%
rename from core/lib/dal/.sqlx/query-69c885498b186f3b7cbb215112ec86783d7da0ec1d008680872f3619cf217923.json
rename to core/lib/dal/.sqlx/query-28c5a9f99af4d2857346e0df73c9b9086ba42bac53629793a42d67b353c30210.json
index 82575c807fb..93520d4ded3 100644
--- a/core/lib/dal/.sqlx/query-69c885498b186f3b7cbb215112ec86783d7da0ec1d008680872f3619cf217923.json
+++ b/core/lib/dal/.sqlx/query-28c5a9f99af4d2857346e0df73c9b9086ba42bac53629793a42d67b353c30210.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                DELETE FROM transactions\n                WHERE\n                    hash = ANY ($1)\n                ",
+  "query": "\n                DELETE FROM transactions\n                WHERE\n                    hash = ANY($1)\n                ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -10,5 +10,5 @@
     },
     "nullable": []
   },
-  "hash": "69c885498b186f3b7cbb215112ec86783d7da0ec1d008680872f3619cf217923"
+  "hash": "28c5a9f99af4d2857346e0df73c9b9086ba42bac53629793a42d67b353c30210"
 }
diff --git a/core/lib/dal/.sqlx/query-28e03d23835e86f77a27735ac0ec801788d834bc1ea9b8194e4461c3df979f8b.json b/core/lib/dal/.sqlx/query-28e03d23835e86f77a27735ac0ec801788d834bc1ea9b8194e4461c3df979f8b.json
deleted file mode 100644
index c61184d56c7..00000000000
--- a/core/lib/dal/.sqlx/query-28e03d23835e86f77a27735ac0ec801788d834bc1ea9b8194e4461c3df979f8b.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                transactions (\n                    hash,\n                    is_priority,\n                    initiator_address,\n                    gas_limit,\n                    max_fee_per_gas,\n                    gas_per_pubdata_limit,\n                    data,\n                    upgrade_id,\n                    contract_address,\n                    l1_block_number,\n                    value,\n                    paymaster,\n                    paymaster_input,\n                    tx_format,\n                    l1_tx_mint,\n                    l1_tx_refund_recipient,\n                    miniblock_number,\n                    index_in_block,\n                    error,\n                    execution_info,\n                    refunded_gas,\n                    effective_gas_price,\n                    received_at,\n                    created_at,\n                    updated_at\n                )\n            SELECT\n                data_table.hash,\n                TRUE,\n                data_table.initiator_address,\n                data_table.gas_limit,\n                data_table.max_fee_per_gas,\n                data_table.gas_per_pubdata_limit,\n                data_table.data,\n                data_table.upgrade_id,\n                data_table.contract_address,\n                data_table.l1_block_number,\n                data_table.value,\n                '\\x0000000000000000000000000000000000000000'::bytea,\n                '\\x'::bytea,\n                data_table.tx_format,\n                data_table.l1_tx_mint,\n                data_table.l1_tx_refund_recipient,\n                $19,\n                data_table.index_in_block,\n                NULLIF(data_table.error, ''),\n                data_table.execution_info,\n                data_table.refunded_gas,\n                data_table.effective_gas_price,\n                NOW(),\n                NOW(),\n                NOW()\n            FROM\n                (\n                    SELECT\n                        UNNEST($1::bytea[]) AS hash,\n                        UNNEST($2::bytea[]) AS initiator_address,\n                        UNNEST($3::NUMERIC[]) AS gas_limit,\n                        UNNEST($4::NUMERIC[]) AS max_fee_per_gas,\n                        UNNEST($5::NUMERIC[]) AS gas_per_pubdata_limit,\n                        UNNEST($6::jsonb[]) AS data,\n                        UNNEST($7::INT[]) AS upgrade_id,\n                        UNNEST($8::bytea[]) AS contract_address,\n                        UNNEST($9::INT[]) AS l1_block_number,\n                        UNNEST($10::NUMERIC[]) AS value,\n                        UNNEST($11::INTEGER[]) AS tx_format,\n                        UNNEST($12::NUMERIC[]) AS l1_tx_mint,\n                        UNNEST($13::bytea[]) AS l1_tx_refund_recipient,\n                        UNNEST($14::INT[]) AS index_in_block,\n                        UNNEST($15::VARCHAR[]) AS error,\n                        UNNEST($16::jsonb[]) AS execution_info,\n                        UNNEST($17::BIGINT[]) AS refunded_gas,\n                        UNNEST($18::NUMERIC[]) AS effective_gas_price\n                ) AS data_table\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "ByteaArray",
-        "ByteaArray",
-        "NumericArray",
-        "NumericArray",
-        "NumericArray",
-        "JsonbArray",
-        "Int4Array",
-        "ByteaArray",
-        "Int4Array",
-        "NumericArray",
-        "Int4Array",
-        "NumericArray",
-        "ByteaArray",
-        "Int4Array",
-        "VarcharArray",
-        "JsonbArray",
-        "Int8Array",
-        "NumericArray",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "28e03d23835e86f77a27735ac0ec801788d834bc1ea9b8194e4461c3df979f8b"
-}
diff --git a/core/lib/dal/.sqlx/query-2a2083fd04ebd006eb0aa4e0e5f62f3339768a85aaff9a509901e9f42b09097b.json b/core/lib/dal/.sqlx/query-2a2083fd04ebd006eb0aa4e0e5f62f3339768a85aaff9a509901e9f42b09097b.json
new file mode 100644
index 00000000000..a713616d582
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-2a2083fd04ebd006eb0aa4e0e5f62f3339768a85aaff9a509901e9f42b09097b.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                number,\n                pubdata_input\n            FROM\n                l1_batches\n            LEFT JOIN\n                data_availability\n                ON data_availability.l1_batch_number = l1_batches.number\n            WHERE\n                eth_commit_tx_id IS NULL\n                AND number != 0\n                AND data_availability.blob_id IS NULL\n                AND pubdata_input IS NOT NULL\n            ORDER BY\n                number\n            LIMIT\n                $1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "pubdata_input",
+        "type_info": "Bytea"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      true
+    ]
+  },
+  "hash": "2a2083fd04ebd006eb0aa4e0e5f62f3339768a85aaff9a509901e9f42b09097b"
+}
diff --git a/core/lib/dal/.sqlx/query-2a4bfb1ed34f0d508352a5f3f761eda9057c7fb71b8f0d96f69fda78662ecec5.json b/core/lib/dal/.sqlx/query-2a4bfb1ed34f0d508352a5f3f761eda9057c7fb71b8f0d96f69fda78662ecec5.json
new file mode 100644
index 00000000000..7444f11734a
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-2a4bfb1ed34f0d508352a5f3f761eda9057c7fb71b8f0d96f69fda78662ecec5.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                number\n            FROM\n                l1_batches\n            LEFT JOIN\n                eth_txs_history AS commit_tx\n                ON (l1_batches.eth_commit_tx_id = commit_tx.eth_tx_id)\n            WHERE\n                commit_tx.confirmed_at IS NOT NULL\n            ORDER BY\n                number DESC\n            LIMIT\n                1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "number",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "2a4bfb1ed34f0d508352a5f3f761eda9057c7fb71b8f0d96f69fda78662ecec5"
+}
diff --git a/core/lib/dal/.sqlx/query-2d1e0f2e043c193052c9cc20f9efeb5f094160627bc09db4bda2dda9a8c11c44.json b/core/lib/dal/.sqlx/query-2d1e0f2e043c193052c9cc20f9efeb5f094160627bc09db4bda2dda9a8c11c44.json
deleted file mode 100644
index 1d9c276b078..00000000000
--- a/core/lib/dal/.sqlx/query-2d1e0f2e043c193052c9cc20f9efeb5f094160627bc09db4bda2dda9a8c11c44.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                contracts_verification_info (address, verification_info)\n            VALUES\n                ($1, $2)\n            ON CONFLICT (address) DO\n            UPDATE\n            SET\n                verification_info = $2\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Bytea",
-        "Jsonb"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "2d1e0f2e043c193052c9cc20f9efeb5f094160627bc09db4bda2dda9a8c11c44"
-}
diff --git a/core/lib/dal/.sqlx/query-2d8da95804a7a300ff2b756e6785c0665ee3ea4086ddb91428fa1b6a00760737.json b/core/lib/dal/.sqlx/query-2d8da95804a7a300ff2b756e6785c0665ee3ea4086ddb91428fa1b6a00760737.json
deleted file mode 100644
index 8b8cef7dd77..00000000000
--- a/core/lib/dal/.sqlx/query-2d8da95804a7a300ff2b756e6785c0665ee3ea4086ddb91428fa1b6a00760737.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT DISTINCT\n                ON (hashed_key) hashed_key,\n                miniblock_number,\n                value\n            FROM\n                storage_logs\n            WHERE\n                hashed_key = ANY ($1)\n                AND miniblock_number <= $2\n                AND miniblock_number <= COALESCE(\n                    (\n                        SELECT\n                            MAX(number)\n                        FROM\n                            miniblocks\n                    ),\n                    (\n                        SELECT\n                            miniblock_number\n                        FROM\n                            snapshot_recovery\n                    )\n                )\n            ORDER BY\n                hashed_key,\n                miniblock_number DESC,\n                operation_number DESC\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "hashed_key",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 1,
-        "name": "miniblock_number",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 2,
-        "name": "value",
-        "type_info": "Bytea"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "ByteaArray",
-        "Int8"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "2d8da95804a7a300ff2b756e6785c0665ee3ea4086ddb91428fa1b6a00760737"
-}
diff --git a/core/lib/dal/.sqlx/query-2e5b9ae1b81b0abfe7a962c93b3119a0a60dc9804175b2baf8b45939c74bd583.json b/core/lib/dal/.sqlx/query-2e5b9ae1b81b0abfe7a962c93b3119a0a60dc9804175b2baf8b45939c74bd583.json
deleted file mode 100644
index 20548776830..00000000000
--- a/core/lib/dal/.sqlx/query-2e5b9ae1b81b0abfe7a962c93b3119a0a60dc9804175b2baf8b45939c74bd583.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                compiler_versions (VERSION, compiler, created_at, updated_at)\n            SELECT\n                u.version,\n                $2,\n                NOW(),\n                NOW()\n            FROM\n                UNNEST($1::TEXT[]) AS u (VERSION)\n            ON CONFLICT (VERSION, compiler) DO NOTHING\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "TextArray",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "2e5b9ae1b81b0abfe7a962c93b3119a0a60dc9804175b2baf8b45939c74bd583"
-}
diff --git a/core/lib/dal/.sqlx/query-5d341e334cbc2d38efc8a060325677d57040037da0e07cef2c7b7246851a3703.json b/core/lib/dal/.sqlx/query-2fa2ba4a62f79d780d239409d426b602aa0cf9b0c5b1ef39b7d07d6309454fcd.json
similarity index 80%
rename from core/lib/dal/.sqlx/query-5d341e334cbc2d38efc8a060325677d57040037da0e07cef2c7b7246851a3703.json
rename to core/lib/dal/.sqlx/query-2fa2ba4a62f79d780d239409d426b602aa0cf9b0c5b1ef39b7d07d6309454fcd.json
index f0d8b01d57c..1d515edba81 100644
--- a/core/lib/dal/.sqlx/query-5d341e334cbc2d38efc8a060325677d57040037da0e07cef2c7b7246851a3703.json
+++ b/core/lib/dal/.sqlx/query-2fa2ba4a62f79d780d239409d426b602aa0cf9b0c5b1ef39b7d07d6309454fcd.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE contract_verification_requests\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                id = (\n                    SELECT\n                        id\n                    FROM\n                        contract_verification_requests\n                    WHERE\n                        status = 'queued'\n                        OR (\n                            status = 'in_progress'\n                            AND processing_started_at < NOW() - $1::INTERVAL\n                        )\n                    ORDER BY\n                        created_at\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                id,\n                contract_address,\n                source_code,\n                contract_name,\n                zk_compiler_version,\n                compiler_version,\n                optimization_used,\n                optimizer_mode,\n                constructor_arguments,\n                is_system,\n                force_evmla\n            ",
+  "query": "\n            UPDATE contract_verification_requests\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                id = (\n                    SELECT\n                        id\n                    FROM\n                        contract_verification_requests\n                    WHERE\n                        status = 'queued'\n                        OR (\n                            status = 'in_progress'\n                            AND processing_started_at < NOW() - $1::INTERVAL\n                        )\n                    ORDER BY\n                        created_at\n                    LIMIT\n                        1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n            RETURNING\n            id,\n            contract_address,\n            source_code,\n            contract_name,\n            zk_compiler_version,\n            compiler_version,\n            optimization_used,\n            optimizer_mode,\n            constructor_arguments,\n            is_system,\n            force_evmla\n            ",
   "describe": {
     "columns": [
       {
@@ -78,5 +78,5 @@
       false
     ]
   },
-  "hash": "5d341e334cbc2d38efc8a060325677d57040037da0e07cef2c7b7246851a3703"
+  "hash": "2fa2ba4a62f79d780d239409d426b602aa0cf9b0c5b1ef39b7d07d6309454fcd"
 }
diff --git a/core/lib/dal/.sqlx/query-2506e9edfd4b41ca1e187909631ae942bab5d71daaed7017e3fa62dc5e42ab0a.json b/core/lib/dal/.sqlx/query-2fc088b319ff8f197e50bb379b77de8ba36685dde66d1b3fcf549a52c5001d06.json
similarity index 80%
rename from core/lib/dal/.sqlx/query-2506e9edfd4b41ca1e187909631ae942bab5d71daaed7017e3fa62dc5e42ab0a.json
rename to core/lib/dal/.sqlx/query-2fc088b319ff8f197e50bb379b77de8ba36685dde66d1b3fcf549a52c5001d06.json
index c4f8057011d..679d2ff917d 100644
--- a/core/lib/dal/.sqlx/query-2506e9edfd4b41ca1e187909631ae942bab5d71daaed7017e3fa62dc5e42ab0a.json
+++ b/core/lib/dal/.sqlx/query-2fc088b319ff8f197e50bb379b77de8ba36685dde66d1b3fcf549a52c5001d06.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                hashed_key,\n                l1_batch_number,\n                INDEX\n            FROM\n                initial_writes\n            ",
+  "query": "\n            SELECT\n                hashed_key,\n                l1_batch_number,\n                index\n            FROM\n                initial_writes\n            ",
   "describe": {
     "columns": [
       {
@@ -28,5 +28,5 @@
       false
     ]
   },
-  "hash": "2506e9edfd4b41ca1e187909631ae942bab5d71daaed7017e3fa62dc5e42ab0a"
+  "hash": "2fc088b319ff8f197e50bb379b77de8ba36685dde66d1b3fcf549a52c5001d06"
 }
diff --git a/core/lib/dal/.sqlx/query-30e5c8710b1611872da06b72ac681aff512b3a9b2587b8e59848345c07dd8f3b.json b/core/lib/dal/.sqlx/query-3010d02e02391732c622a7515e1e494ce1d8e3b6cfb0b897745fb596f283be79.json
similarity index 89%
rename from core/lib/dal/.sqlx/query-30e5c8710b1611872da06b72ac681aff512b3a9b2587b8e59848345c07dd8f3b.json
rename to core/lib/dal/.sqlx/query-3010d02e02391732c622a7515e1e494ce1d8e3b6cfb0b897745fb596f283be79.json
index 1ddc86f29a0..6012c632651 100644
--- a/core/lib/dal/.sqlx/query-30e5c8710b1611872da06b72ac681aff512b3a9b2587b8e59848345c07dd8f3b.json
+++ b/core/lib/dal/.sqlx/query-3010d02e02391732c622a7515e1e494ce1d8e3b6cfb0b897745fb596f283be79.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE tee_verifier_input_producer_jobs\n            SET\n                status = $1,\n                updated_at = NOW(),\n                time_taken = $3,\n                error = $4\n            WHERE\n                l1_batch_number = $2\n                AND status != $5\n            RETURNING\n                tee_verifier_input_producer_jobs.attempts\n            ",
+  "query": "\n            UPDATE tee_verifier_input_producer_jobs\n            SET\n                status = $1,\n                updated_at = NOW(),\n                time_taken = $3,\n                error = $4\n            WHERE\n                l1_batch_number = $2\n                AND status != $5\n            RETURNING\n            tee_verifier_input_producer_jobs.attempts\n            ",
   "describe": {
     "columns": [
       {
@@ -48,5 +48,5 @@
       false
     ]
   },
-  "hash": "30e5c8710b1611872da06b72ac681aff512b3a9b2587b8e59848345c07dd8f3b"
+  "hash": "3010d02e02391732c622a7515e1e494ce1d8e3b6cfb0b897745fb596f283be79"
 }
diff --git a/core/lib/dal/.sqlx/query-307f15e00a97440868189f25e4487ed365c0369f94bc457cb162a5c876a123c7.json b/core/lib/dal/.sqlx/query-307f15e00a97440868189f25e4487ed365c0369f94bc457cb162a5c876a123c7.json
deleted file mode 100644
index 6c55bf34eab..00000000000
--- a/core/lib/dal/.sqlx/query-307f15e00a97440868189f25e4487ed365c0369f94bc457cb162a5c876a123c7.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                commitments (l1_batch_number, events_queue_commitment, bootloader_initial_content_commitment)\n            VALUES\n                ($1, $2, $3)\n            ON CONFLICT (l1_batch_number) DO NOTHING\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Bytea",
-        "Bytea"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "307f15e00a97440868189f25e4487ed365c0369f94bc457cb162a5c876a123c7"
-}
diff --git a/core/lib/dal/.sqlx/query-311d0357c22163b893dc91f2b080f2ede5e22b0bbd8bc910cb36a91ed992bde1.json b/core/lib/dal/.sqlx/query-311d0357c22163b893dc91f2b080f2ede5e22b0bbd8bc910cb36a91ed992bde1.json
deleted file mode 100644
index cabe0a3dc55..00000000000
--- a/core/lib/dal/.sqlx/query-311d0357c22163b893dc91f2b080f2ede5e22b0bbd8bc910cb36a91ed992bde1.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                l1_batches_consensus (l1_batch_number, certificate, updated_at, created_at)\n            VALUES\n                ($1, $2, NOW(), NOW())\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Jsonb"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "311d0357c22163b893dc91f2b080f2ede5e22b0bbd8bc910cb36a91ed992bde1"
-}
diff --git a/core/lib/dal/.sqlx/query-32e8bdbf16fdd2b7617d7a909c3eee66178533c3c0f51e2bfa9ff201e17e4014.json b/core/lib/dal/.sqlx/query-32e8bdbf16fdd2b7617d7a909c3eee66178533c3c0f51e2bfa9ff201e17e4014.json
new file mode 100644
index 00000000000..f2fdebd416c
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-32e8bdbf16fdd2b7617d7a909c3eee66178533c3c0f51e2bfa9ff201e17e4014.json
@@ -0,0 +1,44 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                table_name,\n                PG_TABLE_SIZE(\n                    ('public.' || QUOTE_IDENT(table_name))::regclass\n                ) AS table_size,\n                PG_INDEXES_SIZE(\n                    ('public.' || QUOTE_IDENT(table_name))::regclass\n                ) AS indexes_size,\n                PG_RELATION_SIZE(\n                    ('public.' || QUOTE_IDENT(table_name))::regclass\n                ) AS relation_size,\n                PG_TOTAL_RELATION_SIZE(\n                    ('public.' || QUOTE_IDENT(table_name))::regclass\n                ) AS total_size\n            FROM\n                information_schema.tables\n            WHERE\n                table_schema = 'public'\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "table_name",
+        "type_info": "Name"
+      },
+      {
+        "ordinal": 1,
+        "name": "table_size",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "indexes_size",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 3,
+        "name": "relation_size",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 4,
+        "name": "total_size",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      true,
+      null,
+      null,
+      null,
+      null
+    ]
+  },
+  "hash": "32e8bdbf16fdd2b7617d7a909c3eee66178533c3c0f51e2bfa9ff201e17e4014"
+}
diff --git a/core/lib/dal/.sqlx/query-3353dd735addf184732843151dd47e1ed84929bf75bb814ee2280d241912d38f.json b/core/lib/dal/.sqlx/query-3353dd735addf184732843151dd47e1ed84929bf75bb814ee2280d241912d38f.json
new file mode 100644
index 00000000000..aea0d712857
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-3353dd735addf184732843151dd47e1ed84929bf75bb814ee2280d241912d38f.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            l1_batches_consensus_committees (l1_batch_number, attesters, updated_at)\n            VALUES\n            ($1, $2, NOW())\n            ON CONFLICT (l1_batch_number) DO\n            UPDATE\n            SET\n            l1_batch_number = $1,\n            attesters = $2,\n            updated_at = NOW()\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Jsonb"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "3353dd735addf184732843151dd47e1ed84929bf75bb814ee2280d241912d38f"
+}
diff --git a/core/lib/dal/.sqlx/query-33a78184559d0c0d13469fa799e2c5eeab06ff664141fa542229e7c9a46d4410.json b/core/lib/dal/.sqlx/query-33a78184559d0c0d13469fa799e2c5eeab06ff664141fa542229e7c9a46d4410.json
deleted file mode 100644
index 6dcc1acfd35..00000000000
--- a/core/lib/dal/.sqlx/query-33a78184559d0c0d13469fa799e2c5eeab06ff664141fa542229e7c9a46d4410.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            UPDATE transactions\n            SET\n                hash = data_table.hash,\n                signature = data_table.signature,\n                gas_limit = data_table.gas_limit,\n                max_fee_per_gas = data_table.max_fee_per_gas,\n                max_priority_fee_per_gas = data_table.max_priority_fee_per_gas,\n                gas_per_pubdata_limit = data_table.gas_per_pubdata_limit,\n                input = data_table.input,\n                data = data_table.data,\n                tx_format = data_table.tx_format,\n                miniblock_number = $21,\n                index_in_block = data_table.index_in_block,\n                error = NULLIF(data_table.error, ''),\n                effective_gas_price = data_table.effective_gas_price,\n                execution_info = data_table.new_execution_info,\n                refunded_gas = data_table.refunded_gas,\n                value = data_table.value,\n                contract_address = data_table.contract_address,\n                paymaster = data_table.paymaster,\n                paymaster_input = data_table.paymaster_input,\n                in_mempool = FALSE,\n                updated_at = NOW()\n            FROM\n                (\n                    SELECT\n                        data_table_temp.*\n                    FROM\n                        (\n                            SELECT\n                                UNNEST($1::bytea[]) AS initiator_address,\n                                UNNEST($2::INT[]) AS nonce,\n                                UNNEST($3::bytea[]) AS hash,\n                                UNNEST($4::bytea[]) AS signature,\n                                UNNEST($5::NUMERIC[]) AS gas_limit,\n                                UNNEST($6::NUMERIC[]) AS max_fee_per_gas,\n                                UNNEST($7::NUMERIC[]) AS max_priority_fee_per_gas,\n                                UNNEST($8::NUMERIC[]) AS gas_per_pubdata_limit,\n                                UNNEST($9::INT[]) AS tx_format,\n                                UNNEST($10::INTEGER[]) AS index_in_block,\n                                UNNEST($11::VARCHAR[]) AS error,\n                                UNNEST($12::NUMERIC[]) AS effective_gas_price,\n                                UNNEST($13::jsonb[]) AS new_execution_info,\n                                UNNEST($14::bytea[]) AS input,\n                                UNNEST($15::jsonb[]) AS data,\n                                UNNEST($16::BIGINT[]) AS refunded_gas,\n                                UNNEST($17::NUMERIC[]) AS value,\n                                UNNEST($18::bytea[]) AS contract_address,\n                                UNNEST($19::bytea[]) AS paymaster,\n                                UNNEST($20::bytea[]) AS paymaster_input\n                        ) AS data_table_temp\n                        JOIN transactions ON transactions.initiator_address = data_table_temp.initiator_address\n                        AND transactions.nonce = data_table_temp.nonce\n                    ORDER BY\n                        transactions.hash\n                ) AS data_table\n            WHERE\n                transactions.initiator_address = data_table.initiator_address\n                AND transactions.nonce = data_table.nonce\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "ByteaArray",
-        "Int4Array",
-        "ByteaArray",
-        "ByteaArray",
-        "NumericArray",
-        "NumericArray",
-        "NumericArray",
-        "NumericArray",
-        "Int4Array",
-        "Int4Array",
-        "VarcharArray",
-        "NumericArray",
-        "JsonbArray",
-        "ByteaArray",
-        "JsonbArray",
-        "Int8Array",
-        "NumericArray",
-        "ByteaArray",
-        "ByteaArray",
-        "ByteaArray",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "33a78184559d0c0d13469fa799e2c5eeab06ff664141fa542229e7c9a46d4410"
-}
diff --git a/core/lib/dal/.sqlx/query-34910600545933d85931d41bfe2dfcb3522a0772ac3d2476652df4216d823e04.json b/core/lib/dal/.sqlx/query-34910600545933d85931d41bfe2dfcb3522a0772ac3d2476652df4216d823e04.json
new file mode 100644
index 00000000000..35c606bf22b
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-34910600545933d85931d41bfe2dfcb3522a0772ac3d2476652df4216d823e04.json
@@ -0,0 +1,31 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            miniblocks (\n                number,\n                timestamp,\n                hash,\n                l1_tx_count,\n                l2_tx_count,\n                fee_account_address,\n                base_fee_per_gas,\n                l1_gas_price,\n                l2_fair_gas_price,\n                gas_per_pubdata_limit,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                evm_emulator_code_hash,\n                protocol_version,\n                virtual_blocks,\n                fair_pubdata_price,\n                gas_limit,\n                logs_bloom,\n                created_at,\n                updated_at\n            )\n            VALUES\n            (\n                $1,\n                $2,\n                $3,\n                $4,\n                $5,\n                $6,\n                $7,\n                $8,\n                $9,\n                $10,\n                $11,\n                $12,\n                $13,\n                $14,\n                $15,\n                $16,\n                $17,\n                $18,\n                NOW(),\n                NOW()\n            )\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8",
+        "Bytea",
+        "Int4",
+        "Int4",
+        "Bytea",
+        "Numeric",
+        "Int8",
+        "Int8",
+        "Int8",
+        "Bytea",
+        "Bytea",
+        "Bytea",
+        "Int4",
+        "Int8",
+        "Int8",
+        "Int8",
+        "Bytea"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "34910600545933d85931d41bfe2dfcb3522a0772ac3d2476652df4216d823e04"
+}
diff --git a/core/lib/dal/.sqlx/query-3518a3e93da8115b54426d72aea0800383e6b73a8b48dc3e589a29a4367cbb5a.json b/core/lib/dal/.sqlx/query-3518a3e93da8115b54426d72aea0800383e6b73a8b48dc3e589a29a4367cbb5a.json
deleted file mode 100644
index a2351b5eef8..00000000000
--- a/core/lib/dal/.sqlx/query-3518a3e93da8115b54426d72aea0800383e6b73a8b48dc3e589a29a4367cbb5a.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                INSERT INTO\n                    call_traces (tx_hash, call_trace)\n                SELECT\n                    u.tx_hash,\n                    u.call_trace\n                FROM\n                    UNNEST($1::bytea[], $2::bytea[]) AS u (tx_hash, call_trace)\n                ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "ByteaArray",
-        "ByteaArray"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "3518a3e93da8115b54426d72aea0800383e6b73a8b48dc3e589a29a4367cbb5a"
-}
diff --git a/core/lib/dal/.sqlx/query-be2c8e525d6867c0d2bd254c73ef1719fd1284af1dbb60ea128550224b52da93.json b/core/lib/dal/.sqlx/query-369f8f652335176ab22ee45fd6f1717e73c5e6b063be3553d82bfecb98334980.json
similarity index 79%
rename from core/lib/dal/.sqlx/query-be2c8e525d6867c0d2bd254c73ef1719fd1284af1dbb60ea128550224b52da93.json
rename to core/lib/dal/.sqlx/query-369f8f652335176ab22ee45fd6f1717e73c5e6b063be3553d82bfecb98334980.json
index 21964d27d60..7245fa3059e 100644
--- a/core/lib/dal/.sqlx/query-be2c8e525d6867c0d2bd254c73ef1719fd1284af1dbb60ea128550224b52da93.json
+++ b/core/lib/dal/.sqlx/query-369f8f652335176ab22ee45fd6f1717e73c5e6b063be3553d82bfecb98334980.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                bytecode\n            FROM\n                (\n                    SELECT\n                        *\n                    FROM\n                        storage_logs\n                    WHERE\n                        storage_logs.hashed_key = $1\n                        AND storage_logs.miniblock_number <= $2\n                    ORDER BY\n                        storage_logs.miniblock_number DESC,\n                        storage_logs.operation_number DESC\n                    LIMIT\n                        1\n                ) t\n                JOIN factory_deps ON value = factory_deps.bytecode_hash\n            WHERE\n                value != $3\n            ",
+  "query": "\n            SELECT\n                bytecode\n            FROM\n                (\n                    SELECT\n                        *\n                    FROM\n                        storage_logs\n                    WHERE\n                        storage_logs.hashed_key = $1\n                        AND storage_logs.miniblock_number <= $2\n                    ORDER BY\n                        storage_logs.miniblock_number DESC,\n                        storage_logs.operation_number DESC\n                    LIMIT\n                        1\n                ) t\n            JOIN factory_deps ON value = factory_deps.bytecode_hash\n            WHERE\n                value != $3\n            ",
   "describe": {
     "columns": [
       {
@@ -20,5 +20,5 @@
       false
     ]
   },
-  "hash": "be2c8e525d6867c0d2bd254c73ef1719fd1284af1dbb60ea128550224b52da93"
+  "hash": "369f8f652335176ab22ee45fd6f1717e73c5e6b063be3553d82bfecb98334980"
 }
diff --git a/core/lib/dal/.sqlx/query-37890022be6b5e893cf051266fa16618914d6dedb39a9a40d36484741e8b01f4.json b/core/lib/dal/.sqlx/query-37890022be6b5e893cf051266fa16618914d6dedb39a9a40d36484741e8b01f4.json
deleted file mode 100644
index a39a1bdb07b..00000000000
--- a/core/lib/dal/.sqlx/query-37890022be6b5e893cf051266fa16618914d6dedb39a9a40d36484741e8b01f4.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                tee_attestations (pubkey, attestation)\n            VALUES\n                ($1, $2)\n            ON CONFLICT (pubkey) DO NOTHING\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Bytea",
-        "Bytea"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "37890022be6b5e893cf051266fa16618914d6dedb39a9a40d36484741e8b01f4"
-}
diff --git a/core/lib/dal/.sqlx/query-469db79fcf8d692507317080e0d843620210aff3a9a7aa8a249db50c1c56d927.json b/core/lib/dal/.sqlx/query-37b653ba8a544224ef6fb88e073d1e4657024c66a42e1bbc261c92c9e1c79930.json
similarity index 60%
rename from core/lib/dal/.sqlx/query-469db79fcf8d692507317080e0d843620210aff3a9a7aa8a249db50c1c56d927.json
rename to core/lib/dal/.sqlx/query-37b653ba8a544224ef6fb88e073d1e4657024c66a42e1bbc261c92c9e1c79930.json
index fe91d27abb1..f4b52c688cb 100644
--- a/core/lib/dal/.sqlx/query-469db79fcf8d692507317080e0d843620210aff3a9a7aa8a249db50c1c56d927.json
+++ b/core/lib/dal/.sqlx/query-37b653ba8a544224ef6fb88e073d1e4657024c66a42e1bbc261c92c9e1c79930.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE transactions\n            SET\n                miniblock_number = $1,\n                index_in_block = data_table.index_in_block,\n                error = NULLIF(data_table.error, ''),\n                in_mempool = FALSE,\n                execution_info = execution_info || data_table.new_execution_info,\n                refunded_gas = data_table.refunded_gas,\n                effective_gas_price = data_table.effective_gas_price,\n                updated_at = NOW()\n            FROM\n                (\n                    SELECT\n                        UNNEST($2::bytea[]) AS hash,\n                        UNNEST($3::INTEGER[]) AS index_in_block,\n                        UNNEST($4::VARCHAR[]) AS error,\n                        UNNEST($5::jsonb[]) AS new_execution_info,\n                        UNNEST($6::BIGINT[]) AS refunded_gas,\n                        UNNEST($7::NUMERIC[]) AS effective_gas_price\n                ) AS data_table\n            WHERE\n                transactions.hash = data_table.hash\n            ",
+  "query": "\n            UPDATE transactions\n            SET\n                miniblock_number = $1,\n                index_in_block = data_table.index_in_block,\n                error = NULLIF(data_table.error, ''),\n                in_mempool = FALSE,\n                execution_info = execution_info || data_table.new_execution_info,\n                refunded_gas = data_table.refunded_gas,\n                effective_gas_price = data_table.effective_gas_price,\n                updated_at = NOW()\n            FROM\n                (\n                    SELECT\n                        UNNEST($2::bytea []) AS hash,\n                        UNNEST($3::integer []) AS index_in_block,\n                        UNNEST($4::varchar []) AS error,\n                        UNNEST($5::jsonb []) AS new_execution_info,\n                        UNNEST($6::bigint []) AS refunded_gas,\n                        UNNEST($7::numeric []) AS effective_gas_price\n                ) AS data_table\n            WHERE\n                transactions.hash = data_table.hash\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -16,5 +16,5 @@
     },
     "nullable": []
   },
-  "hash": "469db79fcf8d692507317080e0d843620210aff3a9a7aa8a249db50c1c56d927"
+  "hash": "37b653ba8a544224ef6fb88e073d1e4657024c66a42e1bbc261c92c9e1c79930"
 }
diff --git a/core/lib/dal/.sqlx/query-511b99d53e4559deb1d5fd65193410d8d7497e18aeeed85eaaf6ecdfbb77e10d.json b/core/lib/dal/.sqlx/query-38d7647ec6368e08e3872a6fcbde446e93a47622f4c6753c46dd24e8733d4ad4.json
similarity index 75%
rename from core/lib/dal/.sqlx/query-511b99d53e4559deb1d5fd65193410d8d7497e18aeeed85eaaf6ecdfbb77e10d.json
rename to core/lib/dal/.sqlx/query-38d7647ec6368e08e3872a6fcbde446e93a47622f4c6753c46dd24e8733d4ad4.json
index 83c886dc562..ce61817fcd3 100644
--- a/core/lib/dal/.sqlx/query-511b99d53e4559deb1d5fd65193410d8d7497e18aeeed85eaaf6ecdfbb77e10d.json
+++ b/core/lib/dal/.sqlx/query-38d7647ec6368e08e3872a6fcbde446e93a47622f4c6753c46dd24e8733d4ad4.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                    SELECT\n                        number,\n                        timestamp,\n                        l1_tx_count,\n                        l2_tx_count,\n                        bloom,\n                        priority_ops_onchain_data,\n                        hash,\n                        commitment,\n                        l2_to_l1_messages,\n                        used_contract_hashes,\n                        compressed_initial_writes,\n                        compressed_repeated_writes,\n                        l2_l1_merkle_root,\n                        rollup_last_leaf_index,\n                        zkporter_is_available,\n                        bootloader_code_hash,\n                        default_aa_code_hash,\n                        aux_data_hash,\n                        pass_through_data_hash,\n                        meta_parameters_hash,\n                        protocol_version,\n                        compressed_state_diffs,\n                        system_logs,\n                        events_queue_commitment,\n                        bootloader_initial_content_commitment,\n                        pubdata_input,\n                        data_availability.blob_id AS \"blob_id?\"\n                    FROM\n                        l1_batches\n                        LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n                        LEFT JOIN data_availability ON data_availability.l1_batch_number = l1_batches.number\n                    WHERE\n                        eth_prove_tx_id IS NOT NULL\n                        AND eth_execute_tx_id IS NULL\n                    ORDER BY\n                        number\n                    LIMIT\n                        $1\n                    ",
+  "query": "\n                    SELECT\n                        number,\n                        timestamp,\n                        l1_tx_count,\n                        l2_tx_count,\n                        bloom,\n                        priority_ops_onchain_data,\n                        hash,\n                        commitment,\n                        l2_to_l1_messages,\n                        used_contract_hashes,\n                        compressed_initial_writes,\n                        compressed_repeated_writes,\n                        l2_l1_merkle_root,\n                        rollup_last_leaf_index,\n                        zkporter_is_available,\n                        bootloader_code_hash,\n                        default_aa_code_hash,\n                        evm_emulator_code_hash,\n                        aux_data_hash,\n                        pass_through_data_hash,\n                        meta_parameters_hash,\n                        protocol_version,\n                        compressed_state_diffs,\n                        system_logs,\n                        events_queue_commitment,\n                        bootloader_initial_content_commitment,\n                        pubdata_input,\n                        data_availability.blob_id AS \"blob_id?\"\n                    FROM\n                        l1_batches\n                    LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n                    LEFT JOIN\n                        data_availability\n                        ON data_availability.l1_batch_number = l1_batches.number\n                    WHERE\n                        eth_prove_tx_id IS NOT NULL\n                        AND eth_execute_tx_id IS NULL\n                    ORDER BY\n                        number\n                    LIMIT\n                        $1\n                    ",
   "describe": {
     "columns": [
       {
@@ -90,51 +90,56 @@
       },
       {
         "ordinal": 17,
-        "name": "aux_data_hash",
+        "name": "evm_emulator_code_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 18,
-        "name": "pass_through_data_hash",
+        "name": "aux_data_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 19,
-        "name": "meta_parameters_hash",
+        "name": "pass_through_data_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 20,
+        "name": "meta_parameters_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 21,
         "name": "protocol_version",
         "type_info": "Int4"
       },
       {
-        "ordinal": 21,
+        "ordinal": 22,
         "name": "compressed_state_diffs",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 22,
+        "ordinal": 23,
         "name": "system_logs",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 23,
+        "ordinal": 24,
         "name": "events_queue_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 24,
+        "ordinal": 25,
         "name": "bootloader_initial_content_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 25,
+        "ordinal": 26,
         "name": "pubdata_input",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 26,
+        "ordinal": 27,
         "name": "blob_id?",
         "type_info": "Text"
       }
@@ -167,6 +172,7 @@
       true,
       true,
       true,
+      true,
       false,
       true,
       true,
@@ -174,5 +180,5 @@
       false
     ]
   },
-  "hash": "511b99d53e4559deb1d5fd65193410d8d7497e18aeeed85eaaf6ecdfbb77e10d"
+  "hash": "38d7647ec6368e08e3872a6fcbde446e93a47622f4c6753c46dd24e8733d4ad4"
 }
diff --git a/core/lib/dal/.sqlx/query-3b4d5009ec22f54cc7d305aa11d96ec397767a063dc21aa3add974cb9b070361.json b/core/lib/dal/.sqlx/query-3b4d5009ec22f54cc7d305aa11d96ec397767a063dc21aa3add974cb9b070361.json
deleted file mode 100644
index 38890ae58f2..00000000000
--- a/core/lib/dal/.sqlx/query-3b4d5009ec22f54cc7d305aa11d96ec397767a063dc21aa3add974cb9b070361.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                factory_deps (bytecode_hash, bytecode, miniblock_number, created_at, updated_at)\n            SELECT\n                u.bytecode_hash,\n                u.bytecode,\n                $3,\n                NOW(),\n                NOW()\n            FROM\n                UNNEST($1::bytea[], $2::bytea[]) AS u (bytecode_hash, bytecode)\n            ON CONFLICT (bytecode_hash) DO NOTHING\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "ByteaArray",
-        "ByteaArray",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "3b4d5009ec22f54cc7d305aa11d96ec397767a063dc21aa3add974cb9b070361"
-}
diff --git a/core/lib/dal/.sqlx/query-3ddb13ffbafae2374527886e592b3c0210383d8698f6f84f694fece9fd59f3d5.json b/core/lib/dal/.sqlx/query-3ddb13ffbafae2374527886e592b3c0210383d8698f6f84f694fece9fd59f3d5.json
deleted file mode 100644
index 5652e186ceb..00000000000
--- a/core/lib/dal/.sqlx/query-3ddb13ffbafae2374527886e592b3c0210383d8698f6f84f694fece9fd59f3d5.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                protocol_patches (minor, patch, snark_wrapper_vk_hash, created_at)\n            VALUES\n                ($1, $2, $3, NOW())\n            ON CONFLICT DO NOTHING\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int4",
-        "Int4",
-        "Bytea"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "3ddb13ffbafae2374527886e592b3c0210383d8698f6f84f694fece9fd59f3d5"
-}
diff --git a/core/lib/dal/.sqlx/query-26c80e9bafcf7989e7d40c6e424240b34ce29aad3ac6571116e084d45574c448.json b/core/lib/dal/.sqlx/query-3ee6c2a87c65eaece7048da53c9f98ded0ad3e59e6de69c2b13d92d8ab1a07dd.json
similarity index 79%
rename from core/lib/dal/.sqlx/query-26c80e9bafcf7989e7d40c6e424240b34ce29aad3ac6571116e084d45574c448.json
rename to core/lib/dal/.sqlx/query-3ee6c2a87c65eaece7048da53c9f98ded0ad3e59e6de69c2b13d92d8ab1a07dd.json
index ee5de53d6e6..e2a808d41f8 100644
--- a/core/lib/dal/.sqlx/query-26c80e9bafcf7989e7d40c6e424240b34ce29aad3ac6571116e084d45574c448.json
+++ b/core/lib/dal/.sqlx/query-3ee6c2a87c65eaece7048da53c9f98ded0ad3e59e6de69c2b13d92d8ab1a07dd.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                next_block_to_process\n            FROM\n                processed_events\n            WHERE\n            TYPE = $1\n            AND chain_id = $2\n            ",
+  "query": "\n            SELECT\n                next_block_to_process\n            FROM\n                processed_events\n            WHERE\n                type = $1\n                AND chain_id = $2\n            ",
   "describe": {
     "columns": [
       {
@@ -29,5 +29,5 @@
       false
     ]
   },
-  "hash": "26c80e9bafcf7989e7d40c6e424240b34ce29aad3ac6571116e084d45574c448"
+  "hash": "3ee6c2a87c65eaece7048da53c9f98ded0ad3e59e6de69c2b13d92d8ab1a07dd"
 }
diff --git a/core/lib/dal/.sqlx/query-0fede71ed258790cf70d6d6a32dcf9654c06dfef57863281601c947830ad448a.json b/core/lib/dal/.sqlx/query-400457c97449097837d5e31d4476c32170ea4b47051a100f71a41dd6ed9bb1a9.json
similarity index 76%
rename from core/lib/dal/.sqlx/query-0fede71ed258790cf70d6d6a32dcf9654c06dfef57863281601c947830ad448a.json
rename to core/lib/dal/.sqlx/query-400457c97449097837d5e31d4476c32170ea4b47051a100f71a41dd6ed9bb1a9.json
index 6a3174958db..3e64cc5f5b2 100644
--- a/core/lib/dal/.sqlx/query-0fede71ed258790cf70d6d6a32dcf9654c06dfef57863281601c947830ad448a.json
+++ b/core/lib/dal/.sqlx/query-400457c97449097837d5e31d4476c32170ea4b47051a100f71a41dd6ed9bb1a9.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                eth_txs (\n                    raw_tx,\n                    nonce,\n                    tx_type,\n                    contract_address,\n                    predicted_gas_cost,\n                    created_at,\n                    updated_at,\n                    from_addr,\n                    blob_sidecar,\n                    is_gateway\n                )\n            VALUES\n                ($1, $2, $3, $4, $5, NOW(), NOW(), $6, $7, $8)\n            RETURNING\n                *\n            ",
+  "query": "\n            INSERT INTO\n            eth_txs (\n                raw_tx,\n                nonce,\n                tx_type,\n                contract_address,\n                predicted_gas_cost,\n                created_at,\n                updated_at,\n                from_addr,\n                blob_sidecar,\n                is_gateway\n            )\n            VALUES\n            ($1, $2, $3, $4, $5, NOW(), NOW(), $6, $7, $8)\n            RETURNING\n            *\n            ",
   "describe": {
     "columns": [
       {
@@ -115,5 +115,5 @@
       true
     ]
   },
-  "hash": "0fede71ed258790cf70d6d6a32dcf9654c06dfef57863281601c947830ad448a"
+  "hash": "400457c97449097837d5e31d4476c32170ea4b47051a100f71a41dd6ed9bb1a9"
 }
diff --git a/core/lib/dal/.sqlx/query-403b0b1c93f973aedb41aad7700d656e2a26752fa71ae936ff2eb821b0734b61.json b/core/lib/dal/.sqlx/query-403b0b1c93f973aedb41aad7700d656e2a26752fa71ae936ff2eb821b0734b61.json
new file mode 100644
index 00000000000..6cb9dec6838
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-403b0b1c93f973aedb41aad7700d656e2a26752fa71ae936ff2eb821b0734b61.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            proof_generation_details (l1_batch_number, status, created_at, updated_at)\n            VALUES\n            ($1, 'unpicked', NOW(), NOW())\n            ON CONFLICT (l1_batch_number) DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "403b0b1c93f973aedb41aad7700d656e2a26752fa71ae936ff2eb821b0734b61"
+}
diff --git a/core/lib/dal/.sqlx/query-406e51d7884cdff36632ccf97912484f0a0d76a8097b61ead5f1f20301ce524d.json b/core/lib/dal/.sqlx/query-406e51d7884cdff36632ccf97912484f0a0d76a8097b61ead5f1f20301ce524d.json
deleted file mode 100644
index cc3c2a344eb..00000000000
--- a/core/lib/dal/.sqlx/query-406e51d7884cdff36632ccf97912484f0a0d76a8097b61ead5f1f20301ce524d.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                snapshots (\n                    VERSION,\n                    l1_batch_number,\n                    storage_logs_filepaths,\n                    factory_deps_filepath,\n                    created_at,\n                    updated_at\n                )\n            VALUES\n                ($1, $2, ARRAY_FILL(''::TEXT, ARRAY[$3::INTEGER]), $4, NOW(), NOW())\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int4",
-        "Int8",
-        "Int4",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "406e51d7884cdff36632ccf97912484f0a0d76a8097b61ead5f1f20301ce524d"
-}
diff --git a/core/lib/dal/.sqlx/query-40c17194a2089a7d3fa6b7923c9e03def94f4bf4674def1893e2232be80f57a0.json b/core/lib/dal/.sqlx/query-40c17194a2089a7d3fa6b7923c9e03def94f4bf4674def1893e2232be80f57a0.json
deleted file mode 100644
index c655704fd84..00000000000
--- a/core/lib/dal/.sqlx/query-40c17194a2089a7d3fa6b7923c9e03def94f4bf4674def1893e2232be80f57a0.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                contract_verification_requests (\n                    contract_address,\n                    source_code,\n                    contract_name,\n                    zk_compiler_version,\n                    compiler_version,\n                    optimization_used,\n                    optimizer_mode,\n                    constructor_arguments,\n                    is_system,\n                    force_evmla,\n                    status,\n                    created_at,\n                    updated_at\n                )\n            VALUES\n                ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, 'queued', NOW(), NOW())\n            RETURNING\n                id\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Bytea",
-        "Text",
-        "Text",
-        "Text",
-        "Text",
-        "Bool",
-        "Text",
-        "Bytea",
-        "Bool",
-        "Bool"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "40c17194a2089a7d3fa6b7923c9e03def94f4bf4674def1893e2232be80f57a0"
-}
diff --git a/core/lib/dal/.sqlx/query-546c729829083b7eba94fea742c162d717ffcf46fdf5d2ce5d32555353b6da6b.json b/core/lib/dal/.sqlx/query-41b2d575151bff136037d6f1d75f36d50db45560befec6418020b01c55d94a98.json
similarity index 52%
rename from core/lib/dal/.sqlx/query-546c729829083b7eba94fea742c162d717ffcf46fdf5d2ce5d32555353b6da6b.json
rename to core/lib/dal/.sqlx/query-41b2d575151bff136037d6f1d75f36d50db45560befec6418020b01c55d94a98.json
index 70b94f73909..f5dccac1a01 100644
--- a/core/lib/dal/.sqlx/query-546c729829083b7eba94fea742c162d717ffcf46fdf5d2ce5d32555353b6da6b.json
+++ b/core/lib/dal/.sqlx/query-41b2d575151bff136037d6f1d75f36d50db45560befec6418020b01c55d94a98.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE transactions\n            SET\n                in_mempool = FALSE\n            FROM\n                UNNEST($1::bytea[]) AS s (address)\n            WHERE\n                transactions.in_mempool = TRUE\n                AND transactions.initiator_address = s.address\n            ",
+  "query": "\n            UPDATE transactions\n            SET\n                in_mempool = FALSE\n            FROM\n                UNNEST($1::bytea []) AS s (address)\n            WHERE\n                transactions.in_mempool = TRUE\n                AND transactions.initiator_address = s.address\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -10,5 +10,5 @@
     },
     "nullable": []
   },
-  "hash": "546c729829083b7eba94fea742c162d717ffcf46fdf5d2ce5d32555353b6da6b"
+  "hash": "41b2d575151bff136037d6f1d75f36d50db45560befec6418020b01c55d94a98"
 }
diff --git a/core/lib/dal/.sqlx/query-8b9e5d525c026de97c0a732b1adc8dc4bd57e32dfefe1017acba9a15fc14b895.json b/core/lib/dal/.sqlx/query-442212bb5f28f234cd624f2acc27944b2acedce201da4454aadb79f3545713ae.json
similarity index 61%
rename from core/lib/dal/.sqlx/query-8b9e5d525c026de97c0a732b1adc8dc4bd57e32dfefe1017acba9a15fc14b895.json
rename to core/lib/dal/.sqlx/query-442212bb5f28f234cd624f2acc27944b2acedce201da4454aadb79f3545713ae.json
index de369bccec5..621295d4ab8 100644
--- a/core/lib/dal/.sqlx/query-8b9e5d525c026de97c0a732b1adc8dc4bd57e32dfefe1017acba9a15fc14b895.json
+++ b/core/lib/dal/.sqlx/query-442212bb5f28f234cd624f2acc27944b2acedce201da4454aadb79f3545713ae.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                storage_logs.hashed_key,\n                storage_logs.value,\n                initial_writes.index\n            FROM\n                storage_logs\n                INNER JOIN initial_writes ON storage_logs.hashed_key = initial_writes.hashed_key\n            WHERE\n                storage_logs.miniblock_number = $1\n                AND storage_logs.hashed_key >= $2::bytea\n                AND storage_logs.hashed_key <= $3::bytea\n            ORDER BY\n                storage_logs.hashed_key\n            ",
+  "query": "\n            SELECT\n                storage_logs.hashed_key,\n                storage_logs.value,\n                initial_writes.index\n            FROM\n                storage_logs\n            INNER JOIN initial_writes ON storage_logs.hashed_key = initial_writes.hashed_key\n            WHERE\n                storage_logs.miniblock_number = $1\n                AND storage_logs.hashed_key >= $2::bytea\n                AND storage_logs.hashed_key <= $3::bytea\n            ORDER BY\n                storage_logs.hashed_key\n            ",
   "describe": {
     "columns": [
       {
@@ -32,5 +32,5 @@
       false
     ]
   },
-  "hash": "8b9e5d525c026de97c0a732b1adc8dc4bd57e32dfefe1017acba9a15fc14b895"
+  "hash": "442212bb5f28f234cd624f2acc27944b2acedce201da4454aadb79f3545713ae"
 }
diff --git a/core/lib/dal/.sqlx/query-45a968c6d667b13bbe9d895e7734fc05eaa158a6f38a87187d7f2c2068a0112a.json b/core/lib/dal/.sqlx/query-45a968c6d667b13bbe9d895e7734fc05eaa158a6f38a87187d7f2c2068a0112a.json
deleted file mode 100644
index 36da129b5b7..00000000000
--- a/core/lib/dal/.sqlx/query-45a968c6d667b13bbe9d895e7734fc05eaa158a6f38a87187d7f2c2068a0112a.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                eth_txs_history (\n                    eth_tx_id,\n                    base_fee_per_gas,\n                    priority_fee_per_gas,\n                    tx_hash,\n                    signed_raw_tx,\n                    created_at,\n                    updated_at,\n                    blob_base_fee_per_gas,\n                    sent_at_block,\n                    sent_at\n                )\n            VALUES\n                ($1, $2, $3, $4, $5, NOW(), NOW(), $6, $7, NOW())\n            ON CONFLICT (tx_hash) DO NOTHING\n            RETURNING\n                id\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int4",
-        "Int8",
-        "Int8",
-        "Text",
-        "Bytea",
-        "Int8",
-        "Int4"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "45a968c6d667b13bbe9d895e7734fc05eaa158a6f38a87187d7f2c2068a0112a"
-}
diff --git a/core/lib/dal/.sqlx/query-ada54322a28012b1b761f3631c4cd6ca26aa2fa565fcf208b6985f461c1868f2.json b/core/lib/dal/.sqlx/query-497e1c08e8460be6e838a47dada8375d56609cd6b7f425361acfd0a411dc48bd.json
similarity index 77%
rename from core/lib/dal/.sqlx/query-ada54322a28012b1b761f3631c4cd6ca26aa2fa565fcf208b6985f461c1868f2.json
rename to core/lib/dal/.sqlx/query-497e1c08e8460be6e838a47dada8375d56609cd6b7f425361acfd0a411dc48bd.json
index 04fde45469f..4a47d5b560a 100644
--- a/core/lib/dal/.sqlx/query-ada54322a28012b1b761f3631c4cd6ca26aa2fa565fcf208b6985f461c1868f2.json
+++ b/core/lib/dal/.sqlx/query-497e1c08e8460be6e838a47dada8375d56609cd6b7f425361acfd0a411dc48bd.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE eth_txs_history\n            SET\n                updated_at = NOW(),\n                confirmed_at = NOW()\n            WHERE\n                tx_hash = $1\n            RETURNING\n                id,\n                eth_tx_id\n            ",
+  "query": "\n            UPDATE eth_txs_history\n            SET\n                updated_at = NOW(),\n                confirmed_at = NOW()\n            WHERE\n                tx_hash = $1\n            RETURNING\n            id,\n            eth_tx_id\n            ",
   "describe": {
     "columns": [
       {
@@ -24,5 +24,5 @@
       false
     ]
   },
-  "hash": "ada54322a28012b1b761f3631c4cd6ca26aa2fa565fcf208b6985f461c1868f2"
+  "hash": "497e1c08e8460be6e838a47dada8375d56609cd6b7f425361acfd0a411dc48bd"
 }
diff --git a/core/lib/dal/.sqlx/query-03e00f422f991f8f12aad0083e1c42cfea253a182ca5df143a183cd522ecac33.json b/core/lib/dal/.sqlx/query-499571f0484f4a54541450f935853bb67bd12f2b635af783897f9d2a4f4ead2e.json
similarity index 81%
rename from core/lib/dal/.sqlx/query-03e00f422f991f8f12aad0083e1c42cfea253a182ca5df143a183cd522ecac33.json
rename to core/lib/dal/.sqlx/query-499571f0484f4a54541450f935853bb67bd12f2b635af783897f9d2a4f4ead2e.json
index 12498582ada..ddc3772a1a5 100644
--- a/core/lib/dal/.sqlx/query-03e00f422f991f8f12aad0083e1c42cfea253a182ca5df143a183cd522ecac33.json
+++ b/core/lib/dal/.sqlx/query-499571f0484f4a54541450f935853bb67bd12f2b635af783897f9d2a4f4ead2e.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE transactions\n            SET\n                l1_batch_number = NULL,\n                miniblock_number = NULL,\n                error = NULL,\n                index_in_block = NULL,\n                execution_info = '{}'\n            WHERE\n                miniblock_number > $1\n            RETURNING\n                hash\n            ",
+  "query": "\n            UPDATE transactions\n            SET\n                l1_batch_number = NULL,\n                miniblock_number = NULL,\n                error = NULL,\n                index_in_block = NULL,\n                execution_info = '{}'\n            WHERE\n                miniblock_number > $1\n            RETURNING\n            hash\n            ",
   "describe": {
     "columns": [
       {
@@ -18,5 +18,5 @@
       false
     ]
   },
-  "hash": "03e00f422f991f8f12aad0083e1c42cfea253a182ca5df143a183cd522ecac33"
+  "hash": "499571f0484f4a54541450f935853bb67bd12f2b635af783897f9d2a4f4ead2e"
 }
diff --git a/core/lib/dal/.sqlx/query-4b6fdc5021c536e622373dca8729250962832a0d95d0d82bdd56271d6a07e497.json b/core/lib/dal/.sqlx/query-4b6fdc5021c536e622373dca8729250962832a0d95d0d82bdd56271d6a07e497.json
new file mode 100644
index 00000000000..e4dfb7298a7
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-4b6fdc5021c536e622373dca8729250962832a0d95d0d82bdd56271d6a07e497.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            miniblocks_consensus (number, certificate)\n            VALUES\n            ($1, $2)\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Jsonb"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "4b6fdc5021c536e622373dca8729250962832a0d95d0d82bdd56271d6a07e497"
+}
diff --git a/core/lib/dal/.sqlx/query-6c2dc484f78fb1a08299c1cda6bbfbc69332a0ad8cd288ae99c960f31d34fae9.json b/core/lib/dal/.sqlx/query-4c606e5527402d3a3c9e30bed63082aa15db6b572c8bf041399cca6776d6a7a3.json
similarity index 80%
rename from core/lib/dal/.sqlx/query-6c2dc484f78fb1a08299c1cda6bbfbc69332a0ad8cd288ae99c960f31d34fae9.json
rename to core/lib/dal/.sqlx/query-4c606e5527402d3a3c9e30bed63082aa15db6b572c8bf041399cca6776d6a7a3.json
index 63417ba7c5c..905dd90d9bf 100644
--- a/core/lib/dal/.sqlx/query-6c2dc484f78fb1a08299c1cda6bbfbc69332a0ad8cd288ae99c960f31d34fae9.json
+++ b/core/lib/dal/.sqlx/query-4c606e5527402d3a3c9e30bed63082aa15db6b572c8bf041399cca6776d6a7a3.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                number,\n                timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                protocol_version,\n                compressed_state_diffs,\n                system_logs,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input,\n                data_availability.blob_id AS \"blob_id?\"\n            FROM\n                l1_batches\n                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n                LEFT JOIN data_availability ON data_availability.l1_batch_number = l1_batches.number\n            WHERE\n                eth_commit_tx_id IS NOT NULL\n                AND eth_prove_tx_id IS NULL\n            ORDER BY\n                number\n            LIMIT\n                $1\n            ",
+  "query": "\n            SELECT\n                number,\n                timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                evm_emulator_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                protocol_version,\n                system_logs,\n                compressed_state_diffs,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input,\n                data_availability.blob_id AS \"blob_id?\"\n            FROM\n                l1_batches\n            LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n            LEFT JOIN\n                data_availability\n                ON data_availability.l1_batch_number = l1_batches.number\n            WHERE\n                number = $1\n            ",
   "describe": {
     "columns": [
       {
@@ -90,28 +90,28 @@
       },
       {
         "ordinal": 17,
-        "name": "aux_data_hash",
+        "name": "evm_emulator_code_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 18,
-        "name": "pass_through_data_hash",
+        "name": "aux_data_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 19,
-        "name": "meta_parameters_hash",
+        "name": "pass_through_data_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 20,
-        "name": "protocol_version",
-        "type_info": "Int4"
+        "name": "meta_parameters_hash",
+        "type_info": "Bytea"
       },
       {
         "ordinal": 21,
-        "name": "compressed_state_diffs",
-        "type_info": "Bytea"
+        "name": "protocol_version",
+        "type_info": "Int4"
       },
       {
         "ordinal": 22,
@@ -120,21 +120,26 @@
       },
       {
         "ordinal": 23,
-        "name": "events_queue_commitment",
+        "name": "compressed_state_diffs",
         "type_info": "Bytea"
       },
       {
         "ordinal": 24,
-        "name": "bootloader_initial_content_commitment",
+        "name": "events_queue_commitment",
         "type_info": "Bytea"
       },
       {
         "ordinal": 25,
-        "name": "pubdata_input",
+        "name": "bootloader_initial_content_commitment",
         "type_info": "Bytea"
       },
       {
         "ordinal": 26,
+        "name": "pubdata_input",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 27,
         "name": "blob_id?",
         "type_info": "Text"
       }
@@ -171,8 +176,9 @@
       true,
       true,
       true,
+      true,
       false
     ]
   },
-  "hash": "6c2dc484f78fb1a08299c1cda6bbfbc69332a0ad8cd288ae99c960f31d34fae9"
+  "hash": "4c606e5527402d3a3c9e30bed63082aa15db6b572c8bf041399cca6776d6a7a3"
 }
diff --git a/core/lib/dal/.sqlx/query-5017fb273e532be3a093d682d916aaa0430eeeb48c19ec3eabe78996baa9b140.json b/core/lib/dal/.sqlx/query-5017fb273e532be3a093d682d916aaa0430eeeb48c19ec3eabe78996baa9b140.json
new file mode 100644
index 00000000000..42fd4087a1f
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-5017fb273e532be3a093d682d916aaa0430eeeb48c19ec3eabe78996baa9b140.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            eth_txs_history (\n                eth_tx_id,\n                base_fee_per_gas,\n                priority_fee_per_gas,\n                tx_hash,\n                signed_raw_tx,\n                created_at,\n                updated_at,\n                blob_base_fee_per_gas,\n                sent_at_block,\n                sent_at\n            )\n            VALUES\n            ($1, $2, $3, $4, $5, NOW(), NOW(), $6, $7, NOW())\n            ON CONFLICT (tx_hash) DO NOTHING\n            RETURNING\n            id\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int4",
+        "Int8",
+        "Int8",
+        "Text",
+        "Bytea",
+        "Int8",
+        "Int4"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "5017fb273e532be3a093d682d916aaa0430eeeb48c19ec3eabe78996baa9b140"
+}
diff --git a/core/lib/dal/.sqlx/query-e073cfdc7a00559994ce04eca15f35d55901fb1e6805f23413ea43e3637540a0.json b/core/lib/dal/.sqlx/query-50687903977b973d72acac96b08880eef9af91f5b4fcaebb7beb3a415d4b231d.json
similarity index 85%
rename from core/lib/dal/.sqlx/query-e073cfdc7a00559994ce04eca15f35d55901fb1e6805f23413ea43e3637540a0.json
rename to core/lib/dal/.sqlx/query-50687903977b973d72acac96b08880eef9af91f5b4fcaebb7beb3a415d4b231d.json
index 929e4de8c1b..e58a0ec8821 100644
--- a/core/lib/dal/.sqlx/query-e073cfdc7a00559994ce04eca15f35d55901fb1e6805f23413ea43e3637540a0.json
+++ b/core/lib/dal/.sqlx/query-50687903977b973d72acac96b08880eef9af91f5b4fcaebb7beb3a415d4b231d.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                bytecode,\n                bytecode_hash\n            FROM\n                factory_deps\n            WHERE\n                bytecode_hash = ANY ($1)\n            ",
+  "query": "\n            SELECT\n                bytecode,\n                bytecode_hash\n            FROM\n                factory_deps\n            WHERE\n                bytecode_hash = ANY($1)\n            ",
   "describe": {
     "columns": [
       {
@@ -24,5 +24,5 @@
       false
     ]
   },
-  "hash": "e073cfdc7a00559994ce04eca15f35d55901fb1e6805f23413ea43e3637540a0"
+  "hash": "50687903977b973d72acac96b08880eef9af91f5b4fcaebb7beb3a415d4b231d"
 }
diff --git a/core/lib/dal/.sqlx/query-5137159db7d3ff456e368e6246b07554ce738a2d7005472e7e76a64a8fbd57ad.json b/core/lib/dal/.sqlx/query-5137159db7d3ff456e368e6246b07554ce738a2d7005472e7e76a64a8fbd57ad.json
deleted file mode 100644
index 07ef0aba074..00000000000
--- a/core/lib/dal/.sqlx/query-5137159db7d3ff456e368e6246b07554ce738a2d7005472e7e76a64a8fbd57ad.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                proof_generation_details (l1_batch_number, status, created_at, updated_at)\n            VALUES\n                ($1, 'unpicked', NOW(), NOW())\n            ON CONFLICT (l1_batch_number) DO NOTHING\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "5137159db7d3ff456e368e6246b07554ce738a2d7005472e7e76a64a8fbd57ad"
-}
diff --git a/core/lib/dal/.sqlx/query-778f92b1ac91e1ae279f588053d75a9ac877fdd28bda99661e423405e695223d.json b/core/lib/dal/.sqlx/query-51d5b6fd147fa06ddadb5f8c9c0e12784694d2f8fe9a67159ad4c7abc2279ca6.json
similarity index 81%
rename from core/lib/dal/.sqlx/query-778f92b1ac91e1ae279f588053d75a9ac877fdd28bda99661e423405e695223d.json
rename to core/lib/dal/.sqlx/query-51d5b6fd147fa06ddadb5f8c9c0e12784694d2f8fe9a67159ad4c7abc2279ca6.json
index aa7d4c65a39..6f77a656072 100644
--- a/core/lib/dal/.sqlx/query-778f92b1ac91e1ae279f588053d75a9ac877fdd28bda99661e423405e695223d.json
+++ b/core/lib/dal/.sqlx/query-51d5b6fd147fa06ddadb5f8c9c0e12784694d2f8fe9a67159ad4c7abc2279ca6.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                miniblocks.number,\n                COALESCE(\n                    miniblocks.l1_batch_number,\n                    (\n                        SELECT\n                            (MAX(number) + 1)\n                        FROM\n                            l1_batches\n                    ),\n                    (\n                        SELECT\n                            MAX(l1_batch_number) + 1\n                        FROM\n                            snapshot_recovery\n                    )\n                ) AS \"l1_batch_number!\",\n                (miniblocks.l1_tx_count + miniblocks.l2_tx_count) AS \"tx_count!\",\n                miniblocks.timestamp,\n                miniblocks.l1_gas_price,\n                miniblocks.l2_fair_gas_price,\n                miniblocks.fair_pubdata_price,\n                miniblocks.bootloader_code_hash,\n                miniblocks.default_aa_code_hash,\n                miniblocks.virtual_blocks,\n                miniblocks.hash,\n                miniblocks.protocol_version AS \"protocol_version!\",\n                miniblocks.fee_account_address AS \"fee_account_address!\"\n            FROM\n                miniblocks\n            WHERE\n                miniblocks.number BETWEEN $1 AND $2\n            ",
+  "query": "\n            SELECT\n                miniblocks.number,\n                COALESCE(\n                    miniblocks.l1_batch_number,\n                    (\n                        SELECT\n                            (MAX(number) + 1)\n                        FROM\n                            l1_batches\n                    ),\n                    (\n                        SELECT\n                            MAX(l1_batch_number) + 1\n                        FROM\n                            snapshot_recovery\n                    )\n                ) AS \"l1_batch_number!\",\n                (miniblocks.l1_tx_count + miniblocks.l2_tx_count) AS \"tx_count!\",\n                miniblocks.timestamp,\n                miniblocks.l1_gas_price,\n                miniblocks.l2_fair_gas_price,\n                miniblocks.fair_pubdata_price,\n                miniblocks.bootloader_code_hash,\n                miniblocks.default_aa_code_hash,\n                miniblocks.evm_emulator_code_hash,\n                miniblocks.virtual_blocks,\n                miniblocks.hash,\n                miniblocks.protocol_version AS \"protocol_version!\",\n                miniblocks.fee_account_address AS \"fee_account_address!\"\n            FROM\n                miniblocks\n            WHERE\n                miniblocks.number BETWEEN $1 AND $2\n            ",
   "describe": {
     "columns": [
       {
@@ -50,21 +50,26 @@
       },
       {
         "ordinal": 9,
+        "name": "evm_emulator_code_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 10,
         "name": "virtual_blocks",
         "type_info": "Int8"
       },
       {
-        "ordinal": 10,
+        "ordinal": 11,
         "name": "hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 11,
+        "ordinal": 12,
         "name": "protocol_version!",
         "type_info": "Int4"
       },
       {
-        "ordinal": 12,
+        "ordinal": 13,
         "name": "fee_account_address!",
         "type_info": "Bytea"
       }
@@ -85,11 +90,12 @@
       true,
       true,
       true,
+      true,
       false,
       false,
       true,
       false
     ]
   },
-  "hash": "778f92b1ac91e1ae279f588053d75a9ac877fdd28bda99661e423405e695223d"
+  "hash": "51d5b6fd147fa06ddadb5f8c9c0e12784694d2f8fe9a67159ad4c7abc2279ca6"
 }
diff --git a/core/lib/dal/.sqlx/query-8903ba5db3f87851c12da133573b4207b69cc48b4ba648e797211631be612b69.json b/core/lib/dal/.sqlx/query-5730de5e37535cf126667b89da6e3a2976d6c4fd581e66dd27439ae42a04b7f5.json
similarity index 66%
rename from core/lib/dal/.sqlx/query-8903ba5db3f87851c12da133573b4207b69cc48b4ba648e797211631be612b69.json
rename to core/lib/dal/.sqlx/query-5730de5e37535cf126667b89da6e3a2976d6c4fd581e66dd27439ae42a04b7f5.json
index 3d47a756f3e..275191d04f5 100644
--- a/core/lib/dal/.sqlx/query-8903ba5db3f87851c12da133573b4207b69cc48b4ba648e797211631be612b69.json
+++ b/core/lib/dal/.sqlx/query-5730de5e37535cf126667b89da6e3a2976d6c4fd581e66dd27439ae42a04b7f5.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                bytecode_hash,\n                bytecode\n            FROM\n                factory_deps\n                INNER JOIN miniblocks ON miniblocks.number = factory_deps.miniblock_number\n            WHERE\n                miniblocks.l1_batch_number = $1\n            ",
+  "query": "\n            SELECT\n                bytecode_hash,\n                bytecode\n            FROM\n                factory_deps\n            INNER JOIN miniblocks ON miniblocks.number = factory_deps.miniblock_number\n            WHERE\n                miniblocks.l1_batch_number = $1\n            ",
   "describe": {
     "columns": [
       {
@@ -24,5 +24,5 @@
       false
     ]
   },
-  "hash": "8903ba5db3f87851c12da133573b4207b69cc48b4ba648e797211631be612b69"
+  "hash": "5730de5e37535cf126667b89da6e3a2976d6c4fd581e66dd27439ae42a04b7f5"
 }
diff --git a/core/lib/dal/.sqlx/query-57851c16dce02999bf386e549791b74555863b0cc8281ef2e9c830fa1d38e227.json b/core/lib/dal/.sqlx/query-57851c16dce02999bf386e549791b74555863b0cc8281ef2e9c830fa1d38e227.json
new file mode 100644
index 00000000000..f08a75e5800
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-57851c16dce02999bf386e549791b74555863b0cc8281ef2e9c830fa1d38e227.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            tee_proof_generation_details (\n                l1_batch_number, tee_type, status, created_at, updated_at\n            )\n            VALUES\n            ($1, $2, $3, NOW(), NOW())\n            ON CONFLICT (l1_batch_number, tee_type) DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "57851c16dce02999bf386e549791b74555863b0cc8281ef2e9c830fa1d38e227"
+}
diff --git a/core/lib/dal/.sqlx/query-5dba5f8b178decfd77db0ca4f415e94ad6bdd84c31e4b2e0c629e51857533974.json b/core/lib/dal/.sqlx/query-5dba5f8b178decfd77db0ca4f415e94ad6bdd84c31e4b2e0c629e51857533974.json
new file mode 100644
index 00000000000..c2d9fe2e1ac
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-5dba5f8b178decfd77db0ca4f415e94ad6bdd84c31e4b2e0c629e51857533974.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH\n            available_batches AS (\n                SELECT\n                    MAX(number) AS \"last_batch\"\n                FROM\n                    l1_batches\n            ),\n            \n            processed_batches AS (\n                SELECT\n                    COALESCE(MAX(l1_batch_number), $1) + $2 AS \"last_ready_batch\"\n                FROM\n                    vm_runner_bwip\n                WHERE\n                    time_taken IS NOT NULL\n            )\n            \n            SELECT\n                LEAST(last_batch, last_ready_batch) AS \"last_ready_batch!\"\n            FROM\n                available_batches\n            FULL JOIN processed_batches ON TRUE\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "last_ready_batch!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      true
+    ]
+  },
+  "hash": "5dba5f8b178decfd77db0ca4f415e94ad6bdd84c31e4b2e0c629e51857533974"
+}
diff --git a/core/lib/dal/.sqlx/query-477b6d651c309ed2ab1a361b7f7816c233e16da7330c9327f4020c528f670a33.json b/core/lib/dal/.sqlx/query-6083e429948c139e36cfce2c5ed41edf3965f7ce67341d957ec680a18a0c39ea.json
similarity index 57%
rename from core/lib/dal/.sqlx/query-477b6d651c309ed2ab1a361b7f7816c233e16da7330c9327f4020c528f670a33.json
rename to core/lib/dal/.sqlx/query-6083e429948c139e36cfce2c5ed41edf3965f7ce67341d957ec680a18a0c39ea.json
index 68d2f046a17..c6760a336dc 100644
--- a/core/lib/dal/.sqlx/query-477b6d651c309ed2ab1a361b7f7816c233e16da7330c9327f4020c528f670a33.json
+++ b/core/lib/dal/.sqlx/query-6083e429948c139e36cfce2c5ed41edf3965f7ce67341d957ec680a18a0c39ea.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE transactions\n            SET\n                l1_batch_number = $3,\n                l1_batch_tx_index = data_table.l1_batch_tx_index,\n                updated_at = NOW()\n            FROM\n                (\n                    SELECT\n                        UNNEST($1::INT[]) AS l1_batch_tx_index,\n                        UNNEST($2::BYTEA[]) AS hash\n                ) AS data_table\n            WHERE\n                transactions.hash = data_table.hash\n            ",
+  "query": "\n            UPDATE transactions\n            SET\n                l1_batch_number = $3,\n                l1_batch_tx_index = data_table.l1_batch_tx_index,\n                updated_at = NOW()\n            FROM\n                (\n                    SELECT\n                        UNNEST($1::INT []) AS l1_batch_tx_index,\n                        UNNEST($2::BYTEA []) AS hash\n                ) AS data_table\n            WHERE\n                transactions.hash = data_table.hash\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -12,5 +12,5 @@
     },
     "nullable": []
   },
-  "hash": "477b6d651c309ed2ab1a361b7f7816c233e16da7330c9327f4020c528f670a33"
+  "hash": "6083e429948c139e36cfce2c5ed41edf3965f7ce67341d957ec680a18a0c39ea"
 }
diff --git a/core/lib/dal/.sqlx/query-808d0d7aa2dfe1b27b9f023db9723fe5461502b1607d441e5057923313fc3ab8.json b/core/lib/dal/.sqlx/query-60cfe2cbb047f702e181d3ec0018d0f52d6a11c0b27aa346a47a1545d2527639.json
similarity index 68%
rename from core/lib/dal/.sqlx/query-808d0d7aa2dfe1b27b9f023db9723fe5461502b1607d441e5057923313fc3ab8.json
rename to core/lib/dal/.sqlx/query-60cfe2cbb047f702e181d3ec0018d0f52d6a11c0b27aa346a47a1545d2527639.json
index f1798fbefe3..d9d5b0666c0 100644
--- a/core/lib/dal/.sqlx/query-808d0d7aa2dfe1b27b9f023db9723fe5461502b1607d441e5057923313fc3ab8.json
+++ b/core/lib/dal/.sqlx/query-60cfe2cbb047f702e181d3ec0018d0f52d6a11c0b27aa346a47a1545d2527639.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                number,\n                l1_batches.timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                l1_batches.bootloader_code_hash,\n                l1_batches.default_aa_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                protocol_version,\n                compressed_state_diffs,\n                system_logs,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input,\n                data_availability.blob_id AS \"blob_id?\"\n            FROM\n                l1_batches\n                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n                LEFT JOIN data_availability ON data_availability.l1_batch_number = l1_batches.number\n                JOIN protocol_versions ON protocol_versions.id = l1_batches.protocol_version\n            WHERE\n                eth_commit_tx_id IS NULL\n                AND number != 0\n                AND protocol_versions.bootloader_code_hash = $1\n                AND protocol_versions.default_account_code_hash = $2\n                AND commitment IS NOT NULL\n                AND (\n                    protocol_versions.id = $3\n                    OR protocol_versions.upgrade_tx_hash IS NULL\n                )\n                AND events_queue_commitment IS NOT NULL\n                AND bootloader_initial_content_commitment IS NOT NULL\n                AND (\n                    data_availability.inclusion_data IS NOT NULL\n                    OR $4 IS FALSE\n                )\n            ORDER BY\n                number\n            LIMIT\n                $5\n            ",
+  "query": "\n            SELECT\n                number,\n                l1_batches.timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                l1_batches.bootloader_code_hash,\n                l1_batches.default_aa_code_hash,\n                l1_batches.evm_emulator_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                protocol_version,\n                compressed_state_diffs,\n                system_logs,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input,\n                data_availability.blob_id AS \"blob_id?\"\n            FROM\n                l1_batches\n            LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n            LEFT JOIN\n                data_availability\n                ON data_availability.l1_batch_number = l1_batches.number\n            JOIN protocol_versions ON protocol_versions.id = l1_batches.protocol_version\n            WHERE\n                eth_commit_tx_id IS NULL\n                AND number != 0\n                AND protocol_versions.bootloader_code_hash = $1\n                AND protocol_versions.default_account_code_hash = $2\n                AND commitment IS NOT NULL\n                AND (\n                    protocol_versions.id = $3\n                    OR protocol_versions.upgrade_tx_hash IS NULL\n                )\n                AND events_queue_commitment IS NOT NULL\n                AND bootloader_initial_content_commitment IS NOT NULL\n                AND (\n                    data_availability.inclusion_data IS NOT NULL\n                    OR $4 IS FALSE\n                )\n            ORDER BY\n                number\n            LIMIT\n                $5\n            ",
   "describe": {
     "columns": [
       {
@@ -90,51 +90,56 @@
       },
       {
         "ordinal": 17,
-        "name": "aux_data_hash",
+        "name": "evm_emulator_code_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 18,
-        "name": "pass_through_data_hash",
+        "name": "aux_data_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 19,
-        "name": "meta_parameters_hash",
+        "name": "pass_through_data_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 20,
+        "name": "meta_parameters_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 21,
         "name": "protocol_version",
         "type_info": "Int4"
       },
       {
-        "ordinal": 21,
+        "ordinal": 22,
         "name": "compressed_state_diffs",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 22,
+        "ordinal": 23,
         "name": "system_logs",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 23,
+        "ordinal": 24,
         "name": "events_queue_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 24,
+        "ordinal": 25,
         "name": "bootloader_initial_content_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 25,
+        "ordinal": 26,
         "name": "pubdata_input",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 26,
+        "ordinal": 27,
         "name": "blob_id?",
         "type_info": "Text"
       }
@@ -171,6 +176,7 @@
       true,
       true,
       true,
+      true,
       false,
       true,
       true,
@@ -178,5 +184,5 @@
       false
     ]
   },
-  "hash": "808d0d7aa2dfe1b27b9f023db9723fe5461502b1607d441e5057923313fc3ab8"
+  "hash": "60cfe2cbb047f702e181d3ec0018d0f52d6a11c0b27aa346a47a1545d2527639"
 }
diff --git a/core/lib/dal/.sqlx/query-6179c3c1a0b2aeb01c0527f6ca4d0651174fd63cf6a8950fa6e7c4838ac5abbf.json b/core/lib/dal/.sqlx/query-6179c3c1a0b2aeb01c0527f6ca4d0651174fd63cf6a8950fa6e7c4838ac5abbf.json
deleted file mode 100644
index 443dbf36ea1..00000000000
--- a/core/lib/dal/.sqlx/query-6179c3c1a0b2aeb01c0527f6ca4d0651174fd63cf6a8950fa6e7c4838ac5abbf.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                pruning_log (\n                    pruned_l1_batch,\n                    pruned_miniblock,\n                    TYPE,\n                    created_at,\n                    updated_at\n                )\n            VALUES\n                ($1, $2, $3, NOW(), NOW())\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int8",
-        {
-          "Custom": {
-            "name": "prune_type",
-            "kind": {
-              "Enum": [
-                "Soft",
-                "Hard"
-              ]
-            }
-          }
-        }
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "6179c3c1a0b2aeb01c0527f6ca4d0651174fd63cf6a8950fa6e7c4838ac5abbf"
-}
diff --git a/core/lib/dal/.sqlx/query-718d29517c100ad9d258a7ee90c48449c1c4bed4d0236fcedc177c9478e72262.json b/core/lib/dal/.sqlx/query-6307b42717586a13ac8bc30fc3e5aea6710351dea1f1e57d73447476c3fcd199.json
similarity index 57%
rename from core/lib/dal/.sqlx/query-718d29517c100ad9d258a7ee90c48449c1c4bed4d0236fcedc177c9478e72262.json
rename to core/lib/dal/.sqlx/query-6307b42717586a13ac8bc30fc3e5aea6710351dea1f1e57d73447476c3fcd199.json
index 4e523efe3fc..01ede1d8643 100644
--- a/core/lib/dal/.sqlx/query-718d29517c100ad9d258a7ee90c48449c1c4bed4d0236fcedc177c9478e72262.json
+++ b/core/lib/dal/.sqlx/query-6307b42717586a13ac8bc30fc3e5aea6710351dea1f1e57d73447476c3fcd199.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                tee_verifier_input_producer_jobs (l1_batch_number, status, created_at, updated_at)\n            VALUES\n                ($1, $2, NOW(), NOW())\n            ON CONFLICT (l1_batch_number) DO NOTHING\n            ",
+  "query": "\n            INSERT INTO\n            tee_verifier_input_producer_jobs (\n                l1_batch_number, status, created_at, updated_at\n            )\n            VALUES\n            ($1, $2, NOW(), NOW())\n            ON CONFLICT (l1_batch_number) DO NOTHING\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -24,5 +24,5 @@
     },
     "nullable": []
   },
-  "hash": "718d29517c100ad9d258a7ee90c48449c1c4bed4d0236fcedc177c9478e72262"
+  "hash": "6307b42717586a13ac8bc30fc3e5aea6710351dea1f1e57d73447476c3fcd199"
 }
diff --git a/core/lib/dal/.sqlx/query-66510caa7683ed90729cb545ac8528f012c2ecaebf6622ca1ae481045604e58d.json b/core/lib/dal/.sqlx/query-66510caa7683ed90729cb545ac8528f012c2ecaebf6622ca1ae481045604e58d.json
deleted file mode 100644
index 76900667a9c..00000000000
--- a/core/lib/dal/.sqlx/query-66510caa7683ed90729cb545ac8528f012c2ecaebf6622ca1ae481045604e58d.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                snapshot_recovery (\n                    l1_batch_number,\n                    l1_batch_timestamp,\n                    l1_batch_root_hash,\n                    miniblock_number,\n                    miniblock_timestamp,\n                    miniblock_hash,\n                    protocol_version,\n                    storage_logs_chunks_processed,\n                    updated_at,\n                    created_at\n                )\n            VALUES\n                ($1, $2, $3, $4, $5, $6, $7, $8, NOW(), NOW())\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int8",
-        "Bytea",
-        "Int8",
-        "Int8",
-        "Bytea",
-        "Int4",
-        "BoolArray"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "66510caa7683ed90729cb545ac8528f012c2ecaebf6622ca1ae481045604e58d"
-}
diff --git a/core/lib/dal/.sqlx/query-68327709a740a09b198770ec1746bd6ec3a1cd9db6187e99af40ca8fea4c6ace.json b/core/lib/dal/.sqlx/query-68327709a740a09b198770ec1746bd6ec3a1cd9db6187e99af40ca8fea4c6ace.json
new file mode 100644
index 00000000000..5d34e780b68
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-68327709a740a09b198770ec1746bd6ec3a1cd9db6187e99af40ca8fea4c6ace.json
@@ -0,0 +1,35 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT DISTINCT\n            ON (hashed_key)\n                hashed_key,\n                miniblock_number,\n                value\n            FROM\n                storage_logs\n            WHERE\n                hashed_key = ANY($1)\n                AND miniblock_number <= $2\n                AND miniblock_number <= COALESCE(\n                    (\n                        SELECT\n                            MAX(number)\n                        FROM\n                            miniblocks\n                    ),\n                    (\n                        SELECT\n                            miniblock_number\n                        FROM\n                            snapshot_recovery\n                    )\n                )\n            ORDER BY\n                hashed_key,\n                miniblock_number DESC,\n                operation_number DESC\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "hashed_key",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 1,
+        "name": "miniblock_number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "value",
+        "type_info": "Bytea"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "ByteaArray",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "68327709a740a09b198770ec1746bd6ec3a1cd9db6187e99af40ca8fea4c6ace"
+}
diff --git a/core/lib/dal/.sqlx/query-b42fc86726ac40d0ca38640884da192a143f6a7501b7da65bb7df40a0a4ead70.json b/core/lib/dal/.sqlx/query-6da05c9ac3d0f30b856177e28d28aaad910ca46830c470f8fc1d4265f9ed8631.json
similarity index 76%
rename from core/lib/dal/.sqlx/query-b42fc86726ac40d0ca38640884da192a143f6a7501b7da65bb7df40a0a4ead70.json
rename to core/lib/dal/.sqlx/query-6da05c9ac3d0f30b856177e28d28aaad910ca46830c470f8fc1d4265f9ed8631.json
index 625fa4ab36e..b246c1e9f3a 100644
--- a/core/lib/dal/.sqlx/query-b42fc86726ac40d0ca38640884da192a143f6a7501b7da65bb7df40a0a4ead70.json
+++ b/core/lib/dal/.sqlx/query-6da05c9ac3d0f30b856177e28d28aaad910ca46830c470f8fc1d4265f9ed8631.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            DELETE FROM snapshots\n            WHERE\n                l1_batch_number > $1\n            RETURNING\n                VERSION,\n                l1_batch_number,\n                factory_deps_filepath,\n                storage_logs_filepaths\n            ",
+  "query": "\n            DELETE FROM snapshots\n            WHERE\n                l1_batch_number > $1\n            RETURNING\n            version,\n            l1_batch_number,\n            factory_deps_filepath,\n            storage_logs_filepaths\n            ",
   "describe": {
     "columns": [
       {
@@ -36,5 +36,5 @@
       false
     ]
   },
-  "hash": "b42fc86726ac40d0ca38640884da192a143f6a7501b7da65bb7df40a0a4ead70"
+  "hash": "6da05c9ac3d0f30b856177e28d28aaad910ca46830c470f8fc1d4265f9ed8631"
 }
diff --git a/core/lib/dal/.sqlx/query-6e725f38a8f04ca5516ba3128569973527841e234d8b4635fb337e4b659b7f71.json b/core/lib/dal/.sqlx/query-6e725f38a8f04ca5516ba3128569973527841e234d8b4635fb337e4b659b7f71.json
new file mode 100644
index 00000000000..3a773579b24
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-6e725f38a8f04ca5516ba3128569973527841e234d8b4635fb337e4b659b7f71.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            tee_attestations (pubkey, attestation)\n            VALUES\n            ($1, $2)\n            ON CONFLICT (pubkey) DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Bytea",
+        "Bytea"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "6e725f38a8f04ca5516ba3128569973527841e234d8b4635fb337e4b659b7f71"
+}
diff --git a/core/lib/dal/.sqlx/query-6e3a3ef443ce8aab55b10eea55f9c8ff11775885aebaf457075c6825305244e5.json b/core/lib/dal/.sqlx/query-6f4463a2f95fec4f8b511d28566babfb146e9932d4142139a49599c4bdbd659f.json
similarity index 68%
rename from core/lib/dal/.sqlx/query-6e3a3ef443ce8aab55b10eea55f9c8ff11775885aebaf457075c6825305244e5.json
rename to core/lib/dal/.sqlx/query-6f4463a2f95fec4f8b511d28566babfb146e9932d4142139a49599c4bdbd659f.json
index de474897307..ef514ba7905 100644
--- a/core/lib/dal/.sqlx/query-6e3a3ef443ce8aab55b10eea55f9c8ff11775885aebaf457075c6825305244e5.json
+++ b/core/lib/dal/.sqlx/query-6f4463a2f95fec4f8b511d28566babfb146e9932d4142139a49599c4bdbd659f.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                transactions.is_priority,\n                transactions.initiator_address,\n                transactions.gas_limit,\n                transactions.gas_per_pubdata_limit,\n                transactions.received_at,\n                miniblocks.number AS \"miniblock_number?\",\n                transactions.error,\n                transactions.effective_gas_price,\n                transactions.refunded_gas,\n                commit_tx.tx_hash AS \"eth_commit_tx_hash?\",\n                prove_tx.tx_hash AS \"eth_prove_tx_hash?\",\n                execute_tx.tx_hash AS \"eth_execute_tx_hash?\"\n            FROM\n                transactions\n                LEFT JOIN miniblocks ON miniblocks.number = transactions.miniblock_number\n                LEFT JOIN l1_batches ON l1_batches.number = miniblocks.l1_batch_number\n                LEFT JOIN eth_txs_history AS commit_tx ON (\n                    l1_batches.eth_commit_tx_id = commit_tx.eth_tx_id\n                    AND commit_tx.confirmed_at IS NOT NULL\n                )\n                LEFT JOIN eth_txs_history AS prove_tx ON (\n                    l1_batches.eth_prove_tx_id = prove_tx.eth_tx_id\n                    AND prove_tx.confirmed_at IS NOT NULL\n                )\n                LEFT JOIN eth_txs_history AS execute_tx ON (\n                    l1_batches.eth_execute_tx_id = execute_tx.eth_tx_id\n                    AND execute_tx.confirmed_at IS NOT NULL\n                )\n            WHERE\n                transactions.hash = $1\n                AND transactions.data != '{}'::jsonb\n            ",
+  "query": "\n            SELECT\n                transactions.is_priority,\n                transactions.initiator_address,\n                transactions.gas_limit,\n                transactions.gas_per_pubdata_limit,\n                transactions.received_at,\n                miniblocks.number AS \"miniblock_number?\",\n                transactions.error,\n                transactions.effective_gas_price,\n                transactions.refunded_gas,\n                commit_tx.tx_hash AS \"eth_commit_tx_hash?\",\n                prove_tx.tx_hash AS \"eth_prove_tx_hash?\",\n                execute_tx.tx_hash AS \"eth_execute_tx_hash?\"\n            FROM\n                transactions\n            LEFT JOIN miniblocks ON miniblocks.number = transactions.miniblock_number\n            LEFT JOIN l1_batches ON l1_batches.number = miniblocks.l1_batch_number\n            LEFT JOIN eth_txs_history AS commit_tx\n                ON (\n                    l1_batches.eth_commit_tx_id = commit_tx.eth_tx_id\n                    AND commit_tx.confirmed_at IS NOT NULL\n                )\n            LEFT JOIN eth_txs_history AS prove_tx\n                ON (\n                    l1_batches.eth_prove_tx_id = prove_tx.eth_tx_id\n                    AND prove_tx.confirmed_at IS NOT NULL\n                )\n            LEFT JOIN eth_txs_history AS execute_tx\n                ON (\n                    l1_batches.eth_execute_tx_id = execute_tx.eth_tx_id\n                    AND execute_tx.confirmed_at IS NOT NULL\n                )\n            WHERE\n                transactions.hash = $1\n                AND transactions.data != '{}'::jsonb\n            ",
   "describe": {
     "columns": [
       {
@@ -84,5 +84,5 @@
       false
     ]
   },
-  "hash": "6e3a3ef443ce8aab55b10eea55f9c8ff11775885aebaf457075c6825305244e5"
+  "hash": "6f4463a2f95fec4f8b511d28566babfb146e9932d4142139a49599c4bdbd659f"
 }
diff --git a/core/lib/dal/.sqlx/query-7204d08f6fb83c83c09eb2942ecb671fa559dfdb29b315b17ae2f86533d247e9.json b/core/lib/dal/.sqlx/query-7204d08f6fb83c83c09eb2942ecb671fa559dfdb29b315b17ae2f86533d247e9.json
new file mode 100644
index 00000000000..01adb17775c
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-7204d08f6fb83c83c09eb2942ecb671fa559dfdb29b315b17ae2f86533d247e9.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            protocol_patches (minor, patch, snark_wrapper_vk_hash, created_at)\n            VALUES\n            ($1, $2, $3, NOW())\n            ON CONFLICT DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int4",
+        "Int4",
+        "Bytea"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "7204d08f6fb83c83c09eb2942ecb671fa559dfdb29b315b17ae2f86533d247e9"
+}
diff --git a/core/lib/dal/.sqlx/query-6171f2d631f69dba52cd913742a46bd1b7b9269375f11f050099cb6d3c1427aa.json b/core/lib/dal/.sqlx/query-7235e50f9ce4b5c4f6f8325117eaccc7108538405743fe1ad71451d0f1842561.json
similarity index 67%
rename from core/lib/dal/.sqlx/query-6171f2d631f69dba52cd913742a46bd1b7b9269375f11f050099cb6d3c1427aa.json
rename to core/lib/dal/.sqlx/query-7235e50f9ce4b5c4f6f8325117eaccc7108538405743fe1ad71451d0f1842561.json
index 84ff845b0d0..f46674b08bc 100644
--- a/core/lib/dal/.sqlx/query-6171f2d631f69dba52cd913742a46bd1b7b9269375f11f050099cb6d3c1427aa.json
+++ b/core/lib/dal/.sqlx/query-7235e50f9ce4b5c4f6f8325117eaccc7108538405743fe1ad71451d0f1842561.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                transactions.hash AS tx_hash,\n                transactions.index_in_block AS tx_index_in_block,\n                call_trace\n            FROM\n                call_traces\n                INNER JOIN transactions ON tx_hash = transactions.hash\n            WHERE\n                transactions.miniblock_number = $1\n            ORDER BY\n                transactions.index_in_block\n            ",
+  "query": "\n            SELECT\n                transactions.hash AS tx_hash,\n                transactions.index_in_block AS tx_index_in_block,\n                call_trace\n            FROM\n                call_traces\n            INNER JOIN transactions ON tx_hash = transactions.hash\n            WHERE\n                transactions.miniblock_number = $1\n            ORDER BY\n                transactions.index_in_block\n            ",
   "describe": {
     "columns": [
       {
@@ -30,5 +30,5 @@
       false
     ]
   },
-  "hash": "6171f2d631f69dba52cd913742a46bd1b7b9269375f11f050099cb6d3c1427aa"
+  "hash": "7235e50f9ce4b5c4f6f8325117eaccc7108538405743fe1ad71451d0f1842561"
 }
diff --git a/core/lib/dal/.sqlx/query-ef70506e90e8add3b95940a7333f8222bd9fbe8ce82d8963f7da03fe6fcf9225.json b/core/lib/dal/.sqlx/query-7240ff1240a2cdae14ab1bbfaad97f64d0c9620506bb41890548181bccca9ee5.json
similarity index 74%
rename from core/lib/dal/.sqlx/query-ef70506e90e8add3b95940a7333f8222bd9fbe8ce82d8963f7da03fe6fcf9225.json
rename to core/lib/dal/.sqlx/query-7240ff1240a2cdae14ab1bbfaad97f64d0c9620506bb41890548181bccca9ee5.json
index cf102b828aa..b2f195c4e5c 100644
--- a/core/lib/dal/.sqlx/query-ef70506e90e8add3b95940a7333f8222bd9fbe8ce82d8963f7da03fe6fcf9225.json
+++ b/core/lib/dal/.sqlx/query-7240ff1240a2cdae14ab1bbfaad97f64d0c9620506bb41890548181bccca9ee5.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                miniblocks.number,\n                COALESCE(\n                    miniblocks.l1_batch_number,\n                    (\n                        SELECT\n                            (MAX(number) + 1)\n                        FROM\n                            l1_batches\n                    )\n                ) AS \"l1_batch_number!\",\n                miniblocks.timestamp,\n                miniblocks.l1_tx_count,\n                miniblocks.l2_tx_count,\n                miniblocks.hash AS \"root_hash?\",\n                commit_tx.tx_hash AS \"commit_tx_hash?\",\n                commit_tx.confirmed_at AS \"committed_at?\",\n                prove_tx.tx_hash AS \"prove_tx_hash?\",\n                prove_tx.confirmed_at AS \"proven_at?\",\n                execute_tx.tx_hash AS \"execute_tx_hash?\",\n                execute_tx.confirmed_at AS \"executed_at?\",\n                miniblocks.l1_gas_price,\n                miniblocks.l2_fair_gas_price,\n                miniblocks.fair_pubdata_price,\n                miniblocks.bootloader_code_hash,\n                miniblocks.default_aa_code_hash,\n                miniblocks.protocol_version,\n                miniblocks.fee_account_address\n            FROM\n                miniblocks\n                LEFT JOIN l1_batches ON miniblocks.l1_batch_number = l1_batches.number\n                LEFT JOIN eth_txs_history AS commit_tx ON (\n                    l1_batches.eth_commit_tx_id = commit_tx.eth_tx_id\n                    AND commit_tx.confirmed_at IS NOT NULL\n                )\n                LEFT JOIN eth_txs_history AS prove_tx ON (\n                    l1_batches.eth_prove_tx_id = prove_tx.eth_tx_id\n                    AND prove_tx.confirmed_at IS NOT NULL\n                )\n                LEFT JOIN eth_txs_history AS execute_tx ON (\n                    l1_batches.eth_execute_tx_id = execute_tx.eth_tx_id\n                    AND execute_tx.confirmed_at IS NOT NULL\n                )\n            WHERE\n                miniblocks.number = $1\n            ",
+  "query": "\n            SELECT\n                miniblocks.number,\n                COALESCE(\n                    miniblocks.l1_batch_number,\n                    (\n                        SELECT\n                            (MAX(number) + 1)\n                        FROM\n                            l1_batches\n                    )\n                ) AS \"l1_batch_number!\",\n                miniblocks.timestamp,\n                miniblocks.l1_tx_count,\n                miniblocks.l2_tx_count,\n                miniblocks.hash AS \"root_hash?\",\n                commit_tx.tx_hash AS \"commit_tx_hash?\",\n                commit_tx.confirmed_at AS \"committed_at?\",\n                prove_tx.tx_hash AS \"prove_tx_hash?\",\n                prove_tx.confirmed_at AS \"proven_at?\",\n                execute_tx.tx_hash AS \"execute_tx_hash?\",\n                execute_tx.confirmed_at AS \"executed_at?\",\n                miniblocks.l1_gas_price,\n                miniblocks.l2_fair_gas_price,\n                miniblocks.fair_pubdata_price,\n                miniblocks.bootloader_code_hash,\n                miniblocks.default_aa_code_hash,\n                l1_batches.evm_emulator_code_hash,\n                miniblocks.protocol_version,\n                miniblocks.fee_account_address\n            FROM\n                miniblocks\n            LEFT JOIN l1_batches ON miniblocks.l1_batch_number = l1_batches.number\n            LEFT JOIN eth_txs_history AS commit_tx\n                ON (\n                    l1_batches.eth_commit_tx_id = commit_tx.eth_tx_id\n                    AND commit_tx.confirmed_at IS NOT NULL\n                )\n            LEFT JOIN eth_txs_history AS prove_tx\n                ON (\n                    l1_batches.eth_prove_tx_id = prove_tx.eth_tx_id\n                    AND prove_tx.confirmed_at IS NOT NULL\n                )\n            LEFT JOIN eth_txs_history AS execute_tx\n                ON (\n                    l1_batches.eth_execute_tx_id = execute_tx.eth_tx_id\n                    AND execute_tx.confirmed_at IS NOT NULL\n                )\n            WHERE\n                miniblocks.number = $1\n            ",
   "describe": {
     "columns": [
       {
@@ -90,11 +90,16 @@
       },
       {
         "ordinal": 17,
+        "name": "evm_emulator_code_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 18,
         "name": "protocol_version",
         "type_info": "Int4"
       },
       {
-        "ordinal": 18,
+        "ordinal": 19,
         "name": "fee_account_address",
         "type_info": "Bytea"
       }
@@ -123,8 +128,9 @@
       true,
       true,
       true,
+      true,
       false
     ]
   },
-  "hash": "ef70506e90e8add3b95940a7333f8222bd9fbe8ce82d8963f7da03fe6fcf9225"
+  "hash": "7240ff1240a2cdae14ab1bbfaad97f64d0c9620506bb41890548181bccca9ee5"
 }
diff --git a/core/lib/dal/.sqlx/query-785865beac89aff53fe5493d92cfa3245a75736d14b1ff0799f5f05cd4a247a4.json b/core/lib/dal/.sqlx/query-785865beac89aff53fe5493d92cfa3245a75736d14b1ff0799f5f05cd4a247a4.json
deleted file mode 100644
index e10f32b85eb..00000000000
--- a/core/lib/dal/.sqlx/query-785865beac89aff53fe5493d92cfa3245a75736d14b1ff0799f5f05cd4a247a4.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                transactions (\n                    hash,\n                    is_priority,\n                    initiator_address,\n                    gas_limit,\n                    max_fee_per_gas,\n                    gas_per_pubdata_limit,\n                    data,\n                    priority_op_id,\n                    full_fee,\n                    layer_2_tip_fee,\n                    contract_address,\n                    l1_block_number,\n                    value,\n                    paymaster,\n                    paymaster_input,\n                    tx_format,\n                    l1_tx_mint,\n                    l1_tx_refund_recipient,\n                    miniblock_number,\n                    index_in_block,\n                    error,\n                    execution_info,\n                    refunded_gas,\n                    effective_gas_price,\n                    received_at,\n                    created_at,\n                    updated_at\n                )\n            SELECT\n                data_table.hash,\n                TRUE,\n                data_table.initiator_address,\n                data_table.gas_limit,\n                data_table.max_fee_per_gas,\n                data_table.gas_per_pubdata_limit,\n                data_table.data,\n                data_table.priority_op_id,\n                data_table.full_fee,\n                data_table.layer_2_tip_fee,\n                data_table.contract_address,\n                data_table.l1_block_number,\n                data_table.value,\n                '\\x0000000000000000000000000000000000000000'::bytea,\n                '\\x'::bytea,\n                data_table.tx_format,\n                data_table.l1_tx_mint,\n                data_table.l1_tx_refund_recipient,\n                $21,\n                data_table.index_in_block,\n                NULLIF(data_table.error, ''),\n                data_table.execution_info,\n                data_table.refunded_gas,\n                data_table.effective_gas_price,\n                NOW(),\n                NOW(),\n                NOW()\n            FROM\n                (\n                    SELECT\n                        UNNEST($1::bytea[]) AS hash,\n                        UNNEST($2::bytea[]) AS initiator_address,\n                        UNNEST($3::NUMERIC[]) AS gas_limit,\n                        UNNEST($4::NUMERIC[]) AS max_fee_per_gas,\n                        UNNEST($5::NUMERIC[]) AS gas_per_pubdata_limit,\n                        UNNEST($6::jsonb[]) AS data,\n                        UNNEST($7::BIGINT[]) AS priority_op_id,\n                        UNNEST($8::NUMERIC[]) AS full_fee,\n                        UNNEST($9::NUMERIC[]) AS layer_2_tip_fee,\n                        UNNEST($10::bytea[]) AS contract_address,\n                        UNNEST($11::INT[]) AS l1_block_number,\n                        UNNEST($12::NUMERIC[]) AS value,\n                        UNNEST($13::INTEGER[]) AS tx_format,\n                        UNNEST($14::NUMERIC[]) AS l1_tx_mint,\n                        UNNEST($15::bytea[]) AS l1_tx_refund_recipient,\n                        UNNEST($16::INT[]) AS index_in_block,\n                        UNNEST($17::VARCHAR[]) AS error,\n                        UNNEST($18::jsonb[]) AS execution_info,\n                        UNNEST($19::BIGINT[]) AS refunded_gas,\n                        UNNEST($20::NUMERIC[]) AS effective_gas_price\n                ) AS data_table\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "ByteaArray",
-        "ByteaArray",
-        "NumericArray",
-        "NumericArray",
-        "NumericArray",
-        "JsonbArray",
-        "Int8Array",
-        "NumericArray",
-        "NumericArray",
-        "ByteaArray",
-        "Int4Array",
-        "NumericArray",
-        "Int4Array",
-        "NumericArray",
-        "ByteaArray",
-        "Int4Array",
-        "VarcharArray",
-        "JsonbArray",
-        "Int8Array",
-        "NumericArray",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "785865beac89aff53fe5493d92cfa3245a75736d14b1ff0799f5f05cd4a247a4"
-}
diff --git a/core/lib/dal/.sqlx/query-454e16ddb5e85285d0c4b9013bcce5d464ecc55c80b54bc16040226df7e297bd.json b/core/lib/dal/.sqlx/query-7cceb18485c0fdeed57b7f279debfe9b944b2dd80eb56965a5874ce3168e8c5e.json
similarity index 82%
rename from core/lib/dal/.sqlx/query-454e16ddb5e85285d0c4b9013bcce5d464ecc55c80b54bc16040226df7e297bd.json
rename to core/lib/dal/.sqlx/query-7cceb18485c0fdeed57b7f279debfe9b944b2dd80eb56965a5874ce3168e8c5e.json
index 4a73fde57e2..28fbea09998 100644
--- a/core/lib/dal/.sqlx/query-454e16ddb5e85285d0c4b9013bcce5d464ecc55c80b54bc16040226df7e297bd.json
+++ b/core/lib/dal/.sqlx/query-7cceb18485c0fdeed57b7f279debfe9b944b2dd80eb56965a5874ce3168e8c5e.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                number,\n                l1_tx_count,\n                l2_tx_count,\n                timestamp,\n                l2_to_l1_messages,\n                bloom,\n                priority_ops_onchain_data,\n                used_contract_hashes,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                protocol_version,\n                system_logs,\n                pubdata_input\n            FROM\n                l1_batches\n            WHERE\n                number = $1\n            ",
+  "query": "\n            SELECT\n                number,\n                l1_tx_count,\n                l2_tx_count,\n                timestamp,\n                l2_to_l1_messages,\n                bloom,\n                priority_ops_onchain_data,\n                used_contract_hashes,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                evm_emulator_code_hash,\n                protocol_version,\n                system_logs,\n                pubdata_input\n            FROM\n                l1_batches\n            WHERE\n                number = $1\n            ",
   "describe": {
     "columns": [
       {
@@ -55,16 +55,21 @@
       },
       {
         "ordinal": 10,
+        "name": "evm_emulator_code_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 11,
         "name": "protocol_version",
         "type_info": "Int4"
       },
       {
-        "ordinal": 11,
+        "ordinal": 12,
         "name": "system_logs",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 12,
+        "ordinal": 13,
         "name": "pubdata_input",
         "type_info": "Bytea"
       }
@@ -86,9 +91,10 @@
       true,
       true,
       true,
+      true,
       false,
       true
     ]
   },
-  "hash": "454e16ddb5e85285d0c4b9013bcce5d464ecc55c80b54bc16040226df7e297bd"
+  "hash": "7cceb18485c0fdeed57b7f279debfe9b944b2dd80eb56965a5874ce3168e8c5e"
 }
diff --git a/core/lib/dal/.sqlx/query-dac29d7eb16782713acb7aa68aaa8b12b67678e983dc2570be28fe9b1e016c28.json b/core/lib/dal/.sqlx/query-7f3ca3f1d0b3414575e71af98b810ff145ac2f388a246b9c7b32193e2d4208dd.json
similarity index 62%
rename from core/lib/dal/.sqlx/query-dac29d7eb16782713acb7aa68aaa8b12b67678e983dc2570be28fe9b1e016c28.json
rename to core/lib/dal/.sqlx/query-7f3ca3f1d0b3414575e71af98b810ff145ac2f388a246b9c7b32193e2d4208dd.json
index c0258c12311..830e43b00ed 100644
--- a/core/lib/dal/.sqlx/query-dac29d7eb16782713acb7aa68aaa8b12b67678e983dc2570be28fe9b1e016c28.json
+++ b/core/lib/dal/.sqlx/query-7f3ca3f1d0b3414575e71af98b810ff145ac2f388a246b9c7b32193e2d4208dd.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            DELETE FROM call_traces\n            WHERE\n                tx_hash = ANY ($1)\n            ",
+  "query": "\n            DELETE FROM call_traces\n            WHERE\n                tx_hash = ANY($1)\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -10,5 +10,5 @@
     },
     "nullable": []
   },
-  "hash": "dac29d7eb16782713acb7aa68aaa8b12b67678e983dc2570be28fe9b1e016c28"
+  "hash": "7f3ca3f1d0b3414575e71af98b810ff145ac2f388a246b9c7b32193e2d4208dd"
 }
diff --git a/core/lib/dal/.sqlx/query-a71a87d91dcf0f624dbd64eb8828f65ff83204ebab2ea31847ae305a098823b0.json b/core/lib/dal/.sqlx/query-868bfdc5d8ee5eab395fa690891751dfd285628a75a35b152bccb3c73e9cc057.json
similarity index 83%
rename from core/lib/dal/.sqlx/query-a71a87d91dcf0f624dbd64eb8828f65ff83204ebab2ea31847ae305a098823b0.json
rename to core/lib/dal/.sqlx/query-868bfdc5d8ee5eab395fa690891751dfd285628a75a35b152bccb3c73e9cc057.json
index 272f20e5268..c2e662ef376 100644
--- a/core/lib/dal/.sqlx/query-a71a87d91dcf0f624dbd64eb8828f65ff83204ebab2ea31847ae305a098823b0.json
+++ b/core/lib/dal/.sqlx/query-868bfdc5d8ee5eab395fa690891751dfd285628a75a35b152bccb3c73e9cc057.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                *\n            FROM\n                eth_txs\n            WHERE\n                from_addr IS NOT DISTINCT FROM $1 -- can't just use equality as NULL != NULL\n                AND confirmed_eth_tx_history_id IS NULL\n                AND is_gateway = $2\n                AND id <= (\n                    SELECT\n                        COALESCE(MAX(eth_tx_id), 0)\n                    FROM\n                        eth_txs_history\n                        JOIN eth_txs ON eth_txs.id = eth_txs_history.eth_tx_id\n                    WHERE\n                        eth_txs_history.sent_at_block IS NOT NULL\n                        AND eth_txs.from_addr IS NOT DISTINCT FROM $1\n                        AND is_gateway = $2\n                )\n            ORDER BY\n                id\n            ",
+  "query": "\n            SELECT\n                *\n            FROM\n                eth_txs\n            WHERE\n                from_addr IS NOT DISTINCT FROM $1 -- can't just use equality as NULL != NULL\n                AND confirmed_eth_tx_history_id IS NULL\n                AND is_gateway = $2\n                AND id <= (\n                    SELECT\n                        COALESCE(MAX(eth_tx_id), 0)\n                    FROM\n                        eth_txs_history\n                    JOIN eth_txs ON eth_txs.id = eth_txs_history.eth_tx_id\n                    WHERE\n                        eth_txs_history.sent_at_block IS NOT NULL\n                        AND eth_txs.from_addr IS NOT DISTINCT FROM $1\n                        AND is_gateway = $2\n                )\n            ORDER BY\n                id\n            ",
   "describe": {
     "columns": [
       {
@@ -109,5 +109,5 @@
       true
     ]
   },
-  "hash": "a71a87d91dcf0f624dbd64eb8828f65ff83204ebab2ea31847ae305a098823b0"
+  "hash": "868bfdc5d8ee5eab395fa690891751dfd285628a75a35b152bccb3c73e9cc057"
 }
diff --git a/core/lib/dal/.sqlx/query-cb0a9f6137fb6bee5d17d644714b3b22ea2cd184932fcd59f5931239c7a78003.json b/core/lib/dal/.sqlx/query-87e968b1ef6b95203b5d1e41ddf73be52d97128642d8528535975f8dea798e6c.json
similarity index 85%
rename from core/lib/dal/.sqlx/query-cb0a9f6137fb6bee5d17d644714b3b22ea2cd184932fcd59f5931239c7a78003.json
rename to core/lib/dal/.sqlx/query-87e968b1ef6b95203b5d1e41ddf73be52d97128642d8528535975f8dea798e6c.json
index d2da8dff92c..1211bea560b 100644
--- a/core/lib/dal/.sqlx/query-cb0a9f6137fb6bee5d17d644714b3b22ea2cd184932fcd59f5931239c7a78003.json
+++ b/core/lib/dal/.sqlx/query-87e968b1ef6b95203b5d1e41ddf73be52d97128642d8528535975f8dea798e6c.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                eth_txs_history.*,\n                eth_txs.blob_sidecar\n            FROM\n                eth_txs_history\n                LEFT JOIN eth_txs ON eth_tx_id = eth_txs.id\n            WHERE\n                eth_tx_id = $1\n            ORDER BY\n                eth_txs_history.created_at DESC\n            ",
+  "query": "\n            SELECT\n                eth_txs_history.*,\n                eth_txs.blob_sidecar\n            FROM\n                eth_txs_history\n            LEFT JOIN eth_txs ON eth_tx_id = eth_txs.id\n            WHERE\n                eth_tx_id = $1\n            ORDER BY\n                eth_txs_history.created_at DESC\n            ",
   "describe": {
     "columns": [
       {
@@ -90,5 +90,5 @@
       true
     ]
   },
-  "hash": "cb0a9f6137fb6bee5d17d644714b3b22ea2cd184932fcd59f5931239c7a78003"
+  "hash": "87e968b1ef6b95203b5d1e41ddf73be52d97128642d8528535975f8dea798e6c"
 }
diff --git a/core/lib/dal/.sqlx/query-16f6b0ea452c3402a60a41628e9d6fcff54624e85e5c2c5bd1fc21c8956b9948.json b/core/lib/dal/.sqlx/query-8813dc03aadba85a7c8d0b1f0f19c102d83e3e851a1c291d718f22f71c535109.json
similarity index 77%
rename from core/lib/dal/.sqlx/query-16f6b0ea452c3402a60a41628e9d6fcff54624e85e5c2c5bd1fc21c8956b9948.json
rename to core/lib/dal/.sqlx/query-8813dc03aadba85a7c8d0b1f0f19c102d83e3e851a1c291d718f22f71c535109.json
index 7bf0e5bb41d..029d477eb6e 100644
--- a/core/lib/dal/.sqlx/query-16f6b0ea452c3402a60a41628e9d6fcff54624e85e5c2c5bd1fc21c8956b9948.json
+++ b/core/lib/dal/.sqlx/query-8813dc03aadba85a7c8d0b1f0f19c102d83e3e851a1c291d718f22f71c535109.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                number,\n                timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                protocol_version,\n                compressed_state_diffs,\n                system_logs,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input,\n                data_availability.blob_id AS \"blob_id?\"\n            FROM\n                l1_batches\n                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n                LEFT JOIN data_availability ON data_availability.l1_batch_number = l1_batches.number\n            WHERE\n                number = 0\n                OR eth_commit_tx_id IS NOT NULL\n                AND commitment IS NOT NULL\n            ORDER BY\n                number DESC\n            LIMIT\n                1\n            ",
+  "query": "\n            SELECT\n                number,\n                timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                evm_emulator_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                protocol_version,\n                compressed_state_diffs,\n                system_logs,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input,\n                data_availability.blob_id AS \"blob_id?\"\n            FROM\n                l1_batches\n            LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n            LEFT JOIN\n                data_availability\n                ON data_availability.l1_batch_number = l1_batches.number\n            WHERE\n                number = 0\n                OR eth_commit_tx_id IS NOT NULL\n                AND commitment IS NOT NULL\n            ORDER BY\n                number DESC\n            LIMIT\n                1\n            ",
   "describe": {
     "columns": [
       {
@@ -90,51 +90,56 @@
       },
       {
         "ordinal": 17,
-        "name": "aux_data_hash",
+        "name": "evm_emulator_code_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 18,
-        "name": "pass_through_data_hash",
+        "name": "aux_data_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 19,
-        "name": "meta_parameters_hash",
+        "name": "pass_through_data_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 20,
+        "name": "meta_parameters_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 21,
         "name": "protocol_version",
         "type_info": "Int4"
       },
       {
-        "ordinal": 21,
+        "ordinal": 22,
         "name": "compressed_state_diffs",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 22,
+        "ordinal": 23,
         "name": "system_logs",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 23,
+        "ordinal": 24,
         "name": "events_queue_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 24,
+        "ordinal": 25,
         "name": "bootloader_initial_content_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 25,
+        "ordinal": 26,
         "name": "pubdata_input",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 26,
+        "ordinal": 27,
         "name": "blob_id?",
         "type_info": "Text"
       }
@@ -165,6 +170,7 @@
       true,
       true,
       true,
+      true,
       false,
       true,
       true,
@@ -172,5 +178,5 @@
       false
     ]
   },
-  "hash": "16f6b0ea452c3402a60a41628e9d6fcff54624e85e5c2c5bd1fc21c8956b9948"
+  "hash": "8813dc03aadba85a7c8d0b1f0f19c102d83e3e851a1c291d718f22f71c535109"
 }
diff --git a/core/lib/dal/.sqlx/query-85576fdbb4bd6e3a6e43511c065a2e3eaf72dfe0fa96b335b76c9506cb1ebdcc.json b/core/lib/dal/.sqlx/query-89e53b297b2b1c0dfb263f9175cb70e7a5fe02b60d5d23e4d153190138112c5b.json
similarity index 62%
rename from core/lib/dal/.sqlx/query-85576fdbb4bd6e3a6e43511c065a2e3eaf72dfe0fa96b335b76c9506cb1ebdcc.json
rename to core/lib/dal/.sqlx/query-89e53b297b2b1c0dfb263f9175cb70e7a5fe02b60d5d23e4d153190138112c5b.json
index 3297d411d8a..d944b6abf9e 100644
--- a/core/lib/dal/.sqlx/query-85576fdbb4bd6e3a6e43511c065a2e3eaf72dfe0fa96b335b76c9506cb1ebdcc.json
+++ b/core/lib/dal/.sqlx/query-89e53b297b2b1c0dfb263f9175cb70e7a5fe02b60d5d23e4d153190138112c5b.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                protocol_versions.id AS \"minor!\",\n                protocol_versions.timestamp,\n                protocol_versions.bootloader_code_hash,\n                protocol_versions.default_account_code_hash,\n                protocol_patches.patch,\n                protocol_patches.snark_wrapper_vk_hash\n            FROM\n                protocol_versions\n                JOIN protocol_patches ON protocol_patches.minor = protocol_versions.id\n            WHERE\n                id = $1\n            ORDER BY\n                protocol_patches.patch DESC\n            LIMIT\n                1\n            ",
+  "query": "\n            SELECT\n                protocol_versions.id AS \"minor!\",\n                protocol_versions.timestamp,\n                protocol_versions.bootloader_code_hash,\n                protocol_versions.default_account_code_hash,\n                protocol_versions.evm_emulator_code_hash,\n                protocol_patches.patch,\n                protocol_patches.snark_wrapper_vk_hash\n            FROM\n                protocol_versions\n            JOIN protocol_patches ON protocol_patches.minor = protocol_versions.id\n            WHERE\n                id = $1\n            ORDER BY\n                protocol_patches.patch DESC\n            LIMIT\n                1\n            ",
   "describe": {
     "columns": [
       {
@@ -25,11 +25,16 @@
       },
       {
         "ordinal": 4,
+        "name": "evm_emulator_code_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 5,
         "name": "patch",
         "type_info": "Int4"
       },
       {
-        "ordinal": 5,
+        "ordinal": 6,
         "name": "snark_wrapper_vk_hash",
         "type_info": "Bytea"
       }
@@ -44,9 +49,10 @@
       false,
       false,
       false,
+      true,
       false,
       false
     ]
   },
-  "hash": "85576fdbb4bd6e3a6e43511c065a2e3eaf72dfe0fa96b335b76c9506cb1ebdcc"
+  "hash": "89e53b297b2b1c0dfb263f9175cb70e7a5fe02b60d5d23e4d153190138112c5b"
 }
diff --git a/core/lib/dal/.sqlx/query-2cba440c2925631655a7f67486a5a8869da8f10738ba77e3d8e048057b0e7b12.json b/core/lib/dal/.sqlx/query-8ab1634beba74aaef952562a3bcc84b0dd496700a61569929dcc7602ec678b09.json
similarity index 70%
rename from core/lib/dal/.sqlx/query-2cba440c2925631655a7f67486a5a8869da8f10738ba77e3d8e048057b0e7b12.json
rename to core/lib/dal/.sqlx/query-8ab1634beba74aaef952562a3bcc84b0dd496700a61569929dcc7602ec678b09.json
index b01a5b41649..5869c1d37a0 100644
--- a/core/lib/dal/.sqlx/query-2cba440c2925631655a7f67486a5a8869da8f10738ba77e3d8e048057b0e7b12.json
+++ b/core/lib/dal/.sqlx/query-8ab1634beba74aaef952562a3bcc84b0dd496700a61569929dcc7602ec678b09.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                factory_deps.bytecode,\n                transactions.data AS \"data?\",\n                transactions.contract_address AS \"contract_address?\"\n            FROM\n                (\n                    SELECT\n                        miniblock_number,\n                        tx_hash,\n                        topic3\n                    FROM\n                        events\n                    WHERE\n                        address = $1\n                        AND topic1 = $2\n                        AND topic4 = $3\n                    LIMIT\n                        1\n                ) deploy_event\n                JOIN factory_deps ON factory_deps.bytecode_hash = deploy_event.topic3\n                LEFT JOIN transactions ON transactions.hash = deploy_event.tx_hash\n            WHERE\n                deploy_event.miniblock_number <= (\n                    SELECT\n                        MAX(number)\n                    FROM\n                        miniblocks\n                )\n            ",
+  "query": "\n            SELECT\n                factory_deps.bytecode,\n                transactions.data AS \"data?\",\n                transactions.contract_address AS \"contract_address?\"\n            FROM\n                (\n                    SELECT\n                        miniblock_number,\n                        tx_hash,\n                        topic3\n                    FROM\n                        events\n                    WHERE\n                        address = $1\n                        AND topic1 = $2\n                        AND topic4 = $3\n                    LIMIT\n                        1\n                ) deploy_event\n            JOIN factory_deps ON factory_deps.bytecode_hash = deploy_event.topic3\n            LEFT JOIN transactions ON transactions.hash = deploy_event.tx_hash\n            WHERE\n                deploy_event.miniblock_number <= (\n                    SELECT\n                        MAX(number)\n                    FROM\n                        miniblocks\n                )\n            ",
   "describe": {
     "columns": [
       {
@@ -32,5 +32,5 @@
       true
     ]
   },
-  "hash": "2cba440c2925631655a7f67486a5a8869da8f10738ba77e3d8e048057b0e7b12"
+  "hash": "8ab1634beba74aaef952562a3bcc84b0dd496700a61569929dcc7602ec678b09"
 }
diff --git a/core/lib/dal/.sqlx/query-526a8e1c231e99faadd5dbbe9c49ed811faffcc108d04b59fdec5a0ab9d13fa3.json b/core/lib/dal/.sqlx/query-8dd9596258c4e9eeb9178b32ffefaf767e790a54957218de908c7144658b4681.json
similarity index 83%
rename from core/lib/dal/.sqlx/query-526a8e1c231e99faadd5dbbe9c49ed811faffcc108d04b59fdec5a0ab9d13fa3.json
rename to core/lib/dal/.sqlx/query-8dd9596258c4e9eeb9178b32ffefaf767e790a54957218de908c7144658b4681.json
index dbdec4ac5d6..151d2ece97f 100644
--- a/core/lib/dal/.sqlx/query-526a8e1c231e99faadd5dbbe9c49ed811faffcc108d04b59fdec5a0ab9d13fa3.json
+++ b/core/lib/dal/.sqlx/query-8dd9596258c4e9eeb9178b32ffefaf767e790a54957218de908c7144658b4681.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                address,\n                topic1,\n                topic2,\n                topic3,\n                topic4,\n                value,\n                NULL::bytea AS \"block_hash\",\n                NULL::BIGINT AS \"l1_batch_number?\",\n                miniblock_number,\n                tx_hash,\n                tx_index_in_block,\n                event_index_in_block,\n                event_index_in_tx,\n                NULL::BIGINT AS \"block_timestamp?\"\n            FROM\n                events\n            WHERE\n                tx_hash = ANY ($1)\n            ORDER BY\n                miniblock_number ASC,\n                event_index_in_block ASC\n            ",
+  "query": "\n            SELECT\n                address,\n                topic1,\n                topic2,\n                topic3,\n                topic4,\n                value,\n                NULL::bytea AS \"block_hash\",\n                NULL::bigint AS \"l1_batch_number?\",\n                miniblock_number,\n                tx_hash,\n                tx_index_in_block,\n                event_index_in_block,\n                event_index_in_tx,\n                NULL::bigint AS \"block_timestamp?\"\n            FROM\n                events\n            WHERE\n                tx_hash = ANY($1)\n            ORDER BY\n                miniblock_number ASC,\n                event_index_in_block ASC\n            ",
   "describe": {
     "columns": [
       {
@@ -96,5 +96,5 @@
       null
     ]
   },
-  "hash": "526a8e1c231e99faadd5dbbe9c49ed811faffcc108d04b59fdec5a0ab9d13fa3"
+  "hash": "8dd9596258c4e9eeb9178b32ffefaf767e790a54957218de908c7144658b4681"
 }
diff --git a/core/lib/dal/.sqlx/query-41c9f45d6eb727aafad0d8c18024cee5c602d275bb812022cc8fdabf0a60e151.json b/core/lib/dal/.sqlx/query-8de8fd9aa54e2285a14daf95af18c5de2c9f8f3cf22d0f1145ae67879039e28d.json
similarity index 77%
rename from core/lib/dal/.sqlx/query-41c9f45d6eb727aafad0d8c18024cee5c602d275bb812022cc8fdabf0a60e151.json
rename to core/lib/dal/.sqlx/query-8de8fd9aa54e2285a14daf95af18c5de2c9f8f3cf22d0f1145ae67879039e28d.json
index 8c51c26131b..36ecf511a9a 100644
--- a/core/lib/dal/.sqlx/query-41c9f45d6eb727aafad0d8c18024cee5c602d275bb812022cc8fdabf0a60e151.json
+++ b/core/lib/dal/.sqlx/query-8de8fd9aa54e2285a14daf95af18c5de2c9f8f3cf22d0f1145ae67879039e28d.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                eth_txs_history.id,\n                eth_txs_history.eth_tx_id,\n                eth_txs_history.tx_hash,\n                eth_txs_history.base_fee_per_gas,\n                eth_txs_history.priority_fee_per_gas,\n                eth_txs_history.signed_raw_tx,\n                eth_txs.nonce\n            FROM\n                eth_txs_history\n                JOIN eth_txs ON eth_txs.id = eth_txs_history.eth_tx_id\n            WHERE\n                eth_txs_history.sent_at_block IS NULL\n                AND eth_txs.confirmed_eth_tx_history_id IS NULL\n            ORDER BY\n                eth_txs_history.id DESC\n            ",
+  "query": "\n            SELECT\n                eth_txs_history.id,\n                eth_txs_history.eth_tx_id,\n                eth_txs_history.tx_hash,\n                eth_txs_history.base_fee_per_gas,\n                eth_txs_history.priority_fee_per_gas,\n                eth_txs_history.signed_raw_tx,\n                eth_txs.nonce\n            FROM\n                eth_txs_history\n            JOIN eth_txs ON eth_txs.id = eth_txs_history.eth_tx_id\n            WHERE\n                eth_txs_history.sent_at_block IS NULL\n                AND eth_txs.confirmed_eth_tx_history_id IS NULL\n            ORDER BY\n                eth_txs_history.id DESC\n            ",
   "describe": {
     "columns": [
       {
@@ -52,5 +52,5 @@
       false
     ]
   },
-  "hash": "41c9f45d6eb727aafad0d8c18024cee5c602d275bb812022cc8fdabf0a60e151"
+  "hash": "8de8fd9aa54e2285a14daf95af18c5de2c9f8f3cf22d0f1145ae67879039e28d"
 }
diff --git a/core/lib/dal/.sqlx/query-70d2f1a59e5e12c4c0c843fe14c674d9dab0ebd6256b0d3c9142a62f99de111d.json b/core/lib/dal/.sqlx/query-8ee904c22462b1c9b57be0af039a1835d00426c893355931aeac42d86beba431.json
similarity index 77%
rename from core/lib/dal/.sqlx/query-70d2f1a59e5e12c4c0c843fe14c674d9dab0ebd6256b0d3c9142a62f99de111d.json
rename to core/lib/dal/.sqlx/query-8ee904c22462b1c9b57be0af039a1835d00426c893355931aeac42d86beba431.json
index b4d6d579764..5bae808826e 100644
--- a/core/lib/dal/.sqlx/query-70d2f1a59e5e12c4c0c843fe14c674d9dab0ebd6256b0d3c9142a62f99de111d.json
+++ b/core/lib/dal/.sqlx/query-8ee904c22462b1c9b57be0af039a1835d00426c893355931aeac42d86beba431.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                SELECT\n                    number,\n                    timestamp,\n                    l1_tx_count,\n                    l2_tx_count,\n                    bloom,\n                    priority_ops_onchain_data,\n                    hash,\n                    commitment,\n                    l2_to_l1_messages,\n                    used_contract_hashes,\n                    compressed_initial_writes,\n                    compressed_repeated_writes,\n                    l2_l1_merkle_root,\n                    rollup_last_leaf_index,\n                    zkporter_is_available,\n                    bootloader_code_hash,\n                    default_aa_code_hash,\n                    aux_data_hash,\n                    pass_through_data_hash,\n                    meta_parameters_hash,\n                    protocol_version,\n                    compressed_state_diffs,\n                    system_logs,\n                    events_queue_commitment,\n                    bootloader_initial_content_commitment,\n                    pubdata_input,\n                    data_availability.blob_id AS \"blob_id?\"\n                FROM\n                    l1_batches\n                    LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n                    LEFT JOIN data_availability ON data_availability.l1_batch_number = l1_batches.number\n                WHERE\n                    number BETWEEN $1 AND $2\n                ORDER BY\n                    number\n                LIMIT\n                    $3\n                ",
+  "query": "\n                SELECT\n                    number,\n                    timestamp,\n                    l1_tx_count,\n                    l2_tx_count,\n                    bloom,\n                    priority_ops_onchain_data,\n                    hash,\n                    commitment,\n                    l2_to_l1_messages,\n                    used_contract_hashes,\n                    compressed_initial_writes,\n                    compressed_repeated_writes,\n                    l2_l1_merkle_root,\n                    rollup_last_leaf_index,\n                    zkporter_is_available,\n                    bootloader_code_hash,\n                    default_aa_code_hash,\n                    evm_emulator_code_hash,\n                    aux_data_hash,\n                    pass_through_data_hash,\n                    meta_parameters_hash,\n                    protocol_version,\n                    compressed_state_diffs,\n                    system_logs,\n                    events_queue_commitment,\n                    bootloader_initial_content_commitment,\n                    pubdata_input,\n                    data_availability.blob_id AS \"blob_id?\"\n                FROM\n                    l1_batches\n                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n                LEFT JOIN\n                    data_availability\n                    ON data_availability.l1_batch_number = l1_batches.number\n                WHERE\n                    number BETWEEN $1 AND $2\n                ORDER BY\n                    number\n                LIMIT\n                    $3\n                ",
   "describe": {
     "columns": [
       {
@@ -90,51 +90,56 @@
       },
       {
         "ordinal": 17,
-        "name": "aux_data_hash",
+        "name": "evm_emulator_code_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 18,
-        "name": "pass_through_data_hash",
+        "name": "aux_data_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 19,
-        "name": "meta_parameters_hash",
+        "name": "pass_through_data_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 20,
+        "name": "meta_parameters_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 21,
         "name": "protocol_version",
         "type_info": "Int4"
       },
       {
-        "ordinal": 21,
+        "ordinal": 22,
         "name": "compressed_state_diffs",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 22,
+        "ordinal": 23,
         "name": "system_logs",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 23,
+        "ordinal": 24,
         "name": "events_queue_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 24,
+        "ordinal": 25,
         "name": "bootloader_initial_content_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 25,
+        "ordinal": 26,
         "name": "pubdata_input",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 26,
+        "ordinal": 27,
         "name": "blob_id?",
         "type_info": "Text"
       }
@@ -169,6 +174,7 @@
       true,
       true,
       true,
+      true,
       false,
       true,
       true,
@@ -176,5 +182,5 @@
       false
     ]
   },
-  "hash": "70d2f1a59e5e12c4c0c843fe14c674d9dab0ebd6256b0d3c9142a62f99de111d"
+  "hash": "8ee904c22462b1c9b57be0af039a1835d00426c893355931aeac42d86beba431"
 }
diff --git a/core/lib/dal/.sqlx/query-288e6ac4a1430740be80e89771d20b9c3e72d512db8747bf4c8af2b82855725a.json b/core/lib/dal/.sqlx/query-905d3dc2a7757ab78175dbc5fdbd2846ec9d5a814df33abe2f9a70861ab6ed94.json
similarity index 78%
rename from core/lib/dal/.sqlx/query-288e6ac4a1430740be80e89771d20b9c3e72d512db8747bf4c8af2b82855725a.json
rename to core/lib/dal/.sqlx/query-905d3dc2a7757ab78175dbc5fdbd2846ec9d5a814df33abe2f9a70861ab6ed94.json
index c05ec040ff1..14268ad0bb7 100644
--- a/core/lib/dal/.sqlx/query-288e6ac4a1430740be80e89771d20b9c3e72d512db8747bf4c8af2b82855725a.json
+++ b/core/lib/dal/.sqlx/query-905d3dc2a7757ab78175dbc5fdbd2846ec9d5a814df33abe2f9a70861ab6ed94.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                number,\n                timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                protocol_version,\n                system_logs,\n                compressed_state_diffs,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input,\n                data_availability.blob_id AS \"blob_id?\"\n            FROM\n                l1_batches\n                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n                LEFT JOIN data_availability ON data_availability.l1_batch_number = l1_batches.number\n            WHERE\n                number = $1\n            ",
+  "query": "\n            SELECT\n                number,\n                timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                evm_emulator_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                protocol_version,\n                compressed_state_diffs,\n                system_logs,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input,\n                data_availability.blob_id AS \"blob_id?\"\n            FROM\n                l1_batches\n            LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n            LEFT JOIN\n                data_availability\n                ON data_availability.l1_batch_number = l1_batches.number\n            WHERE\n                eth_commit_tx_id IS NOT NULL\n                AND eth_prove_tx_id IS NULL\n            ORDER BY\n                number\n            LIMIT\n                $1\n            ",
   "describe": {
     "columns": [
       {
@@ -90,28 +90,28 @@
       },
       {
         "ordinal": 17,
-        "name": "aux_data_hash",
+        "name": "evm_emulator_code_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 18,
-        "name": "pass_through_data_hash",
+        "name": "aux_data_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 19,
-        "name": "meta_parameters_hash",
+        "name": "pass_through_data_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 20,
-        "name": "protocol_version",
-        "type_info": "Int4"
+        "name": "meta_parameters_hash",
+        "type_info": "Bytea"
       },
       {
         "ordinal": 21,
-        "name": "system_logs",
-        "type_info": "ByteaArray"
+        "name": "protocol_version",
+        "type_info": "Int4"
       },
       {
         "ordinal": 22,
@@ -120,21 +120,26 @@
       },
       {
         "ordinal": 23,
+        "name": "system_logs",
+        "type_info": "ByteaArray"
+      },
+      {
+        "ordinal": 24,
         "name": "events_queue_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 24,
+        "ordinal": 25,
         "name": "bootloader_initial_content_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 25,
+        "ordinal": 26,
         "name": "pubdata_input",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 26,
+        "ordinal": 27,
         "name": "blob_id?",
         "type_info": "Text"
       }
@@ -166,13 +171,14 @@
       true,
       true,
       true,
-      false,
       true,
       true,
+      false,
+      true,
       true,
       true,
       false
     ]
   },
-  "hash": "288e6ac4a1430740be80e89771d20b9c3e72d512db8747bf4c8af2b82855725a"
+  "hash": "905d3dc2a7757ab78175dbc5fdbd2846ec9d5a814df33abe2f9a70861ab6ed94"
 }
diff --git a/core/lib/dal/.sqlx/query-928139bf23bd0d57b8dbdb3283b139300ad3b80ac9e70c00864c3d9f6521b028.json b/core/lib/dal/.sqlx/query-928139bf23bd0d57b8dbdb3283b139300ad3b80ac9e70c00864c3d9f6521b028.json
deleted file mode 100644
index e192763b189..00000000000
--- a/core/lib/dal/.sqlx/query-928139bf23bd0d57b8dbdb3283b139300ad3b80ac9e70c00864c3d9f6521b028.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                number,\n                pubdata_input\n            FROM\n                l1_batches\n                LEFT JOIN data_availability ON data_availability.l1_batch_number = l1_batches.number\n            WHERE\n                eth_commit_tx_id IS NULL\n                AND number != 0\n                AND data_availability.blob_id IS NULL\n                AND pubdata_input IS NOT NULL\n            ORDER BY\n                number\n            LIMIT\n                $1\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "number",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "pubdata_input",
-        "type_info": "Bytea"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      false,
-      true
-    ]
-  },
-  "hash": "928139bf23bd0d57b8dbdb3283b139300ad3b80ac9e70c00864c3d9f6521b028"
-}
diff --git a/core/lib/dal/.sqlx/query-bdfd7e9d4462ac9cf6f91fced84355e6aec05ba4af297a03169e3122a67ae53e.json b/core/lib/dal/.sqlx/query-96adbd0c9a5786a6cca74324353c7d8bbdbee28d4ac2a2c0a331298c5e39b71d.json
similarity index 66%
rename from core/lib/dal/.sqlx/query-bdfd7e9d4462ac9cf6f91fced84355e6aec05ba4af297a03169e3122a67ae53e.json
rename to core/lib/dal/.sqlx/query-96adbd0c9a5786a6cca74324353c7d8bbdbee28d4ac2a2c0a331298c5e39b71d.json
index 0b1f56ef9f3..3b8accb4fda 100644
--- a/core/lib/dal/.sqlx/query-bdfd7e9d4462ac9cf6f91fced84355e6aec05ba4af297a03169e3122a67ae53e.json
+++ b/core/lib/dal/.sqlx/query-96adbd0c9a5786a6cca74324353c7d8bbdbee28d4ac2a2c0a331298c5e39b71d.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                protocol_version,\n                index_in_block\n            FROM\n                transactions\n                INNER JOIN miniblocks ON transactions.miniblock_number = miniblocks.number\n            WHERE\n                transactions.hash = $1\n            ",
+  "query": "\n            SELECT\n                protocol_version,\n                index_in_block\n            FROM\n                transactions\n            INNER JOIN miniblocks ON transactions.miniblock_number = miniblocks.number\n            WHERE\n                transactions.hash = $1\n            ",
   "describe": {
     "columns": [
       {
@@ -24,5 +24,5 @@
       true
     ]
   },
-  "hash": "bdfd7e9d4462ac9cf6f91fced84355e6aec05ba4af297a03169e3122a67ae53e"
+  "hash": "96adbd0c9a5786a6cca74324353c7d8bbdbee28d4ac2a2c0a331298c5e39b71d"
 }
diff --git a/core/lib/dal/.sqlx/query-99c6597a6edfb8736a9f2f5a5d77ca44a1f6cb5e46bf9e5ffe38741bf61c5cc0.json b/core/lib/dal/.sqlx/query-99c6597a6edfb8736a9f2f5a5d77ca44a1f6cb5e46bf9e5ffe38741bf61c5cc0.json
new file mode 100644
index 00000000000..fd8786ca92c
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-99c6597a6edfb8736a9f2f5a5d77ca44a1f6cb5e46bf9e5ffe38741bf61c5cc0.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                DISTINCT\n                hashed_key\n            FROM\n                storage_logs\n            WHERE\n                miniblock_number BETWEEN $1 AND $2\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "hashed_key",
+        "type_info": "Bytea"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "99c6597a6edfb8736a9f2f5a5d77ca44a1f6cb5e46bf9e5ffe38741bf61c5cc0"
+}
diff --git a/core/lib/dal/.sqlx/query-9badf9f287fd5f8a11cc855b230d23f83a260adf56000748c4b19752e2948ab5.json b/core/lib/dal/.sqlx/query-9badf9f287fd5f8a11cc855b230d23f83a260adf56000748c4b19752e2948ab5.json
new file mode 100644
index 00000000000..aa120d6b8f6
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-9badf9f287fd5f8a11cc855b230d23f83a260adf56000748c4b19752e2948ab5.json
@@ -0,0 +1,34 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE transactions\n            SET\n                hash = data_table.hash,\n                signature = data_table.signature,\n                gas_limit = data_table.gas_limit,\n                max_fee_per_gas = data_table.max_fee_per_gas,\n                max_priority_fee_per_gas = data_table.max_priority_fee_per_gas,\n                gas_per_pubdata_limit = data_table.gas_per_pubdata_limit,\n                input = data_table.input,\n                data = data_table.data,\n                tx_format = data_table.tx_format,\n                miniblock_number = $21,\n                index_in_block = data_table.index_in_block,\n                error = NULLIF(data_table.error, ''),\n                effective_gas_price = data_table.effective_gas_price,\n                execution_info = data_table.new_execution_info,\n                refunded_gas = data_table.refunded_gas,\n                value = data_table.value,\n                contract_address = data_table.contract_address,\n                paymaster = data_table.paymaster,\n                paymaster_input = data_table.paymaster_input,\n                in_mempool = FALSE,\n                updated_at = NOW()\n            FROM\n                (\n                    SELECT\n                        data_table_temp.*\n                    FROM\n                        (\n                            SELECT\n                                UNNEST($1::bytea []) AS initiator_address,\n                                UNNEST($2::int []) AS nonce,\n                                UNNEST($3::bytea []) AS hash,\n                                UNNEST($4::bytea []) AS signature,\n                                UNNEST($5::numeric []) AS gas_limit,\n                                UNNEST($6::numeric []) AS max_fee_per_gas,\n                                UNNEST($7::numeric []) AS max_priority_fee_per_gas,\n                                UNNEST($8::numeric []) AS gas_per_pubdata_limit,\n                                UNNEST($9::int []) AS tx_format,\n                                UNNEST($10::integer []) AS index_in_block,\n                                UNNEST($11::varchar []) AS error,\n                                UNNEST($12::numeric []) AS effective_gas_price,\n                                UNNEST($13::jsonb []) AS new_execution_info,\n                                UNNEST($14::bytea []) AS input,\n                                UNNEST($15::jsonb []) AS data,\n                                UNNEST($16::bigint []) AS refunded_gas,\n                                UNNEST($17::numeric []) AS value,\n                                UNNEST($18::bytea []) AS contract_address,\n                                UNNEST($19::bytea []) AS paymaster,\n                                UNNEST($20::bytea []) AS paymaster_input\n                        ) AS data_table_temp\n                    JOIN transactions\n                        ON\n                            transactions.initiator_address\n                            = data_table_temp.initiator_address\n                            AND transactions.nonce = data_table_temp.nonce\n                    ORDER BY\n                        transactions.hash\n                ) AS data_table\n            WHERE\n                transactions.initiator_address = data_table.initiator_address\n                AND transactions.nonce = data_table.nonce\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "ByteaArray",
+        "Int4Array",
+        "ByteaArray",
+        "ByteaArray",
+        "NumericArray",
+        "NumericArray",
+        "NumericArray",
+        "NumericArray",
+        "Int4Array",
+        "Int4Array",
+        "VarcharArray",
+        "NumericArray",
+        "JsonbArray",
+        "ByteaArray",
+        "JsonbArray",
+        "Int8Array",
+        "NumericArray",
+        "ByteaArray",
+        "ByteaArray",
+        "ByteaArray",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "9badf9f287fd5f8a11cc855b230d23f83a260adf56000748c4b19752e2948ab5"
+}
diff --git a/core/lib/dal/.sqlx/query-9f2c06e6b14434ac4f3b556dc97994cc05ebeb4e5aeeaee50b7c4d8baf58ca44.json b/core/lib/dal/.sqlx/query-9f2c06e6b14434ac4f3b556dc97994cc05ebeb4e5aeeaee50b7c4d8baf58ca44.json
deleted file mode 100644
index 54f0d27bab2..00000000000
--- a/core/lib/dal/.sqlx/query-9f2c06e6b14434ac4f3b556dc97994cc05ebeb4e5aeeaee50b7c4d8baf58ca44.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                l1_batches (\n                    number,\n                    l1_tx_count,\n                    l2_tx_count,\n                    timestamp,\n                    l2_to_l1_messages,\n                    bloom,\n                    priority_ops_onchain_data,\n                    predicted_commit_gas_cost,\n                    predicted_prove_gas_cost,\n                    predicted_execute_gas_cost,\n                    initial_bootloader_heap_content,\n                    used_contract_hashes,\n                    bootloader_code_hash,\n                    default_aa_code_hash,\n                    protocol_version,\n                    system_logs,\n                    storage_refunds,\n                    pubdata_costs,\n                    pubdata_input,\n                    predicted_circuits_by_type,\n                    created_at,\n                    updated_at\n                )\n            VALUES\n                (\n                    $1,\n                    $2,\n                    $3,\n                    $4,\n                    $5,\n                    $6,\n                    $7,\n                    $8,\n                    $9,\n                    $10,\n                    $11,\n                    $12,\n                    $13,\n                    $14,\n                    $15,\n                    $16,\n                    $17,\n                    $18,\n                    $19,\n                    $20,\n                    NOW(),\n                    NOW()\n                )\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int4",
-        "Int4",
-        "Int8",
-        "ByteaArray",
-        "Bytea",
-        "ByteaArray",
-        "Int8",
-        "Int8",
-        "Int8",
-        "Jsonb",
-        "Jsonb",
-        "Bytea",
-        "Bytea",
-        "Int4",
-        "ByteaArray",
-        "Int8Array",
-        "Int8Array",
-        "Bytea",
-        "Jsonb"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "9f2c06e6b14434ac4f3b556dc97994cc05ebeb4e5aeeaee50b7c4d8baf58ca44"
-}
diff --git a/core/lib/dal/.sqlx/query-9f7b35311f0afff1be7dc489348ec87cf78f40429222b3163f3c5235c87e007f.json b/core/lib/dal/.sqlx/query-9f7b35311f0afff1be7dc489348ec87cf78f40429222b3163f3c5235c87e007f.json
new file mode 100644
index 00000000000..30d66d0890b
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-9f7b35311f0afff1be7dc489348ec87cf78f40429222b3163f3c5235c87e007f.json
@@ -0,0 +1,31 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            transactions (\n                hash,\n                is_priority,\n                initiator_address,\n                gas_limit,\n                max_fee_per_gas,\n                gas_per_pubdata_limit,\n                data,\n                priority_op_id,\n                full_fee,\n                layer_2_tip_fee,\n                contract_address,\n                l1_block_number,\n                value,\n                paymaster,\n                paymaster_input,\n                tx_format,\n                l1_tx_mint,\n                l1_tx_refund_recipient,\n                received_at,\n                created_at,\n                updated_at\n            )\n            VALUES\n            (\n                $1,\n                TRUE,\n                $2,\n                $3,\n                $4,\n                $5,\n                $6,\n                $7,\n                $8,\n                $9,\n                $10,\n                $11,\n                $12,\n                $13,\n                $14,\n                $15,\n                $16,\n                $17,\n                $18,\n                NOW(),\n                NOW()\n            )\n            ON CONFLICT (hash) DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Bytea",
+        "Bytea",
+        "Numeric",
+        "Numeric",
+        "Numeric",
+        "Jsonb",
+        "Int8",
+        "Numeric",
+        "Numeric",
+        "Bytea",
+        "Int4",
+        "Numeric",
+        "Bytea",
+        "Bytea",
+        "Int4",
+        "Numeric",
+        "Bytea",
+        "Timestamp"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "9f7b35311f0afff1be7dc489348ec87cf78f40429222b3163f3c5235c87e007f"
+}
diff --git a/core/lib/dal/.sqlx/query-a329c468b25d6d5533766b8ad3d0c8fdca5c5731d490c1ac3ed56266b1d5a8a5.json b/core/lib/dal/.sqlx/query-a329c468b25d6d5533766b8ad3d0c8fdca5c5731d490c1ac3ed56266b1d5a8a5.json
new file mode 100644
index 00000000000..d7947345cf6
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-a329c468b25d6d5533766b8ad3d0c8fdca5c5731d490c1ac3ed56266b1d5a8a5.json
@@ -0,0 +1,32 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            transactions (\n                hash,\n                is_priority,\n                initiator_address,\n                gas_limit,\n                max_fee_per_gas,\n                gas_per_pubdata_limit,\n                data,\n                upgrade_id,\n                contract_address,\n                l1_block_number,\n                value,\n                paymaster,\n                paymaster_input,\n                tx_format,\n                l1_tx_mint,\n                l1_tx_refund_recipient,\n                miniblock_number,\n                index_in_block,\n                error,\n                execution_info,\n                refunded_gas,\n                effective_gas_price,\n                received_at,\n                created_at,\n                updated_at\n            )\n            SELECT\n                data_table.hash,\n                TRUE,\n                data_table.initiator_address,\n                data_table.gas_limit,\n                data_table.max_fee_per_gas,\n                data_table.gas_per_pubdata_limit,\n                data_table.data,\n                data_table.upgrade_id,\n                data_table.contract_address,\n                data_table.l1_block_number,\n                data_table.value,\n                '\\x0000000000000000000000000000000000000000'::bytea,\n                '\\x'::bytea,\n                data_table.tx_format,\n                data_table.l1_tx_mint,\n                data_table.l1_tx_refund_recipient,\n                $19,\n                data_table.index_in_block,\n                NULLIF(data_table.error, ''),\n                data_table.execution_info,\n                data_table.refunded_gas,\n                data_table.effective_gas_price,\n                NOW(),\n                NOW(),\n                NOW()\n            FROM\n                (\n                    SELECT\n                        UNNEST($1::bytea []) AS hash,\n                        UNNEST($2::bytea []) AS initiator_address,\n                        UNNEST($3::numeric []) AS gas_limit,\n                        UNNEST($4::numeric []) AS max_fee_per_gas,\n                        UNNEST($5::numeric []) AS gas_per_pubdata_limit,\n                        UNNEST($6::jsonb []) AS data,\n                        UNNEST($7::int []) AS upgrade_id,\n                        UNNEST($8::bytea []) AS contract_address,\n                        UNNEST($9::int []) AS l1_block_number,\n                        UNNEST($10::numeric []) AS value,\n                        UNNEST($11::integer []) AS tx_format,\n                        UNNEST($12::numeric []) AS l1_tx_mint,\n                        UNNEST($13::bytea []) AS l1_tx_refund_recipient,\n                        UNNEST($14::int []) AS index_in_block,\n                        UNNEST($15::varchar []) AS error,\n                        UNNEST($16::jsonb []) AS execution_info,\n                        UNNEST($17::bigint []) AS refunded_gas,\n                        UNNEST($18::numeric []) AS effective_gas_price\n                ) AS data_table\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "ByteaArray",
+        "ByteaArray",
+        "NumericArray",
+        "NumericArray",
+        "NumericArray",
+        "JsonbArray",
+        "Int4Array",
+        "ByteaArray",
+        "Int4Array",
+        "NumericArray",
+        "Int4Array",
+        "NumericArray",
+        "ByteaArray",
+        "Int4Array",
+        "VarcharArray",
+        "JsonbArray",
+        "Int8Array",
+        "NumericArray",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "a329c468b25d6d5533766b8ad3d0c8fdca5c5731d490c1ac3ed56266b1d5a8a5"
+}
diff --git a/core/lib/dal/.sqlx/query-6621de90a024cc85946f17948e5c171cd0e4d38bd6e9cfec58b2d7f53a3204e1.json b/core/lib/dal/.sqlx/query-a36135b5908992324c4308f549ea77a428820fdcea9969aff3b29ca16727357b.json
similarity index 97%
rename from core/lib/dal/.sqlx/query-6621de90a024cc85946f17948e5c171cd0e4d38bd6e9cfec58b2d7f53a3204e1.json
rename to core/lib/dal/.sqlx/query-a36135b5908992324c4308f549ea77a428820fdcea9969aff3b29ca16727357b.json
index 8ba437fe2ce..1d27af2bbc1 100644
--- a/core/lib/dal/.sqlx/query-6621de90a024cc85946f17948e5c171cd0e4d38bd6e9cfec58b2d7f53a3204e1.json
+++ b/core/lib/dal/.sqlx/query-a36135b5908992324c4308f549ea77a428820fdcea9969aff3b29ca16727357b.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE transactions\n            SET\n                in_mempool = TRUE\n            FROM\n                (\n                    SELECT\n                        hash\n                    FROM\n                        (\n                            SELECT\n                                hash\n                            FROM\n                                transactions\n                            WHERE\n                                miniblock_number IS NULL\n                                AND in_mempool = FALSE\n                                AND error IS NULL\n                                AND (\n                                    is_priority = TRUE\n                                    OR (\n                                        max_fee_per_gas >= $2\n                                        AND gas_per_pubdata_limit >= $3\n                                    )\n                                )\n                                AND tx_format != $4\n                            ORDER BY\n                                is_priority DESC,\n                                priority_op_id,\n                                received_at\n                            LIMIT\n                                $1\n                        ) AS subquery1\n                    ORDER BY\n                        hash\n                ) AS subquery2\n            WHERE\n                transactions.hash = subquery2.hash\n            RETURNING\n                transactions.*\n            ",
+  "query": "\n            UPDATE transactions\n            SET\n                in_mempool = TRUE\n            FROM\n                (\n                    SELECT\n                        hash\n                    FROM\n                        (\n                            SELECT\n                                hash\n                            FROM\n                                transactions\n                            WHERE\n                                miniblock_number IS NULL\n                                AND in_mempool = FALSE\n                                AND error IS NULL\n                                AND (\n                                    is_priority = TRUE\n                                    OR (\n                                        max_fee_per_gas >= $2\n                                        AND gas_per_pubdata_limit >= $3\n                                    )\n                                )\n                                AND tx_format != $4\n                            ORDER BY\n                                is_priority DESC,\n                                priority_op_id,\n                                received_at\n                            LIMIT\n                                $1\n                        ) AS subquery1\n                    ORDER BY\n                        hash\n                ) AS subquery2\n            WHERE\n                transactions.hash = subquery2.hash\n            RETURNING\n            transactions.*\n            ",
   "describe": {
     "columns": [
       {
@@ -231,5 +231,5 @@
       true
     ]
   },
-  "hash": "6621de90a024cc85946f17948e5c171cd0e4d38bd6e9cfec58b2d7f53a3204e1"
+  "hash": "a36135b5908992324c4308f549ea77a428820fdcea9969aff3b29ca16727357b"
 }
diff --git a/core/lib/dal/.sqlx/query-a4fcd075b68467bb119e49e6b20a69138206dfeb41f3daff4a3eef1de0bed4e4.json b/core/lib/dal/.sqlx/query-a4fcd075b68467bb119e49e6b20a69138206dfeb41f3daff4a3eef1de0bed4e4.json
deleted file mode 100644
index 39b0c391ef5..00000000000
--- a/core/lib/dal/.sqlx/query-a4fcd075b68467bb119e49e6b20a69138206dfeb41f3daff4a3eef1de0bed4e4.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                initial_writes (hashed_key, INDEX, l1_batch_number, created_at, updated_at)\n            SELECT\n                u.hashed_key,\n                u.index,\n                $3,\n                NOW(),\n                NOW()\n            FROM\n                UNNEST($1::bytea[], $2::BIGINT[]) AS u (hashed_key, INDEX)\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "ByteaArray",
-        "Int8Array",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "a4fcd075b68467bb119e49e6b20a69138206dfeb41f3daff4a3eef1de0bed4e4"
-}
diff --git a/core/lib/dal/.sqlx/query-39a105cba1be0ec8f2b2b88d2f10c6286fcc824e84bb40a6e9f289c34b85fded.json b/core/lib/dal/.sqlx/query-a62f400a5b0b66300f5febf762c7e0c8a39a49d1cea78ef771d4c64fbbc16756.json
similarity index 81%
rename from core/lib/dal/.sqlx/query-39a105cba1be0ec8f2b2b88d2f10c6286fcc824e84bb40a6e9f289c34b85fded.json
rename to core/lib/dal/.sqlx/query-a62f400a5b0b66300f5febf762c7e0c8a39a49d1cea78ef771d4c64fbbc16756.json
index 26a3458bff9..c8c438295e4 100644
--- a/core/lib/dal/.sqlx/query-39a105cba1be0ec8f2b2b88d2f10c6286fcc824e84bb40a6e9f289c34b85fded.json
+++ b/core/lib/dal/.sqlx/query-a62f400a5b0b66300f5febf762c7e0c8a39a49d1cea78ef771d4c64fbbc16756.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                number,\n                timestamp,\n                hash,\n                l1_tx_count,\n                l2_tx_count,\n                fee_account_address AS \"fee_account_address!\",\n                base_fee_per_gas,\n                l1_gas_price,\n                l2_fair_gas_price,\n                gas_per_pubdata_limit,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                protocol_version,\n                virtual_blocks,\n                fair_pubdata_price,\n                gas_limit,\n                logs_bloom\n            FROM\n                miniblocks\n            ORDER BY\n                number DESC\n            LIMIT\n                1\n            ",
+  "query": "\n            SELECT\n                number,\n                timestamp,\n                hash,\n                l1_tx_count,\n                l2_tx_count,\n                fee_account_address AS \"fee_account_address!\",\n                base_fee_per_gas,\n                l1_gas_price,\n                l2_fair_gas_price,\n                gas_per_pubdata_limit,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                evm_emulator_code_hash,\n                protocol_version,\n                virtual_blocks,\n                fair_pubdata_price,\n                gas_limit,\n                logs_bloom\n            FROM\n                miniblocks\n            ORDER BY\n                number DESC\n            LIMIT\n                1\n            ",
   "describe": {
     "columns": [
       {
@@ -65,26 +65,31 @@
       },
       {
         "ordinal": 12,
+        "name": "evm_emulator_code_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 13,
         "name": "protocol_version",
         "type_info": "Int4"
       },
       {
-        "ordinal": 13,
+        "ordinal": 14,
         "name": "virtual_blocks",
         "type_info": "Int8"
       },
       {
-        "ordinal": 14,
+        "ordinal": 15,
         "name": "fair_pubdata_price",
         "type_info": "Int8"
       },
       {
-        "ordinal": 15,
+        "ordinal": 16,
         "name": "gas_limit",
         "type_info": "Int8"
       },
       {
-        "ordinal": 16,
+        "ordinal": 17,
         "name": "logs_bloom",
         "type_info": "Bytea"
       }
@@ -106,11 +111,12 @@
       true,
       true,
       true,
+      true,
       false,
       true,
       true,
       true
     ]
   },
-  "hash": "39a105cba1be0ec8f2b2b88d2f10c6286fcc824e84bb40a6e9f289c34b85fded"
+  "hash": "a62f400a5b0b66300f5febf762c7e0c8a39a49d1cea78ef771d4c64fbbc16756"
 }
diff --git a/core/lib/dal/.sqlx/query-a65364d10a20420211022dc8234d0a586ce73d09ee28887cb1ad1c0392250629.json b/core/lib/dal/.sqlx/query-a65364d10a20420211022dc8234d0a586ce73d09ee28887cb1ad1c0392250629.json
new file mode 100644
index 00000000000..58195689f5d
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-a65364d10a20420211022dc8234d0a586ce73d09ee28887cb1ad1c0392250629.json
@@ -0,0 +1,34 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            transactions (\n                hash,\n                is_priority,\n                initiator_address,\n                nonce,\n                signature,\n                gas_limit,\n                max_fee_per_gas,\n                max_priority_fee_per_gas,\n                gas_per_pubdata_limit,\n                input,\n                data,\n                tx_format,\n                contract_address,\n                value,\n                paymaster,\n                paymaster_input,\n                execution_info,\n                miniblock_number,\n                index_in_block,\n                error,\n                effective_gas_price,\n                refunded_gas,\n                received_at,\n                created_at,\n                updated_at\n            )\n            SELECT\n                data_table.hash,\n                FALSE,\n                data_table.initiator_address,\n                data_table.nonce,\n                data_table.signature,\n                data_table.gas_limit,\n                data_table.max_fee_per_gas,\n                data_table.max_priority_fee_per_gas,\n                data_table.gas_per_pubdata_limit,\n                data_table.input,\n                data_table.data,\n                data_table.tx_format,\n                data_table.contract_address,\n                data_table.value,\n                data_table.paymaster,\n                data_table.paymaster_input,\n                data_table.new_execution_info,\n                $21,\n                data_table.index_in_block,\n                NULLIF(data_table.error, ''),\n                data_table.effective_gas_price,\n                data_table.refunded_gas,\n                NOW(),\n                NOW(),\n                NOW()\n            FROM\n                (\n                    SELECT\n                        UNNEST($1::bytea []) AS hash,\n                        UNNEST($2::bytea []) AS initiator_address,\n                        UNNEST($3::int []) AS nonce,\n                        UNNEST($4::bytea []) AS signature,\n                        UNNEST($5::numeric []) AS gas_limit,\n                        UNNEST($6::numeric []) AS max_fee_per_gas,\n                        UNNEST($7::numeric []) AS max_priority_fee_per_gas,\n                        UNNEST($8::numeric []) AS gas_per_pubdata_limit,\n                        UNNEST($9::bytea []) AS input,\n                        UNNEST($10::jsonb []) AS data,\n                        UNNEST($11::int []) AS tx_format,\n                        UNNEST($12::bytea []) AS contract_address,\n                        UNNEST($13::numeric []) AS value,\n                        UNNEST($14::bytea []) AS paymaster,\n                        UNNEST($15::bytea []) AS paymaster_input,\n                        UNNEST($16::jsonb []) AS new_execution_info,\n                        UNNEST($17::integer []) AS index_in_block,\n                        UNNEST($18::varchar []) AS error,\n                        UNNEST($19::numeric []) AS effective_gas_price,\n                        UNNEST($20::bigint []) AS refunded_gas\n                ) AS data_table\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "ByteaArray",
+        "ByteaArray",
+        "Int4Array",
+        "ByteaArray",
+        "NumericArray",
+        "NumericArray",
+        "NumericArray",
+        "NumericArray",
+        "ByteaArray",
+        "JsonbArray",
+        "Int4Array",
+        "ByteaArray",
+        "NumericArray",
+        "ByteaArray",
+        "ByteaArray",
+        "JsonbArray",
+        "Int4Array",
+        "VarcharArray",
+        "NumericArray",
+        "Int8Array",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "a65364d10a20420211022dc8234d0a586ce73d09ee28887cb1ad1c0392250629"
+}
diff --git a/core/lib/dal/.sqlx/query-a88b113b5dc06ac990a66202b3c05e2c2f10d5cbdb03d02c3c541f7eaa1f58a6.json b/core/lib/dal/.sqlx/query-a88b113b5dc06ac990a66202b3c05e2c2f10d5cbdb03d02c3c541f7eaa1f58a6.json
new file mode 100644
index 00000000000..28ffcc5ae46
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-a88b113b5dc06ac990a66202b3c05e2c2f10d5cbdb03d02c3c541f7eaa1f58a6.json
@@ -0,0 +1,118 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH\n            mb AS (\n                SELECT\n                    l1_gas_price,\n                    l2_fair_gas_price,\n                    fair_pubdata_price\n                FROM\n                    miniblocks\n                WHERE\n                    l1_batch_number = $1\n                LIMIT\n                    1\n            )\n            \n            SELECT\n                l1_batches.number,\n                l1_batches.timestamp,\n                l1_batches.l1_tx_count,\n                l1_batches.l2_tx_count,\n                l1_batches.hash AS \"root_hash?\",\n                commit_tx.tx_hash AS \"commit_tx_hash?\",\n                commit_tx.confirmed_at AS \"committed_at?\",\n                prove_tx.tx_hash AS \"prove_tx_hash?\",\n                prove_tx.confirmed_at AS \"proven_at?\",\n                execute_tx.tx_hash AS \"execute_tx_hash?\",\n                execute_tx.confirmed_at AS \"executed_at?\",\n                mb.l1_gas_price,\n                mb.l2_fair_gas_price,\n                mb.fair_pubdata_price,\n                l1_batches.bootloader_code_hash,\n                l1_batches.default_aa_code_hash,\n                l1_batches.evm_emulator_code_hash\n            FROM\n                l1_batches\n            INNER JOIN mb ON TRUE\n            LEFT JOIN eth_txs_history AS commit_tx\n                ON (\n                    l1_batches.eth_commit_tx_id = commit_tx.eth_tx_id\n                    AND commit_tx.confirmed_at IS NOT NULL\n                )\n            LEFT JOIN eth_txs_history AS prove_tx\n                ON (\n                    l1_batches.eth_prove_tx_id = prove_tx.eth_tx_id\n                    AND prove_tx.confirmed_at IS NOT NULL\n                )\n            LEFT JOIN eth_txs_history AS execute_tx\n                ON (\n                    l1_batches.eth_execute_tx_id = execute_tx.eth_tx_id\n                    AND execute_tx.confirmed_at IS NOT NULL\n                )\n            WHERE\n                l1_batches.number = $1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "timestamp",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "l1_tx_count",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 3,
+        "name": "l2_tx_count",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 4,
+        "name": "root_hash?",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 5,
+        "name": "commit_tx_hash?",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 6,
+        "name": "committed_at?",
+        "type_info": "Timestamp"
+      },
+      {
+        "ordinal": 7,
+        "name": "prove_tx_hash?",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 8,
+        "name": "proven_at?",
+        "type_info": "Timestamp"
+      },
+      {
+        "ordinal": 9,
+        "name": "execute_tx_hash?",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 10,
+        "name": "executed_at?",
+        "type_info": "Timestamp"
+      },
+      {
+        "ordinal": 11,
+        "name": "l1_gas_price",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 12,
+        "name": "l2_fair_gas_price",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 13,
+        "name": "fair_pubdata_price",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 14,
+        "name": "bootloader_code_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 15,
+        "name": "default_aa_code_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 16,
+        "name": "evm_emulator_code_hash",
+        "type_info": "Bytea"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      true,
+      false,
+      true,
+      false,
+      true,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true
+    ]
+  },
+  "hash": "a88b113b5dc06ac990a66202b3c05e2c2f10d5cbdb03d02c3c541f7eaa1f58a6"
+}
diff --git a/core/lib/dal/.sqlx/query-a8fcb4d43b702d561a573a30790372281e8502002ff9fec82294ea6b972447d8.json b/core/lib/dal/.sqlx/query-a8fcb4d43b702d561a573a30790372281e8502002ff9fec82294ea6b972447d8.json
new file mode 100644
index 00000000000..33187f131df
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-a8fcb4d43b702d561a573a30790372281e8502002ff9fec82294ea6b972447d8.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            factory_deps (bytecode_hash, bytecode, miniblock_number, created_at, updated_at)\n            SELECT\n                u.bytecode_hash,\n                u.bytecode,\n                $3,\n                NOW(),\n                NOW()\n            FROM\n                UNNEST($1::bytea [], $2::bytea []) AS u (bytecode_hash, bytecode)\n            ON CONFLICT (bytecode_hash) DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "ByteaArray",
+        "ByteaArray",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "a8fcb4d43b702d561a573a30790372281e8502002ff9fec82294ea6b972447d8"
+}
diff --git a/core/lib/dal/.sqlx/query-e3f4af790fca9149f4edff070170294ec464d184ad732692faa61d2ef99c84e9.json b/core/lib/dal/.sqlx/query-aa68653ef4ff7e0cfddfc0a7c8f3c39e774c405508e73e77cdd0c01f924c97c0.json
similarity index 53%
rename from core/lib/dal/.sqlx/query-e3f4af790fca9149f4edff070170294ec464d184ad732692faa61d2ef99c84e9.json
rename to core/lib/dal/.sqlx/query-aa68653ef4ff7e0cfddfc0a7c8f3c39e774c405508e73e77cdd0c01f924c97c0.json
index abe74036f4c..b17b5828211 100644
--- a/core/lib/dal/.sqlx/query-e3f4af790fca9149f4edff070170294ec464d184ad732692faa61d2ef99c84e9.json
+++ b/core/lib/dal/.sqlx/query-aa68653ef4ff7e0cfddfc0a7c8f3c39e774c405508e73e77cdd0c01f924c97c0.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE tee_proof_generation_details\n            SET\n                status = $1,\n                updated_at = NOW(),\n                prover_taken_at = NOW()\n            WHERE\n                tee_type = $2\n                AND l1_batch_number = (\n                    SELECT\n                        proofs.l1_batch_number\n                    FROM\n                        tee_proof_generation_details AS proofs\n                        JOIN tee_verifier_input_producer_jobs AS inputs ON proofs.l1_batch_number = inputs.l1_batch_number\n                    WHERE\n                        inputs.status = $3\n                        AND (\n                            proofs.status = $4\n                            OR (\n                                proofs.status = $1\n                                AND proofs.prover_taken_at < NOW() - $5::INTERVAL\n                            )\n                        )\n                        AND proofs.l1_batch_number >= $6\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                tee_proof_generation_details.l1_batch_number\n            ",
+  "query": "\n            UPDATE tee_proof_generation_details\n            SET\n                status = $1,\n                updated_at = NOW(),\n                prover_taken_at = NOW()\n            WHERE\n                tee_type = $2\n                AND l1_batch_number = (\n                    SELECT\n                        proofs.l1_batch_number\n                    FROM\n                        tee_proof_generation_details AS proofs\n                    JOIN\n                        tee_verifier_input_producer_jobs AS inputs\n                        ON proofs.l1_batch_number = inputs.l1_batch_number\n                    WHERE\n                        inputs.status = $3\n                        AND (\n                            proofs.status = $4\n                            OR (\n                                proofs.status = $1\n                                AND proofs.prover_taken_at < NOW() - $5::INTERVAL\n                            )\n                        )\n                        AND proofs.l1_batch_number >= $6\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n            RETURNING\n            tee_proof_generation_details.l1_batch_number\n            ",
   "describe": {
     "columns": [
       {
@@ -36,5 +36,5 @@
       false
     ]
   },
-  "hash": "e3f4af790fca9149f4edff070170294ec464d184ad732692faa61d2ef99c84e9"
+  "hash": "aa68653ef4ff7e0cfddfc0a7c8f3c39e774c405508e73e77cdd0c01f924c97c0"
 }
diff --git a/core/lib/dal/.sqlx/query-acfd5a60fda5782bddb8cba033a5d3a0eed793f7b64ad3ed035f20e896371721.json b/core/lib/dal/.sqlx/query-acfd5a60fda5782bddb8cba033a5d3a0eed793f7b64ad3ed035f20e896371721.json
deleted file mode 100644
index 9232ef6d009..00000000000
--- a/core/lib/dal/.sqlx/query-acfd5a60fda5782bddb8cba033a5d3a0eed793f7b64ad3ed035f20e896371721.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                transactions (\n                    hash,\n                    is_priority,\n                    initiator_address,\n                    gas_limit,\n                    max_fee_per_gas,\n                    gas_per_pubdata_limit,\n                    data,\n                    priority_op_id,\n                    full_fee,\n                    layer_2_tip_fee,\n                    contract_address,\n                    l1_block_number,\n                    value,\n                    paymaster,\n                    paymaster_input,\n                    tx_format,\n                    l1_tx_mint,\n                    l1_tx_refund_recipient,\n                    received_at,\n                    created_at,\n                    updated_at\n                )\n            VALUES\n                (\n                    $1,\n                    TRUE,\n                    $2,\n                    $3,\n                    $4,\n                    $5,\n                    $6,\n                    $7,\n                    $8,\n                    $9,\n                    $10,\n                    $11,\n                    $12,\n                    $13,\n                    $14,\n                    $15,\n                    $16,\n                    $17,\n                    $18,\n                    NOW(),\n                    NOW()\n                )\n            ON CONFLICT (hash) DO NOTHING\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Bytea",
-        "Bytea",
-        "Numeric",
-        "Numeric",
-        "Numeric",
-        "Jsonb",
-        "Int8",
-        "Numeric",
-        "Numeric",
-        "Bytea",
-        "Int4",
-        "Numeric",
-        "Bytea",
-        "Bytea",
-        "Int4",
-        "Numeric",
-        "Bytea",
-        "Timestamp"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "acfd5a60fda5782bddb8cba033a5d3a0eed793f7b64ad3ed035f20e896371721"
-}
diff --git a/core/lib/dal/.sqlx/query-ad8cbc084ef8bc5995031c807bbbd2225e57ae8d42042ac107b35a36c522f0d8.json b/core/lib/dal/.sqlx/query-ad8cbc084ef8bc5995031c807bbbd2225e57ae8d42042ac107b35a36c522f0d8.json
new file mode 100644
index 00000000000..b07701218c3
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-ad8cbc084ef8bc5995031c807bbbd2225e57ae8d42042ac107b35a36c522f0d8.json
@@ -0,0 +1,34 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            transactions (\n                hash,\n                is_priority,\n                initiator_address,\n                gas_limit,\n                max_fee_per_gas,\n                gas_per_pubdata_limit,\n                data,\n                priority_op_id,\n                full_fee,\n                layer_2_tip_fee,\n                contract_address,\n                l1_block_number,\n                value,\n                paymaster,\n                paymaster_input,\n                tx_format,\n                l1_tx_mint,\n                l1_tx_refund_recipient,\n                miniblock_number,\n                index_in_block,\n                error,\n                execution_info,\n                refunded_gas,\n                effective_gas_price,\n                received_at,\n                created_at,\n                updated_at\n            )\n            SELECT\n                data_table.hash,\n                TRUE,\n                data_table.initiator_address,\n                data_table.gas_limit,\n                data_table.max_fee_per_gas,\n                data_table.gas_per_pubdata_limit,\n                data_table.data,\n                data_table.priority_op_id,\n                data_table.full_fee,\n                data_table.layer_2_tip_fee,\n                data_table.contract_address,\n                data_table.l1_block_number,\n                data_table.value,\n                '\\x0000000000000000000000000000000000000000'::bytea,\n                '\\x'::bytea,\n                data_table.tx_format,\n                data_table.l1_tx_mint,\n                data_table.l1_tx_refund_recipient,\n                $21,\n                data_table.index_in_block,\n                NULLIF(data_table.error, ''),\n                data_table.execution_info,\n                data_table.refunded_gas,\n                data_table.effective_gas_price,\n                NOW(),\n                NOW(),\n                NOW()\n            FROM\n                (\n                    SELECT\n                        UNNEST($1::bytea []) AS hash,\n                        UNNEST($2::bytea []) AS initiator_address,\n                        UNNEST($3::numeric []) AS gas_limit,\n                        UNNEST($4::numeric []) AS max_fee_per_gas,\n                        UNNEST($5::numeric []) AS gas_per_pubdata_limit,\n                        UNNEST($6::jsonb []) AS data,\n                        UNNEST($7::bigint []) AS priority_op_id,\n                        UNNEST($8::numeric []) AS full_fee,\n                        UNNEST($9::numeric []) AS layer_2_tip_fee,\n                        UNNEST($10::bytea []) AS contract_address,\n                        UNNEST($11::int []) AS l1_block_number,\n                        UNNEST($12::numeric []) AS value,\n                        UNNEST($13::integer []) AS tx_format,\n                        UNNEST($14::numeric []) AS l1_tx_mint,\n                        UNNEST($15::bytea []) AS l1_tx_refund_recipient,\n                        UNNEST($16::int []) AS index_in_block,\n                        UNNEST($17::varchar []) AS error,\n                        UNNEST($18::jsonb []) AS execution_info,\n                        UNNEST($19::bigint []) AS refunded_gas,\n                        UNNEST($20::numeric []) AS effective_gas_price\n                ) AS data_table\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "ByteaArray",
+        "ByteaArray",
+        "NumericArray",
+        "NumericArray",
+        "NumericArray",
+        "JsonbArray",
+        "Int8Array",
+        "NumericArray",
+        "NumericArray",
+        "ByteaArray",
+        "Int4Array",
+        "NumericArray",
+        "Int4Array",
+        "NumericArray",
+        "ByteaArray",
+        "Int4Array",
+        "VarcharArray",
+        "JsonbArray",
+        "Int8Array",
+        "NumericArray",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "ad8cbc084ef8bc5995031c807bbbd2225e57ae8d42042ac107b35a36c522f0d8"
+}
diff --git a/core/lib/dal/.sqlx/query-465b5e247ba7105ca138ca39965046d12cef9ac2629758decfcf33545d7cb462.json b/core/lib/dal/.sqlx/query-ae7dc0868a7d7e1ff5054fb9b2b58505d908840f5e52a3777a0d844cd229480e.json
similarity index 72%
rename from core/lib/dal/.sqlx/query-465b5e247ba7105ca138ca39965046d12cef9ac2629758decfcf33545d7cb462.json
rename to core/lib/dal/.sqlx/query-ae7dc0868a7d7e1ff5054fb9b2b58505d908840f5e52a3777a0d844cd229480e.json
index 0daee14957b..45643410361 100644
--- a/core/lib/dal/.sqlx/query-465b5e247ba7105ca138ca39965046d12cef9ac2629758decfcf33545d7cb462.json
+++ b/core/lib/dal/.sqlx/query-ae7dc0868a7d7e1ff5054fb9b2b58505d908840f5e52a3777a0d844cd229480e.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                number,\n                l1_batches.timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                l1_batches.bootloader_code_hash,\n                l1_batches.default_aa_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                protocol_version,\n                compressed_state_diffs,\n                system_logs,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input,\n                data_availability.blob_id AS \"blob_id?\"\n            FROM\n                l1_batches\n                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n                JOIN protocol_versions ON protocol_versions.id = l1_batches.protocol_version\n                LEFT JOIN data_availability ON data_availability.l1_batch_number = l1_batches.number\n            WHERE\n                eth_commit_tx_id IS NULL\n                AND number != 0\n                AND protocol_versions.bootloader_code_hash = $1\n                AND protocol_versions.default_account_code_hash = $2\n                AND commitment IS NOT NULL\n                AND (\n                    protocol_versions.id = $3\n                    OR protocol_versions.upgrade_tx_hash IS NULL\n                )\n            ORDER BY\n                number\n            LIMIT\n                $4\n            ",
+  "query": "\n            SELECT\n                number,\n                l1_batches.timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                l1_batches.bootloader_code_hash,\n                l1_batches.default_aa_code_hash,\n                l1_batches.evm_emulator_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                protocol_version,\n                compressed_state_diffs,\n                system_logs,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input,\n                data_availability.blob_id AS \"blob_id?\"\n            FROM\n                l1_batches\n            LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n            JOIN protocol_versions ON protocol_versions.id = l1_batches.protocol_version\n            LEFT JOIN\n                data_availability\n                ON data_availability.l1_batch_number = l1_batches.number\n            WHERE\n                eth_commit_tx_id IS NULL\n                AND number != 0\n                AND protocol_versions.bootloader_code_hash = $1\n                AND protocol_versions.default_account_code_hash = $2\n                AND commitment IS NOT NULL\n                AND (\n                    protocol_versions.id = $3\n                    OR protocol_versions.upgrade_tx_hash IS NULL\n                )\n            ORDER BY\n                number\n            LIMIT\n                $4\n            ",
   "describe": {
     "columns": [
       {
@@ -90,51 +90,56 @@
       },
       {
         "ordinal": 17,
-        "name": "aux_data_hash",
+        "name": "evm_emulator_code_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 18,
-        "name": "pass_through_data_hash",
+        "name": "aux_data_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 19,
-        "name": "meta_parameters_hash",
+        "name": "pass_through_data_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 20,
+        "name": "meta_parameters_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 21,
         "name": "protocol_version",
         "type_info": "Int4"
       },
       {
-        "ordinal": 21,
+        "ordinal": 22,
         "name": "compressed_state_diffs",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 22,
+        "ordinal": 23,
         "name": "system_logs",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 23,
+        "ordinal": 24,
         "name": "events_queue_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 24,
+        "ordinal": 25,
         "name": "bootloader_initial_content_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 25,
+        "ordinal": 26,
         "name": "pubdata_input",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 26,
+        "ordinal": 27,
         "name": "blob_id?",
         "type_info": "Text"
       }
@@ -170,6 +175,7 @@
       true,
       true,
       true,
+      true,
       false,
       true,
       true,
@@ -177,5 +183,5 @@
       false
     ]
   },
-  "hash": "465b5e247ba7105ca138ca39965046d12cef9ac2629758decfcf33545d7cb462"
+  "hash": "ae7dc0868a7d7e1ff5054fb9b2b58505d908840f5e52a3777a0d844cd229480e"
 }
diff --git a/core/lib/dal/.sqlx/query-a1f4334b6bc1642c1bc0ff4ffa34470914b52e2d714e9deb903d62a5d66f0e04.json b/core/lib/dal/.sqlx/query-afe66b4684f2ab1187b49f64f16f21c9bacd8badc624de7664b82dba97d6c9b9.json
similarity index 86%
rename from core/lib/dal/.sqlx/query-a1f4334b6bc1642c1bc0ff4ffa34470914b52e2d714e9deb903d62a5d66f0e04.json
rename to core/lib/dal/.sqlx/query-afe66b4684f2ab1187b49f64f16f21c9bacd8badc624de7664b82dba97d6c9b9.json
index 82612fb5327..6bb3c4e9731 100644
--- a/core/lib/dal/.sqlx/query-a1f4334b6bc1642c1bc0ff4ffa34470914b52e2d714e9deb903d62a5d66f0e04.json
+++ b/core/lib/dal/.sqlx/query-afe66b4684f2ab1187b49f64f16f21c9bacd8badc624de7664b82dba97d6c9b9.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                l1_address,\n                l2_address,\n                NAME,\n                symbol,\n                decimals\n            FROM\n                tokens\n            ORDER BY\n                symbol\n            ",
+  "query": "\n            SELECT\n                l1_address,\n                l2_address,\n                name,\n                symbol,\n                decimals\n            FROM\n                tokens\n            ORDER BY\n                symbol\n            ",
   "describe": {
     "columns": [
       {
@@ -40,5 +40,5 @@
       false
     ]
   },
-  "hash": "a1f4334b6bc1642c1bc0ff4ffa34470914b52e2d714e9deb903d62a5d66f0e04"
+  "hash": "afe66b4684f2ab1187b49f64f16f21c9bacd8badc624de7664b82dba97d6c9b9"
 }
diff --git a/core/lib/dal/.sqlx/query-b1486215ce220d6d2faa7690a5cdd13a572f665e0a5c0edba8076438ba9f044c.json b/core/lib/dal/.sqlx/query-b1486215ce220d6d2faa7690a5cdd13a572f665e0a5c0edba8076438ba9f044c.json
new file mode 100644
index 00000000000..aab080c3a51
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-b1486215ce220d6d2faa7690a5cdd13a572f665e0a5c0edba8076438ba9f044c.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            l1_batches_consensus (l1_batch_number, certificate, updated_at, created_at)\n            VALUES\n            ($1, $2, NOW(), NOW())\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Jsonb"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "b1486215ce220d6d2faa7690a5cdd13a572f665e0a5c0edba8076438ba9f044c"
+}
diff --git a/core/lib/dal/.sqlx/query-b23f9879be394270a0985c082fd2e82c5aa84c85b9486e81261d17901a786917.json b/core/lib/dal/.sqlx/query-b23f9879be394270a0985c082fd2e82c5aa84c85b9486e81261d17901a786917.json
new file mode 100644
index 00000000000..9d9fa72595d
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-b23f9879be394270a0985c082fd2e82c5aa84c85b9486e81261d17901a786917.json
@@ -0,0 +1,19 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            protocol_versions (\n                id,\n                timestamp,\n                bootloader_code_hash,\n                default_account_code_hash,\n                evm_emulator_code_hash,\n                upgrade_tx_hash,\n                created_at\n            )\n            VALUES\n            ($1, $2, $3, $4, $5, $6, NOW())\n            ON CONFLICT DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int4",
+        "Int8",
+        "Bytea",
+        "Bytea",
+        "Bytea",
+        "Bytea"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "b23f9879be394270a0985c082fd2e82c5aa84c85b9486e81261d17901a786917"
+}
diff --git a/core/lib/dal/.sqlx/query-b313ab2b1e0a83136a202ea758c6d2b2e3f2497e6b5f26c72e220397cc0e62f7.json b/core/lib/dal/.sqlx/query-b313ab2b1e0a83136a202ea758c6d2b2e3f2497e6b5f26c72e220397cc0e62f7.json
deleted file mode 100644
index 356fd8e9d99..00000000000
--- a/core/lib/dal/.sqlx/query-b313ab2b1e0a83136a202ea758c6d2b2e3f2497e6b5f26c72e220397cc0e62f7.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                l1_batches_consensus_committees (l1_batch_number, attesters, updated_at)\n            VALUES\n                ($1, $2, NOW())\n            ON CONFLICT (l1_batch_number) DO\n            UPDATE\n            SET\n                l1_batch_number = $1,\n                attesters = $2,\n                updated_at = NOW()\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Jsonb"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "b313ab2b1e0a83136a202ea758c6d2b2e3f2497e6b5f26c72e220397cc0e62f7"
-}
diff --git a/core/lib/dal/.sqlx/query-b47a2961dc2f1347864682c572dd1f5e03924dbf6dd1e824d4aca837e604b7e9.json b/core/lib/dal/.sqlx/query-b47a2961dc2f1347864682c572dd1f5e03924dbf6dd1e824d4aca837e604b7e9.json
deleted file mode 100644
index 63acfcb30dc..00000000000
--- a/core/lib/dal/.sqlx/query-b47a2961dc2f1347864682c572dd1f5e03924dbf6dd1e824d4aca837e604b7e9.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                table_name,\n                PG_TABLE_SIZE(('public.' || QUOTE_IDENT(table_name))::regclass) AS table_size,\n                PG_INDEXES_SIZE(('public.' || QUOTE_IDENT(table_name))::regclass) AS indexes_size,\n                PG_RELATION_SIZE(('public.' || QUOTE_IDENT(table_name))::regclass) AS relation_size,\n                PG_TOTAL_RELATION_SIZE(('public.' || QUOTE_IDENT(table_name))::regclass) AS total_size\n            FROM\n                information_schema.tables\n            WHERE\n                table_schema = 'public'\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "table_name",
-        "type_info": "Name"
-      },
-      {
-        "ordinal": 1,
-        "name": "table_size",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 2,
-        "name": "indexes_size",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 3,
-        "name": "relation_size",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 4,
-        "name": "total_size",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      true,
-      null,
-      null,
-      null,
-      null
-    ]
-  },
-  "hash": "b47a2961dc2f1347864682c572dd1f5e03924dbf6dd1e824d4aca837e604b7e9"
-}
diff --git a/core/lib/dal/.sqlx/query-b6bfb2d998857f165ee04e282e299bf19b587a16ad70a671b0de48fd608bf31c.json b/core/lib/dal/.sqlx/query-b6bfb2d998857f165ee04e282e299bf19b587a16ad70a671b0de48fd608bf31c.json
new file mode 100644
index 00000000000..120fac1021f
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-b6bfb2d998857f165ee04e282e299bf19b587a16ad70a671b0de48fd608bf31c.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH\n            available_batches AS (\n                SELECT\n                    MAX(number) AS \"last_batch\"\n                FROM\n                    l1_batches\n            ),\n            \n            processed_batches AS (\n                SELECT\n                    COALESCE(MAX(l1_batch_number), $1) + $2 AS \"last_ready_batch\"\n                FROM\n                    vm_runner_protective_reads\n                WHERE\n                    time_taken IS NOT NULL\n            )\n            \n            SELECT\n                LEAST(last_batch, last_ready_batch) AS \"last_ready_batch!\"\n            FROM\n                available_batches\n            FULL JOIN processed_batches ON TRUE\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "last_ready_batch!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      true
+    ]
+  },
+  "hash": "b6bfb2d998857f165ee04e282e299bf19b587a16ad70a671b0de48fd608bf31c"
+}
diff --git a/core/lib/dal/.sqlx/query-52655240d4c434e9e01246a659646fc28edbc885e3123584c8d056ba3d3ce96c.json b/core/lib/dal/.sqlx/query-b833a1e7984705508d8fb0fad54539de67f5c24d7a798e29668d36278ed775c0.json
similarity index 72%
rename from core/lib/dal/.sqlx/query-52655240d4c434e9e01246a659646fc28edbc885e3123584c8d056ba3d3ce96c.json
rename to core/lib/dal/.sqlx/query-b833a1e7984705508d8fb0fad54539de67f5c24d7a798e29668d36278ed775c0.json
index 156e2ed0ec7..3a89808e85f 100644
--- a/core/lib/dal/.sqlx/query-52655240d4c434e9e01246a659646fc28edbc885e3123584c8d056ba3d3ce96c.json
+++ b/core/lib/dal/.sqlx/query-b833a1e7984705508d8fb0fad54539de67f5c24d7a798e29668d36278ed775c0.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                number,\n                timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                system_logs,\n                compressed_state_diffs,\n                protocol_version,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input,\n                data_availability.blob_id AS \"blob_id?\"\n            FROM\n                (\n                    SELECT\n                        l1_batches.*,\n                        ROW_NUMBER() OVER (\n                            ORDER BY\n                                number ASC\n                        ) AS ROW_NUMBER\n                    FROM\n                        l1_batches\n                    WHERE\n                        eth_commit_tx_id IS NOT NULL\n                        AND l1_batches.skip_proof = TRUE\n                        AND l1_batches.number > $1\n                    ORDER BY\n                        number\n                    LIMIT\n                        $2\n                ) inn\n                LEFT JOIN commitments ON commitments.l1_batch_number = inn.number\n                LEFT JOIN data_availability ON data_availability.l1_batch_number = inn.number\n            WHERE\n                number - ROW_NUMBER = $1\n            ",
+  "query": "\n            SELECT\n                number,\n                timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                evm_emulator_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                system_logs,\n                compressed_state_diffs,\n                protocol_version,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input,\n                data_availability.blob_id AS \"blob_id?\"\n            FROM\n                (\n                    SELECT\n                        l1_batches.*,\n                        ROW_NUMBER() OVER (\n                            ORDER BY\n                                number ASC\n                        ) AS row_number\n                    FROM\n                        l1_batches\n                    WHERE\n                        eth_commit_tx_id IS NOT NULL\n                        AND l1_batches.skip_proof = TRUE\n                        AND l1_batches.number > $1\n                    ORDER BY\n                        number\n                    LIMIT\n                        $2\n                ) inn\n            LEFT JOIN commitments ON commitments.l1_batch_number = inn.number\n            LEFT JOIN data_availability ON data_availability.l1_batch_number = inn.number\n            WHERE\n                number - row_number = $1\n            ",
   "describe": {
     "columns": [
       {
@@ -90,51 +90,56 @@
       },
       {
         "ordinal": 17,
-        "name": "aux_data_hash",
+        "name": "evm_emulator_code_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 18,
-        "name": "pass_through_data_hash",
+        "name": "aux_data_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 19,
-        "name": "meta_parameters_hash",
+        "name": "pass_through_data_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 20,
+        "name": "meta_parameters_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 21,
         "name": "system_logs",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 21,
+        "ordinal": 22,
         "name": "compressed_state_diffs",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 22,
+        "ordinal": 23,
         "name": "protocol_version",
         "type_info": "Int4"
       },
       {
-        "ordinal": 23,
+        "ordinal": 24,
         "name": "events_queue_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 24,
+        "ordinal": 25,
         "name": "bootloader_initial_content_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 25,
+        "ordinal": 26,
         "name": "pubdata_input",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 26,
+        "ordinal": 27,
         "name": "blob_id?",
         "type_info": "Text"
       }
@@ -166,6 +171,7 @@
       true,
       true,
       true,
+      true,
       false,
       true,
       true,
@@ -175,5 +181,5 @@
       false
     ]
   },
-  "hash": "52655240d4c434e9e01246a659646fc28edbc885e3123584c8d056ba3d3ce96c"
+  "hash": "b833a1e7984705508d8fb0fad54539de67f5c24d7a798e29668d36278ed775c0"
 }
diff --git a/core/lib/dal/.sqlx/query-139c7ea1d6ccfb7d0f56d00cde196f9dd5372b5ef41eaa39af58eed5af777df1.json b/core/lib/dal/.sqlx/query-bba037e1fcffc4415afe3016ff266d19f7ba92c40566e1d098c435da41e95274.json
similarity index 52%
rename from core/lib/dal/.sqlx/query-139c7ea1d6ccfb7d0f56d00cde196f9dd5372b5ef41eaa39af58eed5af777df1.json
rename to core/lib/dal/.sqlx/query-bba037e1fcffc4415afe3016ff266d19f7ba92c40566e1d098c435da41e95274.json
index 305bb493651..a72b621dae5 100644
--- a/core/lib/dal/.sqlx/query-139c7ea1d6ccfb7d0f56d00cde196f9dd5372b5ef41eaa39af58eed5af777df1.json
+++ b/core/lib/dal/.sqlx/query-bba037e1fcffc4415afe3016ff266d19f7ba92c40566e1d098c435da41e95274.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            WITH\n                events AS (\n                    SELECT DISTINCT\n                        ON (events.tx_hash) *\n                    FROM\n                        events\n                    WHERE\n                        events.address = $1\n                        AND events.topic1 = $2\n                        AND events.tx_hash = ANY ($3)\n                    ORDER BY\n                        events.tx_hash,\n                        events.event_index_in_tx DESC\n                )\n            SELECT\n                transactions.hash AS tx_hash,\n                transactions.index_in_block,\n                transactions.l1_batch_tx_index,\n                transactions.miniblock_number AS \"block_number!\",\n                transactions.error,\n                transactions.effective_gas_price,\n                transactions.initiator_address,\n                transactions.data -> 'to' AS \"transfer_to?\",\n                transactions.data -> 'contractAddress' AS \"execute_contract_address?\",\n                transactions.tx_format AS \"tx_format?\",\n                transactions.refunded_gas,\n                transactions.gas_limit,\n                miniblocks.hash AS \"block_hash\",\n                miniblocks.l1_batch_number AS \"l1_batch_number?\",\n                events.topic4 AS \"contract_address?\",\n                miniblocks.timestamp AS \"block_timestamp?\"\n            FROM\n                transactions\n                JOIN miniblocks ON miniblocks.number = transactions.miniblock_number\n                LEFT JOIN events ON events.tx_hash = transactions.hash\n            WHERE\n                transactions.hash = ANY ($3)\n                AND transactions.data != '{}'::jsonb\n            ",
+  "query": "\n            WITH\n            events AS (\n                SELECT DISTINCT\n                ON (events.tx_hash) *\n                FROM\n                    events\n                WHERE\n                    events.address = $1\n                    AND events.topic1 = $2\n                    AND events.tx_hash = ANY($3)\n                ORDER BY\n                    events.tx_hash,\n                    events.event_index_in_tx DESC\n            )\n            \n            SELECT\n                transactions.hash AS tx_hash,\n                transactions.index_in_block,\n                transactions.l1_batch_tx_index,\n                transactions.miniblock_number AS \"block_number!\",\n                transactions.error,\n                transactions.effective_gas_price,\n                transactions.initiator_address,\n                transactions.data -> 'to' AS \"transfer_to?\",\n                transactions.data -> 'contractAddress' AS \"execute_contract_address?\",\n                transactions.tx_format AS \"tx_format?\",\n                transactions.refunded_gas,\n                transactions.gas_limit,\n                miniblocks.hash AS \"block_hash\",\n                miniblocks.l1_batch_number AS \"l1_batch_number?\",\n                events.topic4 AS \"contract_address?\",\n                miniblocks.timestamp AS \"block_timestamp?\"\n            FROM\n                transactions\n            JOIN miniblocks ON miniblocks.number = transactions.miniblock_number\n            LEFT JOIN events ON events.tx_hash = transactions.hash\n            WHERE\n                transactions.hash = ANY($3)\n                AND transactions.data != '{}'::jsonb\n            ",
   "describe": {
     "columns": [
       {
@@ -110,5 +110,5 @@
       false
     ]
   },
-  "hash": "139c7ea1d6ccfb7d0f56d00cde196f9dd5372b5ef41eaa39af58eed5af777df1"
+  "hash": "bba037e1fcffc4415afe3016ff266d19f7ba92c40566e1d098c435da41e95274"
 }
diff --git a/core/lib/dal/.sqlx/query-bd51c9d93b103292f5acbdb266ba4b4e2af48907fa9321064ddb24ac02ab17cd.json b/core/lib/dal/.sqlx/query-bd51c9d93b103292f5acbdb266ba4b4e2af48907fa9321064ddb24ac02ab17cd.json
deleted file mode 100644
index 7f1fc9b176c..00000000000
--- a/core/lib/dal/.sqlx/query-bd51c9d93b103292f5acbdb266ba4b4e2af48907fa9321064ddb24ac02ab17cd.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                number\n            FROM\n                l1_batches\n                LEFT JOIN eth_txs_history AS commit_tx ON (l1_batches.eth_commit_tx_id = commit_tx.eth_tx_id)\n            WHERE\n                commit_tx.confirmed_at IS NOT NULL\n            ORDER BY\n                number DESC\n            LIMIT\n                1\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "number",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "bd51c9d93b103292f5acbdb266ba4b4e2af48907fa9321064ddb24ac02ab17cd"
-}
diff --git a/core/lib/dal/.sqlx/query-5d493cbce749cc5b56d4069423597b16599abaf51df0f19effe1a536376cf6a6.json b/core/lib/dal/.sqlx/query-bdd9b56fd8505170125d4e1271f865162bce330edd9b16587e8f9fdab17a8456.json
similarity index 52%
rename from core/lib/dal/.sqlx/query-5d493cbce749cc5b56d4069423597b16599abaf51df0f19effe1a536376cf6a6.json
rename to core/lib/dal/.sqlx/query-bdd9b56fd8505170125d4e1271f865162bce330edd9b16587e8f9fdab17a8456.json
index eba36994fb3..2689716c38a 100644
--- a/core/lib/dal/.sqlx/query-5d493cbce749cc5b56d4069423597b16599abaf51df0f19effe1a536376cf6a6.json
+++ b/core/lib/dal/.sqlx/query-bdd9b56fd8505170125d4e1271f865162bce330edd9b16587e8f9fdab17a8456.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                bootloader_code_hash,\n                default_account_code_hash\n            FROM\n                protocol_versions\n            WHERE\n                id = $1\n            ",
+  "query": "\n            SELECT\n                bootloader_code_hash,\n                default_account_code_hash,\n                evm_emulator_code_hash\n            FROM\n                protocol_versions\n            WHERE\n                id = $1\n            ",
   "describe": {
     "columns": [
       {
@@ -12,6 +12,11 @@
         "ordinal": 1,
         "name": "default_account_code_hash",
         "type_info": "Bytea"
+      },
+      {
+        "ordinal": 2,
+        "name": "evm_emulator_code_hash",
+        "type_info": "Bytea"
       }
     ],
     "parameters": {
@@ -21,8 +26,9 @@
     },
     "nullable": [
       false,
-      false
+      false,
+      true
     ]
   },
-  "hash": "5d493cbce749cc5b56d4069423597b16599abaf51df0f19effe1a536376cf6a6"
+  "hash": "bdd9b56fd8505170125d4e1271f865162bce330edd9b16587e8f9fdab17a8456"
 }
diff --git a/core/lib/dal/.sqlx/query-bf481c2b498420f80765b837059cab02b0656d863dbfce4b5dad7bc72e52b05d.json b/core/lib/dal/.sqlx/query-bf481c2b498420f80765b837059cab02b0656d863dbfce4b5dad7bc72e52b05d.json
deleted file mode 100644
index c353a35ec5e..00000000000
--- a/core/lib/dal/.sqlx/query-bf481c2b498420f80765b837059cab02b0656d863dbfce4b5dad7bc72e52b05d.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                transactions (\n                    hash,\n                    is_priority,\n                    initiator_address,\n                    nonce,\n                    signature,\n                    gas_limit,\n                    max_fee_per_gas,\n                    max_priority_fee_per_gas,\n                    gas_per_pubdata_limit,\n                    input,\n                    data,\n                    tx_format,\n                    contract_address,\n                    value,\n                    paymaster,\n                    paymaster_input,\n                    execution_info,\n                    miniblock_number,\n                    index_in_block,\n                    error,\n                    effective_gas_price,\n                    refunded_gas,\n                    received_at,\n                    created_at,\n                    updated_at\n                )\n            SELECT\n                data_table.hash,\n                FALSE,\n                data_table.initiator_address,\n                data_table.nonce,\n                data_table.signature,\n                data_table.gas_limit,\n                data_table.max_fee_per_gas,\n                data_table.max_priority_fee_per_gas,\n                data_table.gas_per_pubdata_limit,\n                data_table.input,\n                data_table.data,\n                data_table.tx_format,\n                data_table.contract_address,\n                data_table.value,\n                data_table.paymaster,\n                data_table.paymaster_input,\n                data_table.new_execution_info,\n                $21,\n                data_table.index_in_block,\n                NULLIF(data_table.error, ''),\n                data_table.effective_gas_price,\n                data_table.refunded_gas,\n                NOW(),\n                NOW(),\n                NOW()\n            FROM\n                (\n                    SELECT\n                        UNNEST($1::bytea[]) AS hash,\n                        UNNEST($2::bytea[]) AS initiator_address,\n                        UNNEST($3::INT[]) AS nonce,\n                        UNNEST($4::bytea[]) AS signature,\n                        UNNEST($5::NUMERIC[]) AS gas_limit,\n                        UNNEST($6::NUMERIC[]) AS max_fee_per_gas,\n                        UNNEST($7::NUMERIC[]) AS max_priority_fee_per_gas,\n                        UNNEST($8::NUMERIC[]) AS gas_per_pubdata_limit,\n                        UNNEST($9::bytea[]) AS input,\n                        UNNEST($10::jsonb[]) AS data,\n                        UNNEST($11::INT[]) AS tx_format,\n                        UNNEST($12::bytea[]) AS contract_address,\n                        UNNEST($13::NUMERIC[]) AS value,\n                        UNNEST($14::bytea[]) AS paymaster,\n                        UNNEST($15::bytea[]) AS paymaster_input,\n                        UNNEST($16::jsonb[]) AS new_execution_info,\n                        UNNEST($17::INTEGER[]) AS index_in_block,\n                        UNNEST($18::VARCHAR[]) AS error,\n                        UNNEST($19::NUMERIC[]) AS effective_gas_price,\n                        UNNEST($20::BIGINT[]) AS refunded_gas\n                ) AS data_table\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "ByteaArray",
-        "ByteaArray",
-        "Int4Array",
-        "ByteaArray",
-        "NumericArray",
-        "NumericArray",
-        "NumericArray",
-        "NumericArray",
-        "ByteaArray",
-        "JsonbArray",
-        "Int4Array",
-        "ByteaArray",
-        "NumericArray",
-        "ByteaArray",
-        "ByteaArray",
-        "JsonbArray",
-        "Int4Array",
-        "VarcharArray",
-        "NumericArray",
-        "Int8Array",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "bf481c2b498420f80765b837059cab02b0656d863dbfce4b5dad7bc72e52b05d"
-}
diff --git a/core/lib/dal/.sqlx/query-bfc84bcf0985446b337467dd1da709dbee508ad6d1cae43e477cf1bef8cb4aa9.json b/core/lib/dal/.sqlx/query-bfc84bcf0985446b337467dd1da709dbee508ad6d1cae43e477cf1bef8cb4aa9.json
deleted file mode 100644
index 8079d52a703..00000000000
--- a/core/lib/dal/.sqlx/query-bfc84bcf0985446b337467dd1da709dbee508ad6d1cae43e477cf1bef8cb4aa9.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT DISTINCT\n                hashed_key\n            FROM\n                storage_logs\n            WHERE\n                miniblock_number BETWEEN $1 AND $2\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "hashed_key",
-        "type_info": "Bytea"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int8"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "bfc84bcf0985446b337467dd1da709dbee508ad6d1cae43e477cf1bef8cb4aa9"
-}
diff --git a/core/lib/dal/.sqlx/query-c02f404ce9b0f92b8052ef6f3eaabda70cb9c56ae3e30dc0a8257e43d6714155.json b/core/lib/dal/.sqlx/query-c013947660883612b83bfd207c26c5e9dc50b533524bf856740215aacb8ff5bd.json
similarity index 83%
rename from core/lib/dal/.sqlx/query-c02f404ce9b0f92b8052ef6f3eaabda70cb9c56ae3e30dc0a8257e43d6714155.json
rename to core/lib/dal/.sqlx/query-c013947660883612b83bfd207c26c5e9dc50b533524bf856740215aacb8ff5bd.json
index 53a0aa152f9..b8728de2dac 100644
--- a/core/lib/dal/.sqlx/query-c02f404ce9b0f92b8052ef6f3eaabda70cb9c56ae3e30dc0a8257e43d6714155.json
+++ b/core/lib/dal/.sqlx/query-c013947660883612b83bfd207c26c5e9dc50b533524bf856740215aacb8ff5bd.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                eth_txs_history.*,\n                eth_txs.blob_sidecar\n            FROM\n                eth_txs_history\n                LEFT JOIN eth_txs ON eth_tx_id = eth_txs.id\n            WHERE\n                eth_tx_id = $1\n            ORDER BY\n                eth_txs_history.created_at DESC\n            LIMIT\n                1\n            ",
+  "query": "\n            SELECT\n                eth_txs_history.*,\n                eth_txs.blob_sidecar\n            FROM\n                eth_txs_history\n            LEFT JOIN eth_txs ON eth_tx_id = eth_txs.id\n            WHERE\n                eth_tx_id = $1\n            ORDER BY\n                eth_txs_history.created_at DESC\n            LIMIT\n                1\n            ",
   "describe": {
     "columns": [
       {
@@ -90,5 +90,5 @@
       true
     ]
   },
-  "hash": "c02f404ce9b0f92b8052ef6f3eaabda70cb9c56ae3e30dc0a8257e43d6714155"
+  "hash": "c013947660883612b83bfd207c26c5e9dc50b533524bf856740215aacb8ff5bd"
 }
diff --git a/core/lib/dal/.sqlx/query-c138d84e1af2e2ef20395201f55db71f3457e1619a170683e03ddf0e78abaf29.json b/core/lib/dal/.sqlx/query-c138d84e1af2e2ef20395201f55db71f3457e1619a170683e03ddf0e78abaf29.json
new file mode 100644
index 00000000000..0d80845d8f7
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-c138d84e1af2e2ef20395201f55db71f3457e1619a170683e03ddf0e78abaf29.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                MAX(l1_batches.number)\n            FROM\n                l1_batches\n            JOIN eth_txs ON (l1_batches.eth_commit_tx_id = eth_txs.id)\n            JOIN\n                eth_txs_history AS commit_tx\n                ON (eth_txs.confirmed_eth_tx_history_id = commit_tx.id)\n            WHERE\n                commit_tx.confirmed_at IS NOT NULL\n                AND eth_prove_tx_id IS NOT NULL\n                AND eth_execute_tx_id IS NULL\n                AND EXTRACT(\n                    EPOCH\n                    FROM\n                    commit_tx.confirmed_at\n                ) < $1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "max",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Numeric"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "c138d84e1af2e2ef20395201f55db71f3457e1619a170683e03ddf0e78abaf29"
+}
diff --git a/core/lib/dal/.sqlx/query-afdeecb78e3af802c2b8ffb0f5ab9863082ccd1ce45b2d20e1119f1e78171d66.json b/core/lib/dal/.sqlx/query-c2c40d5aae2e0276de453c78a39ce5a6cca1524adfe99b0cb35662746479dcc1.json
similarity index 52%
rename from core/lib/dal/.sqlx/query-afdeecb78e3af802c2b8ffb0f5ab9863082ccd1ce45b2d20e1119f1e78171d66.json
rename to core/lib/dal/.sqlx/query-c2c40d5aae2e0276de453c78a39ce5a6cca1524adfe99b0cb35662746479dcc1.json
index bb0d73ee6c8..61832d25fd2 100644
--- a/core/lib/dal/.sqlx/query-afdeecb78e3af802c2b8ffb0f5ab9863082ccd1ce45b2d20e1119f1e78171d66.json
+++ b/core/lib/dal/.sqlx/query-c2c40d5aae2e0276de453c78a39ce5a6cca1524adfe99b0cb35662746479dcc1.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                INSERT INTO\n                    processed_events (\n                        TYPE,\n                        chain_id,\n                        next_block_to_process\n                    )\n                VALUES\n                    ($1, $2, $3)\n                ",
+  "query": "\n                INSERT INTO\n                processed_events (\n                    type,\n                    chain_id,\n                    next_block_to_process\n                )\n                VALUES\n                ($1, $2, $3)\n                ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -22,5 +22,5 @@
     },
     "nullable": []
   },
-  "hash": "afdeecb78e3af802c2b8ffb0f5ab9863082ccd1ce45b2d20e1119f1e78171d66"
+  "hash": "c2c40d5aae2e0276de453c78a39ce5a6cca1524adfe99b0cb35662746479dcc1"
 }
diff --git a/core/lib/dal/.sqlx/query-c2fe6a5476e69c9588eec73baba9d0e2d571533d4d5f683919987b6f8cbb00e0.json b/core/lib/dal/.sqlx/query-c2fe6a5476e69c9588eec73baba9d0e2d571533d4d5f683919987b6f8cbb00e0.json
deleted file mode 100644
index bdabc52d137..00000000000
--- a/core/lib/dal/.sqlx/query-c2fe6a5476e69c9588eec73baba9d0e2d571533d4d5f683919987b6f8cbb00e0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                miniblocks_consensus (number, certificate)\n            VALUES\n                ($1, $2)\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Jsonb"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "c2fe6a5476e69c9588eec73baba9d0e2d571533d4d5f683919987b6f8cbb00e0"
-}
diff --git a/core/lib/dal/.sqlx/query-c3af06cc232adb93f16456da07733acd2066a5e238088b39b982b10770f51479.json b/core/lib/dal/.sqlx/query-c3af06cc232adb93f16456da07733acd2066a5e238088b39b982b10770f51479.json
deleted file mode 100644
index 1c15bde02fd..00000000000
--- a/core/lib/dal/.sqlx/query-c3af06cc232adb93f16456da07733acd2066a5e238088b39b982b10770f51479.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            WITH\n                events_select AS (\n                    SELECT\n                        address,\n                        topic1,\n                        topic2,\n                        topic3,\n                        topic4,\n                        value,\n                        miniblock_number,\n                        tx_hash,\n                        tx_index_in_block,\n                        event_index_in_block,\n                        event_index_in_tx\n                    FROM\n                        events\n                    WHERE\n                        miniblock_number > $1\n                    ORDER BY\n                        miniblock_number ASC,\n                        event_index_in_block ASC\n                )\n            SELECT\n                miniblocks.hash AS \"block_hash?\",\n                address AS \"address!\",\n                topic1 AS \"topic1!\",\n                topic2 AS \"topic2!\",\n                topic3 AS \"topic3!\",\n                topic4 AS \"topic4!\",\n                value AS \"value!\",\n                miniblock_number AS \"miniblock_number!\",\n                miniblocks.l1_batch_number AS \"l1_batch_number?\",\n                tx_hash AS \"tx_hash!\",\n                tx_index_in_block AS \"tx_index_in_block!\",\n                event_index_in_block AS \"event_index_in_block!\",\n                event_index_in_tx AS \"event_index_in_tx!\",\n                miniblocks.timestamp AS \"block_timestamp\"\n            FROM\n                events_select\n                INNER JOIN miniblocks ON events_select.miniblock_number = miniblocks.number\n            ORDER BY\n                miniblock_number ASC,\n                event_index_in_block ASC\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "block_hash?",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 1,
-        "name": "address!",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 2,
-        "name": "topic1!",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 3,
-        "name": "topic2!",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 4,
-        "name": "topic3!",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 5,
-        "name": "topic4!",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 6,
-        "name": "value!",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 7,
-        "name": "miniblock_number!",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 8,
-        "name": "l1_batch_number?",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 9,
-        "name": "tx_hash!",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 10,
-        "name": "tx_index_in_block!",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 11,
-        "name": "event_index_in_block!",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 12,
-        "name": "event_index_in_tx!",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 13,
-        "name": "block_timestamp",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      true,
-      false,
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "c3af06cc232adb93f16456da07733acd2066a5e238088b39b982b10770f51479"
-}
diff --git a/core/lib/dal/.sqlx/query-c4835d40921af47bfb4f60102bbba3af74e8e7b5944cb2943b5badb906167046.json b/core/lib/dal/.sqlx/query-c4835d40921af47bfb4f60102bbba3af74e8e7b5944cb2943b5badb906167046.json
deleted file mode 100644
index 9ae9d2e50cd..00000000000
--- a/core/lib/dal/.sqlx/query-c4835d40921af47bfb4f60102bbba3af74e8e7b5944cb2943b5badb906167046.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                miniblocks (\n                    number,\n                    timestamp,\n                    hash,\n                    l1_tx_count,\n                    l2_tx_count,\n                    fee_account_address,\n                    base_fee_per_gas,\n                    l1_gas_price,\n                    l2_fair_gas_price,\n                    gas_per_pubdata_limit,\n                    bootloader_code_hash,\n                    default_aa_code_hash,\n                    protocol_version,\n                    virtual_blocks,\n                    fair_pubdata_price,\n                    gas_limit,\n                    logs_bloom,\n                    created_at,\n                    updated_at\n                )\n            VALUES\n                (\n                    $1,\n                    $2,\n                    $3,\n                    $4,\n                    $5,\n                    $6,\n                    $7,\n                    $8,\n                    $9,\n                    $10,\n                    $11,\n                    $12,\n                    $13,\n                    $14,\n                    $15,\n                    $16,\n                    $17,\n                    NOW(),\n                    NOW()\n                )\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int8",
-        "Bytea",
-        "Int4",
-        "Int4",
-        "Bytea",
-        "Numeric",
-        "Int8",
-        "Int8",
-        "Int8",
-        "Bytea",
-        "Bytea",
-        "Int4",
-        "Int8",
-        "Int8",
-        "Int8",
-        "Bytea"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "c4835d40921af47bfb4f60102bbba3af74e8e7b5944cb2943b5badb906167046"
-}
diff --git a/core/lib/dal/.sqlx/query-c5aef75dbeb520c965a0996abed9713f437db492e2075ca69e11e2ef5728ccaa.json b/core/lib/dal/.sqlx/query-c5aef75dbeb520c965a0996abed9713f437db492e2075ca69e11e2ef5728ccaa.json
deleted file mode 100644
index 6dd2f6cc7a9..00000000000
--- a/core/lib/dal/.sqlx/query-c5aef75dbeb520c965a0996abed9713f437db492e2075ca69e11e2ef5728ccaa.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                base_token_ratios (numerator, denominator, ratio_timestamp, created_at, updated_at)\n            VALUES\n                ($1, $2, $3, NOW(), NOW())\n            RETURNING\n                id\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Numeric",
-        "Numeric",
-        "Timestamp"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "c5aef75dbeb520c965a0996abed9713f437db492e2075ca69e11e2ef5728ccaa"
-}
diff --git a/core/lib/dal/.sqlx/query-c5dfe49f8042f773ced96f8363819da280e72546298b615b88662fa4a19f2bdf.json b/core/lib/dal/.sqlx/query-c5dfe49f8042f773ced96f8363819da280e72546298b615b88662fa4a19f2bdf.json
new file mode 100644
index 00000000000..532d1d929b4
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-c5dfe49f8042f773ced96f8363819da280e72546298b615b88662fa4a19f2bdf.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            vm_runner_bwip (l1_batch_number, created_at, updated_at, processing_started_at)\n            VALUES\n            ($1, NOW(), NOW(), NOW())\n            ON CONFLICT (l1_batch_number) DO\n            UPDATE\n            SET\n            updated_at = NOW(),\n            processing_started_at = NOW()\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "c5dfe49f8042f773ced96f8363819da280e72546298b615b88662fa4a19f2bdf"
+}
diff --git a/core/lib/dal/.sqlx/query-c69d19005dd28bd0abfc84e29fd9442f610a6c57280615eb8c982a4afb847aff.json b/core/lib/dal/.sqlx/query-c69d19005dd28bd0abfc84e29fd9442f610a6c57280615eb8c982a4afb847aff.json
new file mode 100644
index 00000000000..b12a7fb2490
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-c69d19005dd28bd0abfc84e29fd9442f610a6c57280615eb8c982a4afb847aff.json
@@ -0,0 +1,17 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            snapshots (\n                version,\n                l1_batch_number,\n                storage_logs_filepaths,\n                factory_deps_filepath,\n                created_at,\n                updated_at\n            )\n            VALUES\n            ($1, $2, ARRAY_FILL(''::TEXT, ARRAY[$3::INTEGER]), $4, NOW(), NOW())\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int4",
+        "Int8",
+        "Int4",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "c69d19005dd28bd0abfc84e29fd9442f610a6c57280615eb8c982a4afb847aff"
+}
diff --git a/core/lib/dal/.sqlx/query-c8dd57fb86247e67896485c6295d5cfa6c8498e8a58b8ae6fe3a1584401d3b4b.json b/core/lib/dal/.sqlx/query-c8dd57fb86247e67896485c6295d5cfa6c8498e8a58b8ae6fe3a1584401d3b4b.json
new file mode 100644
index 00000000000..f442976281d
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-c8dd57fb86247e67896485c6295d5cfa6c8498e8a58b8ae6fe3a1584401d3b4b.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            consensus_replica_state (fake_key, global_config, genesis, state)\n            VALUES\n            (TRUE, $1, $2, $3)\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Jsonb",
+        "Jsonb",
+        "Jsonb"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "c8dd57fb86247e67896485c6295d5cfa6c8498e8a58b8ae6fe3a1584401d3b4b"
+}
diff --git a/core/lib/dal/.sqlx/query-6849be0788a509e4e68acc2da4bfadbcfc343374fad173df0cc8db38419a9726.json b/core/lib/dal/.sqlx/query-c9742c7f58c5c0f676cee0d0d3a9309c1b45d0134a6c6e15533443353db3bee6.json
similarity index 63%
rename from core/lib/dal/.sqlx/query-6849be0788a509e4e68acc2da4bfadbcfc343374fad173df0cc8db38419a9726.json
rename to core/lib/dal/.sqlx/query-c9742c7f58c5c0f676cee0d0d3a9309c1b45d0134a6c6e15533443353db3bee6.json
index 72dbb2a4178..cabf48d4df7 100644
--- a/core/lib/dal/.sqlx/query-6849be0788a509e4e68acc2da4bfadbcfc343374fad173df0cc8db38419a9726.json
+++ b/core/lib/dal/.sqlx/query-c9742c7f58c5c0f676cee0d0d3a9309c1b45d0134a6c6e15533443353db3bee6.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            DELETE FROM tokens\n            WHERE\n                l2_address = ANY ($1)\n            ",
+  "query": "\n            DELETE FROM tokens\n            WHERE\n                l2_address = ANY($1)\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -10,5 +10,5 @@
     },
     "nullable": []
   },
-  "hash": "6849be0788a509e4e68acc2da4bfadbcfc343374fad173df0cc8db38419a9726"
+  "hash": "c9742c7f58c5c0f676cee0d0d3a9309c1b45d0134a6c6e15533443353db3bee6"
 }
diff --git a/core/lib/dal/.sqlx/query-c9a842d04e8b225e43f07f76541dc766262b5bdc58be0444e164b1bd9feed02d.json b/core/lib/dal/.sqlx/query-c9a842d04e8b225e43f07f76541dc766262b5bdc58be0444e164b1bd9feed02d.json
new file mode 100644
index 00000000000..fb28539ccdf
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-c9a842d04e8b225e43f07f76541dc766262b5bdc58be0444e164b1bd9feed02d.json
@@ -0,0 +1,38 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH\n            soft AS (\n                SELECT\n                    pruned_l1_batch,\n                    pruned_miniblock\n                FROM\n                    pruning_log\n                WHERE\n                    type = 'Soft'\n                ORDER BY\n                    pruned_l1_batch DESC\n                LIMIT\n                    1\n            ),\n            \n            hard AS (\n                SELECT\n                    pruned_l1_batch,\n                    pruned_miniblock\n                FROM\n                    pruning_log\n                WHERE\n                    type = 'Hard'\n                ORDER BY\n                    pruned_l1_batch DESC\n                LIMIT\n                    1\n            )\n            \n            SELECT\n                soft.pruned_l1_batch AS last_soft_pruned_l1_batch,\n                soft.pruned_miniblock AS last_soft_pruned_miniblock,\n                hard.pruned_l1_batch AS last_hard_pruned_l1_batch,\n                hard.pruned_miniblock AS last_hard_pruned_miniblock\n            FROM\n                soft\n            FULL JOIN hard ON TRUE\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "last_soft_pruned_l1_batch",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "last_soft_pruned_miniblock",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "last_hard_pruned_l1_batch",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 3,
+        "name": "last_hard_pruned_miniblock",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      true,
+      true,
+      true,
+      true
+    ]
+  },
+  "hash": "c9a842d04e8b225e43f07f76541dc766262b5bdc58be0444e164b1bd9feed02d"
+}
diff --git a/core/lib/dal/.sqlx/query-ca428423f278feea2942fd2c78fc5223c9d5e2e42d89bb456d24c601edc06a05.json b/core/lib/dal/.sqlx/query-ca428423f278feea2942fd2c78fc5223c9d5e2e42d89bb456d24c601edc06a05.json
new file mode 100644
index 00000000000..c234cbe4235
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-ca428423f278feea2942fd2c78fc5223c9d5e2e42d89bb456d24c601edc06a05.json
@@ -0,0 +1,40 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            transactions (\n                hash,\n                is_priority,\n                initiator_address,\n                nonce,\n                signature,\n                gas_limit,\n                max_fee_per_gas,\n                max_priority_fee_per_gas,\n                gas_per_pubdata_limit,\n                input,\n                data,\n                tx_format,\n                contract_address,\n                value,\n                paymaster,\n                paymaster_input,\n                execution_info,\n                received_at,\n                created_at,\n                updated_at\n            )\n            VALUES\n            (\n                $1,\n                FALSE,\n                $2,\n                $3,\n                $4,\n                $5,\n                $6,\n                $7,\n                $8,\n                $9,\n                $10,\n                $11,\n                $12,\n                $13,\n                $14,\n                $15,\n                JSONB_BUILD_OBJECT(\n                    'gas_used',\n                    $16::BIGINT,\n                    'storage_writes',\n                    $17::INT,\n                    'contracts_used',\n                    $18::INT\n                ),\n                $19,\n                NOW(),\n                NOW()\n            )\n            ON CONFLICT (initiator_address, nonce) DO\n            UPDATE\n            SET\n            hash = $1,\n            signature = $4,\n            gas_limit = $5,\n            max_fee_per_gas = $6,\n            max_priority_fee_per_gas = $7,\n            gas_per_pubdata_limit = $8,\n            input = $9,\n            data = $10,\n            tx_format = $11,\n            contract_address = $12,\n            value = $13,\n            paymaster = $14,\n            paymaster_input = $15,\n            execution_info\n            = JSONB_BUILD_OBJECT(\n                'gas_used',\n                $16::BIGINT,\n                'storage_writes',\n                $17::INT,\n                'contracts_used',\n                $18::INT\n            ),\n            in_mempool = FALSE,\n            received_at = $19,\n            created_at = NOW(),\n            updated_at = NOW(),\n            error = NULL\n            WHERE\n            transactions.is_priority = FALSE\n            AND transactions.miniblock_number IS NULL\n            RETURNING\n            (\n                SELECT\n                    hash\n                FROM\n                    transactions\n                WHERE\n                    transactions.initiator_address = $2\n                    AND transactions.nonce = $3\n            ) IS NOT NULL AS \"is_replaced!\"\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "is_replaced!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Bytea",
+        "Bytea",
+        "Int8",
+        "Bytea",
+        "Numeric",
+        "Numeric",
+        "Numeric",
+        "Numeric",
+        "Bytea",
+        "Jsonb",
+        "Int4",
+        "Bytea",
+        "Numeric",
+        "Bytea",
+        "Bytea",
+        "Int8",
+        "Int4",
+        "Int4",
+        "Timestamp"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "ca428423f278feea2942fd2c78fc5223c9d5e2e42d89bb456d24c601edc06a05"
+}
diff --git a/core/lib/dal/.sqlx/query-58f900812efdb615f6286eb4212c3252680594256dccb0d7e51444f613011980.json b/core/lib/dal/.sqlx/query-cda64a69c8df8eaf67d09324f8283c5b416cbb2c1a1e2712dce1f01835181c3b.json
similarity index 85%
rename from core/lib/dal/.sqlx/query-58f900812efdb615f6286eb4212c3252680594256dccb0d7e51444f613011980.json
rename to core/lib/dal/.sqlx/query-cda64a69c8df8eaf67d09324f8283c5b416cbb2c1a1e2712dce1f01835181c3b.json
index 0b45e2c25c2..69718cebdbe 100644
--- a/core/lib/dal/.sqlx/query-58f900812efdb615f6286eb4212c3252680594256dccb0d7e51444f613011980.json
+++ b/core/lib/dal/.sqlx/query-cda64a69c8df8eaf67d09324f8283c5b416cbb2c1a1e2712dce1f01835181c3b.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                miniblock_number,\n                log_index_in_miniblock,\n                log_index_in_tx,\n                tx_hash,\n                l1_batch_number,\n                shard_id,\n                is_service,\n                tx_index_in_miniblock,\n                tx_index_in_l1_batch,\n                sender,\n                key,\n                value\n            FROM\n                l2_to_l1_logs\n                JOIN miniblocks ON l2_to_l1_logs.miniblock_number = miniblocks.number\n            WHERE\n                l1_batch_number = $1\n            ORDER BY\n                miniblock_number,\n                log_index_in_miniblock\n            ",
+  "query": "\n            SELECT\n                miniblock_number,\n                log_index_in_miniblock,\n                log_index_in_tx,\n                tx_hash,\n                l1_batch_number,\n                shard_id,\n                is_service,\n                tx_index_in_miniblock,\n                tx_index_in_l1_batch,\n                sender,\n                key,\n                value\n            FROM\n                l2_to_l1_logs\n            JOIN miniblocks ON l2_to_l1_logs.miniblock_number = miniblocks.number\n            WHERE\n                l1_batch_number = $1\n            ORDER BY\n                miniblock_number,\n                log_index_in_miniblock\n            ",
   "describe": {
     "columns": [
       {
@@ -84,5 +84,5 @@
       false
     ]
   },
-  "hash": "58f900812efdb615f6286eb4212c3252680594256dccb0d7e51444f613011980"
+  "hash": "cda64a69c8df8eaf67d09324f8283c5b416cbb2c1a1e2712dce1f01835181c3b"
 }
diff --git a/core/lib/dal/.sqlx/query-29a9350164fc0b2983f753e105a70e583b455383eec526eee3acfe6670e30f2f.json b/core/lib/dal/.sqlx/query-cda66c56ab9ff1dcb1b2882a23c4acdfc5af364d7271c06db0c95e0f1b0e33f9.json
similarity index 56%
rename from core/lib/dal/.sqlx/query-29a9350164fc0b2983f753e105a70e583b455383eec526eee3acfe6670e30f2f.json
rename to core/lib/dal/.sqlx/query-cda66c56ab9ff1dcb1b2882a23c4acdfc5af364d7271c06db0c95e0f1b0e33f9.json
index 7582e0f64e7..ec79549adbd 100644
--- a/core/lib/dal/.sqlx/query-29a9350164fc0b2983f753e105a70e583b455383eec526eee3acfe6670e30f2f.json
+++ b/core/lib/dal/.sqlx/query-cda66c56ab9ff1dcb1b2882a23c4acdfc5af364d7271c06db0c95e0f1b0e33f9.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE miniblocks\n            SET\n                logs_bloom = data.logs_bloom\n            FROM\n                (\n                    SELECT\n                        UNNEST($1::BIGINT[]) AS number,\n                        UNNEST($2::BYTEA[]) AS logs_bloom\n                ) AS data\n            WHERE\n                miniblocks.number = data.number\n            ",
+  "query": "\n            UPDATE miniblocks\n            SET\n                logs_bloom = data.logs_bloom\n            FROM\n                (\n                    SELECT\n                        UNNEST($1::BIGINT []) AS number,\n                        UNNEST($2::BYTEA []) AS logs_bloom\n                ) AS data\n            WHERE\n                miniblocks.number = data.number\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -11,5 +11,5 @@
     },
     "nullable": []
   },
-  "hash": "29a9350164fc0b2983f753e105a70e583b455383eec526eee3acfe6670e30f2f"
+  "hash": "cda66c56ab9ff1dcb1b2882a23c4acdfc5af364d7271c06db0c95e0f1b0e33f9"
 }
diff --git a/core/lib/dal/.sqlx/query-cf8cff1e6d277088519ef7dfbdb1885d320c146cd8fad77c107ef12fa38e6c98.json b/core/lib/dal/.sqlx/query-cf8cff1e6d277088519ef7dfbdb1885d320c146cd8fad77c107ef12fa38e6c98.json
deleted file mode 100644
index 1bd791a3f82..00000000000
--- a/core/lib/dal/.sqlx/query-cf8cff1e6d277088519ef7dfbdb1885d320c146cd8fad77c107ef12fa38e6c98.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                transactions (\n                    hash,\n                    is_priority,\n                    initiator_address,\n                    nonce,\n                    signature,\n                    gas_limit,\n                    max_fee_per_gas,\n                    max_priority_fee_per_gas,\n                    gas_per_pubdata_limit,\n                    input,\n                    data,\n                    tx_format,\n                    contract_address,\n                    value,\n                    paymaster,\n                    paymaster_input,\n                    execution_info,\n                    received_at,\n                    created_at,\n                    updated_at\n                )\n            VALUES\n                (\n                    $1,\n                    FALSE,\n                    $2,\n                    $3,\n                    $4,\n                    $5,\n                    $6,\n                    $7,\n                    $8,\n                    $9,\n                    $10,\n                    $11,\n                    $12,\n                    $13,\n                    $14,\n                    $15,\n                    JSONB_BUILD_OBJECT('gas_used', $16::BIGINT, 'storage_writes', $17::INT, 'contracts_used', $18::INT),\n                    $19,\n                    NOW(),\n                    NOW()\n                )\n            ON CONFLICT (initiator_address, nonce) DO\n            UPDATE\n            SET\n                hash = $1,\n                signature = $4,\n                gas_limit = $5,\n                max_fee_per_gas = $6,\n                max_priority_fee_per_gas = $7,\n                gas_per_pubdata_limit = $8,\n                input = $9,\n                data = $10,\n                tx_format = $11,\n                contract_address = $12,\n                value = $13,\n                paymaster = $14,\n                paymaster_input = $15,\n                execution_info = JSONB_BUILD_OBJECT('gas_used', $16::BIGINT, 'storage_writes', $17::INT, 'contracts_used', $18::INT),\n                in_mempool = FALSE,\n                received_at = $19,\n                created_at = NOW(),\n                updated_at = NOW(),\n                error = NULL\n            WHERE\n                transactions.is_priority = FALSE\n                AND transactions.miniblock_number IS NULL\n            RETURNING\n                (\n                    SELECT\n                        hash\n                    FROM\n                        transactions\n                    WHERE\n                        transactions.initiator_address = $2\n                        AND transactions.nonce = $3\n                ) IS NOT NULL AS \"is_replaced!\"\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "is_replaced!",
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Bytea",
-        "Bytea",
-        "Int8",
-        "Bytea",
-        "Numeric",
-        "Numeric",
-        "Numeric",
-        "Numeric",
-        "Bytea",
-        "Jsonb",
-        "Int4",
-        "Bytea",
-        "Numeric",
-        "Bytea",
-        "Bytea",
-        "Int8",
-        "Int4",
-        "Int4",
-        "Timestamp"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "cf8cff1e6d277088519ef7dfbdb1885d320c146cd8fad77c107ef12fa38e6c98"
-}
diff --git a/core/lib/dal/.sqlx/query-0385576f1fb3836fc04a6cde3e92c03e1de8292eb0ea1e026ba1b32a3745c261.json b/core/lib/dal/.sqlx/query-cff500ffe0b6586dd96eb2d3620dd6542fd54ceac41dd41b995a8409c5ab046c.json
similarity index 55%
rename from core/lib/dal/.sqlx/query-0385576f1fb3836fc04a6cde3e92c03e1de8292eb0ea1e026ba1b32a3745c261.json
rename to core/lib/dal/.sqlx/query-cff500ffe0b6586dd96eb2d3620dd6542fd54ceac41dd41b995a8409c5ab046c.json
index a98cbb18034..ec8bfeafc78 100644
--- a/core/lib/dal/.sqlx/query-0385576f1fb3836fc04a6cde3e92c03e1de8292eb0ea1e026ba1b32a3745c261.json
+++ b/core/lib/dal/.sqlx/query-cff500ffe0b6586dd96eb2d3620dd6542fd54ceac41dd41b995a8409c5ab046c.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                storage_logs.hashed_key AS \"hashed_key!\",\n                storage_logs.value AS \"value!\",\n                storage_logs.miniblock_number AS \"miniblock_number!\",\n                initial_writes.l1_batch_number AS \"l1_batch_number!\",\n                initial_writes.index\n            FROM\n                (\n                    SELECT\n                        hashed_key,\n                        MAX(ARRAY[miniblock_number, operation_number]::INT[]) AS op\n                    FROM\n                        storage_logs\n                    WHERE\n                        miniblock_number <= $1\n                        AND hashed_key >= $3\n                        AND hashed_key <= $4\n                    GROUP BY\n                        hashed_key\n                    ORDER BY\n                        hashed_key\n                ) AS keys\n                INNER JOIN storage_logs ON keys.hashed_key = storage_logs.hashed_key\n                AND storage_logs.miniblock_number = keys.op[1]\n                AND storage_logs.operation_number = keys.op[2]\n                INNER JOIN initial_writes ON keys.hashed_key = initial_writes.hashed_key\n            WHERE\n                initial_writes.l1_batch_number <= $2\n            ",
+  "query": "\n            SELECT\n                storage_logs.hashed_key AS \"hashed_key!\",\n                storage_logs.value AS \"value!\",\n                storage_logs.miniblock_number AS \"miniblock_number!\",\n                initial_writes.l1_batch_number AS \"l1_batch_number!\",\n                initial_writes.index\n            FROM\n                (\n                    SELECT\n                        hashed_key,\n                        MAX(ARRAY[miniblock_number, operation_number]::INT []) AS op\n                    FROM\n                        storage_logs\n                    WHERE\n                        miniblock_number <= $1\n                        AND hashed_key >= $3\n                        AND hashed_key <= $4\n                    GROUP BY\n                        hashed_key\n                    ORDER BY\n                        hashed_key\n                ) AS keys\n            INNER JOIN storage_logs\n                ON\n                    keys.hashed_key = storage_logs.hashed_key\n                    AND storage_logs.miniblock_number = keys.op[1]\n                    AND storage_logs.operation_number = keys.op[2]\n            INNER JOIN initial_writes ON keys.hashed_key = initial_writes.hashed_key\n            WHERE\n                initial_writes.l1_batch_number <= $2\n            ",
   "describe": {
     "columns": [
       {
@@ -45,5 +45,5 @@
       false
     ]
   },
-  "hash": "0385576f1fb3836fc04a6cde3e92c03e1de8292eb0ea1e026ba1b32a3745c261"
+  "hash": "cff500ffe0b6586dd96eb2d3620dd6542fd54ceac41dd41b995a8409c5ab046c"
 }
diff --git a/core/lib/dal/.sqlx/query-d0db89030ed6979ecba6786aef1ac9ff144a09e68db07e4ca1c1de105765711f.json b/core/lib/dal/.sqlx/query-d0db89030ed6979ecba6786aef1ac9ff144a09e68db07e4ca1c1de105765711f.json
new file mode 100644
index 00000000000..a4f55f53f8c
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-d0db89030ed6979ecba6786aef1ac9ff144a09e68db07e4ca1c1de105765711f.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            compiler_versions (version, compiler, created_at, updated_at)\n            SELECT\n                u.version,\n                $2,\n                NOW(),\n                NOW()\n            FROM\n                UNNEST($1::TEXT []) AS u (version)\n            ON CONFLICT (version, compiler) DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "TextArray",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "d0db89030ed6979ecba6786aef1ac9ff144a09e68db07e4ca1c1de105765711f"
+}
diff --git a/core/lib/dal/.sqlx/query-d1490262c7a2a583928a611ae69eb0539849f7fd590712103db7d45d119caca2.json b/core/lib/dal/.sqlx/query-d1490262c7a2a583928a611ae69eb0539849f7fd590712103db7d45d119caca2.json
new file mode 100644
index 00000000000..e3b05aff72a
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-d1490262c7a2a583928a611ae69eb0539849f7fd590712103db7d45d119caca2.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                INSERT INTO\n                call_traces (tx_hash, call_trace)\n                SELECT\n                    u.tx_hash,\n                    u.call_trace\n                FROM\n                    UNNEST($1::bytea [], $2::bytea []) AS u (tx_hash, call_trace)\n                ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "ByteaArray",
+        "ByteaArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "d1490262c7a2a583928a611ae69eb0539849f7fd590712103db7d45d119caca2"
+}
diff --git a/core/lib/dal/.sqlx/query-d3abe74360732659a1a35a176679411ba30ac67080552279d821d66b1b804db3.json b/core/lib/dal/.sqlx/query-d3abe74360732659a1a35a176679411ba30ac67080552279d821d66b1b804db3.json
deleted file mode 100644
index 2b5eeec2e63..00000000000
--- a/core/lib/dal/.sqlx/query-d3abe74360732659a1a35a176679411ba30ac67080552279d821d66b1b804db3.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                vm_runner_protective_reads (l1_batch_number, created_at, updated_at, processing_started_at)\n            VALUES\n                ($1, NOW(), NOW(), NOW())\n            ON CONFLICT (l1_batch_number) DO\n            UPDATE\n            SET\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "d3abe74360732659a1a35a176679411ba30ac67080552279d821d66b1b804db3"
-}
diff --git a/core/lib/dal/.sqlx/query-d3b09cbcddf6238b358d32d57678242aad3e9a47400f6d6837a35f4c54a216b9.json b/core/lib/dal/.sqlx/query-d3b09cbcddf6238b358d32d57678242aad3e9a47400f6d6837a35f4c54a216b9.json
deleted file mode 100644
index 8770a9b596e..00000000000
--- a/core/lib/dal/.sqlx/query-d3b09cbcddf6238b358d32d57678242aad3e9a47400f6d6837a35f4c54a216b9.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                number\n            FROM\n                l1_batches\n                LEFT JOIN eth_txs_history AS execute_tx ON (l1_batches.eth_execute_tx_id = execute_tx.eth_tx_id)\n            WHERE\n                execute_tx.confirmed_at IS NOT NULL\n            ORDER BY\n                number DESC\n            LIMIT\n                1\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "number",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "d3b09cbcddf6238b358d32d57678242aad3e9a47400f6d6837a35f4c54a216b9"
-}
diff --git a/core/lib/dal/.sqlx/query-ba2343a38e37d104786f9276d91f67d2ef1428c61ae84003c9b52b03204d1f0a.json b/core/lib/dal/.sqlx/query-d43ae07cf1539826363573d121392687cfe890fe89c748f836bad6eb0cc0fcf5.json
similarity index 70%
rename from core/lib/dal/.sqlx/query-ba2343a38e37d104786f9276d91f67d2ef1428c61ae84003c9b52b03204d1f0a.json
rename to core/lib/dal/.sqlx/query-d43ae07cf1539826363573d121392687cfe890fe89c748f836bad6eb0cc0fcf5.json
index ff608265118..650b9f8d439 100644
--- a/core/lib/dal/.sqlx/query-ba2343a38e37d104786f9276d91f67d2ef1428c61ae84003c9b52b03204d1f0a.json
+++ b/core/lib/dal/.sqlx/query-d43ae07cf1539826363573d121392687cfe890fe89c748f836bad6eb0cc0fcf5.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            DELETE FROM transactions\n            WHERE\n                in_mempool = TRUE\n                AND initiator_address = ANY ($1)\n            ",
+  "query": "\n            DELETE FROM transactions\n            WHERE\n                in_mempool = TRUE\n                AND initiator_address = ANY($1)\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -10,5 +10,5 @@
     },
     "nullable": []
   },
-  "hash": "ba2343a38e37d104786f9276d91f67d2ef1428c61ae84003c9b52b03204d1f0a"
+  "hash": "d43ae07cf1539826363573d121392687cfe890fe89c748f836bad6eb0cc0fcf5"
 }
diff --git a/core/lib/dal/.sqlx/query-d47574939bdfb157a621f86a3ea3a61bf579a0dbeb01c545fa61b10a0047297b.json b/core/lib/dal/.sqlx/query-d47574939bdfb157a621f86a3ea3a61bf579a0dbeb01c545fa61b10a0047297b.json
new file mode 100644
index 00000000000..0915ef2b195
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-d47574939bdfb157a621f86a3ea3a61bf579a0dbeb01c545fa61b10a0047297b.json
@@ -0,0 +1,26 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            pruning_log (\n                pruned_l1_batch,\n                pruned_miniblock,\n                type,\n                created_at,\n                updated_at\n            )\n            VALUES\n            ($1, $2, $3, NOW(), NOW())\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8",
+        {
+          "Custom": {
+            "name": "prune_type",
+            "kind": {
+              "Enum": [
+                "Soft",
+                "Hard"
+              ]
+            }
+          }
+        }
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "d47574939bdfb157a621f86a3ea3a61bf579a0dbeb01c545fa61b10a0047297b"
+}
diff --git a/core/lib/dal/.sqlx/query-0fef49a649d20c9fd263c1dfa40daa9b94d398c635c37746736e98f1f18fcca7.json b/core/lib/dal/.sqlx/query-d89eabd1edb4ee4657249f9f4ab729b9149fee37c5ef7d69e259ee33cb8ca860.json
similarity index 89%
rename from core/lib/dal/.sqlx/query-0fef49a649d20c9fd263c1dfa40daa9b94d398c635c37746736e98f1f18fcca7.json
rename to core/lib/dal/.sqlx/query-d89eabd1edb4ee4657249f9f4ab729b9149fee37c5ef7d69e259ee33cb8ca860.json
index adfd1919db5..fa1a5d6741a 100644
--- a/core/lib/dal/.sqlx/query-0fef49a649d20c9fd263c1dfa40daa9b94d398c635c37746736e98f1f18fcca7.json
+++ b/core/lib/dal/.sqlx/query-d89eabd1edb4ee4657249f9f4ab729b9149fee37c5ef7d69e259ee33cb8ca860.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE tee_verifier_input_producer_jobs\n            SET\n                status = $1,\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        l1_batch_number\n                    FROM\n                        tee_verifier_input_producer_jobs\n                    WHERE\n                        status = $2\n                        OR (\n                            status = $1\n                            AND processing_started_at < NOW() - $4::INTERVAL\n                        )\n                        OR (\n                            status = $3\n                            AND attempts < $5\n                        )\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                tee_verifier_input_producer_jobs.l1_batch_number\n            ",
+  "query": "\n            UPDATE tee_verifier_input_producer_jobs\n            SET\n                status = $1,\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        l1_batch_number\n                    FROM\n                        tee_verifier_input_producer_jobs\n                    WHERE\n                        status = $2\n                        OR (\n                            status = $1\n                            AND processing_started_at < NOW() - $4::INTERVAL\n                        )\n                        OR (\n                            status = $3\n                            AND attempts < $5\n                        )\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n            RETURNING\n            tee_verifier_input_producer_jobs.l1_batch_number\n            ",
   "describe": {
     "columns": [
       {
@@ -61,5 +61,5 @@
       false
     ]
   },
-  "hash": "0fef49a649d20c9fd263c1dfa40daa9b94d398c635c37746736e98f1f18fcca7"
+  "hash": "d89eabd1edb4ee4657249f9f4ab729b9149fee37c5ef7d69e259ee33cb8ca860"
 }
diff --git a/core/lib/dal/.sqlx/query-ddfb7ba0592f1e6714a4496cee18e7265828e3ae78e391ef235b700f0adfe5e4.json b/core/lib/dal/.sqlx/query-ddfb7ba0592f1e6714a4496cee18e7265828e3ae78e391ef235b700f0adfe5e4.json
new file mode 100644
index 00000000000..472c0cb2695
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-ddfb7ba0592f1e6714a4496cee18e7265828e3ae78e391ef235b700f0adfe5e4.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE proof_generation_details\n            SET\n                status = 'picked_by_prover',\n                updated_at = NOW(),\n                prover_taken_at = NOW()\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        l1_batch_number\n                    FROM\n                        proof_generation_details\n                    LEFT JOIN l1_batches ON l1_batch_number = l1_batches.number\n                    WHERE\n                        (\n                            vm_run_data_blob_url IS NOT NULL\n                            AND proof_gen_data_blob_url IS NOT NULL\n                            AND l1_batches.hash IS NOT NULL\n                            AND l1_batches.aux_data_hash IS NOT NULL\n                            AND l1_batches.meta_parameters_hash IS NOT NULL\n                            AND status = 'unpicked'\n                        )\n                        OR (\n                            status = 'picked_by_prover'\n                            AND prover_taken_at < NOW() - $1::INTERVAL\n                        )\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                )\n            RETURNING\n            proof_generation_details.l1_batch_number\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "l1_batch_number",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Interval"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "ddfb7ba0592f1e6714a4496cee18e7265828e3ae78e391ef235b700f0adfe5e4"
+}
diff --git a/core/lib/dal/.sqlx/query-5f7034d22251a893249208c5ff8fa5c8bf46bc0cea4ac2b25ecde236c30ae32d.json b/core/lib/dal/.sqlx/query-de784f549ceda62e37459519b52e7be93b12319c041751bc4138fa64258ecd5c.json
similarity index 87%
rename from core/lib/dal/.sqlx/query-5f7034d22251a893249208c5ff8fa5c8bf46bc0cea4ac2b25ecde236c30ae32d.json
rename to core/lib/dal/.sqlx/query-de784f549ceda62e37459519b52e7be93b12319c041751bc4138fa64258ecd5c.json
index 0ae6e3bff4b..9cc6312f70e 100644
--- a/core/lib/dal/.sqlx/query-5f7034d22251a893249208c5ff8fa5c8bf46bc0cea4ac2b25ecde236c30ae32d.json
+++ b/core/lib/dal/.sqlx/query-de784f549ceda62e37459519b52e7be93b12319c041751bc4138fa64258ecd5c.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                l1_address,\n                l2_address,\n                NAME,\n                symbol,\n                decimals\n            FROM\n                tokens\n            WHERE\n                well_known = TRUE\n            ORDER BY\n                symbol\n            ",
+  "query": "\n            SELECT\n                l1_address,\n                l2_address,\n                name,\n                symbol,\n                decimals\n            FROM\n                tokens\n            WHERE\n                well_known = TRUE\n            ORDER BY\n                symbol\n            ",
   "describe": {
     "columns": [
       {
@@ -40,5 +40,5 @@
       false
     ]
   },
-  "hash": "5f7034d22251a893249208c5ff8fa5c8bf46bc0cea4ac2b25ecde236c30ae32d"
+  "hash": "de784f549ceda62e37459519b52e7be93b12319c041751bc4138fa64258ecd5c"
 }
diff --git a/core/lib/dal/.sqlx/query-e7d0b7c132b80195dae7cbf50355eb148aa6d1dbd69bf3fe48522101a6ea0bcb.json b/core/lib/dal/.sqlx/query-e7d0b7c132b80195dae7cbf50355eb148aa6d1dbd69bf3fe48522101a6ea0bcb.json
deleted file mode 100644
index 576484cd420..00000000000
--- a/core/lib/dal/.sqlx/query-e7d0b7c132b80195dae7cbf50355eb148aa6d1dbd69bf3fe48522101a6ea0bcb.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            WITH\n                available_batches AS (\n                    SELECT\n                        MAX(number) AS \"last_batch\"\n                    FROM\n                        l1_batches\n                ),\n                processed_batches AS (\n                    SELECT\n                        COALESCE(MAX(l1_batch_number), $1) + $2 AS \"last_ready_batch\"\n                    FROM\n                        vm_runner_bwip\n                    WHERE\n                        time_taken IS NOT NULL\n                )\n            SELECT\n                LEAST(last_batch, last_ready_batch) AS \"last_ready_batch!\"\n            FROM\n                available_batches\n                FULL JOIN processed_batches ON TRUE\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "last_ready_batch!",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int8"
-      ]
-    },
-    "nullable": [
-      true
-    ]
-  },
-  "hash": "e7d0b7c132b80195dae7cbf50355eb148aa6d1dbd69bf3fe48522101a6ea0bcb"
-}
diff --git a/core/lib/dal/.sqlx/query-ead71ae66fe4685132c03a973612fe98364aa684180dd6fbf540bb0b68d96a64.json b/core/lib/dal/.sqlx/query-ead71ae66fe4685132c03a973612fe98364aa684180dd6fbf540bb0b68d96a64.json
deleted file mode 100644
index 02cd6733e81..00000000000
--- a/core/lib/dal/.sqlx/query-ead71ae66fe4685132c03a973612fe98364aa684180dd6fbf540bb0b68d96a64.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            WITH\n                new_logs AS MATERIALIZED (\n                    SELECT DISTINCT\n                        ON (hashed_key) hashed_key,\n                        miniblock_number,\n                        operation_number\n                    FROM\n                        storage_logs\n                    WHERE\n                        miniblock_number BETWEEN $1 AND $2\n                    ORDER BY\n                        hashed_key,\n                        miniblock_number DESC,\n                        operation_number DESC\n                )\n            DELETE FROM storage_logs USING new_logs\n            WHERE\n                storage_logs.hashed_key = new_logs.hashed_key\n                AND storage_logs.miniblock_number <= $2\n                AND (storage_logs.miniblock_number, storage_logs.operation_number) < (new_logs.miniblock_number, new_logs.operation_number)\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "ead71ae66fe4685132c03a973612fe98364aa684180dd6fbf540bb0b68d96a64"
-}
diff --git a/core/lib/dal/.sqlx/query-0f1856e55a370280a078d048f09e2d457914c737660b37e9f66b576bbc9a7904.json b/core/lib/dal/.sqlx/query-eb27e1b82b8ecbb9711c417888564a8e245ecee4866264d38146938595b07f37.json
similarity index 91%
rename from core/lib/dal/.sqlx/query-0f1856e55a370280a078d048f09e2d457914c737660b37e9f66b576bbc9a7904.json
rename to core/lib/dal/.sqlx/query-eb27e1b82b8ecbb9711c417888564a8e245ecee4866264d38146938595b07f37.json
index 498e839a63d..2419082dcc2 100644
--- a/core/lib/dal/.sqlx/query-0f1856e55a370280a078d048f09e2d457914c737660b37e9f66b576bbc9a7904.json
+++ b/core/lib/dal/.sqlx/query-eb27e1b82b8ecbb9711c417888564a8e245ecee4866264d38146938595b07f37.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                transactions.*\n            FROM\n                transactions\n                INNER JOIN miniblocks ON miniblocks.number = transactions.miniblock_number\n            WHERE\n                miniblocks.number BETWEEN $1 AND $2\n            ORDER BY\n                miniblock_number,\n                index_in_block\n            ",
+  "query": "\n            SELECT\n                transactions.*\n            FROM\n                transactions\n            INNER JOIN miniblocks ON miniblocks.number = transactions.miniblock_number\n            WHERE\n                miniblocks.number BETWEEN $1 AND $2\n            ORDER BY\n                miniblock_number,\n                index_in_block\n            ",
   "describe": {
     "columns": [
       {
@@ -229,5 +229,5 @@
       true
     ]
   },
-  "hash": "0f1856e55a370280a078d048f09e2d457914c737660b37e9f66b576bbc9a7904"
+  "hash": "eb27e1b82b8ecbb9711c417888564a8e245ecee4866264d38146938595b07f37"
 }
diff --git a/core/lib/dal/.sqlx/query-cea9fe027a6a0ada827f23b48ac32432295b2f7ee40bf13522a6edbd236f1970.json b/core/lib/dal/.sqlx/query-ec2942fecedb7ee47279bf0418eb020b1036f002312271eec76ec3d40f77eb71.json
similarity index 86%
rename from core/lib/dal/.sqlx/query-cea9fe027a6a0ada827f23b48ac32432295b2f7ee40bf13522a6edbd236f1970.json
rename to core/lib/dal/.sqlx/query-ec2942fecedb7ee47279bf0418eb020b1036f002312271eec76ec3d40f77eb71.json
index b1eae968a89..be93834b26c 100644
--- a/core/lib/dal/.sqlx/query-cea9fe027a6a0ada827f23b48ac32432295b2f7ee40bf13522a6edbd236f1970.json
+++ b/core/lib/dal/.sqlx/query-ec2942fecedb7ee47279bf0418eb020b1036f002312271eec76ec3d40f77eb71.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                u.hashed_key AS \"hashed_key!\",\n                (\n                    SELECT\n                        value\n                    FROM\n                        storage_logs\n                    WHERE\n                        hashed_key = u.hashed_key\n                        AND miniblock_number <= $2\n                    ORDER BY\n                        miniblock_number DESC,\n                        operation_number DESC\n                    LIMIT\n                        1\n                ) AS \"value?\"\n            FROM\n                UNNEST($1::bytea[]) AS u (hashed_key)\n            ",
+  "query": "\n            SELECT\n                u.hashed_key AS \"hashed_key!\",\n                (\n                    SELECT\n                        value\n                    FROM\n                        storage_logs\n                    WHERE\n                        hashed_key = u.hashed_key\n                        AND miniblock_number <= $2\n                    ORDER BY\n                        miniblock_number DESC,\n                        operation_number DESC\n                    LIMIT\n                        1\n                ) AS \"value?\"\n            FROM\n                UNNEST($1::bytea []) AS u (hashed_key)\n            ",
   "describe": {
     "columns": [
       {
@@ -25,5 +25,5 @@
       null
     ]
   },
-  "hash": "cea9fe027a6a0ada827f23b48ac32432295b2f7ee40bf13522a6edbd236f1970"
+  "hash": "ec2942fecedb7ee47279bf0418eb020b1036f002312271eec76ec3d40f77eb71"
 }
diff --git a/core/lib/dal/.sqlx/query-4cfdfb32d808e33779ea4566e9cf9bb44a0952d475c3e6f207443b72ebddb0cd.json b/core/lib/dal/.sqlx/query-ee50258050e7a08be67335cddf258ed14ea4ed363db1501e7268909bc18f2043.json
similarity index 78%
rename from core/lib/dal/.sqlx/query-4cfdfb32d808e33779ea4566e9cf9bb44a0952d475c3e6f207443b72ebddb0cd.json
rename to core/lib/dal/.sqlx/query-ee50258050e7a08be67335cddf258ed14ea4ed363db1501e7268909bc18f2043.json
index 4ea4aea2ea6..733a7d36eab 100644
--- a/core/lib/dal/.sqlx/query-4cfdfb32d808e33779ea4566e9cf9bb44a0952d475c3e6f207443b72ebddb0cd.json
+++ b/core/lib/dal/.sqlx/query-ee50258050e7a08be67335cddf258ed14ea4ed363db1501e7268909bc18f2043.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                miniblocks.hash AS \"block_hash\",\n                miniblocks.number AS \"block_number\",\n                prev_miniblock.hash AS \"parent_hash?\",\n                miniblocks.timestamp AS \"block_timestamp\",\n                miniblocks.base_fee_per_gas AS \"base_fee_per_gas\",\n                miniblocks.gas_limit AS \"block_gas_limit?\",\n                miniblocks.logs_bloom AS \"block_logs_bloom?\",\n                transactions.gas_limit AS \"transaction_gas_limit?\",\n                transactions.refunded_gas AS \"transaction_refunded_gas?\"\n            FROM\n                miniblocks\n                LEFT JOIN miniblocks prev_miniblock ON prev_miniblock.number = miniblocks.number - 1\n                LEFT JOIN transactions ON transactions.miniblock_number = miniblocks.number\n            WHERE\n                miniblocks.number > $1\n            ORDER BY\n                miniblocks.number ASC,\n                transactions.index_in_block ASC\n            ",
+  "query": "\n            SELECT\n                miniblocks.hash AS \"block_hash\",\n                miniblocks.number AS \"block_number\",\n                prev_miniblock.hash AS \"parent_hash?\",\n                miniblocks.timestamp AS \"block_timestamp\",\n                miniblocks.base_fee_per_gas AS \"base_fee_per_gas\",\n                miniblocks.gas_limit AS \"block_gas_limit?\",\n                miniblocks.logs_bloom AS \"block_logs_bloom?\",\n                transactions.gas_limit AS \"transaction_gas_limit?\",\n                transactions.refunded_gas AS \"transaction_refunded_gas?\"\n            FROM\n                miniblocks\n            LEFT JOIN\n                miniblocks prev_miniblock\n                ON prev_miniblock.number = miniblocks.number - 1\n            LEFT JOIN transactions ON transactions.miniblock_number = miniblocks.number\n            WHERE\n                miniblocks.number > $1\n            ORDER BY\n                miniblocks.number ASC,\n                transactions.index_in_block ASC\n            ",
   "describe": {
     "columns": [
       {
@@ -66,5 +66,5 @@
       false
     ]
   },
-  "hash": "4cfdfb32d808e33779ea4566e9cf9bb44a0952d475c3e6f207443b72ebddb0cd"
+  "hash": "ee50258050e7a08be67335cddf258ed14ea4ed363db1501e7268909bc18f2043"
 }
diff --git a/core/lib/dal/.sqlx/query-f012d0922265269746396dac8f25ff66f2c3b2b83d45360818a8782e56aa3d66.json b/core/lib/dal/.sqlx/query-f012d0922265269746396dac8f25ff66f2c3b2b83d45360818a8782e56aa3d66.json
deleted file mode 100644
index 9815b5d3895..00000000000
--- a/core/lib/dal/.sqlx/query-f012d0922265269746396dac8f25ff66f2c3b2b83d45360818a8782e56aa3d66.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            WITH\n                sl AS (\n                    SELECT\n                        (\n                            SELECT\n                                ARRAY[hashed_key, value] AS kv\n                            FROM\n                                storage_logs\n                            WHERE\n                                storage_logs.miniblock_number = $1\n                                AND storage_logs.hashed_key >= u.start_key\n                                AND storage_logs.hashed_key <= u.end_key\n                            ORDER BY\n                                storage_logs.hashed_key\n                            LIMIT\n                                1\n                        )\n                    FROM\n                        UNNEST($2::bytea[], $3::bytea[]) AS u (start_key, end_key)\n                )\n            SELECT\n                sl.kv[1] AS \"hashed_key?\",\n                sl.kv[2] AS \"value?\",\n                initial_writes.index\n            FROM\n                sl\n                LEFT OUTER JOIN initial_writes ON initial_writes.hashed_key = sl.kv[1]\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "hashed_key?",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 1,
-        "name": "value?",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 2,
-        "name": "index",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "ByteaArray",
-        "ByteaArray"
-      ]
-    },
-    "nullable": [
-      null,
-      null,
-      true
-    ]
-  },
-  "hash": "f012d0922265269746396dac8f25ff66f2c3b2b83d45360818a8782e56aa3d66"
-}
diff --git a/core/lib/dal/.sqlx/query-45e52d05a4483def84c141e3529bab30553732953e589cd237595227044f438d.json b/core/lib/dal/.sqlx/query-f208ac4d454220cdd5cf8fa1405b21ca4cc94c38a7d18023ef1e89de484e60d8.json
similarity index 83%
rename from core/lib/dal/.sqlx/query-45e52d05a4483def84c141e3529bab30553732953e589cd237595227044f438d.json
rename to core/lib/dal/.sqlx/query-f208ac4d454220cdd5cf8fa1405b21ca4cc94c38a7d18023ef1e89de484e60d8.json
index 74a6187e644..700352c1a8b 100644
--- a/core/lib/dal/.sqlx/query-45e52d05a4483def84c141e3529bab30553732953e589cd237595227044f438d.json
+++ b/core/lib/dal/.sqlx/query-f208ac4d454220cdd5cf8fa1405b21ca4cc94c38a7d18023ef1e89de484e60d8.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                number,\n                timestamp,\n                hash,\n                l1_tx_count,\n                l2_tx_count,\n                fee_account_address AS \"fee_account_address!\",\n                base_fee_per_gas,\n                l1_gas_price,\n                l2_fair_gas_price,\n                gas_per_pubdata_limit,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                protocol_version,\n                virtual_blocks,\n                fair_pubdata_price,\n                gas_limit,\n                logs_bloom\n            FROM\n                miniblocks\n            WHERE\n                number = $1\n            ",
+  "query": "\n            SELECT\n                number,\n                timestamp,\n                hash,\n                l1_tx_count,\n                l2_tx_count,\n                fee_account_address AS \"fee_account_address!\",\n                base_fee_per_gas,\n                l1_gas_price,\n                l2_fair_gas_price,\n                gas_per_pubdata_limit,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                evm_emulator_code_hash,\n                protocol_version,\n                virtual_blocks,\n                fair_pubdata_price,\n                gas_limit,\n                logs_bloom\n            FROM\n                miniblocks\n            WHERE\n                number = $1\n            ",
   "describe": {
     "columns": [
       {
@@ -65,26 +65,31 @@
       },
       {
         "ordinal": 12,
+        "name": "evm_emulator_code_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 13,
         "name": "protocol_version",
         "type_info": "Int4"
       },
       {
-        "ordinal": 13,
+        "ordinal": 14,
         "name": "virtual_blocks",
         "type_info": "Int8"
       },
       {
-        "ordinal": 14,
+        "ordinal": 15,
         "name": "fair_pubdata_price",
         "type_info": "Int8"
       },
       {
-        "ordinal": 15,
+        "ordinal": 16,
         "name": "gas_limit",
         "type_info": "Int8"
       },
       {
-        "ordinal": 16,
+        "ordinal": 17,
         "name": "logs_bloom",
         "type_info": "Bytea"
       }
@@ -108,11 +113,12 @@
       true,
       true,
       true,
+      true,
       false,
       true,
       true,
       true
     ]
   },
-  "hash": "45e52d05a4483def84c141e3529bab30553732953e589cd237595227044f438d"
+  "hash": "f208ac4d454220cdd5cf8fa1405b21ca4cc94c38a7d18023ef1e89de484e60d8"
 }
diff --git a/core/lib/dal/.sqlx/query-f3a049c7eb0d8903737f02fa154b50ebc862a133734382bad8fdfa3a93d8b743.json b/core/lib/dal/.sqlx/query-f3a049c7eb0d8903737f02fa154b50ebc862a133734382bad8fdfa3a93d8b743.json
deleted file mode 100644
index 6869b4f50b1..00000000000
--- a/core/lib/dal/.sqlx/query-f3a049c7eb0d8903737f02fa154b50ebc862a133734382bad8fdfa3a93d8b743.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                transactions (\n                    hash,\n                    is_priority,\n                    initiator_address,\n                    gas_limit,\n                    max_fee_per_gas,\n                    gas_per_pubdata_limit,\n                    data,\n                    upgrade_id,\n                    contract_address,\n                    l1_block_number,\n                    value,\n                    paymaster,\n                    paymaster_input,\n                    tx_format,\n                    l1_tx_mint,\n                    l1_tx_refund_recipient,\n                    received_at,\n                    created_at,\n                    updated_at\n                )\n            VALUES\n                (\n                    $1,\n                    TRUE,\n                    $2,\n                    $3,\n                    $4,\n                    $5,\n                    $6,\n                    $7,\n                    $8,\n                    $9,\n                    $10,\n                    $11,\n                    $12,\n                    $13,\n                    $14,\n                    $15,\n                    $16,\n                    NOW(),\n                    NOW()\n                )\n            ON CONFLICT (hash) DO NOTHING\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Bytea",
-        "Bytea",
-        "Numeric",
-        "Numeric",
-        "Numeric",
-        "Jsonb",
-        "Int4",
-        "Bytea",
-        "Int4",
-        "Numeric",
-        "Bytea",
-        "Bytea",
-        "Int4",
-        "Numeric",
-        "Bytea",
-        "Timestamp"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "f3a049c7eb0d8903737f02fa154b50ebc862a133734382bad8fdfa3a93d8b743"
-}
diff --git a/core/lib/dal/.sqlx/query-f551ac609521345b0dbcce65df2ce3d957afdb5f9809929dbe7a67a4a164e741.json b/core/lib/dal/.sqlx/query-f551ac609521345b0dbcce65df2ce3d957afdb5f9809929dbe7a67a4a164e741.json
new file mode 100644
index 00000000000..9297d4a9cf8
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-f551ac609521345b0dbcce65df2ce3d957afdb5f9809929dbe7a67a4a164e741.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                number\n            FROM\n                l1_batches\n            LEFT JOIN\n                eth_txs_history AS execute_tx\n                ON (l1_batches.eth_execute_tx_id = execute_tx.eth_tx_id)\n            WHERE\n                execute_tx.confirmed_at IS NOT NULL\n            ORDER BY\n                number DESC\n            LIMIT\n                1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "number",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "f551ac609521345b0dbcce65df2ce3d957afdb5f9809929dbe7a67a4a164e741"
+}
diff --git a/core/lib/dal/.sqlx/query-f81c5b92cac0466af8a2721b44d914f15fd7a5fa3d7f7bc56906817c70b04950.json b/core/lib/dal/.sqlx/query-f81c5b92cac0466af8a2721b44d914f15fd7a5fa3d7f7bc56906817c70b04950.json
new file mode 100644
index 00000000000..4fe32531a3f
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-f81c5b92cac0466af8a2721b44d914f15fd7a5fa3d7f7bc56906817c70b04950.json
@@ -0,0 +1,34 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            l1_batches (\n                number,\n                l1_tx_count,\n                l2_tx_count,\n                timestamp,\n                l2_to_l1_messages,\n                bloom,\n                priority_ops_onchain_data,\n                predicted_commit_gas_cost,\n                predicted_prove_gas_cost,\n                predicted_execute_gas_cost,\n                initial_bootloader_heap_content,\n                used_contract_hashes,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                evm_emulator_code_hash,\n                protocol_version,\n                system_logs,\n                storage_refunds,\n                pubdata_costs,\n                pubdata_input,\n                predicted_circuits_by_type,\n                created_at,\n                updated_at\n            )\n            VALUES\n            (\n                $1,\n                $2,\n                $3,\n                $4,\n                $5,\n                $6,\n                $7,\n                $8,\n                $9,\n                $10,\n                $11,\n                $12,\n                $13,\n                $14,\n                $15,\n                $16,\n                $17,\n                $18,\n                $19,\n                $20,\n                $21,\n                NOW(),\n                NOW()\n            )\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int4",
+        "Int4",
+        "Int8",
+        "ByteaArray",
+        "Bytea",
+        "ByteaArray",
+        "Int8",
+        "Int8",
+        "Int8",
+        "Jsonb",
+        "Jsonb",
+        "Bytea",
+        "Bytea",
+        "Bytea",
+        "Int4",
+        "ByteaArray",
+        "Int8Array",
+        "Int8Array",
+        "Bytea",
+        "Jsonb"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "f81c5b92cac0466af8a2721b44d914f15fd7a5fa3d7f7bc56906817c70b04950"
+}
diff --git a/core/lib/dal/.sqlx/query-f90a87a0c8a3ad95d722fbcf1b05371292d0bfbb23eaa2db163ef6fd1e1374d9.json b/core/lib/dal/.sqlx/query-f90a87a0c8a3ad95d722fbcf1b05371292d0bfbb23eaa2db163ef6fd1e1374d9.json
new file mode 100644
index 00000000000..5235d03dc3a
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-f90a87a0c8a3ad95d722fbcf1b05371292d0bfbb23eaa2db163ef6fd1e1374d9.json
@@ -0,0 +1,31 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            contract_verification_requests (\n                contract_address,\n                source_code,\n                contract_name,\n                zk_compiler_version,\n                compiler_version,\n                optimization_used,\n                optimizer_mode,\n                constructor_arguments,\n                is_system,\n                force_evmla,\n                status,\n                created_at,\n                updated_at\n            )\n            VALUES\n            ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, 'queued', NOW(), NOW())\n            RETURNING\n            id\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Bytea",
+        "Text",
+        "Text",
+        "Text",
+        "Text",
+        "Bool",
+        "Text",
+        "Bytea",
+        "Bool",
+        "Bool"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "f90a87a0c8a3ad95d722fbcf1b05371292d0bfbb23eaa2db163ef6fd1e1374d9"
+}
diff --git a/core/lib/dal/.sqlx/query-5556ebdb040428b42c04ea9121b3c2a3d0a09c5ee88bdd671462904d4d27a355.json b/core/lib/dal/.sqlx/query-f9a47bd5532fc10dd0bc1be2af45b243bb067514b67daaf084353e5ada15b23a.json
similarity index 71%
rename from core/lib/dal/.sqlx/query-5556ebdb040428b42c04ea9121b3c2a3d0a09c5ee88bdd671462904d4d27a355.json
rename to core/lib/dal/.sqlx/query-f9a47bd5532fc10dd0bc1be2af45b243bb067514b67daaf084353e5ada15b23a.json
index 5e9051587bb..1b50a750dac 100644
--- a/core/lib/dal/.sqlx/query-5556ebdb040428b42c04ea9121b3c2a3d0a09c5ee88bdd671462904d4d27a355.json
+++ b/core/lib/dal/.sqlx/query-f9a47bd5532fc10dd0bc1be2af45b243bb067514b67daaf084353e5ada15b23a.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                id AS \"minor!\",\n                timestamp,\n                bootloader_code_hash,\n                default_account_code_hash,\n                upgrade_tx_hash\n            FROM\n                protocol_versions\n            WHERE\n                id = $1\n            ",
+  "query": "\n            SELECT\n                id AS \"minor!\",\n                timestamp,\n                bootloader_code_hash,\n                default_account_code_hash,\n                evm_emulator_code_hash,\n                upgrade_tx_hash\n            FROM\n                protocol_versions\n            WHERE\n                id = $1\n            ",
   "describe": {
     "columns": [
       {
@@ -25,6 +25,11 @@
       },
       {
         "ordinal": 4,
+        "name": "evm_emulator_code_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 5,
         "name": "upgrade_tx_hash",
         "type_info": "Bytea"
       }
@@ -39,8 +44,9 @@
       false,
       false,
       false,
+      true,
       true
     ]
   },
-  "hash": "5556ebdb040428b42c04ea9121b3c2a3d0a09c5ee88bdd671462904d4d27a355"
+  "hash": "f9a47bd5532fc10dd0bc1be2af45b243bb067514b67daaf084353e5ada15b23a"
 }
diff --git a/core/lib/dal/.sqlx/query-fce6fff384875df689dc422153a2745b90c68ebec5706b106ef69cb61333466e.json b/core/lib/dal/.sqlx/query-fce6fff384875df689dc422153a2745b90c68ebec5706b106ef69cb61333466e.json
new file mode 100644
index 00000000000..8c4129fec07
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-fce6fff384875df689dc422153a2745b90c68ebec5706b106ef69cb61333466e.json
@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            transactions (\n                hash,\n                is_priority,\n                initiator_address,\n                gas_limit,\n                max_fee_per_gas,\n                gas_per_pubdata_limit,\n                data,\n                upgrade_id,\n                contract_address,\n                l1_block_number,\n                value,\n                paymaster,\n                paymaster_input,\n                tx_format,\n                l1_tx_mint,\n                l1_tx_refund_recipient,\n                received_at,\n                created_at,\n                updated_at\n            )\n            VALUES\n            (\n                $1,\n                TRUE,\n                $2,\n                $3,\n                $4,\n                $5,\n                $6,\n                $7,\n                $8,\n                $9,\n                $10,\n                $11,\n                $12,\n                $13,\n                $14,\n                $15,\n                $16,\n                NOW(),\n                NOW()\n            )\n            ON CONFLICT (hash) DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Bytea",
+        "Bytea",
+        "Numeric",
+        "Numeric",
+        "Numeric",
+        "Jsonb",
+        "Int4",
+        "Bytea",
+        "Int4",
+        "Numeric",
+        "Bytea",
+        "Bytea",
+        "Int4",
+        "Numeric",
+        "Bytea",
+        "Timestamp"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "fce6fff384875df689dc422153a2745b90c68ebec5706b106ef69cb61333466e"
+}
diff --git a/core/lib/dal/.sqlx/query-0458bb8eb595e470b3283847d6c89fd9567bb72dd8b1c604503050b8dab91521.json b/core/lib/dal/.sqlx/query-fd4b42f90ffe24f76a35a005460cc3cec1dbc3e9af406bb900c3ec52590978bc.json
similarity index 73%
rename from core/lib/dal/.sqlx/query-0458bb8eb595e470b3283847d6c89fd9567bb72dd8b1c604503050b8dab91521.json
rename to core/lib/dal/.sqlx/query-fd4b42f90ffe24f76a35a005460cc3cec1dbc3e9af406bb900c3ec52590978bc.json
index c1400f955b9..271924b8b6c 100644
--- a/core/lib/dal/.sqlx/query-0458bb8eb595e470b3283847d6c89fd9567bb72dd8b1c604503050b8dab91521.json
+++ b/core/lib/dal/.sqlx/query-fd4b42f90ffe24f76a35a005460cc3cec1dbc3e9af406bb900c3ec52590978bc.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                PG_LAST_WAL_RECEIVE_LSN() = PG_LAST_WAL_REPLAY_LSN() AS synced,\n                EXTRACT(\n                    seconds\n                    FROM\n                        NOW() - PG_LAST_XACT_REPLAY_TIMESTAMP()\n                )::INT AS LAG\n            ",
+  "query": "\n            SELECT\n                PG_LAST_WAL_RECEIVE_LSN() = PG_LAST_WAL_REPLAY_LSN() AS synced,\n                EXTRACT(\n                    seconds\n                    FROM\n                    NOW() - PG_LAST_XACT_REPLAY_TIMESTAMP()\n                )::INT AS lag\n            ",
   "describe": {
     "columns": [
       {
@@ -22,5 +22,5 @@
       null
     ]
   },
-  "hash": "0458bb8eb595e470b3283847d6c89fd9567bb72dd8b1c604503050b8dab91521"
+  "hash": "fd4b42f90ffe24f76a35a005460cc3cec1dbc3e9af406bb900c3ec52590978bc"
 }
diff --git a/core/lib/dal/.sqlx/query-99d9ee2a0d0450acefa0d9b6c031e30606fddf6631c859ab03819ec476bcf005.json b/core/lib/dal/.sqlx/query-fd8aaef58e1b9bf4f389fb2943adea2b254fed4b5437ee2968707dffe6e6869d.json
similarity index 75%
rename from core/lib/dal/.sqlx/query-99d9ee2a0d0450acefa0d9b6c031e30606fddf6631c859ab03819ec476bcf005.json
rename to core/lib/dal/.sqlx/query-fd8aaef58e1b9bf4f389fb2943adea2b254fed4b5437ee2968707dffe6e6869d.json
index ab00c7b26ce..198ab2d802b 100644
--- a/core/lib/dal/.sqlx/query-99d9ee2a0d0450acefa0d9b6c031e30606fddf6631c859ab03819ec476bcf005.json
+++ b/core/lib/dal/.sqlx/query-fd8aaef58e1b9bf4f389fb2943adea2b254fed4b5437ee2968707dffe6e6869d.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                hashed_key\n            FROM\n                initial_writes\n            WHERE\n                hashed_key = ANY ($1)\n            ",
+  "query": "\n            SELECT\n                hashed_key\n            FROM\n                initial_writes\n            WHERE\n                hashed_key = ANY($1)\n            ",
   "describe": {
     "columns": [
       {
@@ -18,5 +18,5 @@
       false
     ]
   },
-  "hash": "99d9ee2a0d0450acefa0d9b6c031e30606fddf6631c859ab03819ec476bcf005"
+  "hash": "fd8aaef58e1b9bf4f389fb2943adea2b254fed4b5437ee2968707dffe6e6869d"
 }
diff --git a/core/lib/dal/.sqlx/query-9f29aa31d4698031e9f3fe2eb273724dcce382936af0d4c386143399995cd325.json b/core/lib/dal/.sqlx/query-febd2b039a686631e3c943882864f6cb289fdec08f4db49ee40ba67371df1927.json
similarity index 59%
rename from core/lib/dal/.sqlx/query-9f29aa31d4698031e9f3fe2eb273724dcce382936af0d4c386143399995cd325.json
rename to core/lib/dal/.sqlx/query-febd2b039a686631e3c943882864f6cb289fdec08f4db49ee40ba67371df1927.json
index 2e1bf7c3e61..ff702280a63 100644
--- a/core/lib/dal/.sqlx/query-9f29aa31d4698031e9f3fe2eb273724dcce382936af0d4c386143399995cd325.json
+++ b/core/lib/dal/.sqlx/query-febd2b039a686631e3c943882864f6cb289fdec08f4db49ee40ba67371df1927.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                storage_logs.address AS \"address!\",\n                storage_logs.key AS \"key!\",\n                storage_logs.value AS \"value!\",\n                storage_logs.miniblock_number AS \"miniblock_number!\",\n                initial_writes.l1_batch_number AS \"l1_batch_number!\",\n                initial_writes.index\n            FROM\n                (\n                    SELECT\n                        hashed_key,\n                        MAX(ARRAY[miniblock_number, operation_number]::INT[]) AS op\n                    FROM\n                        storage_logs\n                    WHERE\n                        miniblock_number <= $1\n                        AND hashed_key >= $3\n                        AND hashed_key <= $4\n                    GROUP BY\n                        hashed_key\n                    ORDER BY\n                        hashed_key\n                ) AS keys\n                INNER JOIN storage_logs ON keys.hashed_key = storage_logs.hashed_key\n                AND storage_logs.miniblock_number = keys.op[1]\n                AND storage_logs.operation_number = keys.op[2]\n                INNER JOIN initial_writes ON keys.hashed_key = initial_writes.hashed_key\n            WHERE\n                initial_writes.l1_batch_number <= $2\n            ",
+  "query": "\n            SELECT\n                storage_logs.address AS \"address!\",\n                storage_logs.key AS \"key!\",\n                storage_logs.value AS \"value!\",\n                storage_logs.miniblock_number AS \"miniblock_number!\",\n                initial_writes.l1_batch_number AS \"l1_batch_number!\",\n                initial_writes.index\n            FROM\n                (\n                    SELECT\n                        hashed_key,\n                        MAX(ARRAY[miniblock_number, operation_number]::INT []) AS op\n                    FROM\n                        storage_logs\n                    WHERE\n                        miniblock_number <= $1\n                        AND hashed_key >= $3\n                        AND hashed_key <= $4\n                    GROUP BY\n                        hashed_key\n                    ORDER BY\n                        hashed_key\n                ) AS keys\n            INNER JOIN storage_logs\n                ON\n                    keys.hashed_key = storage_logs.hashed_key\n                    AND storage_logs.miniblock_number = keys.op[1]\n                    AND storage_logs.operation_number = keys.op[2]\n            INNER JOIN initial_writes ON keys.hashed_key = initial_writes.hashed_key\n            WHERE\n                initial_writes.l1_batch_number <= $2\n            ",
   "describe": {
     "columns": [
       {
@@ -51,5 +51,5 @@
       false
     ]
   },
-  "hash": "9f29aa31d4698031e9f3fe2eb273724dcce382936af0d4c386143399995cd325"
+  "hash": "febd2b039a686631e3c943882864f6cb289fdec08f4db49ee40ba67371df1927"
 }
diff --git a/core/lib/dal/migrations/20240911161714_evm-simulator.down.sql b/core/lib/dal/migrations/20240911161714_evm-simulator.down.sql
new file mode 100644
index 00000000000..74ac4e60383
--- /dev/null
+++ b/core/lib/dal/migrations/20240911161714_evm-simulator.down.sql
@@ -0,0 +1,3 @@
+ALTER TABLE protocol_versions DROP COLUMN IF EXISTS evm_emulator_code_hash;
+ALTER TABLE l1_batches DROP COLUMN IF EXISTS evm_emulator_code_hash;
+ALTER TABLE miniblocks DROP COLUMN IF EXISTS evm_emulator_code_hash;
diff --git a/core/lib/dal/migrations/20240911161714_evm-simulator.up.sql b/core/lib/dal/migrations/20240911161714_evm-simulator.up.sql
new file mode 100644
index 00000000000..43ae361e7ee
--- /dev/null
+++ b/core/lib/dal/migrations/20240911161714_evm-simulator.up.sql
@@ -0,0 +1,4 @@
+ALTER TABLE protocol_versions ADD COLUMN IF NOT EXISTS evm_emulator_code_hash BYTEA;
+ALTER TABLE l1_batches ADD COLUMN IF NOT EXISTS evm_emulator_code_hash BYTEA;
+-- We need this column in `miniblocks` as well in order to store data for the pending L1 batch
+ALTER TABLE miniblocks ADD COLUMN IF NOT EXISTS evm_emulator_code_hash BYTEA;
diff --git a/core/lib/dal/src/base_token_dal.rs b/core/lib/dal/src/base_token_dal.rs
index a8bf51d0c60..52389bdcb62 100644
--- a/core/lib/dal/src/base_token_dal.rs
+++ b/core/lib/dal/src/base_token_dal.rs
@@ -21,11 +21,13 @@ impl BaseTokenDal<'_, '_> {
         let row = sqlx::query!(
             r#"
             INSERT INTO
-                base_token_ratios (numerator, denominator, ratio_timestamp, created_at, updated_at)
+            base_token_ratios (
+                numerator, denominator, ratio_timestamp, created_at, updated_at
+            )
             VALUES
-                ($1, $2, $3, NOW(), NOW())
+            ($1, $2, $3, NOW(), NOW())
             RETURNING
-                id
+            id
             "#,
             BigDecimal::from_u64(numerator.get()),
             BigDecimal::from_u64(denominator.get()),
diff --git a/core/lib/dal/src/blocks_dal.rs b/core/lib/dal/src/blocks_dal.rs
index ac381a0d9bc..9030214e9b1 100644
--- a/core/lib/dal/src/blocks_dal.rs
+++ b/core/lib/dal/src/blocks_dal.rs
@@ -325,6 +325,7 @@ impl BlocksDal<'_, '_> {
                 zkporter_is_available,
                 bootloader_code_hash,
                 default_aa_code_hash,
+                evm_emulator_code_hash,
                 aux_data_hash,
                 pass_through_data_hash,
                 meta_parameters_hash,
@@ -337,8 +338,10 @@ impl BlocksDal<'_, '_> {
                 data_availability.blob_id AS "blob_id?"
             FROM
                 l1_batches
-                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number
-                LEFT JOIN data_availability ON data_availability.l1_batch_number = l1_batches.number
+            LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number
+            LEFT JOIN
+                data_availability
+                ON data_availability.l1_batch_number = l1_batches.number
             WHERE
                 number = $1
             "#,
@@ -368,6 +371,7 @@ impl BlocksDal<'_, '_> {
                 used_contract_hashes,
                 bootloader_code_hash,
                 default_aa_code_hash,
+                evm_emulator_code_hash,
                 protocol_version,
                 system_logs,
                 pubdata_input
@@ -597,55 +601,57 @@ impl BlocksDal<'_, '_> {
         let query = sqlx::query!(
             r#"
             INSERT INTO
-                l1_batches (
-                    number,
-                    l1_tx_count,
-                    l2_tx_count,
-                    timestamp,
-                    l2_to_l1_messages,
-                    bloom,
-                    priority_ops_onchain_data,
-                    predicted_commit_gas_cost,
-                    predicted_prove_gas_cost,
-                    predicted_execute_gas_cost,
-                    initial_bootloader_heap_content,
-                    used_contract_hashes,
-                    bootloader_code_hash,
-                    default_aa_code_hash,
-                    protocol_version,
-                    system_logs,
-                    storage_refunds,
-                    pubdata_costs,
-                    pubdata_input,
-                    predicted_circuits_by_type,
-                    created_at,
-                    updated_at
-                )
+            l1_batches (
+                number,
+                l1_tx_count,
+                l2_tx_count,
+                timestamp,
+                l2_to_l1_messages,
+                bloom,
+                priority_ops_onchain_data,
+                predicted_commit_gas_cost,
+                predicted_prove_gas_cost,
+                predicted_execute_gas_cost,
+                initial_bootloader_heap_content,
+                used_contract_hashes,
+                bootloader_code_hash,
+                default_aa_code_hash,
+                evm_emulator_code_hash,
+                protocol_version,
+                system_logs,
+                storage_refunds,
+                pubdata_costs,
+                pubdata_input,
+                predicted_circuits_by_type,
+                created_at,
+                updated_at
+            )
             VALUES
-                (
-                    $1,
-                    $2,
-                    $3,
-                    $4,
-                    $5,
-                    $6,
-                    $7,
-                    $8,
-                    $9,
-                    $10,
-                    $11,
-                    $12,
-                    $13,
-                    $14,
-                    $15,
-                    $16,
-                    $17,
-                    $18,
-                    $19,
-                    $20,
-                    NOW(),
-                    NOW()
-                )
+            (
+                $1,
+                $2,
+                $3,
+                $4,
+                $5,
+                $6,
+                $7,
+                $8,
+                $9,
+                $10,
+                $11,
+                $12,
+                $13,
+                $14,
+                $15,
+                $16,
+                $17,
+                $18,
+                $19,
+                $20,
+                $21,
+                NOW(),
+                NOW()
+            )
             "#,
             i64::from(header.number.0),
             i32::from(header.l1_tx_count),
@@ -661,6 +667,11 @@ impl BlocksDal<'_, '_> {
             used_contract_hashes,
             header.base_system_contracts_hashes.bootloader.as_bytes(),
             header.base_system_contracts_hashes.default_aa.as_bytes(),
+            header
+                .base_system_contracts_hashes
+                .evm_emulator
+                .as_ref()
+                .map(H256::as_bytes),
             header.protocol_version.map(|v| v as i32),
             &system_logs,
             &storage_refunds,
@@ -692,49 +703,51 @@ impl BlocksDal<'_, '_> {
         let query = sqlx::query!(
             r#"
             INSERT INTO
-                miniblocks (
-                    number,
-                    timestamp,
-                    hash,
-                    l1_tx_count,
-                    l2_tx_count,
-                    fee_account_address,
-                    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,
-                    fair_pubdata_price,
-                    gas_limit,
-                    logs_bloom,
-                    created_at,
-                    updated_at
-                )
+            miniblocks (
+                number,
+                timestamp,
+                hash,
+                l1_tx_count,
+                l2_tx_count,
+                fee_account_address,
+                base_fee_per_gas,
+                l1_gas_price,
+                l2_fair_gas_price,
+                gas_per_pubdata_limit,
+                bootloader_code_hash,
+                default_aa_code_hash,
+                evm_emulator_code_hash,
+                protocol_version,
+                virtual_blocks,
+                fair_pubdata_price,
+                gas_limit,
+                logs_bloom,
+                created_at,
+                updated_at
+            )
             VALUES
-                (
-                    $1,
-                    $2,
-                    $3,
-                    $4,
-                    $5,
-                    $6,
-                    $7,
-                    $8,
-                    $9,
-                    $10,
-                    $11,
-                    $12,
-                    $13,
-                    $14,
-                    $15,
-                    $16,
-                    $17,
-                    NOW(),
-                    NOW()
-                )
+            (
+                $1,
+                $2,
+                $3,
+                $4,
+                $5,
+                $6,
+                $7,
+                $8,
+                $9,
+                $10,
+                $11,
+                $12,
+                $13,
+                $14,
+                $15,
+                $16,
+                $17,
+                $18,
+                NOW(),
+                NOW()
+            )
             "#,
             i64::from(l2_block_header.number.0),
             l2_block_header.timestamp as i64,
@@ -754,6 +767,11 @@ impl BlocksDal<'_, '_> {
                 .base_system_contracts_hashes
                 .default_aa
                 .as_bytes(),
+            l2_block_header
+                .base_system_contracts_hashes
+                .evm_emulator
+                .as_ref()
+                .map(H256::as_bytes),
             l2_block_header.protocol_version.map(|v| v as i32),
             i64::from(l2_block_header.virtual_blocks),
             l2_block_header.batch_fee_input.fair_pubdata_price() as i64,
@@ -782,6 +800,7 @@ impl BlocksDal<'_, '_> {
                 gas_per_pubdata_limit,
                 bootloader_code_hash,
                 default_aa_code_hash,
+                evm_emulator_code_hash,
                 protocol_version,
                 virtual_blocks,
                 fair_pubdata_price,
@@ -822,6 +841,7 @@ impl BlocksDal<'_, '_> {
                 gas_per_pubdata_limit,
                 bootloader_code_hash,
                 default_aa_code_hash,
+                evm_emulator_code_hash,
                 protocol_version,
                 virtual_blocks,
                 fair_pubdata_price,
@@ -988,9 +1008,13 @@ impl BlocksDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                commitments (l1_batch_number, events_queue_commitment, bootloader_initial_content_commitment)
+            commitments (
+                l1_batch_number,
+                events_queue_commitment,
+                bootloader_initial_content_commitment
+            )
             VALUES
-                ($1, $2, $3)
+            ($1, $2, $3)
             ON CONFLICT (l1_batch_number) DO NOTHING
             "#,
             i64::from(number.0),
@@ -1036,6 +1060,7 @@ impl BlocksDal<'_, '_> {
                 zkporter_is_available,
                 bootloader_code_hash,
                 default_aa_code_hash,
+                evm_emulator_code_hash,
                 aux_data_hash,
                 pass_through_data_hash,
                 meta_parameters_hash,
@@ -1048,8 +1073,10 @@ impl BlocksDal<'_, '_> {
                 data_availability.blob_id AS "blob_id?"
             FROM
                 l1_batches
-                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number
-                LEFT JOIN data_availability ON data_availability.l1_batch_number = l1_batches.number
+            LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number
+            LEFT JOIN
+                data_availability
+                ON data_availability.l1_batch_number = l1_batches.number
             WHERE
                 number = 0
                 OR eth_commit_tx_id IS NOT NULL
@@ -1081,7 +1108,9 @@ impl BlocksDal<'_, '_> {
                 number
             FROM
                 l1_batches
-                LEFT JOIN eth_txs_history AS commit_tx ON (l1_batches.eth_commit_tx_id = commit_tx.eth_tx_id)
+            LEFT JOIN
+                eth_txs_history AS commit_tx
+                ON (l1_batches.eth_commit_tx_id = commit_tx.eth_tx_id)
             WHERE
                 commit_tx.confirmed_at IS NOT NULL
             ORDER BY
@@ -1148,7 +1177,9 @@ impl BlocksDal<'_, '_> {
                 number
             FROM
                 l1_batches
-                LEFT JOIN eth_txs_history AS prove_tx ON (l1_batches.eth_prove_tx_id = prove_tx.eth_tx_id)
+            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
@@ -1173,7 +1204,9 @@ impl BlocksDal<'_, '_> {
                 number
             FROM
                 l1_batches
-                LEFT JOIN eth_txs_history AS execute_tx ON (l1_batches.eth_execute_tx_id = execute_tx.eth_tx_id)
+            LEFT JOIN
+                eth_txs_history AS execute_tx
+                ON (l1_batches.eth_execute_tx_id = execute_tx.eth_tx_id)
             WHERE
                 execute_tx.confirmed_at IS NOT NULL
             ORDER BY
@@ -1218,6 +1251,7 @@ impl BlocksDal<'_, '_> {
                 zkporter_is_available,
                 bootloader_code_hash,
                 default_aa_code_hash,
+                evm_emulator_code_hash,
                 aux_data_hash,
                 pass_through_data_hash,
                 meta_parameters_hash,
@@ -1230,8 +1264,10 @@ impl BlocksDal<'_, '_> {
                 data_availability.blob_id AS "blob_id?"
             FROM
                 l1_batches
-                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number
-                LEFT JOIN data_availability ON data_availability.l1_batch_number = l1_batches.number
+            LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number
+            LEFT JOIN
+                data_availability
+                ON data_availability.l1_batch_number = l1_batches.number
             WHERE
                 eth_commit_tx_id IS NOT NULL
                 AND eth_prove_tx_id IS NULL
@@ -1300,6 +1336,7 @@ impl BlocksDal<'_, '_> {
                 zkporter_is_available,
                 bootloader_code_hash,
                 default_aa_code_hash,
+                evm_emulator_code_hash,
                 aux_data_hash,
                 pass_through_data_hash,
                 meta_parameters_hash,
@@ -1317,7 +1354,7 @@ impl BlocksDal<'_, '_> {
                         ROW_NUMBER() OVER (
                             ORDER BY
                                 number ASC
-                        ) AS ROW_NUMBER
+                        ) AS row_number
                     FROM
                         l1_batches
                     WHERE
@@ -1329,10 +1366,10 @@ impl BlocksDal<'_, '_> {
                     LIMIT
                         $2
                 ) inn
-                LEFT JOIN commitments ON commitments.l1_batch_number = inn.number
-                LEFT JOIN data_availability ON data_availability.l1_batch_number = inn.number
+            LEFT JOIN commitments ON commitments.l1_batch_number = inn.number
+            LEFT JOIN data_availability ON data_availability.l1_batch_number = inn.number
             WHERE
-                number - ROW_NUMBER = $1
+                number - row_number = $1
             "#,
             last_proved_batch_number.0 as i32,
             limit as i32
@@ -1375,6 +1412,7 @@ impl BlocksDal<'_, '_> {
                         zkporter_is_available,
                         bootloader_code_hash,
                         default_aa_code_hash,
+                        evm_emulator_code_hash,
                         aux_data_hash,
                         pass_through_data_hash,
                         meta_parameters_hash,
@@ -1387,8 +1425,10 @@ impl BlocksDal<'_, '_> {
                         data_availability.blob_id AS "blob_id?"
                     FROM
                         l1_batches
-                        LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number
-                        LEFT JOIN data_availability ON data_availability.l1_batch_number = l1_batches.number
+                    LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number
+                    LEFT JOIN
+                        data_availability
+                        ON data_availability.l1_batch_number = l1_batches.number
                     WHERE
                         eth_prove_tx_id IS NOT NULL
                         AND eth_execute_tx_id IS NULL
@@ -1460,8 +1500,10 @@ impl BlocksDal<'_, '_> {
                 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)
+            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
@@ -1469,7 +1511,7 @@ impl BlocksDal<'_, '_> {
                 AND EXTRACT(
                     EPOCH
                     FROM
-                        commit_tx.confirmed_at
+                    commit_tx.confirmed_at
                 ) < $1
             "#,
             max_l1_batch_timestamp_seconds_bd,
@@ -1502,6 +1544,7 @@ impl BlocksDal<'_, '_> {
                     zkporter_is_available,
                     bootloader_code_hash,
                     default_aa_code_hash,
+                    evm_emulator_code_hash,
                     aux_data_hash,
                     pass_through_data_hash,
                     meta_parameters_hash,
@@ -1514,8 +1557,10 @@ impl BlocksDal<'_, '_> {
                     data_availability.blob_id AS "blob_id?"
                 FROM
                     l1_batches
-                    LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number
-                    LEFT JOIN data_availability ON data_availability.l1_batch_number = l1_batches.number
+                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number
+                LEFT JOIN
+                    data_availability
+                    ON data_availability.l1_batch_number = l1_batches.number
                 WHERE
                     number BETWEEN $1 AND $2
                 ORDER BY
@@ -1568,6 +1613,7 @@ impl BlocksDal<'_, '_> {
                 zkporter_is_available,
                 l1_batches.bootloader_code_hash,
                 l1_batches.default_aa_code_hash,
+                l1_batches.evm_emulator_code_hash,
                 aux_data_hash,
                 pass_through_data_hash,
                 meta_parameters_hash,
@@ -1580,9 +1626,11 @@ impl BlocksDal<'_, '_> {
                 data_availability.blob_id AS "blob_id?"
             FROM
                 l1_batches
-                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number
-                JOIN protocol_versions ON protocol_versions.id = l1_batches.protocol_version
-                LEFT JOIN data_availability ON data_availability.l1_batch_number = l1_batches.number
+            LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number
+            JOIN protocol_versions ON protocol_versions.id = l1_batches.protocol_version
+            LEFT JOIN
+                data_availability
+                ON data_availability.l1_batch_number = l1_batches.number
             WHERE
                 eth_commit_tx_id IS NULL
                 AND number != 0
@@ -1648,6 +1696,7 @@ impl BlocksDal<'_, '_> {
                 zkporter_is_available,
                 l1_batches.bootloader_code_hash,
                 l1_batches.default_aa_code_hash,
+                l1_batches.evm_emulator_code_hash,
                 aux_data_hash,
                 pass_through_data_hash,
                 meta_parameters_hash,
@@ -1660,9 +1709,11 @@ impl BlocksDal<'_, '_> {
                 data_availability.blob_id AS "blob_id?"
             FROM
                 l1_batches
-                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number
-                LEFT JOIN data_availability ON data_availability.l1_batch_number = l1_batches.number
-                JOIN protocol_versions ON protocol_versions.id = l1_batches.protocol_version
+            LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number
+            LEFT JOIN
+                data_availability
+                ON data_availability.l1_batch_number = l1_batches.number
+            JOIN protocol_versions ON protocol_versions.id = l1_batches.protocol_version
             WHERE
                 eth_commit_tx_id IS NULL
                 AND number != 0
@@ -1861,7 +1912,7 @@ impl BlocksDal<'_, '_> {
                 bytecode
             FROM
                 factory_deps
-                INNER JOIN miniblocks ON miniblocks.number = factory_deps.miniblock_number
+            INNER JOIN miniblocks ON miniblocks.number = factory_deps.miniblock_number
             WHERE
                 miniblocks.l1_batch_number = $1
             "#,
@@ -2357,7 +2408,7 @@ impl BlocksDal<'_, '_> {
                 value
             FROM
                 l2_to_l1_logs
-                JOIN miniblocks ON l2_to_l1_logs.miniblock_number = miniblocks.number
+            JOIN miniblocks ON l2_to_l1_logs.miniblock_number = miniblocks.number
             WHERE
                 l1_batch_number = $1
             ORDER BY
@@ -2455,8 +2506,8 @@ impl BlocksDal<'_, '_> {
             FROM
                 (
                     SELECT
-                        UNNEST($1::BIGINT[]) AS number,
-                        UNNEST($2::BYTEA[]) AS logs_bloom
+                        UNNEST($1::BIGINT []) AS number,
+                        UNNEST($2::BYTEA []) AS logs_bloom
                 ) AS data
             WHERE
                 miniblocks.number = data.number
@@ -2696,6 +2747,40 @@ mod tests {
             .is_err());
     }
 
+    #[tokio::test]
+    async fn persisting_evm_emulator_hash() {
+        let pool = ConnectionPool::<Core>::test_pool().await;
+        let mut conn = pool.connection().await.unwrap();
+
+        conn.protocol_versions_dal()
+            .save_protocol_version_with_tx(&ProtocolVersion::default())
+            .await
+            .unwrap();
+
+        let mut l2_block_header = create_l2_block_header(1);
+        l2_block_header.base_system_contracts_hashes.evm_emulator = Some(H256::repeat_byte(0x23));
+        conn.blocks_dal()
+            .insert_l2_block(&l2_block_header)
+            .await
+            .unwrap();
+
+        let mut fetched_block_header = conn
+            .blocks_dal()
+            .get_last_sealed_l2_block_header()
+            .await
+            .unwrap()
+            .expect("no block");
+        // Batch fee input isn't restored exactly
+        fetched_block_header.batch_fee_input = l2_block_header.batch_fee_input;
+
+        assert_eq!(fetched_block_header, l2_block_header);
+        // ...and a sanity check just to be sure
+        assert!(fetched_block_header
+            .base_system_contracts_hashes
+            .evm_emulator
+            .is_some());
+    }
+
     #[tokio::test]
     async fn loading_l1_batch_header() {
         let pool = ConnectionPool::<Core>::test_pool().await;
diff --git a/core/lib/dal/src/blocks_web3_dal.rs b/core/lib/dal/src/blocks_web3_dal.rs
index 3d17a919a07..c1a1e6765b6 100644
--- a/core/lib/dal/src/blocks_web3_dal.rs
+++ b/core/lib/dal/src/blocks_web3_dal.rs
@@ -52,9 +52,11 @@ impl BlocksWeb3Dal<'_, '_> {
                 transactions.hash AS "tx_hash?"
             FROM
                 miniblocks
-                LEFT JOIN miniblocks prev_miniblock ON prev_miniblock.number = miniblocks.number - 1
-                LEFT JOIN l1_batches ON l1_batches.number = miniblocks.l1_batch_number
-                LEFT JOIN transactions ON transactions.miniblock_number = miniblocks.number
+            LEFT JOIN
+                miniblocks prev_miniblock
+                ON prev_miniblock.number = miniblocks.number - 1
+            LEFT JOIN l1_batches ON l1_batches.number = miniblocks.l1_batch_number
+            LEFT JOIN transactions ON transactions.miniblock_number = miniblocks.number
             WHERE
                 miniblocks.number = $1
             ORDER BY
@@ -184,8 +186,10 @@ impl BlocksWeb3Dal<'_, '_> {
                 transactions.refunded_gas AS "transaction_refunded_gas?"
             FROM
                 miniblocks
-                LEFT JOIN miniblocks prev_miniblock ON prev_miniblock.number = miniblocks.number - 1
-                LEFT JOIN transactions ON transactions.miniblock_number = miniblocks.number
+            LEFT JOIN
+                miniblocks prev_miniblock
+                ON prev_miniblock.number = miniblocks.number - 1
+            LEFT JOIN transactions ON transactions.miniblock_number = miniblocks.number
             WHERE
                 miniblocks.number > $1
             ORDER BY
@@ -559,7 +563,7 @@ impl BlocksWeb3Dal<'_, '_> {
                 call_trace
             FROM
                 call_traces
-                INNER JOIN transactions ON tx_hash = transactions.hash
+            INNER JOIN transactions ON tx_hash = transactions.hash
             WHERE
                 transactions.miniblock_number = $1
             ORDER BY
@@ -669,20 +673,24 @@ impl BlocksWeb3Dal<'_, '_> {
                 miniblocks.fair_pubdata_price,
                 miniblocks.bootloader_code_hash,
                 miniblocks.default_aa_code_hash,
+                l1_batches.evm_emulator_code_hash,
                 miniblocks.protocol_version,
                 miniblocks.fee_account_address
             FROM
                 miniblocks
-                LEFT JOIN l1_batches ON miniblocks.l1_batch_number = l1_batches.number
-                LEFT JOIN eth_txs_history AS commit_tx ON (
+            LEFT JOIN l1_batches ON miniblocks.l1_batch_number = l1_batches.number
+            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
                 )
-                LEFT JOIN eth_txs_history AS prove_tx ON (
+            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
                 )
-                LEFT JOIN eth_txs_history AS execute_tx ON (
+            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
                 )
@@ -708,18 +716,19 @@ impl BlocksWeb3Dal<'_, '_> {
             StorageL1BatchDetails,
             r#"
             WITH
-                mb AS (
-                    SELECT
-                        l1_gas_price,
-                        l2_fair_gas_price,
-                        fair_pubdata_price
-                    FROM
-                        miniblocks
-                    WHERE
-                        l1_batch_number = $1
-                    LIMIT
-                        1
-                )
+            mb AS (
+                SELECT
+                    l1_gas_price,
+                    l2_fair_gas_price,
+                    fair_pubdata_price
+                FROM
+                    miniblocks
+                WHERE
+                    l1_batch_number = $1
+                LIMIT
+                    1
+            )
+            
             SELECT
                 l1_batches.number,
                 l1_batches.timestamp,
@@ -736,19 +745,23 @@ impl BlocksWeb3Dal<'_, '_> {
                 mb.l2_fair_gas_price,
                 mb.fair_pubdata_price,
                 l1_batches.bootloader_code_hash,
-                l1_batches.default_aa_code_hash
+                l1_batches.default_aa_code_hash,
+                l1_batches.evm_emulator_code_hash
             FROM
                 l1_batches
-                INNER JOIN mb ON TRUE
-                LEFT JOIN eth_txs_history AS commit_tx ON (
+            INNER JOIN mb ON TRUE
+            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
                 )
-                LEFT JOIN eth_txs_history AS prove_tx ON (
+            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
                 )
-                LEFT JOIN eth_txs_history AS execute_tx ON (
+            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
                 )
diff --git a/core/lib/dal/src/consensus/mod.rs b/core/lib/dal/src/consensus/mod.rs
index f01655d56a9..876dfe14bed 100644
--- a/core/lib/dal/src/consensus/mod.rs
+++ b/core/lib/dal/src/consensus/mod.rs
@@ -244,7 +244,7 @@ impl ProtoRepr for proto::TransactionV25 {
             },
             T::L2(l2) => abi::Transaction::L2(required(&l2.rlp).context("rlp")?.clone()),
         };
-        tx.try_into()
+        Transaction::from_abi(tx, true)
     }
 
     fn build(tx: &Self::Type) -> Self {
diff --git a/core/lib/dal/src/consensus_dal.rs b/core/lib/dal/src/consensus_dal.rs
index f2e499ce562..dd976f22086 100644
--- a/core/lib/dal/src/consensus_dal.rs
+++ b/core/lib/dal/src/consensus_dal.rs
@@ -165,9 +165,9 @@ impl ConsensusDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                consensus_replica_state (fake_key, global_config, genesis, state)
+            consensus_replica_state (fake_key, global_config, genesis, state)
             VALUES
-                (TRUE, $1, $2, $3)
+            (TRUE, $1, $2, $3)
             "#,
             global_config,
             genesis,
@@ -479,9 +479,9 @@ impl ConsensusDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                miniblocks_consensus (number, certificate)
+            miniblocks_consensus (number, certificate)
             VALUES
-                ($1, $2)
+            ($1, $2)
             "#,
             i64::try_from(header.number.0).context("overflow")?,
             zksync_protobuf::serde::Serialize
@@ -507,15 +507,15 @@ impl ConsensusDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                l1_batches_consensus_committees (l1_batch_number, attesters, updated_at)
+            l1_batches_consensus_committees (l1_batch_number, attesters, updated_at)
             VALUES
-                ($1, $2, NOW())
+            ($1, $2, NOW())
             ON CONFLICT (l1_batch_number) DO
             UPDATE
             SET
-                l1_batch_number = $1,
-                attesters = $2,
-                updated_at = NOW()
+            l1_batch_number = $1,
+            attesters = $2,
+            updated_at = NOW()
             "#,
             i64::try_from(number.0).context("overflow")?,
             committee
@@ -582,9 +582,9 @@ impl ConsensusDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                l1_batches_consensus (l1_batch_number, certificate, updated_at, created_at)
+            l1_batches_consensus (l1_batch_number, certificate, updated_at, created_at)
             VALUES
-                ($1, $2, NOW(), NOW())
+            ($1, $2, NOW(), NOW())
             "#,
             i64::try_from(cert.message.number.0).context("overflow")?,
             // Unwrap is ok, because serialization should always succeed.
diff --git a/core/lib/dal/src/contract_verification_dal.rs b/core/lib/dal/src/contract_verification_dal.rs
index 97af7880d16..291e60a50d9 100644
--- a/core/lib/dal/src/contract_verification_dal.rs
+++ b/core/lib/dal/src/contract_verification_dal.rs
@@ -67,25 +67,25 @@ impl ContractVerificationDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                contract_verification_requests (
-                    contract_address,
-                    source_code,
-                    contract_name,
-                    zk_compiler_version,
-                    compiler_version,
-                    optimization_used,
-                    optimizer_mode,
-                    constructor_arguments,
-                    is_system,
-                    force_evmla,
-                    status,
-                    created_at,
-                    updated_at
-                )
+            contract_verification_requests (
+                contract_address,
+                source_code,
+                contract_name,
+                zk_compiler_version,
+                compiler_version,
+                optimization_used,
+                optimizer_mode,
+                constructor_arguments,
+                is_system,
+                force_evmla,
+                status,
+                created_at,
+                updated_at
+            )
             VALUES
-                ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, 'queued', NOW(), NOW())
+            ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, 'queued', NOW(), NOW())
             RETURNING
-                id
+            id
             "#,
             query.contract_address.as_bytes(),
             // Serialization should always succeed.
@@ -143,20 +143,20 @@ impl ContractVerificationDal<'_, '_> {
                     LIMIT
                         1
                     FOR UPDATE
-                        SKIP LOCKED
+                    SKIP LOCKED
                 )
             RETURNING
-                id,
-                contract_address,
-                source_code,
-                contract_name,
-                zk_compiler_version,
-                compiler_version,
-                optimization_used,
-                optimizer_mode,
-                constructor_arguments,
-                is_system,
-                force_evmla
+            id,
+            contract_address,
+            source_code,
+            contract_name,
+            zk_compiler_version,
+            compiler_version,
+            optimization_used,
+            optimizer_mode,
+            constructor_arguments,
+            is_system,
+            force_evmla
             "#,
             &processing_timeout
         )
@@ -198,13 +198,13 @@ impl ContractVerificationDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                contracts_verification_info (address, verification_info)
+            contracts_verification_info (address, verification_info)
             VALUES
-                ($1, $2)
+            ($1, $2)
             ON CONFLICT (address) DO
             UPDATE
             SET
-                verification_info = $2
+            verification_info = $2
             "#,
             address.as_bytes(),
             &verification_info_json
@@ -313,8 +313,8 @@ impl ContractVerificationDal<'_, '_> {
                     LIMIT
                         1
                 ) deploy_event
-                JOIN factory_deps ON factory_deps.bytecode_hash = deploy_event.topic3
-                LEFT JOIN transactions ON transactions.hash = deploy_event.tx_hash
+            JOIN factory_deps ON factory_deps.bytecode_hash = deploy_event.topic3
+            LEFT JOIN transactions ON transactions.hash = deploy_event.tx_hash
             WHERE
                 deploy_event.miniblock_number <= (
                     SELECT
@@ -433,15 +433,15 @@ impl ContractVerificationDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                compiler_versions (VERSION, compiler, created_at, updated_at)
+            compiler_versions (version, compiler, created_at, updated_at)
             SELECT
                 u.version,
                 $2,
                 NOW(),
                 NOW()
             FROM
-                UNNEST($1::TEXT[]) AS u (VERSION)
-            ON CONFLICT (VERSION, compiler) DO NOTHING
+                UNNEST($1::TEXT []) AS u (version)
+            ON CONFLICT (version, compiler) DO NOTHING
             "#,
             &versions,
             &compiler,
diff --git a/core/lib/dal/src/data_availability_dal.rs b/core/lib/dal/src/data_availability_dal.rs
index 24048ec4fa1..41dd7efe273 100644
--- a/core/lib/dal/src/data_availability_dal.rs
+++ b/core/lib/dal/src/data_availability_dal.rs
@@ -28,9 +28,9 @@ impl DataAvailabilityDal<'_, '_> {
         let update_result = sqlx::query!(
             r#"
             INSERT INTO
-                data_availability (l1_batch_number, blob_id, sent_at, created_at, updated_at)
+            data_availability (l1_batch_number, blob_id, sent_at, created_at, updated_at)
             VALUES
-                ($1, $2, $3, NOW(), NOW())
+            ($1, $2, $3, NOW(), NOW())
             ON CONFLICT DO NOTHING
             "#,
             i64::from(number.0),
@@ -187,7 +187,9 @@ impl DataAvailabilityDal<'_, '_> {
                 pubdata_input
             FROM
                 l1_batches
-                LEFT JOIN data_availability ON data_availability.l1_batch_number = l1_batches.number
+            LEFT JOIN
+                data_availability
+                ON data_availability.l1_batch_number = l1_batches.number
             WHERE
                 eth_commit_tx_id IS NULL
                 AND number != 0
diff --git a/core/lib/dal/src/eth_sender_dal.rs b/core/lib/dal/src/eth_sender_dal.rs
index a66a513175b..4ce76547ac9 100644
--- a/core/lib/dal/src/eth_sender_dal.rs
+++ b/core/lib/dal/src/eth_sender_dal.rs
@@ -43,7 +43,7 @@ impl EthSenderDal<'_, '_> {
                         COALESCE(MAX(eth_tx_id), 0)
                     FROM
                         eth_txs_history
-                        JOIN eth_txs ON eth_txs.id = eth_txs_history.eth_tx_id
+                    JOIN eth_txs ON eth_txs.id = eth_txs_history.eth_tx_id
                     WHERE
                         eth_txs_history.sent_at_block IS NOT NULL
                         AND eth_txs.from_addr IS NOT DISTINCT FROM $1
@@ -174,7 +174,7 @@ impl EthSenderDal<'_, '_> {
                         COALESCE(MAX(eth_tx_id), 0)
                     FROM
                         eth_txs_history
-                        JOIN eth_txs ON eth_txs.id = eth_txs_history.eth_tx_id
+                    JOIN eth_txs ON eth_txs.id = eth_txs_history.eth_tx_id
                     WHERE
                         eth_txs_history.sent_at_block IS NOT NULL
                         AND eth_txs.from_addr IS NOT DISTINCT FROM $2
@@ -208,7 +208,7 @@ impl EthSenderDal<'_, '_> {
                 eth_txs.nonce
             FROM
                 eth_txs_history
-                JOIN eth_txs ON eth_txs.id = eth_txs_history.eth_tx_id
+            JOIN eth_txs ON eth_txs.id = eth_txs_history.eth_tx_id
             WHERE
                 eth_txs_history.sent_at_block IS NULL
                 AND eth_txs.confirmed_eth_tx_history_id IS NULL
@@ -238,22 +238,22 @@ impl EthSenderDal<'_, '_> {
             StorageEthTx,
             r#"
             INSERT INTO
-                eth_txs (
-                    raw_tx,
-                    nonce,
-                    tx_type,
-                    contract_address,
-                    predicted_gas_cost,
-                    created_at,
-                    updated_at,
-                    from_addr,
-                    blob_sidecar,
-                    is_gateway
-                )
+            eth_txs (
+                raw_tx,
+                nonce,
+                tx_type,
+                contract_address,
+                predicted_gas_cost,
+                created_at,
+                updated_at,
+                from_addr,
+                blob_sidecar,
+                is_gateway
+            )
             VALUES
-                ($1, $2, $3, $4, $5, NOW(), NOW(), $6, $7, $8)
+            ($1, $2, $3, $4, $5, NOW(), NOW(), $6, $7, $8)
             RETURNING
-                *
+            *
             "#,
             raw_tx,
             nonce as i64,
@@ -290,23 +290,23 @@ impl EthSenderDal<'_, '_> {
         Ok(sqlx::query!(
             r#"
             INSERT INTO
-                eth_txs_history (
-                    eth_tx_id,
-                    base_fee_per_gas,
-                    priority_fee_per_gas,
-                    tx_hash,
-                    signed_raw_tx,
-                    created_at,
-                    updated_at,
-                    blob_base_fee_per_gas,
-                    sent_at_block,
-                    sent_at
-                )
+            eth_txs_history (
+                eth_tx_id,
+                base_fee_per_gas,
+                priority_fee_per_gas,
+                tx_hash,
+                signed_raw_tx,
+                created_at,
+                updated_at,
+                blob_base_fee_per_gas,
+                sent_at_block,
+                sent_at
+            )
             VALUES
-                ($1, $2, $3, $4, $5, NOW(), NOW(), $6, $7, NOW())
+            ($1, $2, $3, $4, $5, NOW(), NOW(), $6, $7, NOW())
             ON CONFLICT (tx_hash) DO NOTHING
             RETURNING
-                id
+            id
             "#,
             eth_tx_id as i32,
             base_fee_per_gas,
@@ -376,8 +376,8 @@ impl EthSenderDal<'_, '_> {
             WHERE
                 tx_hash = $1
             RETURNING
-                id,
-                eth_tx_id
+            id,
+            eth_tx_id
             "#,
             tx_hash,
         )
@@ -551,7 +551,7 @@ impl EthSenderDal<'_, '_> {
                 eth_txs.blob_sidecar
             FROM
                 eth_txs_history
-                LEFT JOIN eth_txs ON eth_tx_id = eth_txs.id
+            LEFT JOIN eth_txs ON eth_tx_id = eth_txs.id
             WHERE
                 eth_tx_id = $1
             ORDER BY
@@ -602,7 +602,7 @@ impl EthSenderDal<'_, '_> {
                 eth_txs.blob_sidecar
             FROM
                 eth_txs_history
-                LEFT JOIN eth_txs ON eth_tx_id = eth_txs.id
+            LEFT JOIN eth_txs ON eth_tx_id = eth_txs.id
             WHERE
                 eth_tx_id = $1
             ORDER BY
diff --git a/core/lib/dal/src/eth_watcher_dal.rs b/core/lib/dal/src/eth_watcher_dal.rs
index 3220868decf..bdfc7f24c7b 100644
--- a/core/lib/dal/src/eth_watcher_dal.rs
+++ b/core/lib/dal/src/eth_watcher_dal.rs
@@ -30,8 +30,8 @@ impl EthWatcherDal<'_, '_> {
             FROM
                 processed_events
             WHERE
-            TYPE = $1
-            AND chain_id = $2
+                type = $1
+                AND chain_id = $2
             "#,
             event_type as EventType,
             chain_id.0 as i64
@@ -48,13 +48,13 @@ impl EthWatcherDal<'_, '_> {
             sqlx::query!(
                 r#"
                 INSERT INTO
-                    processed_events (
-                        TYPE,
-                        chain_id,
-                        next_block_to_process
-                    )
+                processed_events (
+                    type,
+                    chain_id,
+                    next_block_to_process
+                )
                 VALUES
-                    ($1, $2, $3)
+                ($1, $2, $3)
                 "#,
                 event_type as EventType,
                 chain_id.0 as i64,
@@ -82,8 +82,8 @@ impl EthWatcherDal<'_, '_> {
             SET
                 next_block_to_process = $3
             WHERE
-            TYPE = $1
-            AND chain_id = $2
+                type = $1
+                AND chain_id = $2
             "#,
             event_type as EventType,
             chain_id.0 as i64,
diff --git a/core/lib/dal/src/events_dal.rs b/core/lib/dal/src/events_dal.rs
index 4050acf7135..487871e3be7 100644
--- a/core/lib/dal/src/events_dal.rs
+++ b/core/lib/dal/src/events_dal.rs
@@ -217,17 +217,17 @@ impl EventsDal<'_, '_> {
                 topic4,
                 value,
                 NULL::bytea AS "block_hash",
-                NULL::BIGINT AS "l1_batch_number?",
+                NULL::bigint AS "l1_batch_number?",
                 miniblock_number,
                 tx_hash,
                 tx_index_in_block,
                 event_index_in_block,
                 event_index_in_tx,
-                NULL::BIGINT AS "block_timestamp?"
+                NULL::bigint AS "block_timestamp?"
             FROM
                 events
             WHERE
-                tx_hash = ANY ($1)
+                tx_hash = ANY($1)
             ORDER BY
                 miniblock_number ASC,
                 event_index_in_block ASC
@@ -319,7 +319,7 @@ impl EventsDal<'_, '_> {
             FROM
                 l2_to_l1_logs
             WHERE
-                tx_hash = ANY ($1)
+                tx_hash = ANY($1)
             ORDER BY
                 tx_index_in_l1_batch ASC,
                 log_index_in_tx ASC
diff --git a/core/lib/dal/src/events_web3_dal.rs b/core/lib/dal/src/events_web3_dal.rs
index fc21cc36460..8b7eb96b714 100644
--- a/core/lib/dal/src/events_web3_dal.rs
+++ b/core/lib/dal/src/events_web3_dal.rs
@@ -189,27 +189,28 @@ impl EventsWeb3Dal<'_, '_> {
             StorageWeb3Log,
             r#"
             WITH
-                events_select AS (
-                    SELECT
-                        address,
-                        topic1,
-                        topic2,
-                        topic3,
-                        topic4,
-                        value,
-                        miniblock_number,
-                        tx_hash,
-                        tx_index_in_block,
-                        event_index_in_block,
-                        event_index_in_tx
-                    FROM
-                        events
-                    WHERE
-                        miniblock_number > $1
-                    ORDER BY
-                        miniblock_number ASC,
-                        event_index_in_block ASC
-                )
+            events_select AS (
+                SELECT
+                    address,
+                    topic1,
+                    topic2,
+                    topic3,
+                    topic4,
+                    value,
+                    miniblock_number,
+                    tx_hash,
+                    tx_index_in_block,
+                    event_index_in_block,
+                    event_index_in_tx
+                FROM
+                    events
+                WHERE
+                    miniblock_number > $1
+                ORDER BY
+                    miniblock_number ASC,
+                    event_index_in_block ASC
+            )
+            
             SELECT
                 miniblocks.hash AS "block_hash?",
                 address AS "address!",
@@ -227,7 +228,7 @@ impl EventsWeb3Dal<'_, '_> {
                 miniblocks.timestamp AS "block_timestamp"
             FROM
                 events_select
-                INNER JOIN miniblocks ON events_select.miniblock_number = miniblocks.number
+            INNER JOIN miniblocks ON events_select.miniblock_number = miniblocks.number
             ORDER BY
                 miniblock_number ASC,
                 event_index_in_block ASC
diff --git a/core/lib/dal/src/factory_deps_dal.rs b/core/lib/dal/src/factory_deps_dal.rs
index 02ce32306cf..857e2973ae3 100644
--- a/core/lib/dal/src/factory_deps_dal.rs
+++ b/core/lib/dal/src/factory_deps_dal.rs
@@ -31,7 +31,7 @@ impl FactoryDepsDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                factory_deps (bytecode_hash, bytecode, miniblock_number, created_at, updated_at)
+            factory_deps (bytecode_hash, bytecode, miniblock_number, created_at, updated_at)
             SELECT
                 u.bytecode_hash,
                 u.bytecode,
@@ -39,7 +39,7 @@ impl FactoryDepsDal<'_, '_> {
                 NOW(),
                 NOW()
             FROM
-                UNNEST($1::bytea[], $2::bytea[]) AS u (bytecode_hash, bytecode)
+                UNNEST($1::bytea [], $2::bytea []) AS u (bytecode_hash, bytecode)
             ON CONFLICT (bytecode_hash) DO NOTHING
             "#,
             &bytecode_hashes as &[&[u8]],
@@ -94,6 +94,7 @@ impl FactoryDepsDal<'_, '_> {
         &mut self,
         bootloader_hash: H256,
         default_aa_hash: H256,
+        evm_emulator_hash: Option<H256>,
     ) -> anyhow::Result<BaseSystemContracts> {
         let bootloader_bytecode = self
             .get_sealed_factory_dep(bootloader_hash)
@@ -115,9 +116,26 @@ impl FactoryDepsDal<'_, '_> {
             code: bytes_to_be_words(default_aa_bytecode),
             hash: default_aa_hash,
         };
+
+        let evm_emulator_code = if let Some(evm_emulator_hash) = evm_emulator_hash {
+            let evm_emulator_bytecode = self
+                .get_sealed_factory_dep(evm_emulator_hash)
+                .await
+                .context("failed loading EVM emulator code")?
+                .with_context(|| format!("EVM emulator code with hash {evm_emulator_hash:?} should be present in the database"))?;
+
+            Some(SystemContractCode {
+                code: bytes_to_be_words(evm_emulator_bytecode),
+                hash: evm_emulator_hash,
+            })
+        } else {
+            None
+        };
+
         Ok(BaseSystemContracts {
             bootloader: bootloader_code,
             default_aa: default_aa_code,
+            evm_emulator: evm_emulator_code,
         })
     }
 
@@ -136,7 +154,7 @@ impl FactoryDepsDal<'_, '_> {
             FROM
                 factory_deps
             WHERE
-                bytecode_hash = ANY ($1)
+                bytecode_hash = ANY($1)
             "#,
             &hashes_as_bytes as &[&[u8]],
         )
diff --git a/core/lib/dal/src/models/storage_block.rs b/core/lib/dal/src/models/storage_block.rs
index 11ff2a83b7b..9ebd0edf0d9 100644
--- a/core/lib/dal/src/models/storage_block.rs
+++ b/core/lib/dal/src/models/storage_block.rs
@@ -44,6 +44,7 @@ pub(crate) struct StorageL1BatchHeader {
     pub used_contract_hashes: serde_json::Value,
     pub bootloader_code_hash: Option<Vec<u8>>,
     pub default_aa_code_hash: Option<Vec<u8>>,
+    pub evm_emulator_code_hash: Option<Vec<u8>>,
     pub protocol_version: Option<i32>,
 
     // `system_logs` are introduced as part of boojum and will be absent in all batches generated prior to boojum.
@@ -82,6 +83,7 @@ impl StorageL1BatchHeader {
             base_system_contracts_hashes: convert_base_system_contracts_hashes(
                 self.bootloader_code_hash,
                 self.default_aa_code_hash,
+                self.evm_emulator_code_hash,
             ),
             system_logs: system_logs.into_iter().map(SystemL2ToL1Log).collect(),
             protocol_version: self
@@ -103,6 +105,7 @@ fn convert_l2_to_l1_logs(raw_logs: Vec<Vec<u8>>) -> Vec<L2ToL1Log> {
 fn convert_base_system_contracts_hashes(
     bootloader_code_hash: Option<Vec<u8>>,
     default_aa_code_hash: Option<Vec<u8>>,
+    evm_emulator_code_hash: Option<Vec<u8>>,
 ) -> BaseSystemContractsHashes {
     BaseSystemContractsHashes {
         bootloader: bootloader_code_hash
@@ -111,6 +114,7 @@ fn convert_base_system_contracts_hashes(
         default_aa: default_aa_code_hash
             .map(|hash| H256::from_slice(&hash))
             .expect("should not be none"),
+        evm_emulator: evm_emulator_code_hash.map(|hash| H256::from_slice(&hash)),
     }
 }
 
@@ -134,6 +138,7 @@ pub(crate) struct StorageL1Batch {
     pub zkporter_is_available: Option<bool>,
     pub bootloader_code_hash: Option<Vec<u8>>,
     pub default_aa_code_hash: Option<Vec<u8>>,
+    pub evm_emulator_code_hash: Option<Vec<u8>>,
 
     pub l2_to_l1_messages: Vec<Vec<u8>>,
     pub l2_l1_merkle_root: Option<Vec<u8>>,
@@ -178,6 +183,7 @@ impl StorageL1Batch {
             base_system_contracts_hashes: convert_base_system_contracts_hashes(
                 self.bootloader_code_hash,
                 self.default_aa_code_hash,
+                self.evm_emulator_code_hash,
             ),
             system_logs: system_logs.into_iter().map(SystemL2ToL1Log).collect(),
             protocol_version: self
@@ -241,6 +247,10 @@ impl TryFrom<StorageL1Batch> for L1BatchMetadata {
                         .default_aa_code_hash
                         .ok_or(L1BatchMetadataError::Incomplete("default_aa_code_hash"))?,
                 ),
+                evm_emulator_code_hash: batch
+                    .evm_emulator_code_hash
+                    .as_deref()
+                    .map(H256::from_slice),
                 protocol_version: batch
                     .protocol_version
                     .map(|v| (v as u16).try_into().unwrap()),
@@ -277,6 +287,7 @@ pub(crate) struct StorageBlockDetails {
     pub fair_pubdata_price: Option<i64>,
     pub bootloader_code_hash: Option<Vec<u8>>,
     pub default_aa_code_hash: Option<Vec<u8>>,
+    pub evm_emulator_code_hash: Option<Vec<u8>>,
     pub fee_account_address: Vec<u8>,
     pub protocol_version: Option<i32>,
 }
@@ -322,6 +333,7 @@ impl From<StorageBlockDetails> for api::BlockDetails {
             base_system_contracts_hashes: convert_base_system_contracts_hashes(
                 details.bootloader_code_hash,
                 details.default_aa_code_hash,
+                details.evm_emulator_code_hash,
             ),
         };
         api::BlockDetails {
@@ -354,6 +366,7 @@ pub(crate) struct StorageL1BatchDetails {
     pub fair_pubdata_price: Option<i64>,
     pub bootloader_code_hash: Option<Vec<u8>>,
     pub default_aa_code_hash: Option<Vec<u8>>,
+    pub evm_emulator_code_hash: Option<Vec<u8>>,
 }
 
 impl From<StorageL1BatchDetails> for api::L1BatchDetails {
@@ -397,6 +410,7 @@ impl From<StorageL1BatchDetails> for api::L1BatchDetails {
             base_system_contracts_hashes: convert_base_system_contracts_hashes(
                 details.bootloader_code_hash,
                 details.default_aa_code_hash,
+                details.evm_emulator_code_hash,
             ),
         };
         api::L1BatchDetails {
@@ -420,6 +434,7 @@ pub(crate) struct StorageL2BlockHeader {
     // L2 gas price assumed in the corresponding batch
     pub bootloader_code_hash: Option<Vec<u8>>,
     pub default_aa_code_hash: Option<Vec<u8>>,
+    pub evm_emulator_code_hash: Option<Vec<u8>>,
     pub protocol_version: Option<i32>,
 
     pub fair_pubdata_price: Option<i64>,
@@ -473,6 +488,7 @@ impl From<StorageL2BlockHeader> for L2BlockHeader {
             base_system_contracts_hashes: convert_base_system_contracts_hashes(
                 row.bootloader_code_hash,
                 row.default_aa_code_hash,
+                row.evm_emulator_code_hash,
             ),
             gas_per_pubdata_limit: row.gas_per_pubdata_limit as u64,
             protocol_version,
diff --git a/core/lib/dal/src/models/storage_protocol_version.rs b/core/lib/dal/src/models/storage_protocol_version.rs
index e53bf7b9d0a..a833236a7b6 100644
--- a/core/lib/dal/src/models/storage_protocol_version.rs
+++ b/core/lib/dal/src/models/storage_protocol_version.rs
@@ -16,6 +16,7 @@ pub struct StorageProtocolVersion {
     pub snark_wrapper_vk_hash: Vec<u8>,
     pub bootloader_code_hash: Vec<u8>,
     pub default_account_code_hash: Vec<u8>,
+    pub evm_emulator_code_hash: Option<Vec<u8>>,
 }
 
 pub(crate) fn protocol_version_from_storage(
@@ -34,6 +35,10 @@ pub(crate) fn protocol_version_from_storage(
         base_system_contracts_hashes: BaseSystemContractsHashes {
             bootloader: H256::from_slice(&storage_version.bootloader_code_hash),
             default_aa: H256::from_slice(&storage_version.default_account_code_hash),
+            evm_emulator: storage_version
+                .evm_emulator_code_hash
+                .as_deref()
+                .map(H256::from_slice),
         },
         tx,
     }
@@ -45,6 +50,7 @@ pub struct StorageApiProtocolVersion {
     pub timestamp: i64,
     pub bootloader_code_hash: Vec<u8>,
     pub default_account_code_hash: Vec<u8>,
+    pub evm_emulator_code_hash: Option<Vec<u8>>,
     pub upgrade_tx_hash: Option<Vec<u8>>,
 }
 
@@ -60,6 +66,10 @@ impl From<StorageApiProtocolVersion> for api::ProtocolVersion {
             storage_protocol_version.timestamp as u64,
             H256::from_slice(&storage_protocol_version.bootloader_code_hash),
             H256::from_slice(&storage_protocol_version.default_account_code_hash),
+            storage_protocol_version
+                .evm_emulator_code_hash
+                .as_deref()
+                .map(H256::from_slice),
             l2_system_upgrade_tx_hash,
         )
     }
diff --git a/core/lib/dal/src/models/storage_sync.rs b/core/lib/dal/src/models/storage_sync.rs
index 688a6f99790..cf7b76d8163 100644
--- a/core/lib/dal/src/models/storage_sync.rs
+++ b/core/lib/dal/src/models/storage_sync.rs
@@ -22,6 +22,7 @@ pub(crate) struct StorageSyncBlock {
     pub fair_pubdata_price: Option<i64>,
     pub bootloader_code_hash: Option<Vec<u8>>,
     pub default_aa_code_hash: Option<Vec<u8>>,
+    pub evm_emulator_code_hash: Option<Vec<u8>>,
     pub fee_account_address: Vec<u8>,
     pub protocol_version: i32,
     pub virtual_blocks: i64,
@@ -75,6 +76,12 @@ impl TryFrom<StorageSyncBlock> for SyncBlock {
                     .decode_column("bootloader_code_hash")?,
                 default_aa: parse_h256_opt(block.default_aa_code_hash.as_deref())
                     .decode_column("default_aa_code_hash")?,
+                evm_emulator: block
+                    .evm_emulator_code_hash
+                    .as_deref()
+                    .map(parse_h256)
+                    .transpose()
+                    .decode_column("evm_emulator_code_hash")?,
             },
             fee_account_address: parse_h160(&block.fee_account_address)
                 .decode_column("fee_account_address")?,
diff --git a/core/lib/dal/src/models/storage_transaction.rs b/core/lib/dal/src/models/storage_transaction.rs
index bb219ee1d61..78daaebb335 100644
--- a/core/lib/dal/src/models/storage_transaction.rs
+++ b/core/lib/dal/src/models/storage_transaction.rs
@@ -352,6 +352,16 @@ impl From<StorageTransactionReceipt> for TransactionReceipt {
             .index_in_block
             .map_or_else(Default::default, U64::from);
 
+        // For better compatibility with various clients, we never return `None` recipient address.
+        let to = storage_receipt
+            .transfer_to
+            .or(storage_receipt.execute_contract_address)
+            .and_then(|addr| {
+                serde_json::from_value::<Option<Address>>(addr)
+                    .expect("invalid address value in the database")
+            })
+            .unwrap_or_else(Address::zero);
+
         let block_hash = H256::from_slice(&storage_receipt.block_hash);
         TransactionReceipt {
             transaction_hash: H256::from_slice(&storage_receipt.tx_hash),
@@ -361,15 +371,7 @@ impl From<StorageTransactionReceipt> for TransactionReceipt {
             l1_batch_tx_index: storage_receipt.l1_batch_tx_index.map(U64::from),
             l1_batch_number: storage_receipt.l1_batch_number.map(U64::from),
             from: H160::from_slice(&storage_receipt.initiator_address),
-            to: storage_receipt
-                .transfer_to
-                .or(storage_receipt.execute_contract_address)
-                .map(|addr| {
-                    serde_json::from_value::<Address>(addr)
-                        .expect("invalid address value in the database")
-                })
-                // For better compatibility with various clients, we never return null.
-                .or_else(|| Some(Address::default())),
+            to: Some(to),
             cumulative_gas_used: Default::default(), // TODO: Should be actually calculated (SMA-1183).
             gas_used: {
                 let refunded_gas: U256 = storage_receipt.refunded_gas.into();
@@ -508,6 +510,10 @@ impl StorageApiTransaction {
             .signature
             .and_then(|signature| PackedEthSignature::deserialize_packed(&signature).ok());
 
+        let to = serde_json::from_value(self.execute_contract_address)
+            .ok()
+            .unwrap_or_default();
+
         // For legacy and EIP-2930 transactions it is gas price willing to be paid by the sender in wei.
         // For other transactions it should be the effective gas price if transaction is included in block,
         // otherwise this value should be set equal to the max fee per gas.
@@ -528,7 +534,7 @@ impl StorageApiTransaction {
             block_number: self.block_number.map(|number| U64::from(number as u64)),
             transaction_index: self.index_in_block.map(|idx| U64::from(idx as u64)),
             from: Some(Address::from_slice(&self.initiator_address)),
-            to: Some(serde_json::from_value(self.execute_contract_address).unwrap()),
+            to,
             value: bigdecimal_to_u256(self.value),
             gas_price: Some(bigdecimal_to_u256(gas_price)),
             gas: bigdecimal_to_u256(self.gas_limit.unwrap_or_else(BigDecimal::zero)),
diff --git a/core/lib/dal/src/proof_generation_dal.rs b/core/lib/dal/src/proof_generation_dal.rs
index dada6c69ed3..7943a930277 100644
--- a/core/lib/dal/src/proof_generation_dal.rs
+++ b/core/lib/dal/src/proof_generation_dal.rs
@@ -55,7 +55,7 @@ impl ProofGenerationDal<'_, '_> {
                         l1_batch_number
                     FROM
                         proof_generation_details
-                        LEFT JOIN l1_batches ON l1_batch_number = l1_batches.number
+                    LEFT JOIN l1_batches ON l1_batch_number = l1_batches.number
                     WHERE
                         (
                             vm_run_data_blob_url IS NOT NULL
@@ -75,7 +75,7 @@ impl ProofGenerationDal<'_, '_> {
                         1
                 )
             RETURNING
-                proof_generation_details.l1_batch_number
+            proof_generation_details.l1_batch_number
             "#,
             &processing_timeout,
         )
@@ -254,9 +254,9 @@ impl ProofGenerationDal<'_, '_> {
         let result = sqlx::query!(
             r#"
             INSERT INTO
-                proof_generation_details (l1_batch_number, status, created_at, updated_at)
+            proof_generation_details (l1_batch_number, status, created_at, updated_at)
             VALUES
-                ($1, 'unpicked', NOW(), NOW())
+            ($1, 'unpicked', NOW(), NOW())
             ON CONFLICT (l1_batch_number) DO NOTHING
             "#,
             i64::from(l1_batch_number.0),
diff --git a/core/lib/dal/src/protocol_versions_dal.rs b/core/lib/dal/src/protocol_versions_dal.rs
index 8cb5094fd49..3b500e07a08 100644
--- a/core/lib/dal/src/protocol_versions_dal.rs
+++ b/core/lib/dal/src/protocol_versions_dal.rs
@@ -40,22 +40,27 @@ impl ProtocolVersionsDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                protocol_versions (
-                    id,
-                    timestamp,
-                    bootloader_code_hash,
-                    default_account_code_hash,
-                    upgrade_tx_hash,
-                    created_at
-                )
+            protocol_versions (
+                id,
+                timestamp,
+                bootloader_code_hash,
+                default_account_code_hash,
+                evm_emulator_code_hash,
+                upgrade_tx_hash,
+                created_at
+            )
             VALUES
-                ($1, $2, $3, $4, $5, NOW())
+            ($1, $2, $3, $4, $5, $6, NOW())
             ON CONFLICT DO NOTHING
             "#,
             version.minor as i32,
             timestamp as i64,
             base_system_contracts_hashes.bootloader.as_bytes(),
             base_system_contracts_hashes.default_aa.as_bytes(),
+            base_system_contracts_hashes
+                .evm_emulator
+                .as_ref()
+                .map(H256::as_bytes),
             tx_hash.as_ref().map(H256::as_bytes),
         )
         .instrument("save_protocol_version#minor")
@@ -71,9 +76,9 @@ impl ProtocolVersionsDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                protocol_patches (minor, patch, snark_wrapper_vk_hash, created_at)
+            protocol_patches (minor, patch, snark_wrapper_vk_hash, created_at)
             VALUES
-                ($1, $2, $3, NOW())
+            ($1, $2, $3, NOW())
             ON CONFLICT DO NOTHING
             "#,
             version.minor as i32,
@@ -193,7 +198,8 @@ impl ProtocolVersionsDal<'_, '_> {
             r#"
             SELECT
                 bootloader_code_hash,
-                default_account_code_hash
+                default_account_code_hash,
+                evm_emulator_code_hash
             FROM
                 protocol_versions
             WHERE
@@ -212,6 +218,7 @@ impl ProtocolVersionsDal<'_, '_> {
                 .get_base_system_contracts(
                     H256::from_slice(&row.bootloader_code_hash),
                     H256::from_slice(&row.default_account_code_hash),
+                    row.evm_emulator_code_hash.as_deref().map(H256::from_slice),
                 )
                 .await?;
             Some(contracts)
@@ -232,11 +239,12 @@ impl ProtocolVersionsDal<'_, '_> {
                 protocol_versions.timestamp,
                 protocol_versions.bootloader_code_hash,
                 protocol_versions.default_account_code_hash,
+                protocol_versions.evm_emulator_code_hash,
                 protocol_patches.patch,
                 protocol_patches.snark_wrapper_vk_hash
             FROM
                 protocol_versions
-                JOIN protocol_patches ON protocol_patches.minor = protocol_versions.id
+            JOIN protocol_patches ON protocol_patches.minor = protocol_versions.id
             WHERE
                 id = $1
             ORDER BY
diff --git a/core/lib/dal/src/protocol_versions_web3_dal.rs b/core/lib/dal/src/protocol_versions_web3_dal.rs
index a3a7a162c3d..adc3957f872 100644
--- a/core/lib/dal/src/protocol_versions_web3_dal.rs
+++ b/core/lib/dal/src/protocol_versions_web3_dal.rs
@@ -21,6 +21,7 @@ impl ProtocolVersionsWeb3Dal<'_, '_> {
                 timestamp,
                 bootloader_code_hash,
                 default_account_code_hash,
+                evm_emulator_code_hash,
                 upgrade_tx_hash
             FROM
                 protocol_versions
diff --git a/core/lib/dal/src/pruning_dal/mod.rs b/core/lib/dal/src/pruning_dal/mod.rs
index 0d1584ebba3..bcd9fdcfc3e 100644
--- a/core/lib/dal/src/pruning_dal/mod.rs
+++ b/core/lib/dal/src/pruning_dal/mod.rs
@@ -45,32 +45,34 @@ impl PruningDal<'_, '_> {
         let pruning_info = sqlx::query!(
             r#"
             WITH
-                soft AS (
-                    SELECT
-                        pruned_l1_batch,
-                        pruned_miniblock
-                    FROM
-                        pruning_log
-                    WHERE
-                    TYPE = 'Soft'
-                    ORDER BY
-                        pruned_l1_batch DESC
-                    LIMIT
-                        1
-                ),
-                hard AS (
-                    SELECT
-                        pruned_l1_batch,
-                        pruned_miniblock
-                    FROM
-                        pruning_log
-                    WHERE
-                    TYPE = 'Hard'
-                    ORDER BY
-                        pruned_l1_batch DESC
-                    LIMIT
-                        1
-                )
+            soft AS (
+                SELECT
+                    pruned_l1_batch,
+                    pruned_miniblock
+                FROM
+                    pruning_log
+                WHERE
+                    type = 'Soft'
+                ORDER BY
+                    pruned_l1_batch DESC
+                LIMIT
+                    1
+            ),
+            
+            hard AS (
+                SELECT
+                    pruned_l1_batch,
+                    pruned_miniblock
+                FROM
+                    pruning_log
+                WHERE
+                    type = 'Hard'
+                ORDER BY
+                    pruned_l1_batch DESC
+                LIMIT
+                    1
+            )
+            
             SELECT
                 soft.pruned_l1_batch AS last_soft_pruned_l1_batch,
                 soft.pruned_miniblock AS last_soft_pruned_miniblock,
@@ -78,7 +80,7 @@ impl PruningDal<'_, '_> {
                 hard.pruned_miniblock AS last_hard_pruned_miniblock
             FROM
                 soft
-                FULL JOIN hard ON TRUE
+            FULL JOIN hard ON TRUE
             "#
         )
         .map(|row| PruningInfo {
@@ -110,15 +112,15 @@ impl PruningDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                pruning_log (
-                    pruned_l1_batch,
-                    pruned_miniblock,
-                    TYPE,
-                    created_at,
-                    updated_at
-                )
+            pruning_log (
+                pruned_l1_batch,
+                pruned_miniblock,
+                type,
+                created_at,
+                updated_at
+            )
             VALUES
-                ($1, $2, $3, NOW(), NOW())
+            ($1, $2, $3, NOW(), NOW())
             "#,
             i64::from(last_l1_batch_to_prune.0),
             i64::from(last_l2_block_to_prune.0),
@@ -319,25 +321,28 @@ impl PruningDal<'_, '_> {
         let execution_result = sqlx::query!(
             r#"
             WITH
-                new_logs AS MATERIALIZED (
-                    SELECT DISTINCT
-                        ON (hashed_key) hashed_key,
-                        miniblock_number,
-                        operation_number
-                    FROM
-                        storage_logs
-                    WHERE
-                        miniblock_number BETWEEN $1 AND $2
-                    ORDER BY
-                        hashed_key,
-                        miniblock_number DESC,
-                        operation_number DESC
-                )
+            new_logs AS MATERIALIZED (
+                SELECT DISTINCT
+                ON (hashed_key)
+                    hashed_key,
+                    miniblock_number,
+                    operation_number
+                FROM
+                    storage_logs
+                WHERE
+                    miniblock_number BETWEEN $1 AND $2
+                ORDER BY
+                    hashed_key,
+                    miniblock_number DESC,
+                    operation_number DESC
+            )
+            
             DELETE FROM storage_logs USING new_logs
             WHERE
                 storage_logs.hashed_key = new_logs.hashed_key
                 AND storage_logs.miniblock_number <= $2
-                AND (storage_logs.miniblock_number, storage_logs.operation_number) < (new_logs.miniblock_number, new_logs.operation_number)
+                AND (storage_logs.miniblock_number, storage_logs.operation_number)
+                < (new_logs.miniblock_number, new_logs.operation_number)
             "#,
             i64::from(l2_blocks_to_prune.start().0),
             i64::from(l2_blocks_to_prune.end().0)
@@ -392,15 +397,15 @@ impl PruningDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                pruning_log (
-                    pruned_l1_batch,
-                    pruned_miniblock,
-                    TYPE,
-                    created_at,
-                    updated_at
-                )
+            pruning_log (
+                pruned_l1_batch,
+                pruned_miniblock,
+                type,
+                created_at,
+                updated_at
+            )
             VALUES
-                ($1, $2, $3, NOW(), NOW())
+            ($1, $2, $3, NOW(), NOW())
             "#,
             i64::from(last_l1_batch_to_prune.0),
             i64::from(last_l2_block_to_prune.0),
diff --git a/core/lib/dal/src/snapshot_recovery_dal.rs b/core/lib/dal/src/snapshot_recovery_dal.rs
index 0b0c0e1735f..72cde14b9c5 100644
--- a/core/lib/dal/src/snapshot_recovery_dal.rs
+++ b/core/lib/dal/src/snapshot_recovery_dal.rs
@@ -18,20 +18,20 @@ impl SnapshotRecoveryDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                snapshot_recovery (
-                    l1_batch_number,
-                    l1_batch_timestamp,
-                    l1_batch_root_hash,
-                    miniblock_number,
-                    miniblock_timestamp,
-                    miniblock_hash,
-                    protocol_version,
-                    storage_logs_chunks_processed,
-                    updated_at,
-                    created_at
-                )
+            snapshot_recovery (
+                l1_batch_number,
+                l1_batch_timestamp,
+                l1_batch_root_hash,
+                miniblock_number,
+                miniblock_timestamp,
+                miniblock_hash,
+                protocol_version,
+                storage_logs_chunks_processed,
+                updated_at,
+                created_at
+            )
             VALUES
-                ($1, $2, $3, $4, $5, $6, $7, $8, NOW(), NOW())
+            ($1, $2, $3, $4, $5, $6, $7, $8, NOW(), NOW())
             "#,
             i64::from(status.l1_batch_number.0),
             status.l1_batch_timestamp as i64,
diff --git a/core/lib/dal/src/snapshots_creator_dal.rs b/core/lib/dal/src/snapshots_creator_dal.rs
index 700e3812018..fdfc2ccf469 100644
--- a/core/lib/dal/src/snapshots_creator_dal.rs
+++ b/core/lib/dal/src/snapshots_creator_dal.rs
@@ -64,7 +64,7 @@ impl SnapshotsCreatorDal<'_, '_> {
                 (
                     SELECT
                         hashed_key,
-                        MAX(ARRAY[miniblock_number, operation_number]::INT[]) AS op
+                        MAX(ARRAY[miniblock_number, operation_number]::INT []) AS op
                     FROM
                         storage_logs
                     WHERE
@@ -76,10 +76,12 @@ impl SnapshotsCreatorDal<'_, '_> {
                     ORDER BY
                         hashed_key
                 ) AS keys
-                INNER JOIN storage_logs ON keys.hashed_key = storage_logs.hashed_key
-                AND storage_logs.miniblock_number = keys.op[1]
-                AND storage_logs.operation_number = keys.op[2]
-                INNER JOIN initial_writes ON keys.hashed_key = initial_writes.hashed_key
+            INNER JOIN storage_logs
+                ON
+                    keys.hashed_key = storage_logs.hashed_key
+                    AND storage_logs.miniblock_number = keys.op[1]
+                    AND storage_logs.operation_number = keys.op[2]
+            INNER JOIN initial_writes ON keys.hashed_key = initial_writes.hashed_key
             WHERE
                 initial_writes.l1_batch_number <= $2
             "#,
@@ -130,7 +132,7 @@ impl SnapshotsCreatorDal<'_, '_> {
                 (
                     SELECT
                         hashed_key,
-                        MAX(ARRAY[miniblock_number, operation_number]::INT[]) AS op
+                        MAX(ARRAY[miniblock_number, operation_number]::INT []) AS op
                     FROM
                         storage_logs
                     WHERE
@@ -142,10 +144,12 @@ impl SnapshotsCreatorDal<'_, '_> {
                     ORDER BY
                         hashed_key
                 ) AS keys
-                INNER JOIN storage_logs ON keys.hashed_key = storage_logs.hashed_key
-                AND storage_logs.miniblock_number = keys.op[1]
-                AND storage_logs.operation_number = keys.op[2]
-                INNER JOIN initial_writes ON keys.hashed_key = initial_writes.hashed_key
+            INNER JOIN storage_logs
+                ON
+                    keys.hashed_key = storage_logs.hashed_key
+                    AND storage_logs.miniblock_number = keys.op[1]
+                    AND storage_logs.operation_number = keys.op[2]
+            INNER JOIN initial_writes ON keys.hashed_key = initial_writes.hashed_key
             WHERE
                 initial_writes.l1_batch_number <= $2
             "#,
diff --git a/core/lib/dal/src/snapshots_dal.rs b/core/lib/dal/src/snapshots_dal.rs
index 950fb6501a4..5ddad933aad 100644
--- a/core/lib/dal/src/snapshots_dal.rs
+++ b/core/lib/dal/src/snapshots_dal.rs
@@ -54,16 +54,16 @@ impl SnapshotsDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                snapshots (
-                    VERSION,
-                    l1_batch_number,
-                    storage_logs_filepaths,
-                    factory_deps_filepath,
-                    created_at,
-                    updated_at
-                )
+            snapshots (
+                version,
+                l1_batch_number,
+                storage_logs_filepaths,
+                factory_deps_filepath,
+                created_at,
+                updated_at
+            )
             VALUES
-                ($1, $2, ARRAY_FILL(''::TEXT, ARRAY[$3::INTEGER]), $4, NOW(), NOW())
+            ($1, $2, ARRAY_FILL(''::TEXT, ARRAY[$3::INTEGER]), $4, NOW(), NOW())
             "#,
             version as i32,
             l1_batch_number.0 as i32,
@@ -115,7 +115,7 @@ impl SnapshotsDal<'_, '_> {
             FROM
                 snapshots
             WHERE
-                NOT (''::TEXT = ANY (storage_logs_filepaths))
+                NOT (''::TEXT = ANY(storage_logs_filepaths))
             ORDER BY
                 l1_batch_number DESC
             "#
@@ -198,10 +198,10 @@ impl SnapshotsDal<'_, '_> {
             WHERE
                 l1_batch_number > $1
             RETURNING
-                VERSION,
-                l1_batch_number,
-                factory_deps_filepath,
-                storage_logs_filepaths
+            version,
+            l1_batch_number,
+            factory_deps_filepath,
+            storage_logs_filepaths
             "#,
             last_retained_l1_batch_number.0 as i32
         )
diff --git a/core/lib/dal/src/storage_logs_dal.rs b/core/lib/dal/src/storage_logs_dal.rs
index 50f41f31333..adad6eb7e1d 100644
--- a/core/lib/dal/src/storage_logs_dal.rs
+++ b/core/lib/dal/src/storage_logs_dal.rs
@@ -186,7 +186,8 @@ impl StorageLogsDal<'_, '_> {
     ) -> DalResult<Vec<H256>> {
         let rows = sqlx::query!(
             r#"
-            SELECT DISTINCT
+            SELECT
+                DISTINCT
                 hashed_key
             FROM
                 storage_logs
@@ -290,13 +291,14 @@ impl StorageLogsDal<'_, '_> {
         let rows = sqlx::query!(
             r#"
             SELECT DISTINCT
-                ON (hashed_key) hashed_key,
+            ON (hashed_key)
+                hashed_key,
                 miniblock_number,
                 value
             FROM
                 storage_logs
             WHERE
-                hashed_key = ANY ($1)
+                hashed_key = ANY($1)
                 AND miniblock_number <= $2
                 AND miniblock_number <= COALESCE(
                     (
@@ -539,11 +541,11 @@ impl StorageLogsDal<'_, '_> {
             SELECT
                 hashed_key,
                 l1_batch_number,
-                INDEX
+                index
             FROM
                 initial_writes
             WHERE
-                hashed_key = ANY ($1::bytea[])
+                hashed_key = ANY($1::bytea [])
             "#,
             &hashed_keys as &[&[u8]],
         )
@@ -621,7 +623,7 @@ impl StorageLogsDal<'_, '_> {
                         1
                 ) AS "value?"
             FROM
-                UNNEST($1::bytea[]) AS u (hashed_key)
+                UNNEST($1::bytea []) AS u (hashed_key)
             "#,
             &hashed_keys as &[&[u8]],
             i64::from(l2_block_number.0)
@@ -717,32 +719,33 @@ impl StorageLogsDal<'_, '_> {
         let rows = sqlx::query!(
             r#"
             WITH
-                sl AS (
-                    SELECT
-                        (
-                            SELECT
-                                ARRAY[hashed_key, value] AS kv
-                            FROM
-                                storage_logs
-                            WHERE
-                                storage_logs.miniblock_number = $1
-                                AND storage_logs.hashed_key >= u.start_key
-                                AND storage_logs.hashed_key <= u.end_key
-                            ORDER BY
-                                storage_logs.hashed_key
-                            LIMIT
-                                1
-                        )
-                    FROM
-                        UNNEST($2::bytea[], $3::bytea[]) AS u (start_key, end_key)
-                )
+            sl AS (
+                SELECT
+                    (
+                        SELECT
+                            ARRAY[hashed_key, value] AS kv
+                        FROM
+                            storage_logs
+                        WHERE
+                            storage_logs.miniblock_number = $1
+                            AND storage_logs.hashed_key >= u.start_key
+                            AND storage_logs.hashed_key <= u.end_key
+                        ORDER BY
+                            storage_logs.hashed_key
+                        LIMIT
+                            1
+                    )
+                FROM
+                    UNNEST($2::bytea [], $3::bytea []) AS u (start_key, end_key)
+            )
+            
             SELECT
                 sl.kv[1] AS "hashed_key?",
                 sl.kv[2] AS "value?",
                 initial_writes.index
             FROM
                 sl
-                LEFT OUTER JOIN initial_writes ON initial_writes.hashed_key = sl.kv[1]
+            LEFT OUTER JOIN initial_writes ON initial_writes.hashed_key = sl.kv[1]
             "#,
             i64::from(l2_block_number.0),
             &start_keys as &[&[u8]],
@@ -779,7 +782,7 @@ impl StorageLogsDal<'_, '_> {
                 initial_writes.index
             FROM
                 storage_logs
-                INNER JOIN initial_writes ON storage_logs.hashed_key = initial_writes.hashed_key
+            INNER JOIN initial_writes ON storage_logs.hashed_key = initial_writes.hashed_key
             WHERE
                 storage_logs.miniblock_number = $1
                 AND storage_logs.hashed_key >= $2::bytea
diff --git a/core/lib/dal/src/storage_logs_dedup_dal.rs b/core/lib/dal/src/storage_logs_dedup_dal.rs
index f02ac6c4cf4..a94c237bc5b 100644
--- a/core/lib/dal/src/storage_logs_dedup_dal.rs
+++ b/core/lib/dal/src/storage_logs_dedup_dal.rs
@@ -93,7 +93,7 @@ impl StorageLogsDedupDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                initial_writes (hashed_key, INDEX, l1_batch_number, created_at, updated_at)
+            initial_writes (hashed_key, index, l1_batch_number, created_at, updated_at)
             SELECT
                 u.hashed_key,
                 u.index,
@@ -101,7 +101,7 @@ impl StorageLogsDedupDal<'_, '_> {
                 NOW(),
                 NOW()
             FROM
-                UNNEST($1::bytea[], $2::BIGINT[]) AS u (hashed_key, INDEX)
+                UNNEST($1::bytea [], $2::bigint []) AS u (hashed_key, index)
             "#,
             &hashed_keys as &[&[u8]],
             &indices,
@@ -202,13 +202,13 @@ impl StorageLogsDedupDal<'_, '_> {
             r#"
             SELECT
                 hashed_key,
-                INDEX
+                index
             FROM
                 initial_writes
             WHERE
                 l1_batch_number = $1
             ORDER BY
-                INDEX
+                index
             "#,
             i64::from(l1_batch_number.0)
         )
@@ -279,7 +279,7 @@ impl StorageLogsDedupDal<'_, '_> {
             FROM
                 initial_writes
             WHERE
-                hashed_key = ANY ($1)
+                hashed_key = ANY($1)
             "#,
             &hashed_keys as &[&[u8]],
         )
@@ -299,7 +299,7 @@ impl StorageLogsDedupDal<'_, '_> {
             SELECT
                 hashed_key,
                 l1_batch_number,
-                INDEX
+                index
             FROM
                 initial_writes
             "#
diff --git a/core/lib/dal/src/storage_web3_dal.rs b/core/lib/dal/src/storage_web3_dal.rs
index f54ac766ee8..f3a20ac39fa 100644
--- a/core/lib/dal/src/storage_web3_dal.rs
+++ b/core/lib/dal/src/storage_web3_dal.rs
@@ -253,7 +253,7 @@ impl StorageWeb3Dal<'_, '_> {
                     LIMIT
                         1
                 ) t
-                JOIN factory_deps ON value = factory_deps.bytecode_hash
+            JOIN factory_deps ON value = factory_deps.bytecode_hash
             WHERE
                 value != $3
             "#,
diff --git a/core/lib/dal/src/sync_dal.rs b/core/lib/dal/src/sync_dal.rs
index ec6ee0f9281..ab5684007d0 100644
--- a/core/lib/dal/src/sync_dal.rs
+++ b/core/lib/dal/src/sync_dal.rs
@@ -50,6 +50,7 @@ impl SyncDal<'_, '_> {
                 miniblocks.fair_pubdata_price,
                 miniblocks.bootloader_code_hash,
                 miniblocks.default_aa_code_hash,
+                miniblocks.evm_emulator_code_hash,
                 miniblocks.virtual_blocks,
                 miniblocks.hash,
                 miniblocks.protocol_version AS "protocol_version!",
diff --git a/core/lib/dal/src/system_dal.rs b/core/lib/dal/src/system_dal.rs
index 9ef375a8d56..105665fa2ec 100644
--- a/core/lib/dal/src/system_dal.rs
+++ b/core/lib/dal/src/system_dal.rs
@@ -30,8 +30,8 @@ impl SystemDal<'_, '_> {
                 EXTRACT(
                     seconds
                     FROM
-                        NOW() - PG_LAST_XACT_REPLAY_TIMESTAMP()
-                )::INT AS LAG
+                    NOW() - PG_LAST_XACT_REPLAY_TIMESTAMP()
+                )::INT AS lag
             "#
         )
         .instrument("get_replication_lag")
@@ -49,10 +49,18 @@ impl SystemDal<'_, '_> {
             r#"
             SELECT
                 table_name,
-                PG_TABLE_SIZE(('public.' || QUOTE_IDENT(table_name))::regclass) AS table_size,
-                PG_INDEXES_SIZE(('public.' || QUOTE_IDENT(table_name))::regclass) AS indexes_size,
-                PG_RELATION_SIZE(('public.' || QUOTE_IDENT(table_name))::regclass) AS relation_size,
-                PG_TOTAL_RELATION_SIZE(('public.' || QUOTE_IDENT(table_name))::regclass) AS total_size
+                PG_TABLE_SIZE(
+                    ('public.' || QUOTE_IDENT(table_name))::regclass
+                ) AS table_size,
+                PG_INDEXES_SIZE(
+                    ('public.' || QUOTE_IDENT(table_name))::regclass
+                ) AS indexes_size,
+                PG_RELATION_SIZE(
+                    ('public.' || QUOTE_IDENT(table_name))::regclass
+                ) AS relation_size,
+                PG_TOTAL_RELATION_SIZE(
+                    ('public.' || QUOTE_IDENT(table_name))::regclass
+                ) AS total_size
             FROM
                 information_schema.tables
             WHERE
diff --git a/core/lib/dal/src/tee_proof_generation_dal.rs b/core/lib/dal/src/tee_proof_generation_dal.rs
index cc6b87a07ac..db56b9d0e3e 100644
--- a/core/lib/dal/src/tee_proof_generation_dal.rs
+++ b/core/lib/dal/src/tee_proof_generation_dal.rs
@@ -53,7 +53,9 @@ impl TeeProofGenerationDal<'_, '_> {
                         proofs.l1_batch_number
                     FROM
                         tee_proof_generation_details AS proofs
-                        JOIN tee_verifier_input_producer_jobs AS inputs ON proofs.l1_batch_number = inputs.l1_batch_number
+                    JOIN
+                        tee_verifier_input_producer_jobs AS inputs
+                        ON proofs.l1_batch_number = inputs.l1_batch_number
                     WHERE
                         inputs.status = $3
                         AND (
@@ -69,10 +71,10 @@ impl TeeProofGenerationDal<'_, '_> {
                     LIMIT
                         1
                     FOR UPDATE
-                        SKIP LOCKED
+                    SKIP LOCKED
                 )
             RETURNING
-                tee_proof_generation_details.l1_batch_number
+            tee_proof_generation_details.l1_batch_number
             "#,
             TeeProofGenerationJobStatus::PickedByProver.to_string(),
             tee_type.to_string(),
@@ -183,9 +185,11 @@ impl TeeProofGenerationDal<'_, '_> {
         let query = sqlx::query!(
             r#"
             INSERT INTO
-                tee_proof_generation_details (l1_batch_number, tee_type, status, created_at, updated_at)
+            tee_proof_generation_details (
+                l1_batch_number, tee_type, status, created_at, updated_at
+            )
             VALUES
-                ($1, $2, $3, NOW(), NOW())
+            ($1, $2, $3, NOW(), NOW())
             ON CONFLICT (l1_batch_number, tee_type) DO NOTHING
             "#,
             batch_number,
@@ -208,9 +212,9 @@ impl TeeProofGenerationDal<'_, '_> {
         let query = sqlx::query!(
             r#"
             INSERT INTO
-                tee_attestations (pubkey, attestation)
+            tee_attestations (pubkey, attestation)
             VALUES
-                ($1, $2)
+            ($1, $2)
             ON CONFLICT (pubkey) DO NOTHING
             "#,
             pubkey,
@@ -274,7 +278,9 @@ impl TeeProofGenerationDal<'_, '_> {
                 proofs.l1_batch_number
             FROM
                 tee_proof_generation_details AS proofs
-                JOIN tee_verifier_input_producer_jobs AS inputs ON proofs.l1_batch_number = inputs.l1_batch_number
+            JOIN
+                tee_verifier_input_producer_jobs AS inputs
+                ON proofs.l1_batch_number = inputs.l1_batch_number
             WHERE
                 inputs.status = $1
                 AND proofs.status = $2
diff --git a/core/lib/dal/src/tee_verifier_input_producer_dal.rs b/core/lib/dal/src/tee_verifier_input_producer_dal.rs
index 4a178fd5225..dddb451a2d7 100644
--- a/core/lib/dal/src/tee_verifier_input_producer_dal.rs
+++ b/core/lib/dal/src/tee_verifier_input_producer_dal.rs
@@ -55,9 +55,11 @@ impl TeeVerifierInputProducerDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                tee_verifier_input_producer_jobs (l1_batch_number, status, created_at, updated_at)
+            tee_verifier_input_producer_jobs (
+                l1_batch_number, status, created_at, updated_at
+            )
             VALUES
-                ($1, $2, NOW(), NOW())
+            ($1, $2, NOW(), NOW())
             ON CONFLICT (l1_batch_number) DO NOTHING
             "#,
             i64::from(l1_batch_number.0),
@@ -104,10 +106,10 @@ impl TeeVerifierInputProducerDal<'_, '_> {
                     LIMIT
                         1
                     FOR UPDATE
-                        SKIP LOCKED
+                    SKIP LOCKED
                 )
             RETURNING
-                tee_verifier_input_producer_jobs.l1_batch_number
+            tee_verifier_input_producer_jobs.l1_batch_number
             "#,
             TeeVerifierInputProducerJobStatus::InProgress as TeeVerifierInputProducerJobStatus,
             TeeVerifierInputProducerJobStatus::Queued as TeeVerifierInputProducerJobStatus,
@@ -197,7 +199,7 @@ impl TeeVerifierInputProducerDal<'_, '_> {
                 l1_batch_number = $2
                 AND status != $5
             RETURNING
-                tee_verifier_input_producer_jobs.attempts
+            tee_verifier_input_producer_jobs.attempts
             "#,
             TeeVerifierInputProducerJobStatus::Failed as TeeVerifierInputProducerJobStatus,
             i64::from(l1_batch_number.0),
diff --git a/core/lib/dal/src/tests/mod.rs b/core/lib/dal/src/tests/mod.rs
index dc672fa1f80..bf85008f7b5 100644
--- a/core/lib/dal/src/tests/mod.rs
+++ b/core/lib/dal/src/tests/mod.rs
@@ -54,6 +54,7 @@ pub(crate) fn create_l2_block_header(number: u32) -> L2BlockHeader {
         logs_bloom: Default::default(),
     }
 }
+
 pub(crate) fn create_l1_batch_header(number: u32) -> L1BatchHeader {
     L1BatchHeader::new(
         L1BatchNumber(number),
@@ -61,6 +62,7 @@ pub(crate) fn create_l1_batch_header(number: u32) -> L1BatchHeader {
         BaseSystemContractsHashes {
             bootloader: H256::repeat_byte(1),
             default_aa: H256::repeat_byte(42),
+            evm_emulator: Some(H256::repeat_byte(43)),
         },
         ProtocolVersionId::latest(),
     )
diff --git a/core/lib/dal/src/tokens_dal.rs b/core/lib/dal/src/tokens_dal.rs
index b34b913c45c..218e152fa82 100644
--- a/core/lib/dal/src/tokens_dal.rs
+++ b/core/lib/dal/src/tokens_dal.rs
@@ -110,7 +110,7 @@ impl TokensDal<'_, '_> {
             r#"
             DELETE FROM tokens
             WHERE
-                l2_address = ANY ($1)
+                l2_address = ANY($1)
             "#,
             &token_addresses_to_be_removed as &[_]
         )
diff --git a/core/lib/dal/src/tokens_web3_dal.rs b/core/lib/dal/src/tokens_web3_dal.rs
index 00c7a69385d..794de18163e 100644
--- a/core/lib/dal/src/tokens_web3_dal.rs
+++ b/core/lib/dal/src/tokens_web3_dal.rs
@@ -43,7 +43,7 @@ impl TokensWeb3Dal<'_, '_> {
             SELECT
                 l1_address,
                 l2_address,
-                NAME,
+                name,
                 symbol,
                 decimals
             FROM
@@ -95,7 +95,7 @@ impl TokensWeb3Dal<'_, '_> {
             SELECT
                 l1_address,
                 l2_address,
-                NAME,
+                name,
                 symbol,
                 decimals
             FROM
diff --git a/core/lib/dal/src/transactions_dal.rs b/core/lib/dal/src/transactions_dal.rs
index 9f63427491a..67c965312bd 100644
--- a/core/lib/dal/src/transactions_dal.rs
+++ b/core/lib/dal/src/transactions_dal.rs
@@ -88,53 +88,53 @@ impl TransactionsDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                transactions (
-                    hash,
-                    is_priority,
-                    initiator_address,
-                    gas_limit,
-                    max_fee_per_gas,
-                    gas_per_pubdata_limit,
-                    data,
-                    priority_op_id,
-                    full_fee,
-                    layer_2_tip_fee,
-                    contract_address,
-                    l1_block_number,
-                    value,
-                    paymaster,
-                    paymaster_input,
-                    tx_format,
-                    l1_tx_mint,
-                    l1_tx_refund_recipient,
-                    received_at,
-                    created_at,
-                    updated_at
-                )
+            transactions (
+                hash,
+                is_priority,
+                initiator_address,
+                gas_limit,
+                max_fee_per_gas,
+                gas_per_pubdata_limit,
+                data,
+                priority_op_id,
+                full_fee,
+                layer_2_tip_fee,
+                contract_address,
+                l1_block_number,
+                value,
+                paymaster,
+                paymaster_input,
+                tx_format,
+                l1_tx_mint,
+                l1_tx_refund_recipient,
+                received_at,
+                created_at,
+                updated_at
+            )
             VALUES
-                (
-                    $1,
-                    TRUE,
-                    $2,
-                    $3,
-                    $4,
-                    $5,
-                    $6,
-                    $7,
-                    $8,
-                    $9,
-                    $10,
-                    $11,
-                    $12,
-                    $13,
-                    $14,
-                    $15,
-                    $16,
-                    $17,
-                    $18,
-                    NOW(),
-                    NOW()
-                )
+            (
+                $1,
+                TRUE,
+                $2,
+                $3,
+                $4,
+                $5,
+                $6,
+                $7,
+                $8,
+                $9,
+                $10,
+                $11,
+                $12,
+                $13,
+                $14,
+                $15,
+                $16,
+                $17,
+                $18,
+                NOW(),
+                NOW()
+            )
             ON CONFLICT (hash) DO NOTHING
             "#,
             tx_hash_bytes,
@@ -190,49 +190,49 @@ impl TransactionsDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                transactions (
-                    hash,
-                    is_priority,
-                    initiator_address,
-                    gas_limit,
-                    max_fee_per_gas,
-                    gas_per_pubdata_limit,
-                    data,
-                    upgrade_id,
-                    contract_address,
-                    l1_block_number,
-                    value,
-                    paymaster,
-                    paymaster_input,
-                    tx_format,
-                    l1_tx_mint,
-                    l1_tx_refund_recipient,
-                    received_at,
-                    created_at,
-                    updated_at
-                )
+            transactions (
+                hash,
+                is_priority,
+                initiator_address,
+                gas_limit,
+                max_fee_per_gas,
+                gas_per_pubdata_limit,
+                data,
+                upgrade_id,
+                contract_address,
+                l1_block_number,
+                value,
+                paymaster,
+                paymaster_input,
+                tx_format,
+                l1_tx_mint,
+                l1_tx_refund_recipient,
+                received_at,
+                created_at,
+                updated_at
+            )
             VALUES
-                (
-                    $1,
-                    TRUE,
-                    $2,
-                    $3,
-                    $4,
-                    $5,
-                    $6,
-                    $7,
-                    $8,
-                    $9,
-                    $10,
-                    $11,
-                    $12,
-                    $13,
-                    $14,
-                    $15,
-                    $16,
-                    NOW(),
-                    NOW()
-                )
+            (
+                $1,
+                TRUE,
+                $2,
+                $3,
+                $4,
+                $5,
+                $6,
+                $7,
+                $8,
+                $9,
+                $10,
+                $11,
+                $12,
+                $13,
+                $14,
+                $15,
+                $16,
+                NOW(),
+                NOW()
+            )
             ON CONFLICT (hash) DO NOTHING
             "#,
             tx_hash,
@@ -326,86 +326,101 @@ impl TransactionsDal<'_, '_> {
         let query_result = sqlx::query!(
             r#"
             INSERT INTO
-                transactions (
-                    hash,
-                    is_priority,
-                    initiator_address,
-                    nonce,
-                    signature,
-                    gas_limit,
-                    max_fee_per_gas,
-                    max_priority_fee_per_gas,
-                    gas_per_pubdata_limit,
-                    input,
-                    data,
-                    tx_format,
-                    contract_address,
-                    value,
-                    paymaster,
-                    paymaster_input,
-                    execution_info,
-                    received_at,
-                    created_at,
-                    updated_at
-                )
+            transactions (
+                hash,
+                is_priority,
+                initiator_address,
+                nonce,
+                signature,
+                gas_limit,
+                max_fee_per_gas,
+                max_priority_fee_per_gas,
+                gas_per_pubdata_limit,
+                input,
+                data,
+                tx_format,
+                contract_address,
+                value,
+                paymaster,
+                paymaster_input,
+                execution_info,
+                received_at,
+                created_at,
+                updated_at
+            )
             VALUES
-                (
-                    $1,
-                    FALSE,
-                    $2,
-                    $3,
-                    $4,
-                    $5,
-                    $6,
-                    $7,
-                    $8,
-                    $9,
-                    $10,
-                    $11,
-                    $12,
-                    $13,
-                    $14,
-                    $15,
-                    JSONB_BUILD_OBJECT('gas_used', $16::BIGINT, 'storage_writes', $17::INT, 'contracts_used', $18::INT),
-                    $19,
-                    NOW(),
-                    NOW()
-                )
+            (
+                $1,
+                FALSE,
+                $2,
+                $3,
+                $4,
+                $5,
+                $6,
+                $7,
+                $8,
+                $9,
+                $10,
+                $11,
+                $12,
+                $13,
+                $14,
+                $15,
+                JSONB_BUILD_OBJECT(
+                    'gas_used',
+                    $16::BIGINT,
+                    'storage_writes',
+                    $17::INT,
+                    'contracts_used',
+                    $18::INT
+                ),
+                $19,
+                NOW(),
+                NOW()
+            )
             ON CONFLICT (initiator_address, nonce) DO
             UPDATE
             SET
-                hash = $1,
-                signature = $4,
-                gas_limit = $5,
-                max_fee_per_gas = $6,
-                max_priority_fee_per_gas = $7,
-                gas_per_pubdata_limit = $8,
-                input = $9,
-                data = $10,
-                tx_format = $11,
-                contract_address = $12,
-                value = $13,
-                paymaster = $14,
-                paymaster_input = $15,
-                execution_info = JSONB_BUILD_OBJECT('gas_used', $16::BIGINT, 'storage_writes', $17::INT, 'contracts_used', $18::INT),
-                in_mempool = FALSE,
-                received_at = $19,
-                created_at = NOW(),
-                updated_at = NOW(),
-                error = NULL
+            hash = $1,
+            signature = $4,
+            gas_limit = $5,
+            max_fee_per_gas = $6,
+            max_priority_fee_per_gas = $7,
+            gas_per_pubdata_limit = $8,
+            input = $9,
+            data = $10,
+            tx_format = $11,
+            contract_address = $12,
+            value = $13,
+            paymaster = $14,
+            paymaster_input = $15,
+            execution_info
+            = JSONB_BUILD_OBJECT(
+                'gas_used',
+                $16::BIGINT,
+                'storage_writes',
+                $17::INT,
+                'contracts_used',
+                $18::INT
+            ),
+            in_mempool = FALSE,
+            received_at = $19,
+            created_at = NOW(),
+            updated_at = NOW(),
+            error = NULL
             WHERE
-                transactions.is_priority = FALSE
-                AND transactions.miniblock_number IS NULL
+            transactions.is_priority = FALSE
+            AND transactions.miniblock_number IS NULL
             RETURNING
-                (
-                    SELECT
-                        hash
-                    FROM
-                        transactions
-                    WHERE
-                        transactions.initiator_address = $2
-                        AND transactions.nonce = $3
-                ) IS NOT NULL AS "is_replaced!"
+            (
+                SELECT
+                    hash
+                FROM
+                    transactions
+                WHERE
+                    transactions.initiator_address = $2
+                    AND transactions.nonce = $3
+            ) IS NOT NULL AS "is_replaced!"
             "#,
             tx_hash.as_bytes(),
             initiator_address.as_bytes(),
@@ -489,8 +504,8 @@ impl TransactionsDal<'_, '_> {
             FROM
                 (
                     SELECT
-                        UNNEST($1::INT[]) AS l1_batch_tx_index,
-                        UNNEST($2::BYTEA[]) AS hash
+                        UNNEST($1::INT []) AS l1_batch_tx_index,
+                        UNNEST($2::BYTEA []) AS hash
                 ) AS data_table
             WHERE
                 transactions.hash = data_table.hash
@@ -535,7 +550,7 @@ impl TransactionsDal<'_, '_> {
                 r#"
                 DELETE FROM transactions
                 WHERE
-                    hash = ANY ($1)
+                    hash = ANY($1)
                 "#,
                 &tx_hashes as &[&[u8]],
             )
@@ -604,12 +619,12 @@ impl TransactionsDal<'_, '_> {
             sqlx::query!(
                 r#"
                 INSERT INTO
-                    call_traces (tx_hash, call_trace)
+                call_traces (tx_hash, call_trace)
                 SELECT
                     u.tx_hash,
                     u.call_trace
                 FROM
-                    UNNEST($1::bytea[], $2::bytea[]) AS u (tx_hash, call_trace)
+                    UNNEST($1::bytea [], $2::bytea []) AS u (tx_hash, call_trace)
                 "#,
                 &call_traces_tx_hashes as &[&[u8]],
                 &bytea_call_traces
@@ -735,33 +750,33 @@ impl TransactionsDal<'_, '_> {
         let query = sqlx::query!(
             r#"
             INSERT INTO
-                transactions (
-                    hash,
-                    is_priority,
-                    initiator_address,
-                    nonce,
-                    signature,
-                    gas_limit,
-                    max_fee_per_gas,
-                    max_priority_fee_per_gas,
-                    gas_per_pubdata_limit,
-                    input,
-                    data,
-                    tx_format,
-                    contract_address,
-                    value,
-                    paymaster,
-                    paymaster_input,
-                    execution_info,
-                    miniblock_number,
-                    index_in_block,
-                    error,
-                    effective_gas_price,
-                    refunded_gas,
-                    received_at,
-                    created_at,
-                    updated_at
-                )
+            transactions (
+                hash,
+                is_priority,
+                initiator_address,
+                nonce,
+                signature,
+                gas_limit,
+                max_fee_per_gas,
+                max_priority_fee_per_gas,
+                gas_per_pubdata_limit,
+                input,
+                data,
+                tx_format,
+                contract_address,
+                value,
+                paymaster,
+                paymaster_input,
+                execution_info,
+                miniblock_number,
+                index_in_block,
+                error,
+                effective_gas_price,
+                refunded_gas,
+                received_at,
+                created_at,
+                updated_at
+            )
             SELECT
                 data_table.hash,
                 FALSE,
@@ -791,26 +806,26 @@ impl TransactionsDal<'_, '_> {
             FROM
                 (
                     SELECT
-                        UNNEST($1::bytea[]) AS hash,
-                        UNNEST($2::bytea[]) AS initiator_address,
-                        UNNEST($3::INT[]) AS nonce,
-                        UNNEST($4::bytea[]) AS signature,
-                        UNNEST($5::NUMERIC[]) AS gas_limit,
-                        UNNEST($6::NUMERIC[]) AS max_fee_per_gas,
-                        UNNEST($7::NUMERIC[]) AS max_priority_fee_per_gas,
-                        UNNEST($8::NUMERIC[]) AS gas_per_pubdata_limit,
-                        UNNEST($9::bytea[]) AS input,
-                        UNNEST($10::jsonb[]) AS data,
-                        UNNEST($11::INT[]) AS tx_format,
-                        UNNEST($12::bytea[]) AS contract_address,
-                        UNNEST($13::NUMERIC[]) AS value,
-                        UNNEST($14::bytea[]) AS paymaster,
-                        UNNEST($15::bytea[]) AS paymaster_input,
-                        UNNEST($16::jsonb[]) AS new_execution_info,
-                        UNNEST($17::INTEGER[]) AS index_in_block,
-                        UNNEST($18::VARCHAR[]) AS error,
-                        UNNEST($19::NUMERIC[]) AS effective_gas_price,
-                        UNNEST($20::BIGINT[]) AS refunded_gas
+                        UNNEST($1::bytea []) AS hash,
+                        UNNEST($2::bytea []) AS initiator_address,
+                        UNNEST($3::int []) AS nonce,
+                        UNNEST($4::bytea []) AS signature,
+                        UNNEST($5::numeric []) AS gas_limit,
+                        UNNEST($6::numeric []) AS max_fee_per_gas,
+                        UNNEST($7::numeric []) AS max_priority_fee_per_gas,
+                        UNNEST($8::numeric []) AS gas_per_pubdata_limit,
+                        UNNEST($9::bytea []) AS input,
+                        UNNEST($10::jsonb []) AS data,
+                        UNNEST($11::int []) AS tx_format,
+                        UNNEST($12::bytea []) AS contract_address,
+                        UNNEST($13::numeric []) AS value,
+                        UNNEST($14::bytea []) AS paymaster,
+                        UNNEST($15::bytea []) AS paymaster_input,
+                        UNNEST($16::jsonb []) AS new_execution_info,
+                        UNNEST($17::integer []) AS index_in_block,
+                        UNNEST($18::varchar []) AS error,
+                        UNNEST($19::numeric []) AS effective_gas_price,
+                        UNNEST($20::bigint []) AS refunded_gas
                 ) AS data_table
             "#,
             &l2_hashes as &[&[u8]],
@@ -974,29 +989,32 @@ impl TransactionsDal<'_, '_> {
                     FROM
                         (
                             SELECT
-                                UNNEST($1::bytea[]) AS initiator_address,
-                                UNNEST($2::INT[]) AS nonce,
-                                UNNEST($3::bytea[]) AS hash,
-                                UNNEST($4::bytea[]) AS signature,
-                                UNNEST($5::NUMERIC[]) AS gas_limit,
-                                UNNEST($6::NUMERIC[]) AS max_fee_per_gas,
-                                UNNEST($7::NUMERIC[]) AS max_priority_fee_per_gas,
-                                UNNEST($8::NUMERIC[]) AS gas_per_pubdata_limit,
-                                UNNEST($9::INT[]) AS tx_format,
-                                UNNEST($10::INTEGER[]) AS index_in_block,
-                                UNNEST($11::VARCHAR[]) AS error,
-                                UNNEST($12::NUMERIC[]) AS effective_gas_price,
-                                UNNEST($13::jsonb[]) AS new_execution_info,
-                                UNNEST($14::bytea[]) AS input,
-                                UNNEST($15::jsonb[]) AS data,
-                                UNNEST($16::BIGINT[]) AS refunded_gas,
-                                UNNEST($17::NUMERIC[]) AS value,
-                                UNNEST($18::bytea[]) AS contract_address,
-                                UNNEST($19::bytea[]) AS paymaster,
-                                UNNEST($20::bytea[]) AS paymaster_input
+                                UNNEST($1::bytea []) AS initiator_address,
+                                UNNEST($2::int []) AS nonce,
+                                UNNEST($3::bytea []) AS hash,
+                                UNNEST($4::bytea []) AS signature,
+                                UNNEST($5::numeric []) AS gas_limit,
+                                UNNEST($6::numeric []) AS max_fee_per_gas,
+                                UNNEST($7::numeric []) AS max_priority_fee_per_gas,
+                                UNNEST($8::numeric []) AS gas_per_pubdata_limit,
+                                UNNEST($9::int []) AS tx_format,
+                                UNNEST($10::integer []) AS index_in_block,
+                                UNNEST($11::varchar []) AS error,
+                                UNNEST($12::numeric []) AS effective_gas_price,
+                                UNNEST($13::jsonb []) AS new_execution_info,
+                                UNNEST($14::bytea []) AS input,
+                                UNNEST($15::jsonb []) AS data,
+                                UNNEST($16::bigint []) AS refunded_gas,
+                                UNNEST($17::numeric []) AS value,
+                                UNNEST($18::bytea []) AS contract_address,
+                                UNNEST($19::bytea []) AS paymaster,
+                                UNNEST($20::bytea []) AS paymaster_input
                         ) AS data_table_temp
-                        JOIN transactions ON transactions.initiator_address = data_table_temp.initiator_address
-                        AND transactions.nonce = data_table_temp.nonce
+                    JOIN transactions
+                        ON
+                            transactions.initiator_address
+                            = data_table_temp.initiator_address
+                            AND transactions.nonce = data_table_temp.nonce
                     ORDER BY
                         transactions.hash
                 ) AS data_table
@@ -1122,35 +1140,35 @@ impl TransactionsDal<'_, '_> {
         let query = sqlx::query!(
             r#"
             INSERT INTO
-                transactions (
-                    hash,
-                    is_priority,
-                    initiator_address,
-                    gas_limit,
-                    max_fee_per_gas,
-                    gas_per_pubdata_limit,
-                    data,
-                    priority_op_id,
-                    full_fee,
-                    layer_2_tip_fee,
-                    contract_address,
-                    l1_block_number,
-                    value,
-                    paymaster,
-                    paymaster_input,
-                    tx_format,
-                    l1_tx_mint,
-                    l1_tx_refund_recipient,
-                    miniblock_number,
-                    index_in_block,
-                    error,
-                    execution_info,
-                    refunded_gas,
-                    effective_gas_price,
-                    received_at,
-                    created_at,
-                    updated_at
-                )
+            transactions (
+                hash,
+                is_priority,
+                initiator_address,
+                gas_limit,
+                max_fee_per_gas,
+                gas_per_pubdata_limit,
+                data,
+                priority_op_id,
+                full_fee,
+                layer_2_tip_fee,
+                contract_address,
+                l1_block_number,
+                value,
+                paymaster,
+                paymaster_input,
+                tx_format,
+                l1_tx_mint,
+                l1_tx_refund_recipient,
+                miniblock_number,
+                index_in_block,
+                error,
+                execution_info,
+                refunded_gas,
+                effective_gas_price,
+                received_at,
+                created_at,
+                updated_at
+            )
             SELECT
                 data_table.hash,
                 TRUE,
@@ -1182,26 +1200,26 @@ impl TransactionsDal<'_, '_> {
             FROM
                 (
                     SELECT
-                        UNNEST($1::bytea[]) AS hash,
-                        UNNEST($2::bytea[]) AS initiator_address,
-                        UNNEST($3::NUMERIC[]) AS gas_limit,
-                        UNNEST($4::NUMERIC[]) AS max_fee_per_gas,
-                        UNNEST($5::NUMERIC[]) AS gas_per_pubdata_limit,
-                        UNNEST($6::jsonb[]) AS data,
-                        UNNEST($7::BIGINT[]) AS priority_op_id,
-                        UNNEST($8::NUMERIC[]) AS full_fee,
-                        UNNEST($9::NUMERIC[]) AS layer_2_tip_fee,
-                        UNNEST($10::bytea[]) AS contract_address,
-                        UNNEST($11::INT[]) AS l1_block_number,
-                        UNNEST($12::NUMERIC[]) AS value,
-                        UNNEST($13::INTEGER[]) AS tx_format,
-                        UNNEST($14::NUMERIC[]) AS l1_tx_mint,
-                        UNNEST($15::bytea[]) AS l1_tx_refund_recipient,
-                        UNNEST($16::INT[]) AS index_in_block,
-                        UNNEST($17::VARCHAR[]) AS error,
-                        UNNEST($18::jsonb[]) AS execution_info,
-                        UNNEST($19::BIGINT[]) AS refunded_gas,
-                        UNNEST($20::NUMERIC[]) AS effective_gas_price
+                        UNNEST($1::bytea []) AS hash,
+                        UNNEST($2::bytea []) AS initiator_address,
+                        UNNEST($3::numeric []) AS gas_limit,
+                        UNNEST($4::numeric []) AS max_fee_per_gas,
+                        UNNEST($5::numeric []) AS gas_per_pubdata_limit,
+                        UNNEST($6::jsonb []) AS data,
+                        UNNEST($7::bigint []) AS priority_op_id,
+                        UNNEST($8::numeric []) AS full_fee,
+                        UNNEST($9::numeric []) AS layer_2_tip_fee,
+                        UNNEST($10::bytea []) AS contract_address,
+                        UNNEST($11::int []) AS l1_block_number,
+                        UNNEST($12::numeric []) AS value,
+                        UNNEST($13::integer []) AS tx_format,
+                        UNNEST($14::numeric []) AS l1_tx_mint,
+                        UNNEST($15::bytea []) AS l1_tx_refund_recipient,
+                        UNNEST($16::int []) AS index_in_block,
+                        UNNEST($17::varchar []) AS error,
+                        UNNEST($18::jsonb []) AS execution_info,
+                        UNNEST($19::bigint []) AS refunded_gas,
+                        UNNEST($20::numeric []) AS effective_gas_price
                 ) AS data_table
             "#,
             &l1_hashes as &[&[u8]],
@@ -1300,12 +1318,12 @@ impl TransactionsDal<'_, '_> {
             FROM
                 (
                     SELECT
-                        UNNEST($2::bytea[]) AS hash,
-                        UNNEST($3::INTEGER[]) AS index_in_block,
-                        UNNEST($4::VARCHAR[]) AS error,
-                        UNNEST($5::jsonb[]) AS new_execution_info,
-                        UNNEST($6::BIGINT[]) AS refunded_gas,
-                        UNNEST($7::NUMERIC[]) AS effective_gas_price
+                        UNNEST($2::bytea []) AS hash,
+                        UNNEST($3::integer []) AS index_in_block,
+                        UNNEST($4::varchar []) AS error,
+                        UNNEST($5::jsonb []) AS new_execution_info,
+                        UNNEST($6::bigint []) AS refunded_gas,
+                        UNNEST($7::numeric []) AS effective_gas_price
                 ) AS data_table
             WHERE
                 transactions.hash = data_table.hash
@@ -1413,33 +1431,33 @@ impl TransactionsDal<'_, '_> {
         let query = sqlx::query!(
             r#"
             INSERT INTO
-                transactions (
-                    hash,
-                    is_priority,
-                    initiator_address,
-                    gas_limit,
-                    max_fee_per_gas,
-                    gas_per_pubdata_limit,
-                    data,
-                    upgrade_id,
-                    contract_address,
-                    l1_block_number,
-                    value,
-                    paymaster,
-                    paymaster_input,
-                    tx_format,
-                    l1_tx_mint,
-                    l1_tx_refund_recipient,
-                    miniblock_number,
-                    index_in_block,
-                    error,
-                    execution_info,
-                    refunded_gas,
-                    effective_gas_price,
-                    received_at,
-                    created_at,
-                    updated_at
-                )
+            transactions (
+                hash,
+                is_priority,
+                initiator_address,
+                gas_limit,
+                max_fee_per_gas,
+                gas_per_pubdata_limit,
+                data,
+                upgrade_id,
+                contract_address,
+                l1_block_number,
+                value,
+                paymaster,
+                paymaster_input,
+                tx_format,
+                l1_tx_mint,
+                l1_tx_refund_recipient,
+                miniblock_number,
+                index_in_block,
+                error,
+                execution_info,
+                refunded_gas,
+                effective_gas_price,
+                received_at,
+                created_at,
+                updated_at
+            )
             SELECT
                 data_table.hash,
                 TRUE,
@@ -1469,24 +1487,24 @@ impl TransactionsDal<'_, '_> {
             FROM
                 (
                     SELECT
-                        UNNEST($1::bytea[]) AS hash,
-                        UNNEST($2::bytea[]) AS initiator_address,
-                        UNNEST($3::NUMERIC[]) AS gas_limit,
-                        UNNEST($4::NUMERIC[]) AS max_fee_per_gas,
-                        UNNEST($5::NUMERIC[]) AS gas_per_pubdata_limit,
-                        UNNEST($6::jsonb[]) AS data,
-                        UNNEST($7::INT[]) AS upgrade_id,
-                        UNNEST($8::bytea[]) AS contract_address,
-                        UNNEST($9::INT[]) AS l1_block_number,
-                        UNNEST($10::NUMERIC[]) AS value,
-                        UNNEST($11::INTEGER[]) AS tx_format,
-                        UNNEST($12::NUMERIC[]) AS l1_tx_mint,
-                        UNNEST($13::bytea[]) AS l1_tx_refund_recipient,
-                        UNNEST($14::INT[]) AS index_in_block,
-                        UNNEST($15::VARCHAR[]) AS error,
-                        UNNEST($16::jsonb[]) AS execution_info,
-                        UNNEST($17::BIGINT[]) AS refunded_gas,
-                        UNNEST($18::NUMERIC[]) AS effective_gas_price
+                        UNNEST($1::bytea []) AS hash,
+                        UNNEST($2::bytea []) AS initiator_address,
+                        UNNEST($3::numeric []) AS gas_limit,
+                        UNNEST($4::numeric []) AS max_fee_per_gas,
+                        UNNEST($5::numeric []) AS gas_per_pubdata_limit,
+                        UNNEST($6::jsonb []) AS data,
+                        UNNEST($7::int []) AS upgrade_id,
+                        UNNEST($8::bytea []) AS contract_address,
+                        UNNEST($9::int []) AS l1_block_number,
+                        UNNEST($10::numeric []) AS value,
+                        UNNEST($11::integer []) AS tx_format,
+                        UNNEST($12::numeric []) AS l1_tx_mint,
+                        UNNEST($13::bytea []) AS l1_tx_refund_recipient,
+                        UNNEST($14::int []) AS index_in_block,
+                        UNNEST($15::varchar []) AS error,
+                        UNNEST($16::jsonb []) AS execution_info,
+                        UNNEST($17::bigint []) AS refunded_gas,
+                        UNNEST($18::numeric []) AS effective_gas_price
                 ) AS data_table
             "#,
             &upgrade_hashes as &[&[u8]],
@@ -1585,12 +1603,12 @@ impl TransactionsDal<'_, '_> {
             FROM
                 (
                     SELECT
-                        UNNEST($2::bytea[]) AS hash,
-                        UNNEST($3::INTEGER[]) AS index_in_block,
-                        UNNEST($4::VARCHAR[]) AS error,
-                        UNNEST($5::jsonb[]) AS new_execution_info,
-                        UNNEST($6::BIGINT[]) AS refunded_gas,
-                        UNNEST($7::NUMERIC[]) AS effective_gas_price
+                        UNNEST($2::bytea []) AS hash,
+                        UNNEST($3::integer []) AS index_in_block,
+                        UNNEST($4::varchar []) AS error,
+                        UNNEST($5::jsonb []) AS new_execution_info,
+                        UNNEST($6::bigint []) AS refunded_gas,
+                        UNNEST($7::numeric []) AS effective_gas_price
                 ) AS data_table
             WHERE
                 transactions.hash = data_table.hash
@@ -1651,7 +1669,7 @@ impl TransactionsDal<'_, '_> {
             WHERE
                 miniblock_number > $1
             RETURNING
-                hash
+            hash
             "#,
             i64::from(l2_block_number.0)
         )
@@ -1665,7 +1683,7 @@ impl TransactionsDal<'_, '_> {
             r#"
             DELETE FROM call_traces
             WHERE
-                tx_hash = ANY ($1)
+                tx_hash = ANY($1)
             "#,
             &tx_hashes as &[&[u8]]
         )
@@ -1688,7 +1706,7 @@ impl TransactionsDal<'_, '_> {
                 AND is_priority = FALSE
                 AND error IS NULL
             RETURNING
-                hash
+            hash
             "#,
             stuck_tx_timeout
         )
@@ -1717,7 +1735,7 @@ impl TransactionsDal<'_, '_> {
             SET
                 in_mempool = FALSE
             FROM
-                UNNEST($1::bytea[]) AS s (address)
+                UNNEST($1::bytea []) AS s (address)
             WHERE
                 transactions.in_mempool = TRUE
                 AND transactions.initiator_address = s.address
@@ -1735,7 +1753,7 @@ impl TransactionsDal<'_, '_> {
             DELETE FROM transactions
             WHERE
                 in_mempool = TRUE
-                AND initiator_address = ANY ($1)
+                AND initiator_address = ANY($1)
             "#,
             &purged_addresses as &[&[u8]]
         )
@@ -1786,7 +1804,7 @@ impl TransactionsDal<'_, '_> {
             WHERE
                 transactions.hash = subquery2.hash
             RETURNING
-                transactions.*
+            transactions.*
             "#,
             limit as i32,
             BigDecimal::from(fee_per_gas),
@@ -2121,7 +2139,7 @@ impl TransactionsDal<'_, '_> {
                 index_in_block
             FROM
                 transactions
-                INNER JOIN miniblocks ON transactions.miniblock_number = miniblocks.number
+            INNER JOIN miniblocks ON transactions.miniblock_number = miniblocks.number
             WHERE
                 transactions.hash = $1
             "#,
diff --git a/core/lib/dal/src/transactions_web3_dal.rs b/core/lib/dal/src/transactions_web3_dal.rs
index 3ec1f7e6d0c..c2209bb9c93 100644
--- a/core/lib/dal/src/transactions_web3_dal.rs
+++ b/core/lib/dal/src/transactions_web3_dal.rs
@@ -49,19 +49,20 @@ impl TransactionsWeb3Dal<'_, '_> {
             StorageTransactionReceipt,
             r#"
             WITH
-                events AS (
-                    SELECT DISTINCT
-                        ON (events.tx_hash) *
-                    FROM
-                        events
-                    WHERE
-                        events.address = $1
-                        AND events.topic1 = $2
-                        AND events.tx_hash = ANY ($3)
-                    ORDER BY
-                        events.tx_hash,
-                        events.event_index_in_tx DESC
-                )
+            events AS (
+                SELECT DISTINCT
+                ON (events.tx_hash) *
+                FROM
+                    events
+                WHERE
+                    events.address = $1
+                    AND events.topic1 = $2
+                    AND events.tx_hash = ANY($3)
+                ORDER BY
+                    events.tx_hash,
+                    events.event_index_in_tx DESC
+            )
+            
             SELECT
                 transactions.hash AS tx_hash,
                 transactions.index_in_block,
@@ -81,10 +82,10 @@ impl TransactionsWeb3Dal<'_, '_> {
                 miniblocks.timestamp AS "block_timestamp?"
             FROM
                 transactions
-                JOIN miniblocks ON miniblocks.number = transactions.miniblock_number
-                LEFT JOIN events ON events.tx_hash = transactions.hash
+            JOIN miniblocks ON miniblocks.number = transactions.miniblock_number
+            LEFT JOIN events ON events.tx_hash = transactions.hash
             WHERE
-                transactions.hash = ANY ($3)
+                transactions.hash = ANY($3)
                 AND transactions.data != '{}'::jsonb
             "#,
             // ^ Filter out transactions with pruned data, which would lead to potentially incomplete / bogus
@@ -302,17 +303,20 @@ impl TransactionsWeb3Dal<'_, '_> {
                 execute_tx.tx_hash AS "eth_execute_tx_hash?"
             FROM
                 transactions
-                LEFT JOIN miniblocks ON miniblocks.number = transactions.miniblock_number
-                LEFT JOIN l1_batches ON l1_batches.number = miniblocks.l1_batch_number
-                LEFT JOIN eth_txs_history AS commit_tx ON (
+            LEFT JOIN miniblocks ON miniblocks.number = transactions.miniblock_number
+            LEFT JOIN l1_batches ON l1_batches.number = miniblocks.l1_batch_number
+            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
                 )
-                LEFT JOIN eth_txs_history AS prove_tx ON (
+            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
                 )
-                LEFT JOIN eth_txs_history AS execute_tx ON (
+            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
                 )
@@ -439,7 +443,7 @@ impl TransactionsWeb3Dal<'_, '_> {
                 transactions.*
             FROM
                 transactions
-                INNER JOIN miniblocks ON miniblocks.number = transactions.miniblock_number
+            INNER JOIN miniblocks ON miniblocks.number = transactions.miniblock_number
             WHERE
                 miniblocks.number BETWEEN $1 AND $2
             ORDER BY
@@ -603,6 +607,39 @@ mod tests {
         );
     }
 
+    #[tokio::test]
+    async fn getting_evm_deployment_tx() {
+        let connection_pool = ConnectionPool::<Core>::test_pool().await;
+        let mut conn = connection_pool.connection().await.unwrap();
+        conn.protocol_versions_dal()
+            .save_protocol_version_with_tx(&ProtocolVersion::default())
+            .await
+            .unwrap();
+        let mut tx = mock_l2_transaction();
+        tx.execute.contract_address = None;
+        let tx_hash = tx.hash();
+        prepare_transactions(&mut conn, vec![tx.clone()]).await;
+
+        let fetched_tx = conn
+            .transactions_dal()
+            .get_tx_by_hash(tx_hash)
+            .await
+            .unwrap()
+            .expect("no transaction");
+        let mut fetched_tx = L2Tx::try_from(fetched_tx).unwrap();
+        assert_eq!(fetched_tx.execute.contract_address, None);
+        fetched_tx.raw_bytes = tx.raw_bytes.clone();
+        assert_eq!(fetched_tx, tx);
+
+        let web3_tx = conn
+            .transactions_web3_dal()
+            .get_transaction_by_position(L2BlockNumber(1), 0, L2ChainId::from(270))
+            .await;
+        let web3_tx = web3_tx.unwrap().expect("no transaction");
+        assert_eq!(web3_tx.hash, tx_hash);
+        assert_eq!(web3_tx.to, None);
+    }
+
     #[tokio::test]
     async fn getting_receipts() {
         let connection_pool = ConnectionPool::<Core>::test_pool().await;
@@ -617,7 +654,7 @@ mod tests {
         let tx2 = mock_l2_transaction();
         let tx2_hash = tx2.hash();
 
-        prepare_transactions(&mut conn, vec![tx1.clone(), tx2.clone()]).await;
+        prepare_transactions(&mut conn, vec![tx1, tx2]).await;
 
         let mut receipts = conn
             .transactions_web3_dal()
@@ -632,6 +669,31 @@ mod tests {
         assert_eq!(receipts[1].transaction_hash, tx2_hash);
     }
 
+    #[tokio::test]
+    async fn getting_receipt_for_evm_deployment_tx() {
+        let connection_pool = ConnectionPool::<Core>::test_pool().await;
+        let mut conn = connection_pool.connection().await.unwrap();
+        conn.protocol_versions_dal()
+            .save_protocol_version_with_tx(&ProtocolVersion::default())
+            .await
+            .unwrap();
+
+        let mut tx = mock_l2_transaction();
+        let tx_hash = tx.hash();
+        tx.execute.contract_address = None;
+        prepare_transactions(&mut conn, vec![tx]).await;
+
+        let receipts = conn
+            .transactions_web3_dal()
+            .get_transaction_receipts(&[tx_hash])
+            .await
+            .unwrap();
+        assert_eq!(receipts.len(), 1);
+        let receipt = receipts.into_iter().next().unwrap();
+        assert_eq!(receipt.transaction_hash, tx_hash);
+        assert_eq!(receipt.to, Some(Address::zero()));
+    }
+
     #[tokio::test]
     async fn getting_l2_block_transactions() {
         let connection_pool = ConnectionPool::<Core>::test_pool().await;
diff --git a/core/lib/dal/src/vm_runner_dal.rs b/core/lib/dal/src/vm_runner_dal.rs
index 37ef1517d54..b12b0218680 100644
--- a/core/lib/dal/src/vm_runner_dal.rs
+++ b/core/lib/dal/src/vm_runner_dal.rs
@@ -37,25 +37,27 @@ impl VmRunnerDal<'_, '_> {
         let row = sqlx::query!(
             r#"
             WITH
-                available_batches AS (
-                    SELECT
-                        MAX(number) AS "last_batch"
-                    FROM
-                        l1_batches
-                ),
-                processed_batches AS (
-                    SELECT
-                        COALESCE(MAX(l1_batch_number), $1) + $2 AS "last_ready_batch"
-                    FROM
-                        vm_runner_protective_reads
-                    WHERE
-                        time_taken IS NOT NULL
-                )
+            available_batches AS (
+                SELECT
+                    MAX(number) AS "last_batch"
+                FROM
+                    l1_batches
+            ),
+            
+            processed_batches AS (
+                SELECT
+                    COALESCE(MAX(l1_batch_number), $1) + $2 AS "last_ready_batch"
+                FROM
+                    vm_runner_protective_reads
+                WHERE
+                    time_taken IS NOT NULL
+            )
+            
             SELECT
                 LEAST(last_batch, last_ready_batch) AS "last_ready_batch!"
             FROM
                 available_batches
-                FULL JOIN processed_batches ON TRUE
+            FULL JOIN processed_batches ON TRUE
             "#,
             default_batch.0 as i32,
             window_size as i32
@@ -74,14 +76,16 @@ impl VmRunnerDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                vm_runner_protective_reads (l1_batch_number, created_at, updated_at, processing_started_at)
+            vm_runner_protective_reads (
+                l1_batch_number, created_at, updated_at, processing_started_at
+            )
             VALUES
-                ($1, NOW(), NOW(), NOW())
+            ($1, NOW(), NOW(), NOW())
             ON CONFLICT (l1_batch_number) DO
             UPDATE
             SET
-                updated_at = NOW(),
-                processing_started_at = NOW()
+            updated_at = NOW(),
+            processing_started_at = NOW()
             "#,
             i64::from(l1_batch_number.0),
         )
@@ -196,25 +200,27 @@ impl VmRunnerDal<'_, '_> {
         let row = sqlx::query!(
             r#"
             WITH
-                available_batches AS (
-                    SELECT
-                        MAX(number) AS "last_batch"
-                    FROM
-                        l1_batches
-                ),
-                processed_batches AS (
-                    SELECT
-                        COALESCE(MAX(l1_batch_number), $1) + $2 AS "last_ready_batch"
-                    FROM
-                        vm_runner_bwip
-                    WHERE
-                        time_taken IS NOT NULL
-                )
+            available_batches AS (
+                SELECT
+                    MAX(number) AS "last_batch"
+                FROM
+                    l1_batches
+            ),
+            
+            processed_batches AS (
+                SELECT
+                    COALESCE(MAX(l1_batch_number), $1) + $2 AS "last_ready_batch"
+                FROM
+                    vm_runner_bwip
+                WHERE
+                    time_taken IS NOT NULL
+            )
+            
             SELECT
                 LEAST(last_batch, last_ready_batch) AS "last_ready_batch!"
             FROM
                 available_batches
-                FULL JOIN processed_batches ON TRUE
+            FULL JOIN processed_batches ON TRUE
             "#,
             default_batch.0 as i32,
             window_size as i32
@@ -233,14 +239,14 @@ impl VmRunnerDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                vm_runner_bwip (l1_batch_number, created_at, updated_at, processing_started_at)
+            vm_runner_bwip (l1_batch_number, created_at, updated_at, processing_started_at)
             VALUES
-                ($1, NOW(), NOW(), NOW())
+            ($1, NOW(), NOW(), NOW())
             ON CONFLICT (l1_batch_number) DO
             UPDATE
             SET
-                updated_at = NOW(),
-                processing_started_at = NOW()
+            updated_at = NOW(),
+            processing_started_at = NOW()
             "#,
             i64::from(l1_batch_number.0),
         )
diff --git a/core/lib/env_config/src/chain.rs b/core/lib/env_config/src/chain.rs
index a25c593bd88..a125f331496 100644
--- a/core/lib/env_config/src/chain.rs
+++ b/core/lib/env_config/src/chain.rs
@@ -102,6 +102,7 @@ mod tests {
             default_aa_hash: Some(hash(
                 "0x0100055b041eb28aff6e3a6e0f37c31fd053fc9ef142683b05e5f0aee6934066",
             )),
+            evm_emulator_hash: None,
             l1_batch_commit_data_generator_mode,
             max_circuits_per_batch: 24100,
             protective_reads_persistence_enabled: true,
diff --git a/core/lib/env_config/src/contracts.rs b/core/lib/env_config/src/contracts.rs
index 298c43b80cc..2f3b64db8a3 100644
--- a/core/lib/env_config/src/contracts.rs
+++ b/core/lib/env_config/src/contracts.rs
@@ -72,6 +72,7 @@ mod tests {
             }),
             base_token_addr: Some(SHARED_BRIDGE_ETHER_TOKEN_ADDRESS),
             chain_admin_addr: Some(addr("0xdd6fa5c14e7550b4caf2aa2818d24c69cbc347ff")),
+            eigenda_verifier_addr: None,
         }
     }
 
@@ -98,6 +99,7 @@ CONTRACTS_STATE_TRANSITION_PROXY_ADDR="0xd90f1c081c6117241624e97cb6147257c3cb209
 CONTRACTS_TRANSPARENT_PROXY_ADMIN_ADDR="0xdd6fa5c14e7550b4caf2aa2818d24c69cbc347e5"
 CONTRACTS_BASE_TOKEN_ADDR="0x0000000000000000000000000000000000000001"
 CONTRACTS_CHAIN_ADMIN_ADDR="0xdd6fa5c14e7550b4caf2aa2818d24c69cbc347ff"
+CONTRACTS_EIGENDA_VERIFIER_ADDR=""
         "#;
         lock.set_env(config);
 
diff --git a/core/lib/env_config/src/genesis.rs b/core/lib/env_config/src/genesis.rs
index bf30fd4cc33..55c79eceb50 100644
--- a/core/lib/env_config/src/genesis.rs
+++ b/core/lib/env_config/src/genesis.rs
@@ -68,6 +68,7 @@ impl FromEnv for GenesisConfig {
             genesis_commitment: contracts_config.genesis_batch_commitment,
             bootloader_hash: state_keeper.bootloader_hash,
             default_aa_hash: state_keeper.default_aa_hash,
+            evm_emulator_hash: state_keeper.evm_emulator_hash,
             // TODO(EVM-676): for now, the settlement layer is always the same as the L1 network
             l1_chain_id: L1ChainId(network_config.network.chain_id().0),
             sl_chain_id: Some(network_config.network.chain_id()),
diff --git a/core/lib/l1_contract_interface/Cargo.toml b/core/lib/l1_contract_interface/Cargo.toml
index 8b68df854e7..4eab89faa5c 100644
--- a/core/lib/l1_contract_interface/Cargo.toml
+++ b/core/lib/l1_contract_interface/Cargo.toml
@@ -23,6 +23,7 @@ sha2.workspace = true
 sha3.workspace = true
 hex.workspace = true
 once_cell.workspace = true
+rlp.workspace = true
 
 [dev-dependencies]
 serde.workspace = true
diff --git a/core/lib/l1_contract_interface/src/i_executor/structures/blob_info.rs b/core/lib/l1_contract_interface/src/i_executor/structures/blob_info.rs
new file mode 100644
index 00000000000..e30e96da904
--- /dev/null
+++ b/core/lib/l1_contract_interface/src/i_executor/structures/blob_info.rs
@@ -0,0 +1,340 @@
+use rlp::{Decodable, DecoderError, Rlp};
+use zksync_types::{
+    blob,
+    ethabi::Token,
+    web3::contract::{Tokenizable, Tokenize},
+    U256,
+};
+
+#[derive(Debug)]
+pub struct G1Commitment {
+    pub x: Vec<u8>,
+    pub y: Vec<u8>,
+}
+
+impl G1Commitment {
+    pub fn into_bytes(&self) -> Vec<u8> {
+        let mut bytes = vec![];
+        bytes.extend(&self.x.len().to_be_bytes());
+        bytes.extend(&self.x);
+        bytes.extend(&self.y.len().to_be_bytes());
+        bytes.extend(&self.y);
+
+        bytes
+    }
+}
+
+impl Decodable for G1Commitment {
+    fn decode(rlp: &Rlp) -> Result<Self, DecoderError> {
+        let x: Vec<u8> = rlp.val_at(0)?; // Decode first element as Vec<u8>
+        let y: Vec<u8> = rlp.val_at(1)?; // Decode second element as Vec<u8>
+
+        Ok(G1Commitment { x, y })
+    }
+}
+
+impl Tokenize for G1Commitment {
+    fn into_tokens(self) -> Vec<Token> {
+        let x = Token::Uint(U256::from_big_endian(&self.x));
+        let y = Token::Uint(U256::from_big_endian(&self.y));
+
+        vec![x, y]
+    }
+}
+
+#[derive(Debug)]
+pub struct BlobQuorumParam {
+    pub quorum_number: u32,
+    pub adversary_threshold_percentage: u32,
+    pub confirmation_threshold_percentage: u32,
+    pub chunk_length: u32,
+}
+
+impl BlobQuorumParam {
+    pub fn into_bytes(&self) -> Vec<u8> {
+        let mut bytes = vec![];
+        bytes.extend(&self.quorum_number.to_be_bytes());
+        bytes.extend(&self.adversary_threshold_percentage.to_be_bytes());
+        bytes.extend(&self.confirmation_threshold_percentage.to_be_bytes());
+        bytes.extend(&self.chunk_length.to_be_bytes());
+
+        bytes
+    }
+}
+
+impl Decodable for BlobQuorumParam {
+    fn decode(rlp: &Rlp) -> Result<Self, DecoderError> {
+        Ok(BlobQuorumParam {
+            quorum_number: rlp.val_at(0)?,
+            adversary_threshold_percentage: rlp.val_at(1)?,
+            confirmation_threshold_percentage: rlp.val_at(2)?,
+            chunk_length: rlp.val_at(3)?,
+        })
+    }
+}
+
+impl Tokenize for BlobQuorumParam {
+    fn into_tokens(self) -> Vec<Token> {
+        let quorum_number = Token::Uint(U256::from(self.quorum_number));
+        let adversary_threshold_percentage =
+            Token::Uint(U256::from(self.adversary_threshold_percentage));
+        let confirmation_threshold_percentage =
+            Token::Uint(U256::from(self.confirmation_threshold_percentage));
+        let chunk_length = Token::Uint(U256::from(self.chunk_length));
+
+        vec![
+            quorum_number,
+            adversary_threshold_percentage,
+            confirmation_threshold_percentage,
+            chunk_length,
+        ]
+    }
+}
+
+#[derive(Debug)]
+pub struct BlobHeader {
+    pub commitment: G1Commitment,
+    pub data_length: u32,
+    pub blob_quorum_params: Vec<BlobQuorumParam>,
+}
+
+impl BlobHeader {
+    pub fn into_bytes(&self) -> Vec<u8> {
+        let mut bytes = vec![];
+        bytes.extend(self.commitment.into_bytes());
+        bytes.extend(&self.data_length.to_be_bytes());
+        bytes.extend(&self.blob_quorum_params.len().to_be_bytes());
+
+        for quorum in &self.blob_quorum_params {
+            bytes.extend(quorum.into_bytes());
+        }
+
+        bytes
+    }
+}
+
+impl Decodable for BlobHeader {
+    fn decode(rlp: &Rlp) -> Result<Self, DecoderError> {
+        let commitment: G1Commitment = rlp.val_at(0)?;
+        let data_length: u32 = rlp.val_at(1)?;
+        let blob_quorum_params: Vec<BlobQuorumParam> = rlp.list_at(2)?;
+
+        Ok(BlobHeader {
+            commitment,
+            data_length,
+            blob_quorum_params,
+        })
+    }
+}
+
+impl Tokenize for BlobHeader {
+    fn into_tokens(self) -> Vec<Token> {
+        let commitment = self.commitment.into_tokens();
+        let data_length = Token::Uint(U256::from(self.data_length));
+        let blob_quorum_params = self
+            .blob_quorum_params
+            .into_iter()
+            .map(|quorum| Token::Tuple(quorum.into_tokens()))
+            .collect();
+
+        vec![
+            Token::Tuple(commitment),
+            data_length,
+            Token::Array(blob_quorum_params),
+        ]
+    }
+}
+
+#[derive(Debug)]
+pub struct BatchHeader {
+    pub batch_root: Vec<u8>,
+    pub quorum_numbers: Vec<u8>,
+    pub quorum_signed_percentages: Vec<u8>,
+    pub reference_block_number: u32,
+}
+
+impl BatchHeader {
+    pub fn into_bytes(&self) -> Vec<u8> {
+        let mut bytes = vec![];
+        bytes.extend(&self.batch_root.len().to_be_bytes());
+        bytes.extend(&self.batch_root);
+        bytes.extend(&self.quorum_numbers.len().to_be_bytes());
+        bytes.extend(&self.quorum_numbers);
+        bytes.extend(&self.quorum_signed_percentages.len().to_be_bytes());
+        bytes.extend(&self.quorum_signed_percentages);
+        bytes.extend(&self.reference_block_number.to_be_bytes());
+
+        bytes
+    }
+}
+
+impl Decodable for BatchHeader {
+    fn decode(rlp: &Rlp) -> Result<Self, DecoderError> {
+        Ok(BatchHeader {
+            batch_root: rlp.val_at(0)?,
+            quorum_numbers: rlp.val_at(1)?,
+            quorum_signed_percentages: rlp.val_at(2)?,
+            reference_block_number: rlp.val_at(3)?,
+        })
+    }
+}
+
+impl Tokenize for BatchHeader {
+    fn into_tokens(self) -> Vec<Token> {
+        let batch_root = Token::FixedBytes(self.batch_root);
+        let quorum_numbers = self.quorum_numbers.into_token();
+        let quorum_signed_percentages = self.quorum_signed_percentages.into_token();
+        let reference_block_number = Token::Uint(U256::from(self.reference_block_number));
+
+        vec![
+            batch_root,
+            quorum_numbers,
+            quorum_signed_percentages,
+            reference_block_number,
+        ]
+    }
+}
+
+#[derive(Debug)]
+pub struct BatchMetadata {
+    pub batch_header: BatchHeader,
+    pub signatory_record_hash: Vec<u8>,
+    pub fee: Vec<u8>,
+    pub confirmation_block_number: u32,
+    pub batch_header_hash: Vec<u8>,
+}
+
+impl BatchMetadata {
+    pub fn into_bytes(&self) -> Vec<u8> {
+        let mut bytes = vec![];
+        bytes.extend(self.batch_header.into_bytes());
+        bytes.extend(&self.signatory_record_hash);
+        bytes.extend(&self.confirmation_block_number.to_be_bytes());
+
+        bytes
+    }
+}
+
+impl Decodable for BatchMetadata {
+    fn decode(rlp: &Rlp) -> Result<Self, DecoderError> {
+        let batch_header: BatchHeader = rlp.val_at(0)?;
+
+        Ok(BatchMetadata {
+            batch_header,
+            signatory_record_hash: rlp.val_at(1)?,
+            fee: rlp.val_at(2)?,
+            confirmation_block_number: rlp.val_at(3)?,
+            batch_header_hash: rlp.val_at(4)?,
+        })
+    }
+}
+
+impl Tokenize for BatchMetadata {
+    fn into_tokens(self) -> Vec<Token> {
+        let batch_header = self.batch_header.into_tokens();
+        let signatory_record_hash = Token::FixedBytes(self.signatory_record_hash);
+        let confirmation_block_number = Token::Uint(U256::from(self.confirmation_block_number));
+
+        vec![
+            Token::Tuple(batch_header),
+            signatory_record_hash,
+            confirmation_block_number,
+        ]
+    }
+}
+
+#[derive(Debug)]
+pub struct BlobVerificationProof {
+    pub batch_id: u32,
+    pub blob_index: u32,
+    pub batch_medatada: BatchMetadata,
+    pub inclusion_proof: Vec<u8>,
+    pub quorum_indexes: Vec<u8>,
+}
+
+impl BlobVerificationProof {
+    pub fn into_bytes(&self) -> Vec<u8> {
+        let mut bytes = vec![];
+        bytes.extend(&self.batch_id.to_be_bytes());
+        bytes.extend(&self.blob_index.to_be_bytes());
+        bytes.extend(self.batch_medatada.into_bytes());
+        bytes.extend(&self.inclusion_proof.len().to_be_bytes());
+        bytes.extend(&self.inclusion_proof);
+        bytes.extend(&self.quorum_indexes.len().to_be_bytes());
+        bytes.extend(&self.quorum_indexes);
+
+        bytes
+    }
+}
+
+impl Decodable for BlobVerificationProof {
+    fn decode(rlp: &Rlp) -> Result<Self, DecoderError> {
+        Ok(BlobVerificationProof {
+            batch_id: rlp.val_at(0)?,
+            blob_index: rlp.val_at(1)?,
+            batch_medatada: rlp.val_at(2)?,
+            inclusion_proof: rlp.val_at(3)?,
+            quorum_indexes: rlp.val_at(4)?,
+        })
+    }
+}
+
+impl Tokenize for BlobVerificationProof {
+    fn into_tokens(self) -> Vec<Token> {
+        let batch_id = Token::Uint(U256::from(self.batch_id));
+        let blob_index = Token::Uint(U256::from(self.blob_index));
+        let batch_medatada = self.batch_medatada.into_tokens();
+        let inclusion_proof = self.inclusion_proof.into_token();
+        let quorum_indexes = self.quorum_indexes.into_token();
+
+        vec![
+            batch_id,
+            blob_index,
+            Token::Tuple(batch_medatada),
+            inclusion_proof,
+            quorum_indexes,
+        ]
+    }
+}
+
+#[derive(Debug)]
+pub struct BlobInfo {
+    pub blob_header: BlobHeader,
+    pub blob_verification_proof: BlobVerificationProof,
+}
+
+impl BlobInfo {
+    pub fn into_bytes(&self) -> Vec<u8> {
+        let mut bytes = vec![];
+        let blob_header_bytes = self.blob_header.into_bytes();
+        bytes.extend(blob_header_bytes.len().to_be_bytes());
+        bytes.extend(blob_header_bytes);
+        let blob_verification_proof_bytes = self.blob_verification_proof.into_bytes();
+        bytes.extend(blob_verification_proof_bytes);
+        bytes
+    }
+}
+
+impl Decodable for BlobInfo {
+    fn decode(rlp: &Rlp) -> Result<Self, DecoderError> {
+        let blob_header: BlobHeader = rlp.val_at(0)?;
+        let blob_verification_proof: BlobVerificationProof = rlp.val_at(1)?;
+
+        Ok(BlobInfo {
+            blob_header,
+            blob_verification_proof,
+        })
+    }
+}
+
+impl Tokenize for BlobInfo {
+    fn into_tokens(self) -> Vec<Token> {
+        let blob_header = self.blob_header.into_tokens();
+        let blob_verification_proof = self.blob_verification_proof.into_tokens();
+
+        vec![Token::Tuple(vec![
+            Token::Tuple(blob_header),
+            Token::Tuple(blob_verification_proof),
+        ])]
+    }
+}
diff --git a/core/lib/l1_contract_interface/src/i_executor/structures/commit_batch_info.rs b/core/lib/l1_contract_interface/src/i_executor/structures/commit_batch_info.rs
index cf2b3a0d089..3a5d25bab4f 100644
--- a/core/lib/l1_contract_interface/src/i_executor/structures/commit_batch_info.rs
+++ b/core/lib/l1_contract_interface/src/i_executor/structures/commit_batch_info.rs
@@ -1,3 +1,4 @@
+use rlp::decode;
 use zksync_types::{
     commitment::{
         pre_boojum_serialize_commitments, serialize_commitments, L1BatchCommitmentMode,
@@ -9,6 +10,7 @@ use zksync_types::{
     ProtocolVersionId, U256,
 };
 
+use super::blob_info::BlobInfo;
 use crate::{
     i_executor::commit::kzg::{KzgInfo, ZK_SYNC_BYTES_PER_BLOB},
     Tokenizable,
@@ -217,14 +219,21 @@ impl Tokenizable for CommitBatchInfo<'_> {
                 }
                 (L1BatchCommitmentMode::Validium, PubdataDA::Custom) => {
                     let mut operator_da_input = vec![PUBDATA_SOURCE_CUSTOM];
-                    operator_da_input.extend(
-                        &self
-                            .l1_batch_with_metadata
-                            .metadata
-                            .da_blob_id
-                            .clone()
-                            .unwrap_or_default(),
-                    );
+                    let commitment = &self
+                        .l1_batch_with_metadata
+                        .metadata
+                        .da_blob_id
+                        .clone()
+                        .unwrap_or_default();
+
+                    let data = &hex::decode(commitment).unwrap()[3..];
+
+                    let blob_info: BlobInfo = match decode(data) {
+                        Ok(info) => info,
+                        Err(_) => return Token::Tuple(vec![]),
+                    };
+
+                    operator_da_input.extend(&blob_info.into_bytes());
                     operator_da_input
                 }
 
diff --git a/core/lib/l1_contract_interface/src/i_executor/structures/mod.rs b/core/lib/l1_contract_interface/src/i_executor/structures/mod.rs
index d1ed57e41f2..ce0f203841c 100644
--- a/core/lib/l1_contract_interface/src/i_executor/structures/mod.rs
+++ b/core/lib/l1_contract_interface/src/i_executor/structures/mod.rs
@@ -1,5 +1,6 @@
 //! Structures exposed by the `IExecutor.sol`.
 
+mod blob_info;
 mod commit_batch_info;
 mod stored_batch_info;
 
diff --git a/core/lib/l1_contract_interface/src/multicall3/mod.rs b/core/lib/l1_contract_interface/src/multicall3/mod.rs
index 7d922668f94..52df37e0430 100644
--- a/core/lib/l1_contract_interface/src/multicall3/mod.rs
+++ b/core/lib/l1_contract_interface/src/multicall3/mod.rs
@@ -7,6 +7,7 @@ use zksync_types::{
 };
 
 /// Multicall3 contract aggregate method input vector struct.
+#[derive(Debug)]
 pub struct Multicall3Call {
     pub target: Address,
     pub allow_failure: bool,
@@ -21,6 +22,7 @@ impl Tokenizable for Multicall3Call {
             self.calldata.into_token(),
         ])
     }
+
     fn from_token(token: Token) -> Result<Self, ContractError> {
         let Token::Tuple(mut result_token) = token else {
             return Err(error(&[token], "Multicall3Call"));
diff --git a/core/lib/multivm/Cargo.toml b/core/lib/multivm/Cargo.toml
index 7d604157d1a..ab418d24cd1 100644
--- a/core/lib/multivm/Cargo.toml
+++ b/core/lib/multivm/Cargo.toml
@@ -37,10 +37,10 @@ once_cell.workspace = true
 thiserror.workspace = true
 tracing.workspace = true
 vise.workspace = true
+ethabi.workspace = true
 
 [dev-dependencies]
 assert_matches.workspace = true
 pretty_assertions.workspace = true
 zksync_test_account.workspace = true
-ethabi.workspace = true
 zksync_eth_signer.workspace = true
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 ce928e652d7..50bb19938fe 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
@@ -47,6 +47,7 @@ impl GlueFrom<crate::vm_m5::vm_instance::VmBlockResult> for crate::interface::Fi
                     circuit_statistic: Default::default(),
                 },
                 refunds: Refunds::default(),
+                new_known_factory_deps: None,
             },
             final_execution_state: CurrentExecutionState {
                 events: value.full_result.events,
@@ -103,6 +104,7 @@ impl GlueFrom<crate::vm_m6::vm_instance::VmBlockResult> for crate::interface::Fi
                     circuit_statistic: Default::default(),
                 },
                 refunds: Refunds::default(),
+                new_known_factory_deps: None,
             },
             final_execution_state: CurrentExecutionState {
                 events: value.full_result.events,
@@ -158,6 +160,7 @@ impl GlueFrom<crate::vm_1_3_2::vm_instance::VmBlockResult> for crate::interface:
                     circuit_statistic: Default::default(),
                 },
                 refunds: Refunds::default(),
+                new_known_factory_deps: None,
             },
             final_execution_state: CurrentExecutionState {
                 events: value.full_result.events,
@@ -227,6 +230,7 @@ impl GlueFrom<crate::vm_1_3_2::vm_instance::VmBlockResult>
                 circuit_statistic: Default::default(),
             },
             refunds: Refunds::default(),
+            new_known_factory_deps: None,
         }
     }
 }
@@ -259,6 +263,7 @@ impl GlueFrom<crate::vm_m5::vm_instance::VmBlockResult>
                 circuit_statistic: Default::default(),
             },
             refunds: Refunds::default(),
+            new_known_factory_deps: None,
         }
     }
 }
@@ -307,6 +312,7 @@ impl GlueFrom<crate::vm_m6::vm_instance::VmBlockResult>
                 circuit_statistic: Default::default(),
             },
             refunds: Refunds::default(),
+            new_known_factory_deps: None,
         }
     }
 }
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 3cb61b461a4..4c4cffcc687 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
@@ -22,6 +22,7 @@ impl GlueFrom<crate::vm_m5::vm_instance::VmPartialExecutionResult>
                 gas_refunded: 0,
                 operator_suggested_refund: 0,
             },
+            new_known_factory_deps: None,
         }
     }
 }
@@ -48,6 +49,7 @@ impl GlueFrom<crate::vm_m6::vm_instance::VmPartialExecutionResult>
                 gas_refunded: 0,
                 operator_suggested_refund: 0,
             },
+            new_known_factory_deps: None,
         }
     }
 }
@@ -74,6 +76,7 @@ impl GlueFrom<crate::vm_1_3_2::vm_instance::VmPartialExecutionResult>
                 gas_refunded: 0,
                 operator_suggested_refund: 0,
             },
+            new_known_factory_deps: None,
         }
     }
 }
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 2dc680ba77d..8978d4348ed 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
@@ -66,12 +66,14 @@ impl GlueFrom<Result<crate::vm_m6::vm_instance::VmTxExecutionResult, crate::vm_m
                         logs: Default::default(),
                         statistics: Default::default(),
                         refunds: Default::default(),
+                        new_known_factory_deps: None,
                     },
                     TxRevertReason::Halt(halt) => VmExecutionResultAndLogs {
                         result: ExecutionResult::Halt { reason: halt },
                         logs: Default::default(),
                         statistics: Default::default(),
                         refunds: Default::default(),
+                        new_known_factory_deps: None,
                     },
                 }
             }
@@ -100,12 +102,14 @@ impl
                         logs: Default::default(),
                         statistics: Default::default(),
                         refunds: Default::default(),
+                        new_known_factory_deps: None,
                     },
                     TxRevertReason::Halt(halt) => VmExecutionResultAndLogs {
                         result: ExecutionResult::Halt { reason: halt },
                         logs: Default::default(),
                         statistics: Default::default(),
                         refunds: Default::default(),
+                        new_known_factory_deps: None,
                     },
                 }
             }
@@ -129,6 +133,7 @@ impl GlueFrom<Result<crate::vm_m5::vm_instance::VmTxExecutionResult, crate::vm_m
                         logs: Default::default(),
                         statistics: Default::default(),
                         refunds: Default::default(),
+                        new_known_factory_deps: None,
                     },
                     _ => {
                         unreachable!("Halt is the only revert reason for VM 5")
diff --git a/core/lib/multivm/src/versions/vm_1_4_1/implementation/execution.rs b/core/lib/multivm/src/versions/vm_1_4_1/implementation/execution.rs
index 2160c4b56a0..cc199fef941 100644
--- a/core/lib/multivm/src/versions/vm_1_4_1/implementation/execution.rs
+++ b/core/lib/multivm/src/versions/vm_1_4_1/implementation/execution.rs
@@ -99,6 +99,7 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
             logs,
             statistics,
             refunds,
+            new_known_factory_deps: None,
         };
 
         (stop_reason, result)
diff --git a/core/lib/multivm/src/versions/vm_1_4_2/implementation/execution.rs b/core/lib/multivm/src/versions/vm_1_4_2/implementation/execution.rs
index d42d1880933..f6e49cd8b14 100644
--- a/core/lib/multivm/src/versions/vm_1_4_2/implementation/execution.rs
+++ b/core/lib/multivm/src/versions/vm_1_4_2/implementation/execution.rs
@@ -96,6 +96,7 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
             logs,
             statistics,
             refunds,
+            new_known_factory_deps: None,
         };
 
         (stop_reason, result)
diff --git a/core/lib/multivm/src/versions/vm_boojum_integration/implementation/execution.rs b/core/lib/multivm/src/versions/vm_boojum_integration/implementation/execution.rs
index 79669eddd56..b8b939f8673 100644
--- a/core/lib/multivm/src/versions/vm_boojum_integration/implementation/execution.rs
+++ b/core/lib/multivm/src/versions/vm_boojum_integration/implementation/execution.rs
@@ -93,6 +93,7 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
             logs,
             statistics,
             refunds,
+            new_known_factory_deps: None,
         };
 
         (stop_reason, result)
diff --git a/core/lib/multivm/src/versions/vm_fast/tests/get_used_contracts.rs b/core/lib/multivm/src/versions/vm_fast/tests/get_used_contracts.rs
index 62fa82f52f2..0447304f69f 100644
--- a/core/lib/multivm/src/versions/vm_fast/tests/get_used_contracts.rs
+++ b/core/lib/multivm/src/versions/vm_fast/tests/get_used_contracts.rs
@@ -31,7 +31,7 @@ fn test_get_used_contracts() {
         .with_execution_mode(TxExecutionMode::VerifyExecute)
         .build();
 
-    assert!(known_bytecodes_without_aa_code(&vm.vm).is_empty());
+    assert!(known_bytecodes_without_base_system_contracts(&vm.vm).is_empty());
 
     // create and push and execute some not-empty factory deps transaction with success status
     // to check that `get_decommitted_hashes()` updates
@@ -50,7 +50,7 @@ fn test_get_used_contracts() {
     // Note: `Default_AA` will be in the list of used contracts if L2 tx is used
     assert_eq!(
         vm.vm.decommitted_hashes().collect::<HashSet<U256>>(),
-        known_bytecodes_without_aa_code(&vm.vm)
+        known_bytecodes_without_base_system_contracts(&vm.vm)
     );
 
     // create push and execute some non-empty factory deps transaction that fails
@@ -83,20 +83,26 @@ fn test_get_used_contracts() {
     for factory_dep in tx2.execute.factory_deps {
         let hash = hash_bytecode(&factory_dep);
         let hash_to_u256 = h256_to_u256(hash);
-        assert!(known_bytecodes_without_aa_code(&vm.vm).contains(&hash_to_u256));
+        assert!(known_bytecodes_without_base_system_contracts(&vm.vm).contains(&hash_to_u256));
         assert!(!vm.vm.decommitted_hashes().contains(&hash_to_u256));
     }
 }
 
-fn known_bytecodes_without_aa_code<S: ReadStorage>(vm: &Vm<S>) -> HashSet<U256> {
-    let mut known_bytecodes_without_aa_code = vm
+fn known_bytecodes_without_base_system_contracts<S: ReadStorage>(vm: &Vm<S>) -> HashSet<U256> {
+    let mut known_bytecodes_without_base_system_contracts = vm
         .world
         .bytecode_cache
         .keys()
         .cloned()
         .collect::<HashSet<_>>();
-    known_bytecodes_without_aa_code.remove(&h256_to_u256(BASE_SYSTEM_CONTRACTS.default_aa.hash));
-    known_bytecodes_without_aa_code
+    known_bytecodes_without_base_system_contracts
+        .remove(&h256_to_u256(BASE_SYSTEM_CONTRACTS.default_aa.hash));
+    if let Some(evm_emulator) = &BASE_SYSTEM_CONTRACTS.evm_emulator {
+        let was_removed =
+            known_bytecodes_without_base_system_contracts.remove(&h256_to_u256(evm_emulator.hash));
+        assert!(was_removed);
+    }
+    known_bytecodes_without_base_system_contracts
 }
 
 /// Counter test contract bytecode inflated by appending lots of `NOP` opcodes at the end. This leads to non-trivial
diff --git a/core/lib/multivm/src/versions/vm_fast/tests/require_eip712.rs b/core/lib/multivm/src/versions/vm_fast/tests/require_eip712.rs
index 88fe2dab5c9..b4448683cf7 100644
--- a/core/lib/multivm/src/versions/vm_fast/tests/require_eip712.rs
+++ b/core/lib/multivm/src/versions/vm_fast/tests/require_eip712.rs
@@ -107,7 +107,7 @@ fn test_require_eip712() {
     let aa_tx = private_account.sign_legacy_tx(aa_raw_tx);
     let (tx_request, hash) = TransactionRequest::from_bytes(&aa_tx, L2ChainId::from(270)).unwrap();
 
-    let mut l2_tx: L2Tx = L2Tx::from_request(tx_request, 10000).unwrap();
+    let mut l2_tx: L2Tx = L2Tx::from_request(tx_request, 10000, false).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;
@@ -157,7 +157,7 @@ fn test_require_eip712() {
     let (aa_txn_request, aa_hash) =
         TransactionRequest::from_bytes(&encoded_tx, L2ChainId::from(chain_id)).unwrap();
 
-    let mut l2_tx = L2Tx::from_request(aa_txn_request, 100000).unwrap();
+    let mut l2_tx = L2Tx::from_request(aa_txn_request, 100000, false).unwrap();
     l2_tx.set_input(encoded_tx, aa_hash);
 
     let transaction: Transaction = l2_tx.into();
diff --git a/core/lib/multivm/src/versions/vm_fast/vm.rs b/core/lib/multivm/src/versions/vm_fast/vm.rs
index 10be6d88b04..0c20af57e03 100644
--- a/core/lib/multivm/src/versions/vm_fast/vm.rs
+++ b/core/lib/multivm/src/versions/vm_fast/vm.rs
@@ -639,6 +639,7 @@ impl<S: ReadStorage, Tr: Tracer + Default + 'static> VmInterface for Vm<S, Tr> {
                 total_log_queries: 0,
             },
             refunds: result.refunds,
+            new_known_factory_deps: None,
         }
     }
 
diff --git a/core/lib/multivm/src/versions/vm_latest/implementation/execution.rs b/core/lib/multivm/src/versions/vm_latest/implementation/execution.rs
index b8242fa7ca8..e70f05f85ef 100644
--- a/core/lib/multivm/src/versions/vm_latest/implementation/execution.rs
+++ b/core/lib/multivm/src/versions/vm_latest/implementation/execution.rs
@@ -14,6 +14,7 @@ use crate::{
             circuits_capacity::circuit_statistic_from_cycles, dispatcher::TracerDispatcher,
             DefaultExecutionTracer, PubdataTracer, RefundsTracer,
         },
+        utils::extract_bytecodes_marked_as_known,
         vm::Vm,
     },
     HistoryMode,
@@ -55,6 +56,10 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
             .then_some(RefundsTracer::new(self.batch_env.clone(), self.subversion));
         let mut tx_tracer: DefaultExecutionTracer<S, H::Vm1_5_0> = DefaultExecutionTracer::new(
             self.system_env.default_validation_computational_gas_limit,
+            self.system_env
+                .base_system_smart_contracts
+                .evm_emulator
+                .is_some(),
             execution_mode,
             mem::take(dispatcher),
             self.storage.clone(),
@@ -95,6 +100,8 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
             circuit_statistic_from_cycles(tx_tracer.circuits_tracer.statistics),
         );
         let result = tx_tracer.result_tracer.into_result();
+        let factory_deps_marked_as_known = extract_bytecodes_marked_as_known(&logs.events);
+        let new_known_factory_deps = self.decommit_bytecodes(&factory_deps_marked_as_known);
         *dispatcher = tx_tracer.dispatcher;
 
         let result = VmExecutionResultAndLogs {
@@ -102,6 +109,7 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
             logs,
             statistics,
             refunds,
+            new_known_factory_deps: Some(new_known_factory_deps),
         };
 
         (stop_reason, result)
diff --git a/core/lib/multivm/src/versions/vm_latest/implementation/tx.rs b/core/lib/multivm/src/versions/vm_latest/implementation/tx.rs
index 98d71efa00f..6dd73866adf 100644
--- a/core/lib/multivm/src/versions/vm_latest/implementation/tx.rs
+++ b/core/lib/multivm/src/versions/vm_latest/implementation/tx.rs
@@ -59,7 +59,12 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
         tx: Transaction,
         with_compression: bool,
     ) {
-        let tx: TransactionData = tx.into();
+        let use_evm_emulator = self
+            .system_env
+            .base_system_smart_contracts
+            .evm_emulator
+            .is_some();
+        let tx = TransactionData::new(tx, use_evm_emulator);
         let overhead = tx.overhead_gas();
         self.push_raw_transaction(tx, overhead, 0, with_compression);
     }
diff --git a/core/lib/multivm/src/versions/vm_latest/old_vm/oracles/decommitter.rs b/core/lib/multivm/src/versions/vm_latest/old_vm/oracles/decommitter.rs
index 0315aa38327..d91fbfdb24d 100644
--- a/core/lib/multivm/src/versions/vm_latest/old_vm/oracles/decommitter.rs
+++ b/core/lib/multivm/src/versions/vm_latest/old_vm/oracles/decommitter.rs
@@ -5,9 +5,7 @@ use zk_evm_1_5_0::{
     aux_structures::{
         DecommittmentQuery, MemoryIndex, MemoryLocation, MemoryPage, MemoryQuery, Timestamp,
     },
-    zkevm_opcode_defs::{
-        ContractCodeSha256, VersionedHashDef, VersionedHashHeader, VersionedHashNormalizedPreimage,
-    },
+    zkevm_opcode_defs::{VersionedHashHeader, VersionedHashNormalizedPreimage},
 };
 use zksync_types::{H256, U256};
 use zksync_utils::{bytes_to_be_words, h256_to_u256, u256_to_h256};
@@ -166,8 +164,8 @@ impl<S: ReadStorage + Debug, const B: bool, H: HistoryMode> DecommittmentProcess
         _monotonic_cycle_counter: u32,
         mut partial_query: DecommittmentQuery,
     ) -> anyhow::Result<DecommittmentQuery> {
-        let (stored_hash, length) = stored_hash_from_query(&partial_query);
-        partial_query.decommitted_length = length;
+        let versioned_hash = VersionedCodeHash::from_query(&partial_query);
+        let stored_hash = versioned_hash.to_stored_hash();
 
         if let Some(memory_page) = self
             .decommitted_code_hashes
@@ -178,10 +176,10 @@ impl<S: ReadStorage + Debug, const B: bool, H: HistoryMode> DecommittmentProcess
         {
             partial_query.is_fresh = false;
             partial_query.memory_page = MemoryPage(memory_page);
+            partial_query.decommitted_length = versioned_hash.get_preimage_length() as u16;
 
             Ok(partial_query)
         } else {
-            partial_query.is_fresh = true;
             if self
                 .decommitted_code_hashes
                 .inner()
@@ -190,7 +188,9 @@ impl<S: ReadStorage + Debug, const B: bool, H: HistoryMode> DecommittmentProcess
             {
                 self.decommitted_code_hashes
                     .insert(stored_hash, None, partial_query.timestamp);
-            }
+            };
+            partial_query.is_fresh = true;
+            partial_query.decommitted_length = versioned_hash.get_preimage_length() as u16;
 
             Ok(partial_query)
         }
@@ -204,11 +204,10 @@ impl<S: ReadStorage + Debug, const B: bool, H: HistoryMode> DecommittmentProcess
         memory: &mut M,
     ) -> anyhow::Result<Option<Vec<U256>>> {
         assert!(partial_query.is_fresh);
-
         self.decommitment_requests.push((), partial_query.timestamp);
 
-        let stored_hash = stored_hash_from_query(&partial_query).0;
-
+        let versioned_hash = VersionedCodeHash::from_query(&partial_query);
+        let stored_hash = versioned_hash.to_stored_hash();
         // We are fetching a fresh bytecode that we didn't read before.
         let values = self.get_bytecode(stored_hash, partial_query.timestamp);
         let page_to_use = partial_query.memory_page;
@@ -251,28 +250,49 @@ impl<S: ReadStorage + Debug, const B: bool, H: HistoryMode> DecommittmentProcess
     }
 }
 
-fn concat_header_and_preimage(
-    header: VersionedHashHeader,
-    normalized_preimage: VersionedHashNormalizedPreimage,
-) -> [u8; 32] {
-    let mut buffer = [0u8; 32];
+#[derive(Debug)]
+// TODO: consider moving this to the zk-evm crate
+enum VersionedCodeHash {
+    ZkEVM(VersionedHashHeader, VersionedHashNormalizedPreimage),
+    Evm(VersionedHashHeader, VersionedHashNormalizedPreimage),
+}
 
-    buffer[0..4].copy_from_slice(&header.0);
-    buffer[4..32].copy_from_slice(&normalized_preimage.0);
+impl VersionedCodeHash {
+    fn from_query(query: &DecommittmentQuery) -> Self {
+        match query.header.0[0] {
+            1 => Self::ZkEVM(query.header, query.normalized_preimage),
+            2 => Self::Evm(query.header, query.normalized_preimage),
+            _ => panic!("Unsupported hash version"),
+        }
+    }
 
-    buffer
-}
+    /// Returns the hash in the format it is stored in the DB.
+    fn to_stored_hash(&self) -> U256 {
+        let (header, preimage) = match self {
+            Self::ZkEVM(header, preimage) => (header, preimage),
+            Self::Evm(header, preimage) => (header, preimage),
+        };
 
-/// For a given decommitment query, returns a pair of the stored hash as U256 and the length of the preimage in 32-byte words.
-fn stored_hash_from_query(partial_query: &DecommittmentQuery) -> (U256, u16) {
-    let full_hash =
-        concat_header_and_preimage(partial_query.header, partial_query.normalized_preimage);
+        let mut hash = [0u8; 32];
+        hash[0..4].copy_from_slice(&header.0);
+        hash[4..32].copy_from_slice(&preimage.0);
 
-    let versioned_hash =
-        ContractCodeSha256::try_deserialize(full_hash).expect("Invalid ContractCodeSha256 hash");
+        // Hash[1] is used in both of the versions to denote whether the bytecode is being constructed.
+        // We ignore this param.
+        hash[1] = 0;
 
-    let stored_hash = H256(ContractCodeSha256::serialize_to_stored(versioned_hash).unwrap());
-    let length = versioned_hash.code_length_in_words;
+        h256_to_u256(H256(hash))
+    }
 
-    (h256_to_u256(stored_hash), length)
+    fn get_preimage_length(&self) -> u32 {
+        // In zkEVM the hash[2..3] denotes the length of the preimage in words, while
+        // in EVM the hash[2..3] denotes the length of the preimage in bytes.
+        match self {
+            Self::ZkEVM(header, _) => {
+                let length_in_words = header.0[2] as u32 * 256 + header.0[3] as u32;
+                length_in_words * 32
+            }
+            Self::Evm(header, _) => header.0[2] as u32 * 256 + header.0[3] as u32,
+        }
+    }
 }
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/evm_emulator.rs b/core/lib/multivm/src/versions/vm_latest/tests/evm_emulator.rs
new file mode 100644
index 00000000000..ca8157b170d
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_latest/tests/evm_emulator.rs
@@ -0,0 +1,76 @@
+use ethabi::Token;
+use zksync_contracts::read_bytecode;
+use zksync_system_constants::{CONTRACT_DEPLOYER_ADDRESS, KNOWN_CODES_STORAGE_ADDRESS};
+use zksync_types::{get_code_key, get_known_code_key, Execute, H256};
+use zksync_utils::{be_words_to_bytes, bytecode::hash_bytecode, h256_to_u256};
+use zksync_vm_interface::VmInterfaceExt;
+
+use crate::{
+    interface::{storage::InMemoryStorage, TxExecutionMode},
+    versions::testonly::default_system_env,
+    vm_latest::{tests::tester::VmTesterBuilder, utils::hash_evm_bytecode, HistoryEnabled},
+};
+
+const MOCK_DEPLOYER_PATH: &str = "etc/contracts-test-data/artifacts-zk/contracts/mock-evm/mock-evm.sol/MockContractDeployer.json";
+const MOCK_KNOWN_CODE_STORAGE_PATH: &str = "etc/contracts-test-data/artifacts-zk/contracts/mock-evm/mock-evm.sol/MockKnownCodeStorage.json";
+
+#[test]
+fn tracing_evm_contract_deployment() {
+    let mock_deployer = read_bytecode(MOCK_DEPLOYER_PATH);
+    let mock_deployer_hash = hash_bytecode(&mock_deployer);
+    let mock_known_code_storage = read_bytecode(MOCK_KNOWN_CODE_STORAGE_PATH);
+    let mock_known_code_storage_hash = hash_bytecode(&mock_known_code_storage);
+
+    // Override
+    let mut storage = InMemoryStorage::with_system_contracts(hash_bytecode);
+    storage.set_value(get_code_key(&CONTRACT_DEPLOYER_ADDRESS), mock_deployer_hash);
+    storage.set_value(
+        get_known_code_key(&mock_deployer_hash),
+        H256::from_low_u64_be(1),
+    );
+    storage.set_value(
+        get_code_key(&KNOWN_CODES_STORAGE_ADDRESS),
+        mock_known_code_storage_hash,
+    );
+    storage.set_value(
+        get_known_code_key(&mock_known_code_storage_hash),
+        H256::from_low_u64_be(1),
+    );
+    storage.store_factory_dep(mock_deployer_hash, mock_deployer);
+    storage.store_factory_dep(mock_known_code_storage_hash, mock_known_code_storage);
+
+    let mut system_env = default_system_env();
+    // The EVM emulator will not be accessed, so we set it to a dummy value.
+    system_env.base_system_smart_contracts.evm_emulator =
+        Some(system_env.base_system_smart_contracts.default_aa.clone());
+    let mut vm = VmTesterBuilder::new(HistoryEnabled)
+        .with_system_env(system_env)
+        .with_storage(storage)
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .with_random_rich_accounts(1)
+        .build();
+    let account = &mut vm.rich_accounts[0];
+
+    let args = [Token::Bytes((0..=u8::MAX).collect())];
+    let evm_bytecode = ethabi::encode(&args);
+    let expected_bytecode_hash = hash_evm_bytecode(&evm_bytecode);
+    let execute = Execute::for_deploy(expected_bytecode_hash, vec![0; 32], &args);
+    let deploy_tx = account.get_l2_tx_for_execute(execute, None);
+    let (_, vm_result) = vm
+        .vm
+        .execute_transaction_with_bytecode_compression(deploy_tx, true);
+    assert!(!vm_result.result.is_failed(), "{:?}", vm_result.result);
+
+    // Check that the surrogate EVM bytecode was added to the decommitter.
+    let known_bytecodes = vm.vm.state.decommittment_processor.known_bytecodes.inner();
+    let known_evm_bytecode =
+        be_words_to_bytes(&known_bytecodes[&h256_to_u256(expected_bytecode_hash)]);
+    assert_eq!(known_evm_bytecode, evm_bytecode);
+
+    let new_known_factory_deps = vm_result.new_known_factory_deps.unwrap();
+    assert_eq!(new_known_factory_deps.len(), 2); // the deployed EraVM contract + EVM contract
+    assert_eq!(
+        new_known_factory_deps[&expected_bytecode_hash],
+        evm_bytecode
+    );
+}
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/get_used_contracts.rs b/core/lib/multivm/src/versions/vm_latest/tests/get_used_contracts.rs
index ef19717a627..d7cadc54b44 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/get_used_contracts.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/get_used_contracts.rs
@@ -41,7 +41,7 @@ fn test_get_used_contracts() {
         .with_execution_mode(TxExecutionMode::VerifyExecute)
         .build();
 
-    assert!(known_bytecodes_without_aa_code(&vm.vm).is_empty());
+    assert!(known_bytecodes_without_base_system_contracts(&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
@@ -63,7 +63,7 @@ fn test_get_used_contracts() {
             .get_used_contracts()
             .into_iter()
             .collect::<HashSet<U256>>(),
-        known_bytecodes_without_aa_code(&vm.vm)
+        known_bytecodes_without_base_system_contracts(&vm.vm)
             .keys()
             .cloned()
             .collect::<HashSet<U256>>()
@@ -99,7 +99,7 @@ fn test_get_used_contracts() {
     for factory_dep in tx2.execute.factory_deps {
         let hash = hash_bytecode(&factory_dep);
         let hash_to_u256 = h256_to_u256(hash);
-        assert!(known_bytecodes_without_aa_code(&vm.vm)
+        assert!(known_bytecodes_without_base_system_contracts(&vm.vm)
             .keys()
             .contains(&hash_to_u256));
         assert!(!vm.vm.get_used_contracts().contains(&hash_to_u256));
@@ -147,19 +147,24 @@ fn test_contract_is_used_right_after_prepare_to_decommit() {
     assert_eq!(vm.vm.get_used_contracts(), vec![bytecode_hash]);
 }
 
-fn known_bytecodes_without_aa_code<S: WriteStorage, H: HistoryMode>(
+fn known_bytecodes_without_base_system_contracts<S: WriteStorage, H: HistoryMode>(
     vm: &Vm<S, H>,
 ) -> HashMap<U256, Vec<U256>> {
-    let mut known_bytecodes_without_aa_code = vm
+    let mut known_bytecodes_without_base_system_contracts = vm
         .state
         .decommittment_processor
         .known_bytecodes
         .inner()
         .clone();
-    known_bytecodes_without_aa_code
+    known_bytecodes_without_base_system_contracts
         .remove(&h256_to_u256(BASE_SYSTEM_CONTRACTS.default_aa.hash))
         .unwrap();
-    known_bytecodes_without_aa_code
+    if let Some(evm_emulator) = &BASE_SYSTEM_CONTRACTS.evm_emulator {
+        known_bytecodes_without_base_system_contracts
+            .remove(&h256_to_u256(evm_emulator.hash))
+            .unwrap();
+    }
+    known_bytecodes_without_base_system_contracts
 }
 
 /// Counter test contract bytecode inflated by appending lots of `NOP` opcodes at the end. This leads to non-trivial
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/l1_tx_execution.rs b/core/lib/multivm/src/versions/vm_latest/tests/l1_tx_execution.rs
index 0fc12848227..4bb32cdf7ae 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/l1_tx_execution.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/l1_tx_execution.rs
@@ -52,7 +52,7 @@ fn test_l1_tx_execution() {
     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 tx_data = TransactionData::new(deploy_tx.tx.clone(), false);
 
     let required_l2_to_l1_logs: Vec<_> = vec![L2ToL1Log {
         shard_id: 0,
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/mod.rs b/core/lib/multivm/src/versions/vm_latest/tests/mod.rs
index 1203d61b80b..112be637fe0 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/mod.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/mod.rs
@@ -8,6 +8,7 @@ mod call_tracer;
 mod circuits;
 mod code_oracle;
 mod constants;
+mod evm_emulator;
 mod gas_limit;
 mod get_used_contracts;
 mod is_write_initial;
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/nonce_holder.rs b/core/lib/multivm/src/versions/vm_latest/tests/nonce_holder.rs
index 91d78c69a93..6be49367d39 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/nonce_holder.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/nonce_holder.rs
@@ -61,19 +61,17 @@ fn test_nonce_holder() {
         // 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: Some(account.address),
-                    calldata: vec![12],
-                    value: Default::default(),
-                    factory_deps: vec![],
-                },
-                None,
-                Nonce(nonce),
-            )
-            .into();
-
+        let tx = account.get_l2_tx_for_execute_with_nonce(
+            Execute {
+                contract_address: Some(account.address),
+                calldata: vec![12],
+                value: Default::default(),
+                factory_deps: vec![],
+            },
+            None,
+            Nonce(nonce),
+        );
+        let mut transaction_data = TransactionData::new(tx, false);
         transaction_data.signature = vec![test_mode.into()];
         vm.vm.push_raw_transaction(transaction_data, 0, 0, true);
         let result = vm.vm.execute(VmExecutionMode::OneTx);
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/refunds.rs b/core/lib/multivm/src/versions/vm_latest/tests/refunds.rs
index cc0085f2025..c00192aa8f1 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/refunds.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/refunds.rs
@@ -62,7 +62,7 @@ fn test_predetermined_refunded_gas() {
         .with_rich_accounts(vec![account.clone()])
         .build();
 
-    let tx: TransactionData = tx.into();
+    let tx = TransactionData::new(tx, false);
     // Overhead
     let overhead = tx.overhead_gas();
     vm.vm
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/require_eip712.rs b/core/lib/multivm/src/versions/vm_latest/tests/require_eip712.rs
index a6dc7118005..1f38c6f947e 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/require_eip712.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/require_eip712.rs
@@ -98,7 +98,7 @@ fn test_require_eip712() {
     let aa_tx = private_account.sign_legacy_tx(aa_raw_tx);
     let (tx_request, hash) = TransactionRequest::from_bytes(&aa_tx, L2ChainId::from(270)).unwrap();
 
-    let mut l2_tx: L2Tx = L2Tx::from_request(tx_request, 10000).unwrap();
+    let mut l2_tx: L2Tx = L2Tx::from_request(tx_request, 10000, false).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;
@@ -148,7 +148,7 @@ fn test_require_eip712() {
     let (aa_txn_request, aa_hash) =
         TransactionRequest::from_bytes(&encoded_tx, L2ChainId::from(chain_id)).unwrap();
 
-    let mut l2_tx = L2Tx::from_request(aa_txn_request, 100000).unwrap();
+    let mut l2_tx = L2Tx::from_request(aa_txn_request, 100000, false).unwrap();
     l2_tx.set_input(encoded_tx, aa_hash);
 
     let transaction: Transaction = l2_tx.into();
diff --git a/core/lib/multivm/src/versions/vm_latest/tracers/default_tracers.rs b/core/lib/multivm/src/versions/vm_latest/tracers/default_tracers.rs
index 6a908c2a73e..2ae5e81a328 100755
--- a/core/lib/multivm/src/versions/vm_latest/tracers/default_tracers.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tracers/default_tracers.rs
@@ -13,7 +13,7 @@ use zk_evm_1_5_0::{
     zkevm_opcode_defs::{decoding::EncodingModeProduction, Opcode, RetOpcode},
 };
 
-use super::PubdataTracer;
+use super::{EvmDeployTracer, PubdataTracer};
 use crate::{
     glue::GlueInto,
     interface::{
@@ -38,7 +38,7 @@ use crate::{
 };
 
 /// Default tracer for the VM. It manages the other tracers execution and stop the vm when needed.
-pub(crate) struct DefaultExecutionTracer<S: WriteStorage, H: HistoryMode> {
+pub struct DefaultExecutionTracer<S: WriteStorage, H: HistoryMode> {
     tx_has_been_processed: bool,
     execution_mode: VmExecutionMode,
 
@@ -63,14 +63,18 @@ pub(crate) struct DefaultExecutionTracer<S: WriteStorage, H: HistoryMode> {
     // It only takes into account circuits that are generated for actual execution. It doesn't
     // take into account e.g circuits produced by the initial bootloader memory commitment.
     pub(crate) circuits_tracer: CircuitsTracer<S, H>,
+    // This tracer is responsible for handling EVM deployments and providing the data to the code decommitter.
+    pub(crate) evm_deploy_tracer: Option<EvmDeployTracer<S>>,
     subversion: MultiVMSubversion,
     storage: StoragePtr<S>,
     _phantom: PhantomData<H>,
 }
 
 impl<S: WriteStorage, H: HistoryMode> DefaultExecutionTracer<S, H> {
+    #[allow(clippy::too_many_arguments)]
     pub(crate) fn new(
         computational_gas_limit: u32,
+        use_evm_emulator: bool,
         execution_mode: VmExecutionMode,
         dispatcher: TracerDispatcher<S, H>,
         storage: StoragePtr<S>,
@@ -92,6 +96,7 @@ impl<S: WriteStorage, H: HistoryMode> DefaultExecutionTracer<S, H> {
             pubdata_tracer,
             ret_from_the_bootloader: None,
             circuits_tracer: CircuitsTracer::new(),
+            evm_deploy_tracer: use_evm_emulator.then(EvmDeployTracer::new),
             storage,
             _phantom: PhantomData,
         }
@@ -172,6 +177,9 @@ macro_rules! dispatch_tracers {
             tracer.$function($( $params ),*);
         }
         $self.circuits_tracer.$function($( $params ),*);
+        if let Some(tracer) = &mut $self.evm_deploy_tracer {
+            tracer.$function($( $params ),*);
+        }
     };
 }
 
@@ -289,6 +297,12 @@ impl<S: WriteStorage, H: HistoryMode> DefaultExecutionTracer<S, H> {
             .finish_cycle(state, bootloader_state)
             .stricter(&result);
 
+        if let Some(evm_deploy_tracer) = &mut self.evm_deploy_tracer {
+            result = evm_deploy_tracer
+                .finish_cycle(state, bootloader_state)
+                .stricter(&result);
+        }
+
         result.stricter(&self.should_stop_execution())
     }
 
diff --git a/core/lib/multivm/src/versions/vm_latest/tracers/evm_deploy_tracer.rs b/core/lib/multivm/src/versions/vm_latest/tracers/evm_deploy_tracer.rs
new file mode 100644
index 00000000000..d91ee13a920
--- /dev/null
+++ b/core/lib/multivm/src/versions/vm_latest/tracers/evm_deploy_tracer.rs
@@ -0,0 +1,105 @@
+use std::{marker::PhantomData, mem};
+
+use zk_evm_1_5_0::{
+    aux_structures::Timestamp,
+    tracing::{AfterExecutionData, VmLocalStateData},
+    zkevm_opcode_defs::{
+        FarCallOpcode, FatPointer, Opcode, CALL_IMPLICIT_CALLDATA_FAT_PTR_REGISTER,
+    },
+};
+use zksync_types::{CONTRACT_DEPLOYER_ADDRESS, KNOWN_CODES_STORAGE_ADDRESS};
+use zksync_utils::{bytes_to_be_words, h256_to_u256};
+use zksync_vm_interface::storage::StoragePtr;
+
+use super::{traits::VmTracer, utils::read_pointer};
+use crate::{
+    interface::{storage::WriteStorage, tracer::TracerExecutionStatus},
+    tracers::dynamic::vm_1_5_0::DynTracer,
+    vm_latest::{
+        utils::hash_evm_bytecode, BootloaderState, HistoryMode, SimpleMemory, ZkSyncVmState,
+    },
+};
+
+/// Tracer responsible for collecting information about EVM deploys and providing those
+/// to the code decommitter.
+#[derive(Debug)]
+pub(crate) struct EvmDeployTracer<S> {
+    tracked_signature: [u8; 4],
+    pending_bytecodes: Vec<Vec<u8>>,
+    _phantom: PhantomData<S>,
+}
+
+impl<S> EvmDeployTracer<S> {
+    pub(crate) fn new() -> Self {
+        let tracked_signature =
+            ethabi::short_signature("publishEVMBytecode", &[ethabi::ParamType::Bytes]);
+
+        Self {
+            tracked_signature,
+            pending_bytecodes: vec![],
+            _phantom: PhantomData,
+        }
+    }
+}
+
+impl<S, H: HistoryMode> DynTracer<S, SimpleMemory<H>> for EvmDeployTracer<S> {
+    fn after_execution(
+        &mut self,
+        state: VmLocalStateData<'_>,
+        data: AfterExecutionData,
+        memory: &SimpleMemory<H>,
+        _storage: StoragePtr<S>,
+    ) {
+        if !matches!(
+            data.opcode.variant.opcode,
+            Opcode::FarCall(FarCallOpcode::Normal)
+        ) {
+            return;
+        };
+
+        let current = state.vm_local_state.callstack.current;
+        let from = current.msg_sender;
+        let to = current.this_address;
+        if from != CONTRACT_DEPLOYER_ADDRESS || to != KNOWN_CODES_STORAGE_ADDRESS {
+            return;
+        }
+
+        let calldata_ptr =
+            state.vm_local_state.registers[usize::from(CALL_IMPLICIT_CALLDATA_FAT_PTR_REGISTER)];
+        let data = read_pointer(memory, FatPointer::from_u256(calldata_ptr.value));
+        if data.len() < 4 {
+            return;
+        }
+        let (signature, data) = data.split_at(4);
+        if signature != self.tracked_signature {
+            return;
+        }
+
+        match ethabi::decode(&[ethabi::ParamType::Bytes], data) {
+            Ok(decoded) => {
+                let published_bytecode = decoded.into_iter().next().unwrap().into_bytes().unwrap();
+                self.pending_bytecodes.push(published_bytecode);
+            }
+            Err(err) => tracing::error!("Unable to decode `publishEVMBytecode` call: {err}"),
+        }
+    }
+}
+
+impl<S: WriteStorage, H: HistoryMode> VmTracer<S, H> for EvmDeployTracer<S> {
+    fn finish_cycle(
+        &mut self,
+        state: &mut ZkSyncVmState<S, H>,
+        _bootloader_state: &mut BootloaderState,
+    ) -> TracerExecutionStatus {
+        for published_bytecode in mem::take(&mut self.pending_bytecodes) {
+            let hash = hash_evm_bytecode(&published_bytecode);
+            let as_words = bytes_to_be_words(published_bytecode);
+
+            state.decommittment_processor.populate(
+                vec![(h256_to_u256(hash), as_words)],
+                Timestamp(state.local_state.timestamp),
+            );
+        }
+        TracerExecutionStatus::Continue
+    }
+}
diff --git a/core/lib/multivm/src/versions/vm_latest/tracers/mod.rs b/core/lib/multivm/src/versions/vm_latest/tracers/mod.rs
index fe916e19e8c..82721a32264 100755
--- a/core/lib/multivm/src/versions/vm_latest/tracers/mod.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tracers/mod.rs
@@ -1,11 +1,13 @@
 pub(crate) use circuits_tracer::CircuitsTracer;
 pub(crate) use default_tracers::DefaultExecutionTracer;
+pub(crate) use evm_deploy_tracer::EvmDeployTracer;
 pub(crate) use pubdata_tracer::PubdataTracer;
 pub(crate) use refunds::RefundsTracer;
 pub(crate) use result_tracer::ResultTracer;
 
 pub(crate) mod circuits_tracer;
 pub(crate) mod default_tracers;
+pub(crate) mod evm_deploy_tracer;
 pub(crate) mod pubdata_tracer;
 pub(crate) mod refunds;
 pub(crate) mod result_tracer;
diff --git a/core/lib/multivm/src/versions/vm_latest/types/internals/transaction_data.rs b/core/lib/multivm/src/versions/vm_latest/types/internals/transaction_data.rs
index 2ec86eb3cea..90948f2f89f 100644
--- a/core/lib/multivm/src/versions/vm_latest/types/internals/transaction_data.rs
+++ b/core/lib/multivm/src/versions/vm_latest/types/internals/transaction_data.rs
@@ -46,8 +46,8 @@ pub(crate) struct TransactionData {
     pub(crate) raw_bytes: Option<Vec<u8>>,
 }
 
-impl From<Transaction> for TransactionData {
-    fn from(execute_tx: Transaction) -> Self {
+impl TransactionData {
+    pub(crate) fn new(execute_tx: Transaction, use_evm_emulator: bool) -> Self {
         match execute_tx.common_data {
             ExecuteTransactionCommon::L2(common_data) => {
                 let nonce = U256::from_big_endian(&common_data.nonce.to_be_bytes());
@@ -62,6 +62,19 @@ impl From<Transaction> for TransactionData {
                     U256::zero()
                 };
 
+                let should_deploy_contract = if execute_tx.execute.contract_address.is_none() {
+                    // Transactions with no `contract_address` should be filtered out by the API server,
+                    // so this is more of a sanity check.
+                    assert!(
+                        use_evm_emulator,
+                        "`execute.contract_address` not set for transaction {:?} with EVM emulation disabled",
+                        common_data.hash()
+                    );
+                    U256([1, 0, 0, 0])
+                } else {
+                    U256::zero()
+                };
+
                 // Ethereum transactions do not sign gas per pubdata limit, and so for them we need to use
                 // some default value. We use the maximum possible value that is allowed by the bootloader
                 // (i.e. we can not use u64::MAX, because the bootloader requires gas per pubdata for such
@@ -85,7 +98,7 @@ impl From<Transaction> for TransactionData {
                     value: execute_tx.execute.value,
                     reserved: [
                         should_check_chain_id,
-                        U256::zero(),
+                        should_deploy_contract,
                         U256::zero(),
                         U256::zero(),
                     ],
diff --git a/core/lib/multivm/src/versions/vm_latest/types/internals/vm_state.rs b/core/lib/multivm/src/versions/vm_latest/types/internals/vm_state.rs
index 6f9522572ad..cb4b13eecdf 100644
--- a/core/lib/multivm/src/versions/vm_latest/types/internals/vm_state.rs
+++ b/core/lib/multivm/src/versions/vm_latest/types/internals/vm_state.rs
@@ -98,6 +98,13 @@ pub(crate) fn new_vm_state<S: WriteStorage, H: HistoryMode>(
         Timestamp(0),
     );
 
+    if let Some(evm_emulator) = &system_env.base_system_smart_contracts.evm_emulator {
+        decommittment_processor.populate(
+            vec![(h256_to_u256(evm_emulator.hash), evm_emulator.code.clone())],
+            Timestamp(0),
+        );
+    }
+
     memory.populate(
         vec![(
             BOOTLOADER_CODE_PAGE,
@@ -117,6 +124,13 @@ pub(crate) fn new_vm_state<S: WriteStorage, H: HistoryMode>(
         Timestamp(0),
     );
 
+    // By convention, default AA is used as a fallback if the EVM emulator is not available.
+    let evm_emulator_code_hash = system_env
+        .base_system_smart_contracts
+        .evm_emulator
+        .as_ref()
+        .unwrap_or(&system_env.base_system_smart_contracts.default_aa)
+        .hash;
     let mut vm = VmState::empty_state(
         storage_oracle,
         memory,
@@ -128,11 +142,7 @@ pub(crate) fn new_vm_state<S: WriteStorage, H: HistoryMode>(
             default_aa_code_hash: h256_to_u256(
                 system_env.base_system_smart_contracts.default_aa.hash,
             ),
-            // For now, the default account hash is used as the code hash for the EVM simulator.
-            // In the 1.5.0 version, it is not possible to instantiate EVM bytecode.
-            evm_simulator_code_hash: h256_to_u256(
-                system_env.base_system_smart_contracts.default_aa.hash,
-            ),
+            evm_simulator_code_hash: h256_to_u256(evm_emulator_code_hash),
             zkporter_is_available: system_env.zk_porter_available,
         },
     );
diff --git a/core/lib/multivm/src/versions/vm_latest/utils/mod.rs b/core/lib/multivm/src/versions/vm_latest/utils/mod.rs
index 0fb803de5d4..e07d3eda7c4 100644
--- a/core/lib/multivm/src/versions/vm_latest/utils/mod.rs
+++ b/core/lib/multivm/src/versions/vm_latest/utils/mod.rs
@@ -1,6 +1,57 @@
-/// Utility functions for the VM.
+//! Utility functions for the VM.
+
+use once_cell::sync::Lazy;
+use zk_evm_1_5_0::{
+    aux_structures::MemoryPage,
+    sha2,
+    zkevm_opcode_defs::{BlobSha256Format, VersionedHashLen32},
+};
+use zksync_types::{H256, KNOWN_CODES_STORAGE_ADDRESS};
+use zksync_vm_interface::VmEvent;
+
 pub mod fee;
 pub mod l2_blocks;
 pub(crate) mod logs;
 pub mod overhead;
 pub mod transaction_encoding;
+
+pub(crate) fn hash_evm_bytecode(bytecode: &[u8]) -> H256 {
+    use sha2::{Digest, Sha256};
+    let mut hasher = Sha256::new();
+    let len = bytecode.len() as u16;
+    hasher.update(bytecode);
+    let result = hasher.finalize();
+
+    let mut output = [0u8; 32];
+    output[..].copy_from_slice(result.as_slice());
+    output[0] = BlobSha256Format::VERSION_BYTE;
+    output[1] = 0;
+    output[2..4].copy_from_slice(&len.to_be_bytes());
+
+    H256(output)
+}
+
+pub const fn heap_page_from_base(base: MemoryPage) -> MemoryPage {
+    MemoryPage(base.0 + 2)
+}
+
+/// Extracts all bytecodes marked as known on the system contracts.
+pub fn extract_bytecodes_marked_as_known(all_generated_events: &[VmEvent]) -> Vec<H256> {
+    static PUBLISHED_BYTECODE_SIGNATURE: Lazy<H256> = Lazy::new(|| {
+        ethabi::long_signature(
+            "MarkedAsKnown",
+            &[ethabi::ParamType::FixedBytes(32), ethabi::ParamType::Bool],
+        )
+    });
+
+    all_generated_events
+        .iter()
+        .filter(|event| {
+            // Filter events from the deployer contract that match the expected signature.
+            event.address == KNOWN_CODES_STORAGE_ADDRESS
+                && event.indexed_topics.len() == 3
+                && event.indexed_topics[0] == *PUBLISHED_BYTECODE_SIGNATURE
+        })
+        .map(|event| event.indexed_topics[1])
+        .collect()
+}
diff --git a/core/lib/multivm/src/versions/vm_latest/utils/transaction_encoding.rs b/core/lib/multivm/src/versions/vm_latest/utils/transaction_encoding.rs
index 86c49a3eb15..ed532f89dbc 100644
--- a/core/lib/multivm/src/versions/vm_latest/utils/transaction_encoding.rs
+++ b/core/lib/multivm/src/versions/vm_latest/utils/transaction_encoding.rs
@@ -10,7 +10,9 @@ pub trait TransactionVmExt {
 
 impl TransactionVmExt for Transaction {
     fn bootloader_encoding_size(&self) -> usize {
-        let transaction_data: TransactionData = self.clone().into();
+        // Since we want to just measure the encoding size, `use_evm_emulator` arg doesn't matter here,
+        // so we use a more lenient option.
+        let transaction_data = TransactionData::new(self.clone(), true);
         transaction_data.into_tokens().len()
     }
 }
diff --git a/core/lib/multivm/src/versions/vm_latest/vm.rs b/core/lib/multivm/src/versions/vm_latest/vm.rs
index 8ccd600a79e..f4cc1580e93 100644
--- a/core/lib/multivm/src/versions/vm_latest/vm.rs
+++ b/core/lib/multivm/src/versions/vm_latest/vm.rs
@@ -1,10 +1,12 @@
+use std::collections::HashMap;
+
 use circuit_sequencer_api_1_5_0::sort_storage_access::sort_storage_access_queries;
 use zksync_types::{
     l2_to_l1_log::{SystemL2ToL1Log, UserL2ToL1Log},
     vm::VmVersion,
     Transaction, H256,
 };
-use zksync_utils::u256_to_h256;
+use zksync_utils::{be_words_to_bytes, h256_to_u256, u256_to_h256};
 
 use crate::{
     glue::GlueInto,
@@ -79,6 +81,20 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
         self.state.local_state.callstack.current.ergs_remaining
     }
 
+    pub(crate) fn decommit_bytecodes(&self, hashes: &[H256]) -> HashMap<H256, Vec<u8>> {
+        let bytecodes = hashes.iter().map(|&hash| {
+            let bytecode_words = self
+                .state
+                .decommittment_processor
+                .known_bytecodes
+                .inner()
+                .get(&h256_to_u256(hash))
+                .unwrap_or_else(|| panic!("Bytecode with hash {hash:?} not found"));
+            (hash, be_words_to_bytes(bytecode_words))
+        });
+        bytecodes.collect()
+    }
+
     // visible for testing
     pub(super) fn get_current_execution_state(&self) -> CurrentExecutionState {
         let (raw_events, l1_messages) = self.state.event_sink.flatten();
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/execution.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/execution.rs
index 8196760a621..9462a89be2a 100644
--- a/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/execution.rs
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/implementation/execution.rs
@@ -90,6 +90,7 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
             logs,
             statistics,
             refunds,
+            new_known_factory_deps: None,
         };
 
         (stop_reason, result)
diff --git a/core/lib/multivm/src/versions/vm_virtual_blocks/implementation/execution.rs b/core/lib/multivm/src/versions/vm_virtual_blocks/implementation/execution.rs
index c48d48edd3b..b1ad4d257b7 100644
--- a/core/lib/multivm/src/versions/vm_virtual_blocks/implementation/execution.rs
+++ b/core/lib/multivm/src/versions/vm_virtual_blocks/implementation/execution.rs
@@ -88,6 +88,7 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
                 .refund_tracer
                 .map(|r| r.get_refunds())
                 .unwrap_or_default(),
+            new_known_factory_deps: None,
         };
 
         tx_tracer.dispatcher.save_results(&mut result);
diff --git a/core/lib/protobuf_config/src/chain.rs b/core/lib/protobuf_config/src/chain.rs
index f91bf07e43f..2f8ac8df07e 100644
--- a/core/lib/protobuf_config/src/chain.rs
+++ b/core/lib/protobuf_config/src/chain.rs
@@ -86,6 +86,7 @@ impl ProtoRepr for proto::StateKeeper {
             // needed during the initialization from files
             bootloader_hash: None,
             default_aa_hash: None,
+            evm_emulator_hash: None,
             fee_account_addr: None,
             l1_batch_commit_data_generator_mode: Default::default(),
         })
diff --git a/core/lib/protobuf_config/src/contracts.rs b/core/lib/protobuf_config/src/contracts.rs
index 84c40436750..cd904b63202 100644
--- a/core/lib/protobuf_config/src/contracts.rs
+++ b/core/lib/protobuf_config/src/contracts.rs
@@ -107,6 +107,12 @@ impl ProtoRepr for proto::Contracts {
                 .map(|x| parse_h160(x))
                 .transpose()
                 .context("chain_admin_addr")?,
+            eigenda_verifier_addr: l1
+                .eigenda_verifier_addr
+                .as_ref()
+                .map(|x| parse_h160(x))
+                .transpose()
+                .context("eigenda_verifier_addr")?,
         })
     }
 
@@ -139,6 +145,7 @@ impl ProtoRepr for proto::Contracts {
                 multicall3_addr: Some(format!("{:?}", this.l1_multicall3_addr)),
                 base_token_addr: this.base_token_addr.map(|a| format!("{:?}", a)),
                 chain_admin_addr: this.chain_admin_addr.map(|a| format!("{:?}", a)),
+                eigenda_verifier_addr: this.eigenda_verifier_addr.map(|a| format!("{:?}", a)),
             }),
             l2: Some(proto::L2 {
                 testnet_paymaster_addr: this.l2_testnet_paymaster_addr.map(|a| format!("{:?}", a)),
diff --git a/core/lib/protobuf_config/src/genesis.rs b/core/lib/protobuf_config/src/genesis.rs
index 59896aa244d..7ecc768100f 100644
--- a/core/lib/protobuf_config/src/genesis.rs
+++ b/core/lib/protobuf_config/src/genesis.rs
@@ -75,6 +75,12 @@ impl ProtoRepr for proto::Genesis {
                     .and_then(|x| parse_h256(x))
                     .context("default_aa_hash")?,
             ),
+            evm_emulator_hash: self
+                .evm_emulator_hash
+                .as_deref()
+                .map(parse_h256)
+                .transpose()
+                .context("evm_emulator_hash")?,
             l1_chain_id: required(&self.l1_chain_id)
                 .map(|x| L1ChainId(*x))
                 .context("l1_chain_id")?,
@@ -105,6 +111,7 @@ impl ProtoRepr for proto::Genesis {
             genesis_protocol_semantic_version: this.protocol_version.map(|x| x.to_string()),
             default_aa_hash: this.default_aa_hash.map(|x| format!("{:?}", x)),
             bootloader_hash: this.bootloader_hash.map(|x| format!("{:?}", x)),
+            evm_emulator_hash: this.evm_emulator_hash.map(|x| format!("{:?}", x)),
             fee_account: Some(format!("{:?}", this.fee_account)),
             l1_chain_id: Some(this.l1_chain_id.0),
             l2_chain_id: Some(this.l2_chain_id.as_u64()),
diff --git a/core/lib/protobuf_config/src/lib.rs b/core/lib/protobuf_config/src/lib.rs
index a0f4d45214f..c89199359aa 100644
--- a/core/lib/protobuf_config/src/lib.rs
+++ b/core/lib/protobuf_config/src/lib.rs
@@ -12,11 +12,14 @@ mod commitment_generator;
 mod consensus;
 mod contract_verifier;
 mod contracts;
+mod da_client;
 mod da_dispatcher;
 mod database;
 mod en;
 mod eth;
 mod experimental;
+mod external_price_api_client;
+mod external_proof_integration_api;
 mod general;
 mod genesis;
 mod house_keeper;
@@ -25,15 +28,11 @@ mod observability;
 mod proof_data_handler;
 pub mod proto;
 mod prover;
+mod prover_job_monitor;
 mod pruning;
 mod secrets;
-mod snapshots_creator;
-
-mod da_client;
-mod external_price_api_client;
-mod external_proof_integration_api;
-mod prover_job_monitor;
 mod snapshot_recovery;
+mod snapshots_creator;
 #[cfg(test)]
 mod tests;
 mod utils;
diff --git a/core/lib/protobuf_config/src/proto/config/contracts.proto b/core/lib/protobuf_config/src/proto/config/contracts.proto
index f4488c7901a..d4f8d561160 100644
--- a/core/lib/protobuf_config/src/proto/config/contracts.proto
+++ b/core/lib/protobuf_config/src/proto/config/contracts.proto
@@ -17,6 +17,7 @@ message L1 {
   optional string multicall3_addr = 6; // required; H160
   optional string base_token_addr = 7; // required; H160
   optional string chain_admin_addr = 8; // required; H160
+  optional string eigenda_verifier_addr = 9 ; // optional; h160
 }
 
 message L2 {
diff --git a/core/lib/protobuf_config/src/proto/config/genesis.proto b/core/lib/protobuf_config/src/proto/config/genesis.proto
index 08cbb954fcb..e3a9a45366f 100644
--- a/core/lib/protobuf_config/src/proto/config/genesis.proto
+++ b/core/lib/protobuf_config/src/proto/config/genesis.proto
@@ -28,5 +28,6 @@ message Genesis {
   optional Prover prover = 10;
   optional L1BatchCommitDataGeneratorMode l1_batch_commit_data_generator_mode = 29; // optional, default to rollup
   optional string genesis_protocol_semantic_version = 12; // optional;
+  optional string evm_emulator_hash = 13; // optional; h256
   reserved 11; reserved "shared_bridge";
 }
diff --git a/core/lib/prover_interface/src/inputs.rs b/core/lib/prover_interface/src/inputs.rs
index 22a20223c8b..8fe192a5f51 100644
--- a/core/lib/prover_interface/src/inputs.rs
+++ b/core/lib/prover_interface/src/inputs.rs
@@ -144,6 +144,8 @@ pub struct VMRunWitnessInputData {
     pub protocol_version: ProtocolVersionId,
     pub bootloader_code: Vec<[u8; 32]>,
     pub default_account_code_hash: U256,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub evm_emulator_code_hash: Option<U256>,
     pub storage_refunds: Vec<u32>,
     pub pubdata_costs: Vec<i32>,
     pub witness_block_state: WitnessStorageState,
diff --git a/core/lib/tee_verifier/src/lib.rs b/core/lib/tee_verifier/src/lib.rs
index 68b25416d66..86b563f823e 100644
--- a/core/lib/tee_verifier/src/lib.rs
+++ b/core/lib/tee_verifier/src/lib.rs
@@ -306,6 +306,7 @@ mod tests {
                         code: vec![U256([1; 4])],
                         hash: H256([1; 32]),
                     },
+                    evm_emulator: None,
                 },
                 bootloader_gas_limit: 0,
                 execution_mode: TxExecutionMode::VerifyExecute,
diff --git a/core/lib/types/src/api/mod.rs b/core/lib/types/src/api/mod.rs
index 1e5a1b3fe65..103b6de1fb3 100644
--- a/core/lib/types/src/api/mod.rs
+++ b/core/lib/types/src/api/mod.rs
@@ -643,7 +643,7 @@ pub struct ProtocolVersion {
     /// Verifier configuration
     #[deprecated]
     pub verification_keys_hashes: Option<L1VerifierConfig>,
-    /// Hashes of base system contracts (bootloader and default account)
+    /// Hashes of base system contracts (bootloader, default account and evm simulator)
     #[deprecated]
     pub base_system_contracts: Option<BaseSystemContractsHashes>,
     /// Bootloader code hash
@@ -652,6 +652,9 @@ pub struct ProtocolVersion {
     /// Default account code hash
     #[serde(rename = "defaultAccountCodeHash")]
     pub default_account_code_hash: Option<H256>,
+    /// EVM emulator code hash
+    #[serde(rename = "evmSimulatorCodeHash")]
+    pub evm_emulator_code_hash: Option<H256>,
     /// L2 Upgrade transaction hash
     #[deprecated]
     pub l2_system_upgrade_tx_hash: Option<H256>,
@@ -667,6 +670,7 @@ impl ProtocolVersion {
         timestamp: u64,
         bootloader_code_hash: H256,
         default_account_code_hash: H256,
+        evm_emulator_code_hash: Option<H256>,
         l2_system_upgrade_tx_hash: Option<H256>,
     ) -> Self {
         Self {
@@ -677,9 +681,11 @@ impl ProtocolVersion {
             base_system_contracts: Some(BaseSystemContractsHashes {
                 bootloader: bootloader_code_hash,
                 default_aa: default_account_code_hash,
+                evm_emulator: evm_emulator_code_hash,
             }),
             bootloader_code_hash: Some(bootloader_code_hash),
             default_account_code_hash: Some(default_account_code_hash),
+            evm_emulator_code_hash,
             l2_system_upgrade_tx_hash,
             l2_system_upgrade_tx_hash_new: l2_system_upgrade_tx_hash,
         }
@@ -695,6 +701,13 @@ impl ProtocolVersion {
             .or_else(|| self.base_system_contracts.map(|hashes| hashes.default_aa))
     }
 
+    pub fn evm_emulator_code_hash(&self) -> Option<H256> {
+        self.evm_emulator_code_hash.or_else(|| {
+            self.base_system_contracts
+                .and_then(|hashes| hashes.evm_emulator)
+        })
+    }
+
     pub fn minor_version(&self) -> Option<u16> {
         self.minor_version.or(self.version_id)
     }
@@ -917,6 +930,7 @@ mod tests {
             base_system_contracts: Some(Default::default()),
             bootloader_code_hash: Some(Default::default()),
             default_account_code_hash: Some(Default::default()),
+            evm_emulator_code_hash: Some(Default::default()),
             l2_system_upgrade_tx_hash: Default::default(),
             l2_system_upgrade_tx_hash_new: Default::default(),
         };
diff --git a/core/lib/types/src/commitment/mod.rs b/core/lib/types/src/commitment/mod.rs
index 0e9912688a9..e76a4cc9b11 100644
--- a/core/lib/types/src/commitment/mod.rs
+++ b/core/lib/types/src/commitment/mod.rs
@@ -468,6 +468,7 @@ pub struct L1BatchMetaParameters {
     pub zkporter_is_available: bool,
     pub bootloader_code_hash: H256,
     pub default_aa_code_hash: H256,
+    pub evm_emulator_code_hash: Option<H256>,
     pub protocol_version: Option<ProtocolVersionId>,
 }
 
@@ -483,10 +484,11 @@ impl L1BatchMetaParameters {
             .protocol_version
             .map_or(false, |ver| ver.is_post_1_5_0())
         {
-            // EVM simulator hash for now is the same as the default AA hash.
-            result.extend(self.default_aa_code_hash.as_bytes());
+            let evm_emulator_code_hash = self
+                .evm_emulator_code_hash
+                .unwrap_or(self.default_aa_code_hash);
+            result.extend(evm_emulator_code_hash.as_bytes());
         }
-
         result
     }
 
@@ -552,6 +554,7 @@ impl L1BatchCommitment {
             zkporter_is_available: ZKPORTER_IS_AVAILABLE,
             bootloader_code_hash: input.common().bootloader_code_hash,
             default_aa_code_hash: input.common().default_aa_code_hash,
+            evm_emulator_code_hash: input.common().evm_emulator_code_hash,
             protocol_version: Some(input.common().protocol_version),
         };
 
@@ -654,6 +657,7 @@ pub struct CommitmentCommonInput {
     pub rollup_root_hash: H256,
     pub bootloader_code_hash: H256,
     pub default_aa_code_hash: H256,
+    pub evm_emulator_code_hash: Option<H256>,
     pub protocol_version: ProtocolVersionId,
 }
 
@@ -694,6 +698,7 @@ impl CommitmentInput {
             rollup_root_hash,
             bootloader_code_hash: base_system_contracts_hashes.bootloader,
             default_aa_code_hash: base_system_contracts_hashes.default_aa,
+            evm_emulator_code_hash: base_system_contracts_hashes.evm_emulator,
             protocol_version,
         };
         if protocol_version.is_pre_boojum() {
diff --git a/core/lib/types/src/commitment/tests/mod.rs b/core/lib/types/src/commitment/tests/mod.rs
index 34e308cfd0a..33fb0142b04 100644
--- a/core/lib/types/src/commitment/tests/mod.rs
+++ b/core/lib/types/src/commitment/tests/mod.rs
@@ -50,3 +50,8 @@ fn post_boojum_1_4_2() {
 fn post_boojum_1_5_0() {
     run_test("post_boojum_1_5_0_test");
 }
+
+#[test]
+fn post_boojum_1_5_0_with_evm() {
+    run_test("post_boojum_1_5_0_test_with_evm");
+}
diff --git a/core/lib/types/src/commitment/tests/post_boojum_1_5_0_test_with_evm.json b/core/lib/types/src/commitment/tests/post_boojum_1_5_0_test_with_evm.json
new file mode 100644
index 00000000000..4e8c0e0814a
--- /dev/null
+++ b/core/lib/types/src/commitment/tests/post_boojum_1_5_0_test_with_evm.json
@@ -0,0 +1,359 @@
+{
+  "input": {
+    "PostBoojum": {
+      "common": {
+        "l2_to_l1_logs": [
+          {
+            "shard_id": 0,
+            "is_service": true,
+            "tx_number_in_block": 0,
+            "sender": "0x0000000000000000000000000000000000008001",
+            "key": "0x7814f203b8e02f6a676b8f7faefcf732d8b4368bab25239ea4525010aa85d5ee",
+            "value": "0x0000000000000000000000000000000000000000000000000000000000000001"
+          }
+        ],
+        "rollup_last_leaf_index": 89,
+        "rollup_root_hash": "0xe47f013d1ecd4ce53b6872f6b762670b393815e7ddacdf2b0886af9c7f3a555b",
+        "bootloader_code_hash": "0x010007ed0e328b940e241f7666a6303b7ffd4e3fd7e8c154d6e7556befe6cd6d",
+        "default_aa_code_hash": "0x0100055b7a8be90522251be8be1a186464d056462973502ac8a0437c85e4d2a9",
+        "evm_emulator_code_hash": "0x01000e53aa35d9d19fa99341c2e2901cf93b3668f01569dd5c6ca409c7696b91",
+        "protocol_version": "Version23"
+      },
+      "system_logs": [
+        {
+          "shard_id": 0,
+          "is_service": false,
+          "tx_number_in_block": 0,
+          "sender": "0x000000000000000000000000000000000000800b",
+          "key": "0x0000000000000000000000000000000000000000000000000000000000000004",
+          "value": "0x55618db5ff24aee4d236921b6f4272101161137115a3b4c4a65f8677b124c01c"
+        },
+        {
+          "shard_id": 0,
+          "is_service": false,
+          "tx_number_in_block": 1,
+          "sender": "0x000000000000000000000000000000000000800b",
+          "key": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "value": "0x00000000000000000000000065c22f8000000000000000000000000065c22f81"
+        },
+        {
+          "shard_id": 0,
+          "is_service": true,
+          "tx_number_in_block": 1,
+          "sender": "0x0000000000000000000000000000000000008001",
+          "key": "0x0000000000000000000000000000000000000000000000000000000000000005",
+          "value": "0x155c82febe94e07df0065c153e8ed403b5351fd64d657c8dffbfbee8ec3d2ba3"
+        },
+        {
+          "shard_id": 0,
+          "is_service": true,
+          "tx_number_in_block": 1,
+          "sender": "0x0000000000000000000000000000000000008001",
+          "key": "0x0000000000000000000000000000000000000000000000000000000000000006",
+          "value": "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        {
+          "shard_id": 0,
+          "is_service": true,
+          "tx_number_in_block": 1,
+          "sender": "0x0000000000000000000000000000000000008008",
+          "key": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "value": "0x30ba728b1aac22b122de4f32589dd2711da264412cb90e35bf7b1f735dd357ff"
+        },
+        {
+          "shard_id": 0,
+          "is_service": true,
+          "tx_number_in_block": 1,
+          "sender": "0x0000000000000000000000000000000000008008",
+          "key": "0x0000000000000000000000000000000000000000000000000000000000000001",
+          "value": "0x85a7fb853512ba6575c99ee121dd560559523a4587a2cd7e83cd359cd9ea2aed"
+        },
+        {
+          "shard_id": 0,
+          "is_service": true,
+          "tx_number_in_block": 1,
+          "sender": "0x0000000000000000000000000000000000008008",
+          "key": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "value": "0xb18f72a4a5b4b8ce1b7e41095fb1332a211a140376bcc2607910875d236708e0"
+        },
+        {
+          "shard_id": 0,
+          "is_service": true,
+          "tx_number_in_block": 1,
+          "sender": "0x0000000000000000000000000000000000008011",
+          "key": "0x0000000000000000000000000000000000000000000000000000000000000007",
+          "value": "0x0000000000000000000000000000000000000000000000000000000000000003"
+        },
+        {
+          "shard_id": 0,
+          "is_service": true,
+          "tx_number_in_block": 1,
+          "sender": "0x0000000000000000000000000000000000008011",
+          "key": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "value": "0x0000000000000000000000000000000000000000000000000000000000000004"
+        },
+        {
+          "shard_id": 0,
+          "is_service": true,
+          "tx_number_in_block": 1,
+          "sender": "0x0000000000000000000000000000000000008011",
+          "key": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "value": "0x0000000000000000000000000000000000000000000000000000000000000005"
+        },
+        {
+          "shard_id": 0,
+          "is_service": true,
+          "tx_number_in_block": 1,
+          "sender": "0x0000000000000000000000000000000000008011",
+          "key": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "value": "0x0000000000000000000000000000000000000000000000000000000000000006"
+        },
+        {
+          "shard_id": 0,
+          "is_service": true,
+          "tx_number_in_block": 1,
+          "sender": "0x0000000000000000000000000000000000008011",
+          "key": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "value": "0x0000000000000000000000000000000000000000000000000000000000000007"
+        },
+        {
+          "shard_id": 0,
+          "is_service": true,
+          "tx_number_in_block": 1,
+          "sender": "0x0000000000000000000000000000000000008011",
+          "key": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "value": "0x0000000000000000000000000000000000000000000000000000000000000008"
+        }
+      ],
+      "state_diffs": [
+        {
+          "address": "0x000000000000000000000000000000000000800a",
+          "key": "0x1",
+          "derived_key": [
+            113, 233, 23, 33, 249, 145, 133, 118, 215, 96, 240, 47, 3, 202, 196,
+            124, 111, 64, 3, 49, 96, 49, 132, 142, 60, 29, 153, 230, 232, 58,
+            71, 67
+          ],
+          "enumeration_index": 49,
+          "initial_value": "0x18776f28c303800",
+          "final_value": "0x708da482cab20760"
+        },
+        {
+          "address": "0x000000000000000000000000000000000000800a",
+          "key": "0x294a00337abeee2b3cd948ffeed92231e2a3acc2eb11210400e0aa9557f23e26",
+          "derived_key": [
+            45, 90, 105, 98, 204, 206, 229, 212, 173, 180, 138, 54, 187, 191,
+            68, 58, 83, 23, 33, 72, 67, 129, 18, 89, 55, 243, 0, 26, 197, 255,
+            135, 91
+          ],
+          "enumeration_index": 50,
+          "initial_value": "0xf5559e28fd66c0",
+          "final_value": "0xf5a19b324caf80"
+        },
+        {
+          "address": "0x000000000000000000000000000000000000800a",
+          "key": "0xeaa2b2fbf0b42c559059e5e9510edc15755f1c1883f0e41d5ba5f9aea4ac201a",
+          "derived_key": [
+            141, 97, 126, 192, 90, 203, 191, 95, 226, 69, 41, 166, 75, 35, 133,
+            169, 106, 173, 67, 240, 155, 225, 173, 169, 44, 112, 64, 49, 220,
+            193, 72, 27
+          ],
+          "enumeration_index": 0,
+          "initial_value": "0x0",
+          "final_value": "0x6f05e193353286a0"
+        },
+        {
+          "address": "0x000000000000000000000000000000000000800b",
+          "key": "0x7",
+          "derived_key": [
+            18, 59, 175, 197, 134, 247, 119, 100, 72, 140, 210, 76, 106, 119,
+            84, 110, 90, 15, 232, 189, 251, 79, 162, 3, 207, 175, 252, 54, 204,
+            228, 221, 91
+          ],
+          "enumeration_index": 53,
+          "initial_value": "0x100000000000000000000000065c22e3e",
+          "final_value": "0x200000000000000000000000065c22f80"
+        },
+        {
+          "address": "0x000000000000000000000000000000000000800b",
+          "key": "0x9",
+          "derived_key": [
+            142, 125, 208, 106, 197, 183, 59, 71, 59, 230, 188, 90, 81, 3, 15,
+            76, 116, 55, 101, 124, 183, 178, 155, 243, 118, 197, 100, 184, 209,
+            103, 90, 94
+          ],
+          "enumeration_index": 54,
+          "initial_value": "0x200000000000000000000000065c22e3f",
+          "final_value": "0x400000000000000000000000065c22f81"
+        },
+        {
+          "address": "0x000000000000000000000000000000000000800b",
+          "key": "0xd",
+          "derived_key": [
+            235, 221, 239, 221, 164, 142, 178, 170, 127, 102, 236, 247, 148, 10,
+            40, 14, 158, 243, 251, 46, 149, 219, 9, 149, 83, 132, 64, 166, 42,
+            247, 152, 97
+          ],
+          "enumeration_index": 0,
+          "initial_value": "0x0",
+          "final_value": "0xebbe609cd3ccd11f273eb94374d6d3a2f7856c5f1039dc4877c6a334188ac7c1"
+        },
+        {
+          "address": "0x000000000000000000000000000000000000800b",
+          "key": "0xe",
+          "derived_key": [
+            70, 64, 215, 56, 69, 54, 78, 198, 145, 246, 222, 251, 96, 106, 58,
+            114, 253, 165, 215, 173, 51, 209, 125, 4, 153, 90, 142, 37, 44, 74,
+            6, 216
+          ],
+          "enumeration_index": 0,
+          "initial_value": "0x0",
+          "final_value": "0x708e7fcf68ebab6c87322686cac4bcdb5f2bd4c71f337b18d147fd9a6c44ad13"
+        },
+        {
+          "address": "0x000000000000000000000000000000000000800b",
+          "key": "0x10c",
+          "derived_key": [
+            121, 9, 53, 136, 208, 232, 71, 239, 167, 58, 16, 206, 32, 228, 121,
+            159, 177, 228, 102, 66, 214, 86, 23, 199, 229, 33, 63, 160, 73, 137,
+            217, 45
+          ],
+          "enumeration_index": 57,
+          "initial_value": "0x200000000000000000000000065c22e3f",
+          "final_value": "0x400000000000000000000000065c22f81"
+        },
+        {
+          "address": "0x000000000000000000000000000000000000800b",
+          "key": "0xad67d757c34507f157cacfa2e3153e9f260a2244f30428821be7be64587ac55f",
+          "derived_key": [
+            12, 194, 74, 180, 47, 190, 197, 49, 125, 155, 26, 44, 164, 124, 169,
+            185, 59, 158, 195, 109, 121, 142, 253, 124, 218, 167, 57, 36, 22,
+            48, 203, 70
+          ],
+          "enumeration_index": 0,
+          "initial_value": "0x0",
+          "final_value": "0x55618db5ff24aee4d236921b6f4272101161137115a3b4c4a65f8677b124c01c"
+        }
+      ],
+      "aux_commitments": {
+        "events_queue_commitment": "0x6193a5098eb140796387bdf40700a3855eeb010474b5478f30bf917172c67883",
+        "bootloader_initial_content_commitment": "0xf031b4491c37f20516c4ebf428f4765156409f67089e64772f4106fd2d9f3351"
+      },
+      "blob_commitments": [
+        "0x0000000000000000000000000000000000000000000000000000000000000001",
+        "0x0000000000000000000000000000000000000000000000000000000000000002",
+        "0x0000000000000000000000000000000000000000000000000000000000000003",
+        "0x0000000000000000000000000000000000000000000000000000000000000004",
+        "0x0000000000000000000000000000000000000000000000000000000000000005",
+        "0x0000000000000000000000000000000000000000000000000000000000000006",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000"
+      ]
+    }
+  },
+  "pass_through_data": {
+    "shared_states": [
+      {
+        "last_leaf_index": 89,
+        "root_hash": "0xe47f013d1ecd4ce53b6872f6b762670b393815e7ddacdf2b0886af9c7f3a555b"
+      },
+      {
+        "last_leaf_index": 0,
+        "root_hash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+      }
+    ]
+  },
+  "meta_parameters": {
+    "zkporter_is_available": false,
+    "bootloader_code_hash": "0x010007ed0e328b940e241f7666a6303b7ffd4e3fd7e8c154d6e7556befe6cd6d",
+    "default_aa_code_hash": "0x0100055b7a8be90522251be8be1a186464d056462973502ac8a0437c85e4d2a9",
+    "evm_emulator_code_hash": "0x01000e53aa35d9d19fa99341c2e2901cf93b3668f01569dd5c6ca409c7696b91",
+    "protocol_version": "Version23"
+  },
+  "auxiliary_output": {
+    "PostBoojum": {
+      "common": {
+        "l2_l1_logs_merkle_root": "0x30ba728b1aac22b122de4f32589dd2711da264412cb90e35bf7b1f735dd357ff",
+        "protocol_version": "Version23"
+      },
+      "system_logs_linear_hash": "0x602dacc0a26e3347f0679924c4ae151ff5200e7dd80902fe0fc11c806c4d3ffb",
+      "state_diffs_compressed": [
+        1, 0, 1, 72, 4, 0, 4, 141, 97, 126, 192, 90, 203, 191, 95, 226, 69, 41,
+        166, 75, 35, 133, 169, 106, 173, 67, 240, 155, 225, 173, 169, 44, 112,
+        64, 49, 220, 193, 72, 27, 65, 111, 5, 225, 147, 53, 50, 134, 160, 235,
+        221, 239, 221, 164, 142, 178, 170, 127, 102, 236, 247, 148, 10, 40, 14,
+        158, 243, 251, 46, 149, 219, 9, 149, 83, 132, 64, 166, 42, 247, 152, 97,
+        0, 235, 190, 96, 156, 211, 204, 209, 31, 39, 62, 185, 67, 116, 214, 211,
+        162, 247, 133, 108, 95, 16, 57, 220, 72, 119, 198, 163, 52, 24, 138,
+        199, 193, 70, 64, 215, 56, 69, 54, 78, 198, 145, 246, 222, 251, 96, 106,
+        58, 114, 253, 165, 215, 173, 51, 209, 125, 4, 153, 90, 142, 37, 44, 74,
+        6, 216, 0, 112, 142, 127, 207, 104, 235, 171, 108, 135, 50, 38, 134,
+        202, 196, 188, 219, 95, 43, 212, 199, 31, 51, 123, 24, 209, 71, 253,
+        154, 108, 68, 173, 19, 12, 194, 74, 180, 47, 190, 197, 49, 125, 155, 26,
+        44, 164, 124, 169, 185, 59, 158, 195, 109, 121, 142, 253, 124, 218, 167,
+        57, 36, 22, 48, 203, 70, 0, 85, 97, 141, 181, 255, 36, 174, 228, 210,
+        54, 146, 27, 111, 66, 114, 16, 17, 97, 19, 113, 21, 163, 180, 196, 166,
+        95, 134, 119, 177, 36, 192, 28, 0, 0, 0, 49, 65, 111, 6, 45, 144, 62,
+        129, 207, 96, 0, 0, 0, 50, 49, 75, 253, 9, 79, 72, 192, 0, 0, 0, 53,
+        137, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 66, 0, 0, 0, 54,
+        137, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 66, 0, 0, 0, 57,
+        137, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 66
+      ],
+      "state_diffs_hash": "0xb18f72a4a5b4b8ce1b7e41095fb1332a211a140376bcc2607910875d236708e0",
+      "aux_commitments": {
+        "events_queue_commitment": "0x6193a5098eb140796387bdf40700a3855eeb010474b5478f30bf917172c67883",
+        "bootloader_initial_content_commitment": "0xf031b4491c37f20516c4ebf428f4765156409f67089e64772f4106fd2d9f3351"
+      },
+      "blob_linear_hashes": [
+        "0x0000000000000000000000000000000000000000000000000000000000000003",
+        "0x0000000000000000000000000000000000000000000000000000000000000004",
+        "0x0000000000000000000000000000000000000000000000000000000000000005",
+        "0x0000000000000000000000000000000000000000000000000000000000000006",
+        "0x0000000000000000000000000000000000000000000000000000000000000007",
+        "0x0000000000000000000000000000000000000000000000000000000000000008",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000"
+      ],
+      "blob_commitments": [
+        "0x0000000000000000000000000000000000000000000000000000000000000001",
+        "0x0000000000000000000000000000000000000000000000000000000000000002",
+        "0x0000000000000000000000000000000000000000000000000000000000000003",
+        "0x0000000000000000000000000000000000000000000000000000000000000004",
+        "0x0000000000000000000000000000000000000000000000000000000000000005",
+        "0x0000000000000000000000000000000000000000000000000000000000000006",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000"
+      ]
+    }
+  },
+  "hashes": {
+    "pass_through_data": "0x6a3ffc0f55d4abce9498b8bcb01a3018bc2b83d96acb27e23772fe9347954725",
+    "aux_output": "0xadc63d9c45f85598f3e3c232970315d1f6ac96222e379e16ced7a204524a4061",
+    "meta_parameters": "0x02531e5cc22688523a4ac9317e5097743771f6914015cf1152491cf22084bd58",
+    "commitment": "0x4fdd8c5b231dfc9fc81aba744a90fbec78627f529ac29f9fc758a7b9e62fa321"
+  }
+}
diff --git a/core/lib/types/src/l2/mod.rs b/core/lib/types/src/l2/mod.rs
index 036d2a7a036..48e813e571d 100644
--- a/core/lib/types/src/l2/mod.rs
+++ b/core/lib/types/src/l2/mod.rs
@@ -216,7 +216,9 @@ impl L2Tx {
         let raw = req.get_signed_bytes(&sig).context("get_signed_bytes")?;
         let (req, hash) =
             TransactionRequest::from_bytes_unverified(&raw).context("from_bytes_unverified()")?;
-        let mut tx = L2Tx::from_request_unverified(req).context("from_request_unverified()")?;
+        // Since we allow users to specify `None` recipient, EVM emulation is implicitly enabled.
+        let mut tx =
+            L2Tx::from_request_unverified(req, true).context("from_request_unverified()")?;
         tx.set_input(raw, hash);
         Ok(tx)
     }
diff --git a/core/lib/types/src/lib.rs b/core/lib/types/src/lib.rs
index 67661eb14ad..a50fc8a655b 100644
--- a/core/lib/types/src/lib.rs
+++ b/core/lib/types/src/lib.rs
@@ -331,9 +331,14 @@ impl TryFrom<Transaction> for abi::Transaction {
     }
 }
 
-impl TryFrom<abi::Transaction> for Transaction {
-    type Error = anyhow::Error;
-    fn try_from(tx: abi::Transaction) -> anyhow::Result<Self> {
+impl Transaction {
+    /// Converts a transaction from its ABI representation.
+    ///
+    /// # Arguments
+    ///
+    /// - `allow_no_target` enables / disables L2 transactions without target (i.e., `to` field).
+    ///   This field can only be absent for EVM deployment transactions.
+    pub fn from_abi(tx: abi::Transaction, allow_no_target: bool) -> anyhow::Result<Self> {
         Ok(match tx {
             abi::Transaction::L1 {
                 tx,
@@ -405,7 +410,7 @@ impl TryFrom<abi::Transaction> for Transaction {
             abi::Transaction::L2(raw) => {
                 let (req, hash) =
                     transaction_request::TransactionRequest::from_bytes_unverified(&raw)?;
-                let mut tx = L2Tx::from_request_unverified(req)?;
+                let mut tx = L2Tx::from_request_unverified(req, allow_no_target)?;
                 tx.set_input(raw, hash);
                 tx.into()
             }
diff --git a/core/lib/types/src/protocol_upgrade.rs b/core/lib/types/src/protocol_upgrade.rs
index 1afb108a053..48f26dfd5c7 100644
--- a/core/lib/types/src/protocol_upgrade.rs
+++ b/core/lib/types/src/protocol_upgrade.rs
@@ -62,6 +62,8 @@ pub struct ProtocolUpgrade {
     pub bootloader_code_hash: Option<H256>,
     /// New default account code hash.
     pub default_account_code_hash: Option<H256>,
+    /// New EVM emulator code hash
+    pub evm_emulator_code_hash: Option<H256>,
     /// New verifier params.
     pub verifier_params: Option<VerifierParams>,
     /// New verifier address.
@@ -118,17 +120,21 @@ impl ProtocolUpgrade {
             bootloader_code_hash: (bootloader_hash != H256::zero()).then_some(bootloader_hash),
             default_account_code_hash: (default_account_hash != H256::zero())
                 .then_some(default_account_hash),
+            evm_emulator_code_hash: None, // EVM emulator upgrades are not supported yet
             verifier_params: (upgrade.verifier_params != abi::VerifierParams::default())
                 .then_some(upgrade.verifier_params.into()),
             verifier_address: (upgrade.verifier != Address::zero()).then_some(upgrade.verifier),
             timestamp: upgrade.upgrade_timestamp.try_into().unwrap(),
             tx: (upgrade.l2_protocol_upgrade_tx.tx_type != U256::zero())
                 .then(|| {
-                    Transaction::try_from(abi::Transaction::L1 {
-                        tx: upgrade.l2_protocol_upgrade_tx,
-                        factory_deps: upgrade.factory_deps,
-                        eth_block: 0,
-                    })
+                    Transaction::from_abi(
+                        abi::Transaction::L1 {
+                            tx: upgrade.l2_protocol_upgrade_tx,
+                            factory_deps: upgrade.factory_deps,
+                            eth_block: 0,
+                        },
+                        true,
+                    )
                     .context("Transaction::try_from()")?
                     .try_into()
                     .map_err(|err| anyhow::format_err!("try_into::<ProtocolUpgradeTx>(): {err}"))
@@ -149,11 +155,14 @@ pub fn decode_set_chain_id_event(
         .unwrap_or_else(|_| panic!("Version is not supported, packed version: {full_version_id}"));
     Ok((
         protocol_version,
-        Transaction::try_from(abi::Transaction::L1 {
-            tx: tx.into(),
-            eth_block: 0,
-            factory_deps: vec![],
-        })
+        Transaction::from_abi(
+            abi::Transaction::L1 {
+                tx: tx.into(),
+                eth_block: 0,
+                factory_deps: vec![],
+            },
+            true,
+        )
         .unwrap()
         .try_into()
         .unwrap(),
@@ -298,6 +307,9 @@ impl ProtocolVersion {
                 default_aa: upgrade
                     .default_account_code_hash
                     .unwrap_or(self.base_system_contracts_hashes.default_aa),
+                evm_emulator: upgrade
+                    .evm_emulator_code_hash
+                    .or(self.base_system_contracts_hashes.evm_emulator),
             },
             tx: upgrade.tx,
         }
diff --git a/core/lib/types/src/storage/mod.rs b/core/lib/types/src/storage/mod.rs
index a30a57bffa5..9ef037dc29b 100644
--- a/core/lib/types/src/storage/mod.rs
+++ b/core/lib/types/src/storage/mod.rs
@@ -5,7 +5,7 @@ pub use log::*;
 use serde::{Deserialize, Serialize};
 use zksync_basic_types::{web3::keccak256, L2ChainId};
 pub use zksync_system_constants::*;
-use zksync_utils::address_to_h256;
+use zksync_utils::{address_to_h256, u256_to_h256};
 
 use crate::{AccountTreeId, Address, H160, H256, U256};
 
@@ -78,6 +78,10 @@ pub fn get_code_key(account: &Address) -> StorageKey {
     StorageKey::new(account_code_storage, address_to_h256(account))
 }
 
+pub fn get_evm_code_hash_key(account: &Address) -> StorageKey {
+    get_deployer_key(get_address_mapping_key(account, u256_to_h256(1.into())))
+}
+
 pub fn get_known_code_key(hash: &H256) -> StorageKey {
     let known_codes_storage = AccountTreeId::new(KNOWN_CODES_STORAGE_ADDRESS);
     StorageKey::new(known_codes_storage, *hash)
@@ -88,6 +92,11 @@ pub fn get_system_context_key(key: H256) -> StorageKey {
     StorageKey::new(system_context, key)
 }
 
+pub fn get_deployer_key(key: H256) -> StorageKey {
+    let deployer_contract = AccountTreeId::new(CONTRACT_DEPLOYER_ADDRESS);
+    StorageKey::new(deployer_contract, key)
+}
+
 pub fn get_is_account_key(account: &Address) -> StorageKey {
     let deployer = AccountTreeId::new(CONTRACT_DEPLOYER_ADDRESS);
 
diff --git a/core/lib/types/src/system_contracts.rs b/core/lib/types/src/system_contracts.rs
index a28c45b8fea..4329680991c 100644
--- a/core/lib/types/src/system_contracts.rs
+++ b/core/lib/types/src/system_contracts.rs
@@ -1,11 +1,11 @@
 use std::path::PathBuf;
 
-use once_cell::sync::Lazy;
 use zksync_basic_types::{AccountTreeId, Address, U256};
 use zksync_contracts::{read_sys_contract_bytecode, ContractLanguage, SystemContractsRepo};
 use zksync_system_constants::{
     BOOTLOADER_UTILITIES_ADDRESS, CODE_ORACLE_ADDRESS, COMPRESSOR_ADDRESS, CREATE2_FACTORY_ADDRESS,
-    EVENT_WRITER_ADDRESS, P256VERIFY_PRECOMPILE_ADDRESS, PUBDATA_CHUNK_PUBLISHER_ADDRESS,
+    EVENT_WRITER_ADDRESS, EVM_GAS_MANAGER_ADDRESS, P256VERIFY_PRECOMPILE_ADDRESS,
+    PUBDATA_CHUNK_PUBLISHER_ADDRESS,
 };
 
 use crate::{
@@ -25,7 +25,7 @@ use crate::{
 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_CONTRACT_LIST: [(&str, &str, Address, ContractLanguage); 25] = [
+static SYSTEM_CONTRACT_LIST: [(&str, &str, Address, ContractLanguage); 26] = [
     (
         "",
         "AccountCodeStorage",
@@ -147,6 +147,12 @@ static SYSTEM_CONTRACT_LIST: [(&str, &str, Address, ContractLanguage); 25] = [
         COMPLEX_UPGRADER_ADDRESS,
         ContractLanguage::Sol,
     ),
+    (
+        "",
+        "EvmGasManager",
+        EVM_GAS_MANAGER_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.
     ("", "EmptyContract", Address::zero(), ContractLanguage::Sol),
@@ -170,29 +176,40 @@ static SYSTEM_CONTRACT_LIST: [(&str, &str, Address, ContractLanguage); 25] = [
     ),
 ];
 
-static SYSTEM_CONTRACTS: Lazy<Vec<DeployedContract>> = Lazy::new(|| {
+/// Gets default set of system contracts, based on Cargo workspace location.
+pub fn get_system_smart_contracts(use_evm_emulator: bool) -> Vec<DeployedContract> {
     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()),
+        .filter_map(|(path, name, address, contract_lang)| {
+            if *name == "EvmGasManager" && !use_evm_emulator {
+                None
+            } else {
+                Some(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 Cargo workspace location.
-pub fn get_system_smart_contracts() -> Vec<DeployedContract> {
-    SYSTEM_CONTRACTS.clone()
+        .collect()
 }
 
 /// Loads system contracts from a given directory.
-pub fn get_system_smart_contracts_from_dir(path: PathBuf) -> Vec<DeployedContract> {
+pub fn get_system_smart_contracts_from_dir(
+    path: PathBuf,
+    use_evm_emulator: bool,
+) -> 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()),
+        .filter_map(|(path, name, address, contract_lang)| {
+            if *name == "EvmGasManager" && !use_evm_emulator {
+                None
+            } else {
+                Some(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 5f26b1d6a6a..a8713f301ba 100644
--- a/core/lib/types/src/transaction_request.rs
+++ b/core/lib/types/src/transaction_request.rs
@@ -809,6 +809,7 @@ impl TransactionRequest {
 impl L2Tx {
     pub(crate) fn from_request_unverified(
         mut value: TransactionRequest,
+        allow_no_target: bool,
     ) -> Result<Self, SerializationTransactionError> {
         let fee = value.get_fee_data_checked()?;
         let nonce = value.get_nonce_checked()?;
@@ -817,8 +818,7 @@ impl L2Tx {
         let meta = value.eip712_meta.take().unwrap_or_default();
         validate_factory_deps(&meta.factory_deps)?;
 
-        // TODO: Remove this check when evm equivalence gets enabled
-        if value.to.is_none() {
+        if value.to.is_none() && !allow_no_target {
             return Err(SerializationTransactionError::ToAddressIsNull);
         }
 
@@ -848,11 +848,18 @@ impl L2Tx {
         Ok(tx)
     }
 
+    /// Converts a request into a transaction.
+    ///
+    /// # Arguments
+    ///
+    /// - `allow_no_target` enables / disables transactions without target (i.e., `to` field).
+    ///   This field can only be absent for EVM deployment transactions.
     pub fn from_request(
-        value: TransactionRequest,
+        request: TransactionRequest,
         max_tx_size: usize,
+        allow_no_target: bool,
     ) -> Result<Self, SerializationTransactionError> {
-        let tx = Self::from_request_unverified(value)?;
+        let tx = Self::from_request_unverified(request, allow_no_target)?;
         tx.check_encoded_size(max_tx_size)?;
         Ok(tx)
     }
@@ -916,11 +923,19 @@ impl From<CallRequest> for TransactionRequest {
     }
 }
 
-impl TryFrom<CallRequest> for L1Tx {
-    type Error = SerializationTransactionError;
-    fn try_from(tx: CallRequest) -> Result<Self, Self::Error> {
+impl L1Tx {
+    /// Converts a request into a transaction.
+    ///
+    /// # Arguments
+    ///
+    /// - `allow_no_target` enables / disables transactions without target (i.e., `to` field).
+    ///   This field can only be absent for EVM deployment transactions.
+    pub fn from_request(
+        request: CallRequest,
+        allow_no_target: bool,
+    ) -> Result<Self, SerializationTransactionError> {
         // L1 transactions have no limitations on the transaction size.
-        let tx: L2Tx = L2Tx::from_request(tx.into(), MAX_ENCODED_TX_SIZE)?;
+        let tx: L2Tx = L2Tx::from_request(request.into(), MAX_ENCODED_TX_SIZE, allow_no_target)?;
 
         // Note, that while the user has theoretically provided the fee for ETH on L1,
         // the payment to the operator as well as refunds happen on L2 and so all the ETH
@@ -1316,7 +1331,7 @@ mod tests {
             ..Default::default()
         };
         let execute_tx1: Result<L2Tx, SerializationTransactionError> =
-            L2Tx::from_request(tx1, usize::MAX);
+            L2Tx::from_request(tx1, usize::MAX, true);
         assert!(execute_tx1.is_ok());
 
         let tx2 = TransactionRequest {
@@ -1327,7 +1342,7 @@ mod tests {
             ..Default::default()
         };
         let execute_tx2: Result<L2Tx, SerializationTransactionError> =
-            L2Tx::from_request(tx2, usize::MAX);
+            L2Tx::from_request(tx2, usize::MAX, true);
         assert_eq!(
             execute_tx2.unwrap_err(),
             SerializationTransactionError::TooBigNonce
@@ -1344,7 +1359,7 @@ mod tests {
             ..Default::default()
         };
         let execute_tx1: Result<L2Tx, SerializationTransactionError> =
-            L2Tx::from_request(tx1, usize::MAX);
+            L2Tx::from_request(tx1, usize::MAX, true);
         assert_eq!(
             execute_tx1.unwrap_err(),
             SerializationTransactionError::MaxFeePerGasNotU64
@@ -1358,7 +1373,7 @@ mod tests {
             ..Default::default()
         };
         let execute_tx2: Result<L2Tx, SerializationTransactionError> =
-            L2Tx::from_request(tx2, usize::MAX);
+            L2Tx::from_request(tx2, usize::MAX, true);
         assert_eq!(
             execute_tx2.unwrap_err(),
             SerializationTransactionError::MaxPriorityFeePerGasNotU64
@@ -1376,7 +1391,7 @@ mod tests {
         };
 
         let execute_tx3: Result<L2Tx, SerializationTransactionError> =
-            L2Tx::from_request(tx3, usize::MAX);
+            L2Tx::from_request(tx3, usize::MAX, true);
         assert_eq!(
             execute_tx3.unwrap_err(),
             SerializationTransactionError::MaxFeePerPubdataByteNotU64
@@ -1432,7 +1447,7 @@ mod tests {
         let request =
             TransactionRequest::from_bytes(data.as_slice(), L2ChainId::from(270)).unwrap();
         assert_matches!(
-            L2Tx::from_request(request.0, random_tx_max_size),
+            L2Tx::from_request(request.0, random_tx_max_size, true),
             Err(SerializationTransactionError::OversizedData(_, _))
         )
     }
@@ -1458,7 +1473,7 @@ mod tests {
         };
 
         let try_to_l2_tx: Result<L2Tx, SerializationTransactionError> =
-            L2Tx::from_request(call_request.into(), random_tx_max_size);
+            L2Tx::from_request(call_request.into(), random_tx_max_size, true);
 
         assert_matches!(
             try_to_l2_tx,
@@ -1483,15 +1498,20 @@ mod tests {
             access_list: None,
             eip712_meta: None,
         };
-        let l2_tx = L2Tx::from_request(call_request_with_nonce.clone().into(), MAX_ENCODED_TX_SIZE)
-            .unwrap();
+        let l2_tx = L2Tx::from_request(
+            call_request_with_nonce.clone().into(),
+            MAX_ENCODED_TX_SIZE,
+            true,
+        )
+        .unwrap();
         assert_eq!(l2_tx.nonce(), Nonce(123u32));
 
         let mut call_request_without_nonce = call_request_with_nonce;
         call_request_without_nonce.nonce = None;
 
         let l2_tx =
-            L2Tx::from_request(call_request_without_nonce.into(), MAX_ENCODED_TX_SIZE).unwrap();
+            L2Tx::from_request(call_request_without_nonce.into(), MAX_ENCODED_TX_SIZE, true)
+                .unwrap();
         assert_eq!(l2_tx.nonce(), Nonce(0u32));
     }
 
diff --git a/core/lib/types/src/tx/execute.rs b/core/lib/types/src/tx/execute.rs
index c133261bc23..0edece9e46b 100644
--- a/core/lib/types/src/tx/execute.rs
+++ b/core/lib/types/src/tx/execute.rs
@@ -1,6 +1,7 @@
 use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};
-use zksync_utils::ZeroPrefixHexSerde;
+use zksync_system_constants::CONTRACT_DEPLOYER_ADDRESS;
+use zksync_utils::{bytecode::hash_bytecode, ZeroPrefixHexSerde};
 
 use crate::{ethabi, Address, EIP712TypedStructure, StructBuilder, H256, U256};
 
@@ -89,8 +90,7 @@ impl Execute {
         &self.calldata
     }
 
-    /// Prepares calldata to invoke deployer contract.
-    /// This method encodes parameters for the `create` method.
+    /// Prepares calldata to invoke deployer contract. This method encodes parameters for the `create` method.
     pub fn encode_deploy_params_create(
         salt: H256,
         contract_hash: H256,
@@ -116,4 +116,24 @@ impl Execute {
 
         FUNCTION_SIGNATURE.iter().copied().chain(params).collect()
     }
+
+    /// Creates an instance for deploying the specified bytecode without additional dependencies. If necessary,
+    /// additional deps can be added to `Self.factory_deps` after this call.
+    pub fn for_deploy(
+        salt: H256,
+        contract_bytecode: Vec<u8>,
+        constructor_input: &[ethabi::Token],
+    ) -> Self {
+        let bytecode_hash = hash_bytecode(&contract_bytecode);
+        Self {
+            contract_address: Some(CONTRACT_DEPLOYER_ADDRESS),
+            calldata: Self::encode_deploy_params_create(
+                salt,
+                bytecode_hash,
+                ethabi::encode(constructor_input),
+            ),
+            value: 0.into(),
+            factory_deps: vec![contract_bytecode],
+        }
+    }
 }
diff --git a/core/lib/vm_executor/src/oneshot/block.rs b/core/lib/vm_executor/src/oneshot/block.rs
index 8ba77305ad7..c820ea794fe 100644
--- a/core/lib/vm_executor/src/oneshot/block.rs
+++ b/core/lib/vm_executor/src/oneshot/block.rs
@@ -133,26 +133,33 @@ impl BlockInfo {
         let protocol_version = l2_block_header
             .protocol_version
             .unwrap_or(ProtocolVersionId::last_potentially_undefined());
-
+        // We cannot use the EVM emulator mentioned in the block as is because of batch vs playground settings etc.
+        // Instead, we just check whether EVM emulation in general is enabled for a block, and store this binary flag for further use.
+        let use_evm_emulator = l2_block_header
+            .base_system_contracts_hashes
+            .evm_emulator
+            .is_some();
         Ok(ResolvedBlockInfo {
             state_l2_block_number,
             state_l2_block_hash: l2_block_header.hash,
             vm_l1_batch_number,
             l1_batch_timestamp,
             protocol_version,
+            use_evm_emulator,
             is_pending: self.is_pending_l2_block(),
         })
     }
 }
 
 /// Resolved [`BlockInfo`] containing additional data from VM state.
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct ResolvedBlockInfo {
     state_l2_block_number: L2BlockNumber,
     state_l2_block_hash: H256,
     vm_l1_batch_number: L1BatchNumber,
     l1_batch_timestamp: u64,
     protocol_version: ProtocolVersionId,
+    use_evm_emulator: bool,
     is_pending: bool,
 }
 
@@ -161,6 +168,14 @@ impl ResolvedBlockInfo {
     pub fn state_l2_block_number(&self) -> L2BlockNumber {
         self.state_l2_block_number
     }
+
+    pub fn protocol_version(&self) -> ProtocolVersionId {
+        self.protocol_version
+    }
+
+    pub fn use_evm_emulator(&self) -> bool {
+        self.use_evm_emulator
+    }
 }
 
 impl<T> OneshotEnvParameters<T> {
@@ -213,7 +228,10 @@ impl<T> OneshotEnvParameters<T> {
             version: resolved_block_info.protocol_version,
             base_system_smart_contracts: self
                 .base_system_contracts
-                .get_by_protocol_version(resolved_block_info.protocol_version)
+                .get_by_protocol_version(
+                    resolved_block_info.protocol_version,
+                    resolved_block_info.use_evm_emulator,
+                )
                 .clone(),
             bootloader_gas_limit: BATCH_COMPUTATIONAL_GAS_LIMIT,
             execution_mode,
diff --git a/core/lib/vm_executor/src/oneshot/contracts.rs b/core/lib/vm_executor/src/oneshot/contracts.rs
index 3b3a65fe30b..0e1fb9b2762 100644
--- a/core/lib/vm_executor/src/oneshot/contracts.rs
+++ b/core/lib/vm_executor/src/oneshot/contracts.rs
@@ -26,8 +26,12 @@ pub(super) struct MultiVMBaseSystemContracts {
 
 impl MultiVMBaseSystemContracts {
     /// Gets contracts for a certain version.
-    pub fn get_by_protocol_version(&self, version: ProtocolVersionId) -> &BaseSystemContracts {
-        match version {
+    pub fn get_by_protocol_version(
+        &self,
+        version: ProtocolVersionId,
+        use_evm_emulator: bool,
+    ) -> BaseSystemContracts {
+        let base = match version {
             ProtocolVersionId::Version0
             | ProtocolVersionId::Version1
             | ProtocolVersionId::Version2
@@ -54,6 +58,14 @@ impl MultiVMBaseSystemContracts {
             ProtocolVersionId::Version24 | ProtocolVersionId::Version25 => {
                 &self.vm_1_5_0_increased_memory
             }
+        };
+        let base = base.clone();
+
+        if version.is_post_1_5_0() && use_evm_emulator {
+            // EVM emulator is not versioned now; the latest version is always checked out
+            base.with_latest_evm_emulator()
+        } else {
+            base
         }
     }
 
diff --git a/core/lib/vm_executor/src/oneshot/mock.rs b/core/lib/vm_executor/src/oneshot/mock.rs
index 8f3a12603c1..a7363c633c6 100644
--- a/core/lib/vm_executor/src/oneshot/mock.rs
+++ b/core/lib/vm_executor/src/oneshot/mock.rs
@@ -68,6 +68,7 @@ impl MockOneshotExecutor {
                     logs: Default::default(),
                     statistics: Default::default(),
                     refunds: Default::default(),
+                    new_known_factory_deps: None,
                 }
             },
         )
diff --git a/core/lib/vm_executor/src/storage.rs b/core/lib/vm_executor/src/storage.rs
index a2369820a5b..fa0e530c190 100644
--- a/core/lib/vm_executor/src/storage.rs
+++ b/core/lib/vm_executor/src/storage.rs
@@ -309,7 +309,11 @@ impl L1BatchParamsProvider {
         let contract_hashes = first_l2_block_in_batch.header.base_system_contracts_hashes;
         let base_system_contracts = storage
             .factory_deps_dal()
-            .get_base_system_contracts(contract_hashes.bootloader, contract_hashes.default_aa)
+            .get_base_system_contracts(
+                contract_hashes.bootloader,
+                contract_hashes.default_aa,
+                contract_hashes.evm_emulator,
+            )
             .await
             .context("failed getting base system contracts")?;
 
diff --git a/core/lib/vm_interface/src/storage/in_memory.rs b/core/lib/vm_interface/src/storage/in_memory.rs
index 6a8b5643345..d83f675cd54 100644
--- a/core/lib/vm_interface/src/storage/in_memory.rs
+++ b/core/lib/vm_interface/src/storage/in_memory.rs
@@ -36,7 +36,7 @@ impl InMemoryStorage {
         Self::with_custom_system_contracts_and_chain_id(
             chain_id,
             bytecode_hasher,
-            get_system_smart_contracts(),
+            get_system_smart_contracts(false),
         )
     }
 
diff --git a/core/lib/vm_interface/src/types/outputs/execution_result.rs b/core/lib/vm_interface/src/types/outputs/execution_result.rs
index 3e53aad85f1..018ea075db5 100644
--- a/core/lib/vm_interface/src/types/outputs/execution_result.rs
+++ b/core/lib/vm_interface/src/types/outputs/execution_result.rs
@@ -1,3 +1,5 @@
+use std::collections::HashMap;
+
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use zksync_system_constants::{
     BOOTLOADER_ADDRESS, KNOWN_CODES_STORAGE_ADDRESS, L1_MESSENGER_ADDRESS,
@@ -118,6 +120,10 @@ pub struct VmExecutionResultAndLogs {
     pub logs: VmExecutionLogs,
     pub statistics: VmExecutionStatistics,
     pub refunds: Refunds,
+    /// Bytecodes decommitted during VM execution. `None` if not computed by the VM.
+    // FIXME: currently, this is only filled up by `vm_latest`; probably makes sense to narrow down
+    //   to *dynamic* factory deps, so that `HashMap::new()` is a valid value for VMs not supporting EVM emulation.
+    pub new_known_factory_deps: Option<HashMap<H256, Vec<u8>>>,
 }
 
 #[derive(Debug, Clone, PartialEq)]
diff --git a/core/lib/vm_interface/src/types/outputs/finished_l1batch.rs b/core/lib/vm_interface/src/types/outputs/finished_l1batch.rs
index 27241c2c0fa..8f7c1d4fb0d 100644
--- a/core/lib/vm_interface/src/types/outputs/finished_l1batch.rs
+++ b/core/lib/vm_interface/src/types/outputs/finished_l1batch.rs
@@ -26,6 +26,7 @@ impl FinishedL1Batch {
                 logs: VmExecutionLogs::default(),
                 statistics: VmExecutionStatistics::default(),
                 refunds: Refunds::default(),
+                new_known_factory_deps: None,
             },
             final_execution_state: CurrentExecutionState {
                 events: vec![],
diff --git a/core/node/api_server/src/execution_sandbox/execute.rs b/core/node/api_server/src/execution_sandbox/execute.rs
index d974f2e9aa1..14ac37e5936 100644
--- a/core/node/api_server/src/execution_sandbox/execute.rs
+++ b/core/node/api_server/src/execution_sandbox/execute.rs
@@ -175,7 +175,7 @@ impl SandboxExecutor {
         let initialization_stage = SANDBOX_METRICS.sandbox[&SandboxStage::Initialization].start();
         let resolve_started_at = Instant::now();
         let resolve_time = resolve_started_at.elapsed();
-        let resolved_block_info = block_args.inner.resolve(&mut connection).await?;
+        let resolved_block_info = &block_args.resolved;
         // We don't want to emit too many logs.
         if resolve_time > Duration::from_millis(10) {
             tracing::debug!("Resolved block numbers (took {resolve_time:?})");
@@ -185,7 +185,7 @@ impl SandboxExecutor {
             SandboxAction::Execution { fee_input, tx } => {
                 self.options
                     .eth_call
-                    .to_execute_env(&mut connection, &resolved_block_info, *fee_input, tx)
+                    .to_execute_env(&mut connection, resolved_block_info, *fee_input, tx)
                     .await?
             }
             &SandboxAction::Call {
@@ -197,7 +197,7 @@ impl SandboxExecutor {
                     .eth_call
                     .to_call_env(
                         &mut connection,
-                        &resolved_block_info,
+                        resolved_block_info,
                         fee_input,
                         enforced_base_fee,
                     )
@@ -210,7 +210,7 @@ impl SandboxExecutor {
             } => {
                 self.options
                     .estimate_gas
-                    .to_env(&mut connection, &resolved_block_info, fee_input, base_fee)
+                    .to_env(&mut connection, resolved_block_info, fee_input, base_fee)
                     .await?
             }
         };
diff --git a/core/node/api_server/src/execution_sandbox/mod.rs b/core/node/api_server/src/execution_sandbox/mod.rs
index 36f10b8e9b0..b560d161ab5 100644
--- a/core/node/api_server/src/execution_sandbox/mod.rs
+++ b/core/node/api_server/src/execution_sandbox/mod.rs
@@ -10,7 +10,7 @@ use zksync_multivm::utils::get_eth_call_gas_limit;
 use zksync_types::{
     api, fee_model::BatchFeeInput, L1BatchNumber, L2BlockNumber, ProtocolVersionId, U256,
 };
-use zksync_vm_executor::oneshot::BlockInfo;
+use zksync_vm_executor::oneshot::{BlockInfo, ResolvedBlockInfo};
 
 use self::vm_metrics::SandboxStage;
 pub(super) use self::{
@@ -285,21 +285,32 @@ pub enum BlockArgsError {
 }
 
 /// Information about a block provided to VM.
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone)]
 pub(crate) struct BlockArgs {
     inner: BlockInfo,
+    resolved: ResolvedBlockInfo,
     block_id: api::BlockId,
 }
 
 impl BlockArgs {
     pub async fn pending(connection: &mut Connection<'_, Core>) -> anyhow::Result<Self> {
         let inner = BlockInfo::pending(connection).await?;
+        let resolved = inner.resolve(connection).await?;
         Ok(Self {
             inner,
+            resolved,
             block_id: api::BlockId::Number(api::BlockNumber::Pending),
         })
     }
 
+    pub fn protocol_version(&self) -> ProtocolVersionId {
+        self.resolved.protocol_version()
+    }
+
+    pub fn use_evm_emulator(&self) -> bool {
+        self.resolved.use_evm_emulator()
+    }
+
     /// Loads block information from DB.
     pub async fn new(
         connection: &mut Connection<'_, Core>,
@@ -326,8 +337,10 @@ impl BlockArgs {
             return Err(BlockArgsError::Missing);
         };
 
+        let inner = BlockInfo::for_existing_block(connection, block_number).await?;
         Ok(Self {
-            inner: BlockInfo::for_existing_block(connection, block_number).await?,
+            inner,
+            resolved: inner.resolve(connection).await?,
             block_id,
         })
     }
diff --git a/core/node/api_server/src/execution_sandbox/tests.rs b/core/node/api_server/src/execution_sandbox/tests.rs
index 306018e1543..75788d48058 100644
--- a/core/node/api_server/src/execution_sandbox/tests.rs
+++ b/core/node/api_server/src/execution_sandbox/tests.rs
@@ -7,7 +7,7 @@ use test_casing::test_casing;
 use zksync_dal::ConnectionPool;
 use zksync_multivm::{interface::ExecutionResult, utils::derive_base_fee_and_gas_per_pubdata};
 use zksync_node_genesis::{insert_genesis_batch, GenesisParams};
-use zksync_node_test_utils::{create_l2_block, prepare_recovery_snapshot};
+use zksync_node_test_utils::{create_l1_batch, create_l2_block, prepare_recovery_snapshot};
 use zksync_state::PostgresStorageCaches;
 use zksync_types::{
     api::state_override::{OverrideAccount, StateOverride},
@@ -93,17 +93,6 @@ async fn creating_block_args_after_snapshot_recovery() {
     let snapshot_recovery =
         prepare_recovery_snapshot(&mut storage, L1BatchNumber(23), L2BlockNumber(42), &[]).await;
 
-    let pending_block_args = BlockArgs::pending(&mut storage).await.unwrap();
-    assert_eq!(
-        pending_block_args.block_id,
-        api::BlockId::Number(api::BlockNumber::Pending)
-    );
-    assert_eq!(
-        pending_block_args.resolved_block_number(),
-        snapshot_recovery.l2_block_number + 1
-    );
-    assert!(pending_block_args.is_pending());
-
     let start_info = BlockStartInfo::new(&mut storage, Duration::MAX)
         .await
         .unwrap();
@@ -122,6 +111,35 @@ async fn creating_block_args_after_snapshot_recovery() {
         .unwrap_err();
     assert_matches!(err, BlockArgsError::Missing);
 
+    // Ensure there is a batch in the storage.
+    let l2_block = create_l2_block(snapshot_recovery.l2_block_number.0 + 1);
+    storage
+        .blocks_dal()
+        .insert_l2_block(&l2_block)
+        .await
+        .unwrap();
+    storage
+        .blocks_dal()
+        .insert_mock_l1_batch(&create_l1_batch(snapshot_recovery.l1_batch_number.0 + 1))
+        .await
+        .unwrap();
+    storage
+        .blocks_dal()
+        .mark_l2_blocks_as_executed_in_l1_batch(snapshot_recovery.l1_batch_number + 1)
+        .await
+        .unwrap();
+
+    let pending_block_args = BlockArgs::pending(&mut storage).await.unwrap();
+    assert_eq!(
+        pending_block_args.block_id,
+        api::BlockId::Number(api::BlockNumber::Pending)
+    );
+    assert_eq!(
+        pending_block_args.resolved_block_number(),
+        snapshot_recovery.l2_block_number + 2
+    );
+    assert!(pending_block_args.is_pending());
+
     let pruned_blocks = [
         api::BlockNumber::Earliest,
         0.into(),
@@ -147,13 +165,6 @@ async fn creating_block_args_after_snapshot_recovery() {
         assert_matches!(err, BlockArgsError::Missing);
     }
 
-    let l2_block = create_l2_block(snapshot_recovery.l2_block_number.0 + 1);
-    storage
-        .blocks_dal()
-        .insert_l2_block(&l2_block)
-        .await
-        .unwrap();
-
     let latest_block_args = BlockArgs::new(&mut storage, latest_block, &start_info)
         .await
         .unwrap();
diff --git a/core/node/api_server/src/tx_sender/gas_estimation.rs b/core/node/api_server/src/tx_sender/gas_estimation.rs
index f5e42875a3d..44e568ce418 100644
--- a/core/node/api_server/src/tx_sender/gas_estimation.rs
+++ b/core/node/api_server/src/tx_sender/gas_estimation.rs
@@ -44,13 +44,14 @@ impl TxSender {
     pub async fn get_txs_fee_in_wei(
         &self,
         tx: Transaction,
+        block_args: BlockArgs,
         estimated_fee_scale_factor: f64,
         acceptable_overestimation: u64,
         state_override: Option<StateOverride>,
         kind: BinarySearchKind,
     ) -> Result<Fee, SubmitTxError> {
         let estimation_started_at = Instant::now();
-        let mut estimator = GasEstimator::new(self, tx, state_override).await?;
+        let mut estimator = GasEstimator::new(self, tx, block_args, state_override).await?;
         estimator.adjust_transaction_fee();
 
         let initial_estimate = estimator.initialize().await?;
@@ -309,16 +310,10 @@ impl<'a> GasEstimator<'a> {
     pub(super) async fn new(
         sender: &'a TxSender,
         mut transaction: Transaction,
+        block_args: BlockArgs,
         state_override: Option<StateOverride>,
     ) -> Result<Self, SubmitTxError> {
-        let mut connection = sender.acquire_replica_connection().await?;
-        let block_args = BlockArgs::pending(&mut connection).await?;
-        let protocol_version = connection
-            .blocks_dal()
-            .pending_protocol_version()
-            .await
-            .context("failed getting pending protocol version")?;
-        drop(connection);
+        let protocol_version = block_args.protocol_version();
 
         let max_gas_limit = get_max_batch_gas_limit(protocol_version.into());
         let fee_input = adjust_pubdata_price_for_tx(
diff --git a/core/node/api_server/src/tx_sender/mod.rs b/core/node/api_server/src/tx_sender/mod.rs
index ad8e38ef3cc..2dbc0d5a0dd 100644
--- a/core/node/api_server/src/tx_sender/mod.rs
+++ b/core/node/api_server/src/tx_sender/mod.rs
@@ -280,13 +280,11 @@ impl TxSender {
     pub async fn submit_tx(
         &self,
         tx: L2Tx,
+        block_args: BlockArgs,
     ) -> Result<(L2TxSubmissionResult, VmExecutionResultAndLogs), SubmitTxError> {
         let tx_hash = tx.hash();
         let stage_latency = SANDBOX_METRICS.start_tx_submit_stage(tx_hash, SubmitTxStage::Validate);
-        let mut connection = self.acquire_replica_connection().await?;
-        let protocol_version = connection.blocks_dal().pending_protocol_version().await?;
-        drop(connection);
-        self.validate_tx(&tx, protocol_version).await?;
+        self.validate_tx(&tx, block_args.protocol_version()).await?;
         stage_latency.observe();
 
         let stage_latency = SANDBOX_METRICS.start_tx_submit_stage(tx_hash, SubmitTxStage::DryRun);
@@ -305,9 +303,7 @@ impl TxSender {
             tx: tx.clone(),
         };
         let vm_permit = vm_permit.ok_or(SubmitTxError::ServerShuttingDown)?;
-        let mut connection = self.acquire_replica_connection().await?;
-        let block_args = BlockArgs::pending(&mut connection).await?;
-
+        let connection = self.acquire_replica_connection().await?;
         let execution_output = self
             .0
             .executor
diff --git a/core/node/api_server/src/tx_sender/tests/call.rs b/core/node/api_server/src/tx_sender/tests/call.rs
index bdddb8e3895..e43f55b2b9a 100644
--- a/core/node/api_server/src/tx_sender/tests/call.rs
+++ b/core/node/api_server/src/tx_sender/tests/call.rs
@@ -56,7 +56,7 @@ async fn test_call(
     mut call: CallRequest,
 ) -> Result<Vec<u8>, SubmitTxError> {
     call.gas = call.gas.max(Some(10_000_000.into()));
-    let call = L2Tx::from_request(call.into(), usize::MAX).unwrap();
+    let call = L2Tx::from_request(call.into(), usize::MAX, true).unwrap();
 
     let mut storage = tx_sender
         .0
diff --git a/core/node/api_server/src/tx_sender/tests/gas_estimation.rs b/core/node/api_server/src/tx_sender/tests/gas_estimation.rs
index 086313a8562..3fd5fcb5188 100644
--- a/core/node/api_server/src/tx_sender/tests/gas_estimation.rs
+++ b/core/node/api_server/src/tx_sender/tests/gas_estimation.rs
@@ -25,6 +25,7 @@ const DEFAULT_MULTIPLIER: f64 = 64.0 / 63.0;
 async fn initial_gas_estimation_is_somewhat_accurate() {
     let pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
     let tx_sender = create_real_tx_sender(pool).await;
+    let block_args = pending_block_args(&tx_sender).await;
 
     let alice = K256PrivateKey::random();
     let transfer_value = U256::from(1_000_000_000);
@@ -35,7 +36,7 @@ async fn initial_gas_estimation_is_somewhat_accurate() {
     let state_override = StateOverride::new(HashMap::from([(alice.address(), account_overrides)]));
     let tx = alice.create_transfer(transfer_value);
 
-    let mut estimator = GasEstimator::new(&tx_sender, tx.into(), Some(state_override))
+    let mut estimator = GasEstimator::new(&tx_sender, tx.into(), block_args, Some(state_override))
         .await
         .unwrap();
     estimator.adjust_transaction_fee();
@@ -131,7 +132,8 @@ async fn test_initial_estimate(
 ) -> VmExecutionResultAndLogs {
     let pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
     let tx_sender = create_real_tx_sender(pool).await;
-    let mut estimator = GasEstimator::new(&tx_sender, tx.into(), Some(state_override))
+    let block_args = pending_block_args(&tx_sender).await;
+    let mut estimator = GasEstimator::new(&tx_sender, tx.into(), block_args, Some(state_override))
         .await
         .unwrap();
     estimator.adjust_transaction_fee();
@@ -153,7 +155,8 @@ async fn test_initial_estimate(
 async fn test_initial_estimate_error(state_override: StateOverride, tx: L2Tx) -> SubmitTxError {
     let pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
     let tx_sender = create_real_tx_sender(pool).await;
-    let mut estimator = GasEstimator::new(&tx_sender, tx.into(), Some(state_override))
+    let block_args = pending_block_args(&tx_sender).await;
+    let mut estimator = GasEstimator::new(&tx_sender, tx.into(), block_args, Some(state_override))
         .await
         .unwrap();
     estimator.adjust_transaction_fee();
@@ -292,6 +295,7 @@ async fn out_of_gas_during_initial_estimate() {
 async fn insufficient_funds_error_for_transfer() {
     let pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
     let tx_sender = create_real_tx_sender(pool).await;
+    let block_args = pending_block_args(&tx_sender).await;
 
     let alice = K256PrivateKey::random();
     let tx = alice.create_transfer(1_000_000_000.into());
@@ -300,6 +304,7 @@ async fn insufficient_funds_error_for_transfer() {
     let err = tx_sender
         .get_txs_fee_in_wei(
             tx.clone().into(),
+            block_args,
             fee_scale_factor,
             1_000,
             None,
@@ -317,11 +322,13 @@ async fn test_estimating_gas(
 ) {
     let pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
     let tx_sender = create_real_tx_sender(pool).await;
+    let block_args = pending_block_args(&tx_sender).await;
 
     let fee_scale_factor = 1.0;
     let fee = tx_sender
         .get_txs_fee_in_wei(
             tx.clone().into(),
+            block_args.clone(),
             fee_scale_factor,
             acceptable_overestimation,
             Some(state_override.clone()),
@@ -339,6 +346,7 @@ async fn test_estimating_gas(
     let fee = tx_sender
         .get_txs_fee_in_wei(
             tx.into(),
+            block_args,
             fee_scale_factor,
             acceptable_overestimation,
             Some(state_override.clone()),
@@ -419,6 +427,7 @@ async fn estimating_gas_for_reverting_tx() {
     let tx = alice.create_counter_tx(1.into(), true);
     let pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
     let tx_sender = create_real_tx_sender(pool).await;
+    let block_args = pending_block_args(&tx_sender).await;
 
     let fee_scale_factor = 1.0;
     let acceptable_overestimation = 0;
@@ -426,6 +435,7 @@ async fn estimating_gas_for_reverting_tx() {
         let err = tx_sender
             .get_txs_fee_in_wei(
                 tx.clone().into(),
+                block_args.clone(),
                 fee_scale_factor,
                 acceptable_overestimation,
                 Some(state_override.clone()),
@@ -447,6 +457,7 @@ async fn estimating_gas_for_infinite_loop_tx() {
     let tx = alice.create_infinite_loop_tx();
     let pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
     let tx_sender = create_real_tx_sender(pool).await;
+    let block_args = pending_block_args(&tx_sender).await;
 
     let fee_scale_factor = 1.0;
     let acceptable_overestimation = 0;
@@ -454,6 +465,7 @@ async fn estimating_gas_for_infinite_loop_tx() {
         let err = tx_sender
             .get_txs_fee_in_wei(
                 tx.clone().into(),
+                block_args.clone(),
                 fee_scale_factor,
                 acceptable_overestimation,
                 Some(state_override.clone()),
diff --git a/core/node/api_server/src/tx_sender/tests/mod.rs b/core/node/api_server/src/tx_sender/tests/mod.rs
index 3d48e320abc..cacd616202d 100644
--- a/core/node/api_server/src/tx_sender/tests/mod.rs
+++ b/core/node/api_server/src/tx_sender/tests/mod.rs
@@ -159,3 +159,8 @@ async fn create_real_tx_sender(pool: ConnectionPool<Core>) -> TxSender {
         .await
         .0
 }
+
+async fn pending_block_args(tx_sender: &TxSender) -> BlockArgs {
+    let mut storage = tx_sender.acquire_replica_connection().await.unwrap();
+    BlockArgs::pending(&mut storage).await.unwrap()
+}
diff --git a/core/node/api_server/src/tx_sender/tests/send_tx.rs b/core/node/api_server/src/tx_sender/tests/send_tx.rs
index 678b88dab94..fdd63254cf0 100644
--- a/core/node/api_server/src/tx_sender/tests/send_tx.rs
+++ b/core/node/api_server/src/tx_sender/tests/send_tx.rs
@@ -42,8 +42,9 @@ async fn submitting_tx_requires_one_connection() {
     });
     let tx_executor = SandboxExecutor::mock(tx_executor).await;
     let (tx_sender, _) = create_test_tx_sender(pool.clone(), l2_chain_id, tx_executor).await;
+    let block_args = pending_block_args(&tx_sender).await;
 
-    let submission_result = tx_sender.submit_tx(tx).await.unwrap();
+    let submission_result = tx_sender.submit_tx(tx, block_args).await.unwrap();
     assert_matches!(submission_result.0, L2TxSubmissionResult::Added);
 
     let mut storage = pool.connection().await.unwrap();
@@ -178,6 +179,7 @@ async fn fee_validation_errors() {
 async fn sending_transfer() {
     let pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
     let tx_sender = create_real_tx_sender(pool).await;
+    let block_args = pending_block_args(&tx_sender).await;
     let alice = K256PrivateKey::random();
 
     // Manually set sufficient balance for the tx initiator.
@@ -189,7 +191,7 @@ async fn sending_transfer() {
     drop(storage);
 
     let transfer = alice.create_transfer(1_000_000_000.into());
-    let (sub_result, vm_result) = tx_sender.submit_tx(transfer).await.unwrap();
+    let (sub_result, vm_result) = tx_sender.submit_tx(transfer, block_args).await.unwrap();
     assert_matches!(sub_result, L2TxSubmissionResult::Added);
     assert!(!vm_result.result.is_failed(), "{:?}", vm_result.result);
 }
@@ -198,11 +200,12 @@ async fn sending_transfer() {
 async fn sending_transfer_with_insufficient_balance() {
     let pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
     let tx_sender = create_real_tx_sender(pool).await;
+    let block_args = pending_block_args(&tx_sender).await;
     let alice = K256PrivateKey::random();
     let transfer_value = 1_000_000_000.into();
 
     let transfer = alice.create_transfer(transfer_value);
-    let err = tx_sender.submit_tx(transfer).await.unwrap_err();
+    let err = tx_sender.submit_tx(transfer, block_args).await.unwrap_err();
     assert_matches!(
         err,
         SubmitTxError::NotEnoughBalanceForFeeValue(balance, _, value) if balance.is_zero()
@@ -214,6 +217,7 @@ async fn sending_transfer_with_insufficient_balance() {
 async fn sending_transfer_with_incorrect_signature() {
     let pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
     let tx_sender = create_real_tx_sender(pool).await;
+    let block_args = pending_block_args(&tx_sender).await;
     let alice = K256PrivateKey::random();
     let transfer_value = 1_000_000_000.into();
 
@@ -226,7 +230,7 @@ async fn sending_transfer_with_incorrect_signature() {
 
     let mut transfer = alice.create_transfer(transfer_value);
     transfer.execute.value = transfer_value / 2; // This should invalidate tx signature
-    let err = tx_sender.submit_tx(transfer).await.unwrap_err();
+    let err = tx_sender.submit_tx(transfer, block_args).await.unwrap_err();
     assert_matches!(err, SubmitTxError::ValidationFailed(_));
 }
 
@@ -235,6 +239,7 @@ async fn sending_transfer_with_incorrect_signature() {
 async fn sending_load_test_transaction(tx_params: LoadnextContractExecutionParams) {
     let pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
     let tx_sender = create_real_tx_sender(pool).await;
+    let block_args = pending_block_args(&tx_sender).await;
     let alice = K256PrivateKey::random();
 
     let mut storage = tx_sender.acquire_replica_connection().await.unwrap();
@@ -246,7 +251,7 @@ async fn sending_load_test_transaction(tx_params: LoadnextContractExecutionParam
     drop(storage);
 
     let tx = alice.create_load_test_tx(tx_params);
-    let (sub_result, vm_result) = tx_sender.submit_tx(tx).await.unwrap();
+    let (sub_result, vm_result) = tx_sender.submit_tx(tx, block_args).await.unwrap();
     assert_matches!(sub_result, L2TxSubmissionResult::Added);
     assert!(!vm_result.result.is_failed(), "{:?}", vm_result.result);
 }
@@ -255,6 +260,7 @@ async fn sending_load_test_transaction(tx_params: LoadnextContractExecutionParam
 async fn sending_reverting_transaction() {
     let pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
     let tx_sender = create_real_tx_sender(pool).await;
+    let block_args = pending_block_args(&tx_sender).await;
     let alice = K256PrivateKey::random();
 
     let mut storage = tx_sender.acquire_replica_connection().await.unwrap();
@@ -266,7 +272,7 @@ async fn sending_reverting_transaction() {
     drop(storage);
 
     let tx = alice.create_counter_tx(1.into(), true);
-    let (_, vm_result) = tx_sender.submit_tx(tx).await.unwrap();
+    let (_, vm_result) = tx_sender.submit_tx(tx, block_args).await.unwrap();
     assert_matches!(
         vm_result.result,
         ExecutionResult::Revert { output } if output.to_string().contains("This method always reverts")
@@ -277,6 +283,7 @@ async fn sending_reverting_transaction() {
 async fn sending_transaction_out_of_gas() {
     let pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
     let tx_sender = create_real_tx_sender(pool).await;
+    let block_args = pending_block_args(&tx_sender).await;
     let alice = K256PrivateKey::random();
 
     let mut storage = tx_sender.acquire_replica_connection().await.unwrap();
@@ -288,6 +295,6 @@ async fn sending_transaction_out_of_gas() {
     drop(storage);
 
     let tx = alice.create_infinite_loop_tx();
-    let (_, vm_result) = tx_sender.submit_tx(tx).await.unwrap();
+    let (_, vm_result) = tx_sender.submit_tx(tx, block_args).await.unwrap();
     assert_matches!(vm_result.result, ExecutionResult::Revert { .. });
 }
diff --git a/core/node/api_server/src/web3/namespaces/debug.rs b/core/node/api_server/src/web3/namespaces/debug.rs
index 71560e4ddb8..7e99808dbc7 100644
--- a/core/node/api_server/src/web3/namespaces/debug.rs
+++ b/core/node/api_server/src/web3/namespaces/debug.rs
@@ -259,7 +259,11 @@ impl DebugNamespace {
         };
 
         let call_overrides = request.get_call_overrides()?;
-        let call = L2Tx::from_request(request.into(), MAX_ENCODED_TX_SIZE)?;
+        let call = L2Tx::from_request(
+            request.into(),
+            MAX_ENCODED_TX_SIZE,
+            false, // Even with EVM emulation enabled, calls must specify `to` field
+        )?;
 
         let vm_permit = self
             .state
diff --git a/core/node/api_server/src/web3/namespaces/en.rs b/core/node/api_server/src/web3/namespaces/en.rs
index a412c064fac..721ca985ceb 100644
--- a/core/node/api_server/src/web3/namespaces/en.rs
+++ b/core/node/api_server/src/web3/namespaces/en.rs
@@ -177,6 +177,10 @@ impl EnNamespace {
             genesis_commitment: Some(genesis_batch.metadata.commitment),
             bootloader_hash: Some(genesis_batch.header.base_system_contracts_hashes.bootloader),
             default_aa_hash: Some(genesis_batch.header.base_system_contracts_hashes.default_aa),
+            evm_emulator_hash: genesis_batch
+                .header
+                .base_system_contracts_hashes
+                .evm_emulator,
             l1_chain_id: self.state.api_config.l1_chain_id,
             sl_chain_id: Some(self.state.api_config.l1_chain_id.into()),
             l2_chain_id: self.state.api_config.l2_chain_id,
diff --git a/core/node/api_server/src/web3/namespaces/eth.rs b/core/node/api_server/src/web3/namespaces/eth.rs
index 1d60d839e4e..44362dd098e 100644
--- a/core/node/api_server/src/web3/namespaces/eth.rs
+++ b/core/node/api_server/src/web3/namespaces/eth.rs
@@ -19,6 +19,7 @@ use zksync_web3_decl::{
 };
 
 use crate::{
+    execution_sandbox::BlockArgs,
     tx_sender::BinarySearchKind,
     utils::open_readonly_transaction,
     web3::{backend_jsonrpsee::MethodTracer, metrics::API_METRICS, state::RpcState, TypedFilter},
@@ -77,7 +78,11 @@ impl EthNamespace {
         drop(connection);
 
         let call_overrides = request.get_call_overrides()?;
-        let tx = L2Tx::from_request(request.into(), self.state.api_config.max_tx_size)?;
+        let tx = L2Tx::from_request(
+            request.into(),
+            self.state.api_config.max_tx_size,
+            false, // Even with EVM emulation enabled, calls must specify `to` field
+        )?;
 
         // It is assumed that the previous checks has already enforced that the `max_fee_per_gas` is at most u64.
         let call_result: Vec<u8> = self
@@ -108,10 +113,13 @@ impl EthNamespace {
         let is_eip712 = request_with_gas_per_pubdata_overridden
             .eip712_meta
             .is_some();
-
+        let mut connection = self.state.acquire_connection().await?;
+        let block_args = BlockArgs::pending(&mut connection).await?;
+        drop(connection);
         let mut tx: L2Tx = L2Tx::from_request(
             request_with_gas_per_pubdata_overridden.into(),
             self.state.api_config.max_tx_size,
+            block_args.use_evm_emulator(),
         )?;
 
         // The user may not include the proper transaction type during the estimation of
@@ -137,6 +145,7 @@ impl EthNamespace {
             .tx_sender
             .get_txs_fee_in_wei(
                 tx.into(),
+                block_args,
                 scale_factor,
                 acceptable_overestimation as u64,
                 state_override,
@@ -619,10 +628,15 @@ impl EthNamespace {
     }
 
     pub async fn send_raw_transaction_impl(&self, tx_bytes: Bytes) -> Result<H256, Web3Error> {
-        let (mut tx, hash) = self.state.parse_transaction_bytes(&tx_bytes.0)?;
+        let mut connection = self.state.acquire_connection().await?;
+        let block_args = BlockArgs::pending(&mut connection).await?;
+        drop(connection);
+        let (mut tx, hash) = self
+            .state
+            .parse_transaction_bytes(&tx_bytes.0, &block_args)?;
         tx.set_input(tx_bytes.0, hash);
 
-        let submit_result = self.state.tx_sender.submit_tx(tx).await;
+        let submit_result = self.state.tx_sender.submit_tx(tx, block_args).await;
         submit_result.map(|_| hash).map_err(|err| {
             tracing::debug!("Send raw transaction error: {err}");
             API_METRICS.submit_tx_error[&err.prom_error_code()].inc();
diff --git a/core/node/api_server/src/web3/namespaces/zks.rs b/core/node/api_server/src/web3/namespaces/zks.rs
index 2192f11eb14..bcfd7daf346 100644
--- a/core/node/api_server/src/web3/namespaces/zks.rs
+++ b/core/node/api_server/src/web3/namespaces/zks.rs
@@ -1,4 +1,4 @@
-use std::{collections::HashMap, convert::TryInto};
+use std::collections::HashMap;
 
 use anyhow::Context as _;
 use zksync_dal::{Connection, Core, CoreDal, DalError};
@@ -30,6 +30,7 @@ use zksync_web3_decl::{
 };
 
 use crate::{
+    execution_sandbox::BlockArgs,
     tx_sender::BinarySearchKind,
     utils::open_readonly_transaction,
     web3::{backend_jsonrpsee::MethodTracer, metrics::API_METRICS, RpcState},
@@ -63,16 +64,21 @@ impl ZksNamespace {
             eip712_meta.gas_per_pubdata = U256::from(DEFAULT_L2_TX_GAS_PER_PUBDATA_BYTE);
         }
 
+        let mut connection = self.state.acquire_connection().await?;
+        let block_args = BlockArgs::pending(&mut connection).await?;
+        drop(connection);
         let mut tx = L2Tx::from_request(
             request_with_gas_per_pubdata_overridden.into(),
             self.state.api_config.max_tx_size,
+            block_args.use_evm_emulator(),
         )?;
 
         // When we're estimating fee, we are trying to deduce values related to fee, so we should
         // not consider provided ones.
         tx.common_data.fee.max_priority_fee_per_gas = 0u64.into();
         tx.common_data.fee.gas_per_pubdata_limit = U256::from(DEFAULT_L2_TX_GAS_PER_PUBDATA_BYTE);
-        self.estimate_fee(tx.into(), state_override).await
+        self.estimate_fee(tx.into(), block_args, state_override)
+            .await
     }
 
     pub async fn estimate_l1_to_l2_gas_impl(
@@ -89,17 +95,25 @@ impl ZksNamespace {
             }
         }
 
-        let tx: L1Tx = request_with_gas_per_pubdata_overridden
-            .try_into()
-            .map_err(Web3Error::SerializationError)?;
-
-        let fee = self.estimate_fee(tx.into(), state_override).await?;
+        let mut connection = self.state.acquire_connection().await?;
+        let block_args = BlockArgs::pending(&mut connection).await?;
+        drop(connection);
+        let tx = L1Tx::from_request(
+            request_with_gas_per_pubdata_overridden,
+            block_args.use_evm_emulator(),
+        )
+        .map_err(Web3Error::SerializationError)?;
+
+        let fee = self
+            .estimate_fee(tx.into(), block_args, state_override)
+            .await?;
         Ok(fee.gas_limit)
     }
 
     async fn estimate_fee(
         &self,
         tx: Transaction,
+        block_args: BlockArgs,
         state_override: Option<StateOverride>,
     ) -> Result<Fee, Web3Error> {
         let scale_factor = self.state.api_config.estimate_gas_scale_factor;
@@ -112,6 +126,7 @@ impl ZksNamespace {
             .tx_sender
             .get_txs_fee_in_wei(
                 tx,
+                block_args,
                 scale_factor,
                 acceptable_overestimation as u64,
                 state_override,
@@ -583,10 +598,15 @@ impl ZksNamespace {
         &self,
         tx_bytes: Bytes,
     ) -> Result<(H256, VmExecutionResultAndLogs), Web3Error> {
-        let (mut tx, hash) = self.state.parse_transaction_bytes(&tx_bytes.0)?;
+        let mut connection = self.state.acquire_connection().await?;
+        let block_args = BlockArgs::pending(&mut connection).await?;
+        drop(connection);
+        let (mut tx, hash) = self
+            .state
+            .parse_transaction_bytes(&tx_bytes.0, &block_args)?;
         tx.set_input(tx_bytes.0, hash);
 
-        let submit_result = self.state.tx_sender.submit_tx(tx).await;
+        let submit_result = self.state.tx_sender.submit_tx(tx, block_args).await;
         submit_result.map(|result| (hash, result.1)).map_err(|err| {
             tracing::debug!("Send raw transaction error: {err}");
             API_METRICS.submit_tx_error[&err.prom_error_code()].inc();
diff --git a/core/node/api_server/src/web3/state.rs b/core/node/api_server/src/web3/state.rs
index 723661ab908..18c206eaf58 100644
--- a/core/node/api_server/src/web3/state.rs
+++ b/core/node/api_server/src/web3/state.rs
@@ -245,12 +245,19 @@ pub(crate) struct RpcState {
 }
 
 impl RpcState {
-    pub fn parse_transaction_bytes(&self, bytes: &[u8]) -> Result<(L2Tx, H256), Web3Error> {
+    pub fn parse_transaction_bytes(
+        &self,
+        bytes: &[u8],
+        block_args: &BlockArgs,
+    ) -> Result<(L2Tx, H256), Web3Error> {
         let chain_id = self.api_config.l2_chain_id;
         let (tx_request, hash) = api::TransactionRequest::from_bytes(bytes, chain_id)?;
-
         Ok((
-            L2Tx::from_request(tx_request, self.api_config.max_tx_size)?,
+            L2Tx::from_request(
+                tx_request,
+                self.api_config.max_tx_size,
+                block_args.use_evm_emulator(),
+            )?,
             hash,
         ))
     }
diff --git a/core/node/api_server/src/web3/tests/vm.rs b/core/node/api_server/src/web3/tests/vm.rs
index d8086c6c6ad..e29ea246213 100644
--- a/core/node/api_server/src/web3/tests/vm.rs
+++ b/core/node/api_server/src/web3/tests/vm.rs
@@ -257,12 +257,12 @@ struct SendRawTransactionTest {
 }
 
 impl SendRawTransactionTest {
-    fn transaction_bytes_and_hash() -> (Vec<u8>, H256) {
+    fn transaction_bytes_and_hash(include_to: bool) -> (Vec<u8>, H256) {
         let private_key = Self::private_key();
         let tx_request = api::TransactionRequest {
             chain_id: Some(L2ChainId::default().as_u64()),
             from: Some(private_key.address()),
-            to: Some(Address::repeat_byte(2)),
+            to: include_to.then(|| Address::repeat_byte(2)),
             value: 123_456.into(),
             gas: (get_intrinsic_constants().l2_tx_intrinsic_gas * 2).into(),
             gas_price: StateKeeperConfig::for_tests().minimal_l2_gas_price.into(),
@@ -313,7 +313,7 @@ impl HttpTest for SendRawTransactionTest {
             L2BlockNumber(1)
         };
         tx_executor.set_tx_responses(move |tx, env| {
-            assert_eq!(tx.hash(), Self::transaction_bytes_and_hash().1);
+            assert_eq!(tx.hash(), Self::transaction_bytes_and_hash(true).1);
             assert_eq!(env.l1_batch.first_l2_block.number, pending_block.0);
             ExecutionResult::Success { output: vec![] }
         });
@@ -334,7 +334,7 @@ impl HttpTest for SendRawTransactionTest {
                 .await?;
         }
 
-        let (tx_bytes, tx_hash) = Self::transaction_bytes_and_hash();
+        let (tx_bytes, tx_hash) = Self::transaction_bytes_and_hash(true);
         let send_result = client.send_raw_transaction(tx_bytes.into()).await?;
         assert_eq!(send_result, tx_hash);
         Ok(())
@@ -357,6 +357,50 @@ async fn send_raw_transaction_after_snapshot_recovery() {
     .await;
 }
 
+fn assert_null_to_address_error(error: &ClientError) {
+    if let ClientError::Call(error) = error {
+        assert_eq!(error.code(), 3);
+        assert!(error.message().contains("toAddressIsNull"), "{error:?}");
+        assert!(error.data().is_none(), "{error:?}");
+    } else {
+        panic!("Unexpected error: {error:?}");
+    }
+}
+
+#[derive(Debug)]
+struct SendRawTransactionWithoutToAddressTest;
+
+#[async_trait]
+impl HttpTest for SendRawTransactionWithoutToAddressTest {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
+        let mut storage = pool.connection().await?;
+        storage
+            .storage_logs_dal()
+            .append_storage_logs(
+                L2BlockNumber(0),
+                &[SendRawTransactionTest::balance_storage_log()],
+            )
+            .await?;
+
+        let (tx_bytes, _) = SendRawTransactionTest::transaction_bytes_and_hash(false);
+        let err = client
+            .send_raw_transaction(tx_bytes.into())
+            .await
+            .unwrap_err();
+        assert_null_to_address_error(&err);
+        Ok(())
+    }
+}
+
+#[tokio::test]
+async fn send_raw_transaction_fails_without_to_address() {
+    test_http_server(SendRawTransactionWithoutToAddressTest).await;
+}
+
 #[derive(Debug)]
 struct SendTransactionWithDetailedOutputTest;
 
@@ -405,7 +449,7 @@ impl SendTransactionWithDetailedOutputTest {
 impl HttpTest for SendTransactionWithDetailedOutputTest {
     fn transaction_executor(&self) -> MockOneshotExecutor {
         let mut tx_executor = MockOneshotExecutor::default();
-        let tx_bytes_and_hash = SendRawTransactionTest::transaction_bytes_and_hash();
+        let tx_bytes_and_hash = SendRawTransactionTest::transaction_bytes_and_hash(true);
         let vm_execution_logs = VmExecutionLogs {
             storage_logs: self.storage_logs(),
             events: self.vm_events(),
@@ -423,6 +467,7 @@ impl HttpTest for SendTransactionWithDetailedOutputTest {
                 logs: vm_execution_logs.clone(),
                 statistics: Default::default(),
                 refunds: Default::default(),
+                new_known_factory_deps: None,
             }
         });
         tx_executor
@@ -443,7 +488,7 @@ impl HttpTest for SendTransactionWithDetailedOutputTest {
             )
             .await?;
 
-        let (tx_bytes, tx_hash) = SendRawTransactionTest::transaction_bytes_and_hash();
+        let (tx_bytes, tx_hash) = SendRawTransactionTest::transaction_bytes_and_hash(true);
         let send_result = client
             .send_raw_transaction_with_detailed_output(tx_bytes.into())
             .await?;
@@ -835,3 +880,30 @@ async fn estimate_gas_with_state_override() {
     let inner = EstimateGasTest::new(false);
     test_http_server(EstimateGasWithStateOverrideTest { inner }).await;
 }
+
+#[derive(Debug)]
+struct EstimateGasWithoutToAddessTest;
+
+#[async_trait]
+impl HttpTest for EstimateGasWithoutToAddessTest {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        _pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
+        let mut l2_transaction = create_l2_transaction(10, 100);
+        l2_transaction.execute.contract_address = None;
+        l2_transaction.common_data.signature = vec![]; // Remove invalidated signature so that it doesn't trip estimation logic
+        let err = client
+            .estimate_gas(l2_transaction.clone().into(), None, None)
+            .await
+            .unwrap_err();
+        assert_null_to_address_error(&err);
+        Ok(())
+    }
+}
+
+#[tokio::test]
+async fn estimate_gas_fails_without_to_address() {
+    test_http_server(EstimateGasWithoutToAddessTest).await;
+}
diff --git a/core/node/commitment_generator/src/lib.rs b/core/node/commitment_generator/src/lib.rs
index 6cb14cfda53..cf6971b041c 100644
--- a/core/node/commitment_generator/src/lib.rs
+++ b/core/node/commitment_generator/src/lib.rs
@@ -176,6 +176,7 @@ impl CommitmentGenerator {
             rollup_root_hash: tree_data.hash,
             bootloader_code_hash: header.base_system_contracts_hashes.bootloader,
             default_aa_code_hash: header.base_system_contracts_hashes.default_aa,
+            evm_emulator_code_hash: header.base_system_contracts_hashes.evm_emulator,
             protocol_version,
         };
         let touched_slots = connection
diff --git a/core/node/consensus/src/batch.rs b/core/node/consensus/src/batch.rs
index 08246c4e5c0..af38f446c1b 100644
--- a/core/node/consensus/src/batch.rs
+++ b/core/node/consensus/src/batch.rs
@@ -261,7 +261,7 @@ impl L1BatchWithWitness {
                 // TODO: make consensus payload contain `abi::Transaction` instead.
                 // TODO: currently the payload doesn't contain the block number, which is
                 // annoying. Consider adding it to payload.
-                let t2: Transaction = abi::Transaction::try_from(t.clone())?.try_into()?;
+                let t2 = Transaction::from_abi(abi::Transaction::try_from(t.clone())?, true)?;
                 anyhow::ensure!(t == &t2);
                 hasher.push_tx_hash(t.hash());
             }
diff --git a/core/node/consensus/src/storage/testonly.rs b/core/node/consensus/src/storage/testonly.rs
index 65c464d98b9..5817e766c6b 100644
--- a/core/node/consensus/src/storage/testonly.rs
+++ b/core/node/consensus/src/storage/testonly.rs
@@ -57,7 +57,7 @@ pub(crate) fn mock_genesis_params(protocol_version: ProtocolVersionId) -> Genesi
     GenesisParams::from_genesis_config(
         cfg,
         BaseSystemContracts::load_from_disk(),
-        get_system_smart_contracts(),
+        get_system_smart_contracts(false),
     )
     .unwrap()
 }
diff --git a/core/node/da_clients/Cargo.toml b/core/node/da_clients/Cargo.toml
index b7e5510600f..5b5567a8aab 100644
--- a/core/node/da_clients/Cargo.toml
+++ b/core/node/da_clients/Cargo.toml
@@ -23,6 +23,8 @@ zksync_types.workspace = true
 zksync_object_store.workspace = true
 zksync_da_client.workspace = true
 zksync_env_config.workspace = true
+zksync_eth_client.workspace = true
+zksync_contracts.workspace = true
 futures.workspace = true
 
 # Avail dependencies
@@ -41,3 +43,5 @@ subxt-signer = { workspace = true, features = ["sr25519", "native"] }
 # EigenDA dependencies
 reqwest = { version = "0.12" }
 http = "1"
+rlp.workspace = true
+ethers = { version = "2.0.0-rc.1", features = ["abigen", "etherscan"] }
diff --git a/core/node/da_clients/src/blob_info.rs b/core/node/da_clients/src/blob_info.rs
new file mode 100644
index 00000000000..f25900836ca
--- /dev/null
+++ b/core/node/da_clients/src/blob_info.rs
@@ -0,0 +1,247 @@
+use rlp::{Decodable, DecoderError, Rlp};
+use zksync_types::{
+    ethabi::Token,
+    web3::contract::{Tokenizable, Tokenize},
+    U256,
+};
+
+#[derive(Debug)]
+pub struct G1Commitment {
+    pub x: Vec<u8>,
+    pub y: Vec<u8>,
+}
+
+impl Decodable for G1Commitment {
+    fn decode(rlp: &Rlp) -> Result<Self, DecoderError> {
+        let x: Vec<u8> = rlp.val_at(0)?; // Decode first element as Vec<u8>
+        let y: Vec<u8> = rlp.val_at(1)?; // Decode second element as Vec<u8>
+
+        Ok(G1Commitment { x, y })
+    }
+}
+
+impl Tokenize for G1Commitment {
+    fn into_tokens(self) -> Vec<Token> {
+        let x = Token::Uint(U256::from_big_endian(&self.x));
+        let y = Token::Uint(U256::from_big_endian(&self.y));
+
+        vec![x, y]
+    }
+}
+
+#[derive(Debug)]
+pub struct BlobQuorumParam {
+    pub quorum_number: u32,
+    pub adversary_threshold_percentage: u32,
+    pub confirmation_threshold_percentage: u32,
+    pub chunk_length: u32,
+}
+
+impl Decodable for BlobQuorumParam {
+    fn decode(rlp: &Rlp) -> Result<Self, DecoderError> {
+        Ok(BlobQuorumParam {
+            quorum_number: rlp.val_at(0)?,
+            adversary_threshold_percentage: rlp.val_at(1)?,
+            confirmation_threshold_percentage: rlp.val_at(2)?,
+            chunk_length: rlp.val_at(3)?,
+        })
+    }
+}
+
+impl Tokenize for BlobQuorumParam {
+    fn into_tokens(self) -> Vec<Token> {
+        let quorum_number = Token::Uint(U256::from(self.quorum_number));
+        let adversary_threshold_percentage =
+            Token::Uint(U256::from(self.adversary_threshold_percentage));
+        let confirmation_threshold_percentage =
+            Token::Uint(U256::from(self.confirmation_threshold_percentage));
+        let chunk_length = Token::Uint(U256::from(self.chunk_length));
+
+        vec![
+            quorum_number,
+            adversary_threshold_percentage,
+            confirmation_threshold_percentage,
+            chunk_length,
+        ]
+    }
+}
+
+#[derive(Debug)]
+pub struct BlobHeader {
+    pub commitment: G1Commitment,
+    pub data_length: u32,
+    pub blob_quorum_params: Vec<BlobQuorumParam>,
+}
+
+impl Decodable for BlobHeader {
+    fn decode(rlp: &Rlp) -> Result<Self, DecoderError> {
+        let commitment: G1Commitment = rlp.val_at(0)?;
+        let data_length: u32 = rlp.val_at(1)?;
+        let blob_quorum_params: Vec<BlobQuorumParam> = rlp.list_at(2)?;
+
+        Ok(BlobHeader {
+            commitment,
+            data_length,
+            blob_quorum_params,
+        })
+    }
+}
+
+impl Tokenize for BlobHeader {
+    fn into_tokens(self) -> Vec<Token> {
+        let commitment = self.commitment.into_tokens();
+        let data_length = Token::Uint(U256::from(self.data_length));
+        let blob_quorum_params = self
+            .blob_quorum_params
+            .into_iter()
+            .map(|quorum| Token::Tuple(quorum.into_tokens()))
+            .collect();
+
+        vec![
+            Token::Tuple(commitment),
+            data_length,
+            Token::Array(blob_quorum_params),
+        ]
+    }
+}
+
+#[derive(Debug)]
+pub struct BatchHeader {
+    pub batch_root: Vec<u8>,
+    pub quorum_numbers: Vec<u8>,
+    pub quorum_signed_percentages: Vec<u8>,
+    pub reference_block_number: u32,
+}
+
+impl Decodable for BatchHeader {
+    fn decode(rlp: &Rlp) -> Result<Self, DecoderError> {
+        Ok(BatchHeader {
+            batch_root: rlp.val_at(0)?,
+            quorum_numbers: rlp.val_at(1)?,
+            quorum_signed_percentages: rlp.val_at(2)?,
+            reference_block_number: rlp.val_at(3)?,
+        })
+    }
+}
+
+impl Tokenize for BatchHeader {
+    fn into_tokens(self) -> Vec<Token> {
+        let batch_root = Token::FixedBytes(self.batch_root);
+        let quorum_numbers = self.quorum_numbers.into_token();
+        let quorum_signed_percentages = self.quorum_signed_percentages.into_token();
+        let reference_block_number = Token::Uint(U256::from(self.reference_block_number));
+
+        vec![
+            batch_root,
+            quorum_numbers,
+            quorum_signed_percentages,
+            reference_block_number,
+        ]
+    }
+}
+
+#[derive(Debug)]
+pub struct BatchMetadata {
+    pub batch_header: BatchHeader,
+    pub signatory_record_hash: Vec<u8>,
+    pub fee: Vec<u8>,
+    pub confirmation_block_number: u32,
+    pub batch_header_hash: Vec<u8>,
+}
+
+impl Decodable for BatchMetadata {
+    fn decode(rlp: &Rlp) -> Result<Self, DecoderError> {
+        let batch_header: BatchHeader = rlp.val_at(0)?;
+
+        Ok(BatchMetadata {
+            batch_header,
+            signatory_record_hash: rlp.val_at(1)?,
+            fee: rlp.val_at(2)?,
+            confirmation_block_number: rlp.val_at(3)?,
+            batch_header_hash: rlp.val_at(4)?,
+        })
+    }
+}
+
+impl Tokenize for BatchMetadata {
+    fn into_tokens(self) -> Vec<Token> {
+        let batch_header = self.batch_header.into_tokens();
+        let signatory_record_hash = Token::FixedBytes(self.signatory_record_hash);
+        let confirmation_block_number = Token::Uint(U256::from(self.confirmation_block_number));
+
+        vec![
+            Token::Tuple(batch_header),
+            signatory_record_hash,
+            confirmation_block_number,
+        ]
+    }
+}
+
+#[derive(Debug)]
+pub struct BlobVerificationProof {
+    pub batch_id: u32,
+    pub blob_index: u32,
+    pub batch_medatada: BatchMetadata,
+    pub inclusion_proof: Vec<u8>,
+    pub quorum_indexes: Vec<u8>,
+}
+
+impl Decodable for BlobVerificationProof {
+    fn decode(rlp: &Rlp) -> Result<Self, DecoderError> {
+        Ok(BlobVerificationProof {
+            batch_id: rlp.val_at(0)?,
+            blob_index: rlp.val_at(1)?,
+            batch_medatada: rlp.val_at(2)?,
+            inclusion_proof: rlp.val_at(3)?,
+            quorum_indexes: rlp.val_at(4)?,
+        })
+    }
+}
+
+impl Tokenize for BlobVerificationProof {
+    fn into_tokens(self) -> Vec<Token> {
+        let batch_id = Token::Uint(U256::from(self.batch_id));
+        let blob_index = Token::Uint(U256::from(self.blob_index));
+        let batch_medatada = self.batch_medatada.into_tokens();
+        let inclusion_proof = self.inclusion_proof.into_token();
+        let quorum_indexes = self.quorum_indexes.into_token();
+
+        vec![
+            batch_id,
+            blob_index,
+            Token::Tuple(batch_medatada),
+            inclusion_proof,
+            quorum_indexes,
+        ]
+    }
+}
+
+#[derive(Debug)]
+pub struct BlobInfo {
+    pub blob_header: BlobHeader,
+    pub blob_verification_proof: BlobVerificationProof,
+}
+
+impl Decodable for BlobInfo {
+    fn decode(rlp: &Rlp) -> Result<Self, DecoderError> {
+        let blob_header: BlobHeader = rlp.val_at(0)?;
+        let blob_verification_proof: BlobVerificationProof = rlp.val_at(1)?;
+
+        Ok(BlobInfo {
+            blob_header,
+            blob_verification_proof,
+        })
+    }
+}
+
+impl Tokenize for BlobInfo {
+    fn into_tokens(self) -> Vec<Token> {
+        let blob_header = self.blob_header.into_tokens();
+        let blob_verification_proof = self.blob_verification_proof.into_tokens();
+
+        vec![Token::Tuple(vec![
+            Token::Tuple(blob_header),
+            Token::Tuple(blob_verification_proof),
+        ])]
+    }
+}
diff --git a/core/node/da_clients/src/eigen_da.rs b/core/node/da_clients/src/eigen_da.rs
index f2eff70faa3..ee58159cd2e 100644
--- a/core/node/da_clients/src/eigen_da.rs
+++ b/core/node/da_clients/src/eigen_da.rs
@@ -1,28 +1,66 @@
 use std::fmt::Debug;
 
 use async_trait::async_trait;
+use rlp::decode;
 use zksync_config::configs::da_client::eigen_da::EigenDAConfig;
 use zksync_da_client::{
     types::{self, DAError, InclusionData},
     DataAvailabilityClient,
 };
+use zksync_eth_client::{
+    clients::{DynClient, L1},
+    CallFunctionArgs, ContractCallError, EthInterface,
+};
+use zksync_types::{blob, Address, U256};
+
+use crate::blob_info::BlobInfo;
 
 #[derive(Clone, Debug)]
 pub struct EigenDAClient {
     client: reqwest::Client,
     config: EigenDAConfig,
+    eth_client: Box<DynClient<L1>>,
+    verifier_address: Address,
 }
 
 impl EigenDAClient {
     pub const BLOB_SIZE_LIMIT_IN_BYTES: usize = 2 * 1024 * 1024; // 2MB
 
-    pub async fn new(config: EigenDAConfig) -> anyhow::Result<Self> {
+    pub async fn new(
+        config: EigenDAConfig,
+        eth_client: Box<DynClient<L1>>,
+        verifier_address: Address,
+    ) -> anyhow::Result<Self> {
         Ok(Self {
             client: reqwest::Client::new(),
             config,
+            eth_client,
+            verifier_address,
         })
     }
 }
+impl EigenDAClient {
+    pub async fn verify_blob(&self, commitment: String) -> Result<bool, DAError> {
+        let data = &hex::decode(commitment).unwrap()[3..];
+
+        let blob_info: BlobInfo = decode(&data).map_err(|e| DAError {
+            error: e.into(),
+            is_retriable: true,
+        })?;
+
+        CallFunctionArgs::new("verifyBlob", blob_info)
+            .for_contract(
+                self.verifier_address,
+                &zksync_contracts::eigenda_verifier_contract(),
+            )
+            .call(&self.eth_client)
+            .await
+            .map_err(|e| DAError {
+                error: e.into(),
+                is_retriable: true,
+            })
+    }
+}
 
 #[async_trait]
 impl DataAvailabilityClient for EigenDAClient {
@@ -45,6 +83,9 @@ impl DataAvailabilityClient for EigenDAClient {
             .await
             .map_err(to_non_retriable_da_error)?
             .to_vec();
+
+        //self.verify_blob(hex::encode(request_id.clone())).await?;
+
         Ok(types::DispatchResponse {
             blob_id: hex::encode(request_id),
         })
diff --git a/core/node/da_clients/src/lib.rs b/core/node/da_clients/src/lib.rs
index 6b2622c64e2..e4cf987d257 100644
--- a/core/node/da_clients/src/lib.rs
+++ b/core/node/da_clients/src/lib.rs
@@ -1,4 +1,5 @@
 pub mod avail;
+pub mod blob_info;
 pub mod eigen_da;
 pub mod no_da;
 pub mod object_store;
diff --git a/core/node/eth_sender/src/eth_tx_aggregator.rs b/core/node/eth_sender/src/eth_tx_aggregator.rs
index 6e9e71d74ea..a08d16f456a 100644
--- a/core/node/eth_sender/src/eth_tx_aggregator.rs
+++ b/core/node/eth_sender/src/eth_tx_aggregator.rs
@@ -144,19 +144,19 @@ impl EthTxAggregator {
     }
 
     pub(super) async fn get_multicall_data(&mut self) -> Result<MulticallData, EthSenderError> {
-        let calldata = self.generate_calldata_for_multicall();
+        let (calldata, evm_emulator_hash_requested) = self.generate_calldata_for_multicall();
         let args = CallFunctionArgs::new(&self.functions.aggregate3.name, calldata).for_contract(
             self.l1_multicall3_address,
             &self.functions.multicall_contract,
         );
         let aggregate3_result: Token = args.call((*self.eth_client).as_ref()).await?;
-        self.parse_multicall_data(aggregate3_result)
+        self.parse_multicall_data(aggregate3_result, evm_emulator_hash_requested)
     }
 
     // Multicall's aggregate function accepts 1 argument - arrays of different contract calls.
     // The role of the method below is to tokenize input for multicall, which is actually a vector of tokens.
     // Each token describes a specific contract call.
-    pub(super) fn generate_calldata_for_multicall(&self) -> Vec<Token> {
+    pub(super) fn generate_calldata_for_multicall(&self) -> (Vec<Token>, bool) {
         const ALLOW_FAILURE: bool = false;
 
         // First zksync contract call
@@ -215,14 +215,31 @@ impl EthTxAggregator {
             calldata: get_protocol_version_input,
         };
 
-        // Convert structs into tokens and return vector with them
-        vec![
+        let mut token_vec = vec![
             get_bootloader_hash_call.into_token(),
             get_default_aa_hash_call.into_token(),
             get_verifier_params_call.into_token(),
             get_verifier_call.into_token(),
             get_protocol_version_call.into_token(),
-        ]
+        ];
+
+        let mut evm_emulator_hash_requested = false;
+        let get_l2_evm_emulator_hash_input = self
+            .functions
+            .get_evm_emulator_bytecode_hash
+            .as_ref()
+            .and_then(|f| f.encode_input(&[]).ok());
+        if let Some(input) = get_l2_evm_emulator_hash_input {
+            let call = Multicall3Call {
+                target: self.state_transition_chain_contract,
+                allow_failure: ALLOW_FAILURE,
+                calldata: input,
+            };
+            token_vec.insert(2, call.into_token());
+            evm_emulator_hash_requested = true;
+        }
+
+        (token_vec, evm_emulator_hash_requested)
     }
 
     // The role of the method below is to de-tokenize multicall call's result, which is actually a token.
@@ -230,6 +247,7 @@ impl EthTxAggregator {
     pub(super) fn parse_multicall_data(
         &self,
         token: Token,
+        evm_emulator_hash_requested: bool,
     ) -> Result<MulticallData, EthSenderError> {
         let parse_error = |tokens: &[Token]| {
             Err(EthSenderError::Parse(Web3ContractError::InvalidOutputType(
@@ -238,8 +256,9 @@ impl EthTxAggregator {
         };
 
         if let Token::Array(call_results) = token {
-            // 5 calls are aggregated in multicall
-            if call_results.len() != 5 {
+            let number_of_calls = if evm_emulator_hash_requested { 6 } else { 5 };
+            // 5 or 6 calls are aggregated in multicall
+            if call_results.len() != number_of_calls {
                 return parse_error(&call_results);
             }
             let mut call_results_iterator = call_results.into_iter();
@@ -268,12 +287,31 @@ impl EthTxAggregator {
                 )));
             }
             let default_aa = H256::from_slice(&multicall3_default_aa);
+
+            let evm_emulator = if evm_emulator_hash_requested {
+                let multicall3_evm_emulator =
+                    Multicall3Result::from_token(call_results_iterator.next().unwrap())?
+                        .return_data;
+                if multicall3_evm_emulator.len() != 32 {
+                    return Err(EthSenderError::Parse(Web3ContractError::InvalidOutputType(
+                        format!(
+                            "multicall3 EVM emulator hash data is not of the len of 32: {:?}",
+                            multicall3_evm_emulator
+                        ),
+                    )));
+                }
+                Some(H256::from_slice(&multicall3_evm_emulator))
+            } else {
+                None
+            };
+
             let base_system_contracts_hashes = BaseSystemContractsHashes {
                 bootloader,
                 default_aa,
+                evm_emulator,
             };
 
-            call_results_iterator.next().unwrap();
+            call_results_iterator.next().unwrap(); // FIXME: why is this value requested?
 
             let multicall3_verifier_address =
                 Multicall3Result::from_token(call_results_iterator.next().unwrap())?.return_data;
diff --git a/core/node/eth_sender/src/tester.rs b/core/node/eth_sender/src/tester.rs
index 9be1384daae..86a8c477f9f 100644
--- a/core/node/eth_sender/src/tester.rs
+++ b/core/node/eth_sender/src/tester.rs
@@ -23,6 +23,8 @@ use crate::{
     Aggregator, EthTxAggregator, EthTxManager,
 };
 
+pub(super) const STATE_TRANSITION_CONTRACT_ADDRESS: Address = Address::repeat_byte(0xa0);
+
 // Alias to conveniently call static methods of `ETHSender`.
 type MockEthTxManager = EthTxManager;
 
@@ -172,7 +174,7 @@ impl EthSenderTester {
             .with_non_ordering_confirmation(non_ordering_confirmations)
             .with_call_handler(move |call, _| {
                 assert_eq!(call.to, Some(contracts_config.l1_multicall3_addr));
-                crate::tests::mock_multicall_response()
+                crate::tests::mock_multicall_response(call)
             })
             .build();
         gateway.advance_block_number(Self::WAIT_CONFIRMATIONS);
@@ -192,7 +194,7 @@ impl EthSenderTester {
             .with_non_ordering_confirmation(non_ordering_confirmations)
             .with_call_handler(move |call, _| {
                 assert_eq!(call.to, Some(contracts_config.l1_multicall3_addr));
-                crate::tests::mock_multicall_response()
+                crate::tests::mock_multicall_response(call)
             })
             .build();
         l2_gateway.advance_block_number(Self::WAIT_CONFIRMATIONS);
@@ -212,7 +214,7 @@ impl EthSenderTester {
             .with_non_ordering_confirmation(non_ordering_confirmations)
             .with_call_handler(move |call, _| {
                 assert_eq!(call.to, Some(contracts_config.l1_multicall3_addr));
-                crate::tests::mock_multicall_response()
+                crate::tests::mock_multicall_response(call)
             })
             .build();
         gateway_blobs.advance_block_number(Self::WAIT_CONFIRMATIONS);
@@ -261,7 +263,7 @@ impl EthSenderTester {
             // ZKsync contract address
             Address::random(),
             contracts_config.l1_multicall3_addr,
-            Address::random(),
+            STATE_TRANSITION_CONTRACT_ADDRESS,
             Default::default(),
             custom_commit_sender_addr,
             SettlementMode::SettlesToL1,
diff --git a/core/node/eth_sender/src/tests.rs b/core/node/eth_sender/src/tests.rs
index 148022bc774..46b9682838f 100644
--- a/core/node/eth_sender/src/tests.rs
+++ b/core/node/eth_sender/src/tests.rs
@@ -1,7 +1,9 @@
 use assert_matches::assert_matches;
 use test_casing::{test_casing, Product};
 use zksync_dal::{ConnectionPool, Core, CoreDal};
-use zksync_l1_contract_interface::i_executor::methods::ExecuteBatches;
+use zksync_l1_contract_interface::{
+    i_executor::methods::ExecuteBatches, multicall3::Multicall3Call, Tokenizable,
+};
 use zksync_node_test_utils::create_l1_batch;
 use zksync_types::{
     aggregated_operations::AggregatedActionType,
@@ -9,16 +11,19 @@ use zksync_types::{
     commitment::{
         L1BatchCommitmentMode, L1BatchMetaParameters, L1BatchMetadata, L1BatchWithMetadata,
     },
+    ethabi,
     ethabi::Token,
     helpers::unix_timestamp_ms,
+    web3,
     web3::contract::Error,
-    ProtocolVersionId, H256,
+    Address, ProtocolVersionId, H256,
 };
 
 use crate::{
     abstract_l1_interface::OperatorType,
     aggregated_operations::AggregatedOperation,
-    tester::{EthSenderTester, TestL1Batch},
+    tester::{EthSenderTester, TestL1Batch, STATE_TRANSITION_CONTRACT_ADDRESS},
+    zksync_functions::ZkSyncFunctions,
     EthSenderError,
 };
 
@@ -37,21 +42,59 @@ const COMMITMENT_MODES: [L1BatchCommitmentMode; 2] = [
     L1BatchCommitmentMode::Validium,
 ];
 
-pub(crate) fn mock_multicall_response() -> Token {
-    Token::Array(vec![
-        Token::Tuple(vec![Token::Bool(true), Token::Bytes(vec![1u8; 32])]),
-        Token::Tuple(vec![Token::Bool(true), Token::Bytes(vec![2u8; 32])]),
-        Token::Tuple(vec![Token::Bool(true), Token::Bytes(vec![3u8; 96])]),
-        Token::Tuple(vec![Token::Bool(true), Token::Bytes(vec![4u8; 32])]),
-        Token::Tuple(vec![
-            Token::Bool(true),
-            Token::Bytes(
+pub(crate) fn mock_multicall_response(call: &web3::CallRequest) -> Token {
+    let functions = ZkSyncFunctions::default();
+    let evm_emulator_getter_signature = functions
+        .get_evm_emulator_bytecode_hash
+        .as_ref()
+        .map(ethabi::Function::short_signature);
+    let bootloader_signature = functions.get_l2_bootloader_bytecode_hash.short_signature();
+    let default_aa_signature = functions
+        .get_l2_default_account_bytecode_hash
+        .short_signature();
+    let evm_emulator_getter_signature = evm_emulator_getter_signature.as_ref().map(|sig| &sig[..]);
+
+    let calldata = &call.data.as_ref().expect("no calldata").0;
+    assert_eq!(calldata[..4], functions.aggregate3.short_signature());
+    let mut tokens = functions
+        .aggregate3
+        .decode_input(&calldata[4..])
+        .expect("invalid multicall");
+    assert_eq!(tokens.len(), 1);
+    let Token::Array(tokens) = tokens.pop().unwrap() else {
+        panic!("Unexpected input: {tokens:?}");
+    };
+
+    let calls = tokens.into_iter().map(Multicall3Call::from_token);
+    let response = calls.map(|call| {
+        let call = call.unwrap();
+        assert_eq!(call.target, STATE_TRANSITION_CONTRACT_ADDRESS);
+        let output = match &call.calldata[..4] {
+            selector if selector == bootloader_signature => {
+                vec![1u8; 32]
+            }
+            selector if selector == default_aa_signature => {
+                vec![2u8; 32]
+            }
+            selector if Some(selector) == evm_emulator_getter_signature => {
+                vec![3u8; 32]
+            }
+            selector if selector == functions.get_verifier_params.short_signature() => {
+                vec![4u8; 96]
+            }
+            selector if selector == functions.get_verifier.short_signature() => {
+                vec![5u8; 32]
+            }
+            selector if selector == functions.get_protocol_version.short_signature() => {
                 H256::from_low_u64_be(ProtocolVersionId::default() as u64)
                     .0
-                    .to_vec(),
-            ),
-        ]),
-    ])
+                    .to_vec()
+            }
+            _ => panic!("unexpected call: {call:?}"),
+        };
+        Token::Tuple(vec![Token::Bool(true), Token::Bytes(output)])
+    });
+    Token::Array(response.collect())
 }
 
 pub(crate) fn l1_batch_with_metadata(header: L1BatchHeader) -> L1BatchWithMetadata {
@@ -74,6 +117,7 @@ pub(crate) fn default_l1_batch_metadata() -> L1BatchMetadata {
             zkporter_is_available: false,
             bootloader_code_hash: H256::default(),
             default_aa_code_hash: H256::default(),
+            evm_emulator_code_hash: None,
             protocol_version: Some(ProtocolVersionId::default()),
         },
         aux_data_hash: H256::default(),
@@ -657,22 +701,71 @@ async fn skipped_l1_batch_in_the_middle(
     Ok(())
 }
 
-#[test_casing(2, COMMITMENT_MODES)]
+#[test_casing(2, [false, true])]
 #[test_log::test(tokio::test)]
-async fn test_parse_multicall_data(commitment_mode: L1BatchCommitmentMode) {
+async fn parsing_multicall_data(with_evm_emulator: bool) {
     let tester = EthSenderTester::new(
         ConnectionPool::<Core>::test_pool().await,
         vec![100; 100],
         false,
         true,
-        commitment_mode,
+        L1BatchCommitmentMode::Rollup,
     )
     .await;
 
-    assert!(tester
+    let mut mock_response = vec![
+        Token::Tuple(vec![Token::Bool(true), Token::Bytes(vec![1u8; 32])]),
+        Token::Tuple(vec![Token::Bool(true), Token::Bytes(vec![2u8; 32])]),
+        Token::Tuple(vec![Token::Bool(true), Token::Bytes(vec![4u8; 96])]),
+        Token::Tuple(vec![Token::Bool(true), Token::Bytes(vec![5u8; 32])]),
+        Token::Tuple(vec![
+            Token::Bool(true),
+            Token::Bytes(
+                H256::from_low_u64_be(ProtocolVersionId::latest() as u64)
+                    .0
+                    .to_vec(),
+            ),
+        ]),
+    ];
+    if with_evm_emulator {
+        mock_response.insert(
+            2,
+            Token::Tuple(vec![Token::Bool(true), Token::Bytes(vec![3u8; 32])]),
+        );
+    }
+    let mock_response = Token::Array(mock_response);
+
+    let parsed = tester
         .aggregator
-        .parse_multicall_data(mock_multicall_response())
-        .is_ok());
+        .parse_multicall_data(mock_response, with_evm_emulator)
+        .unwrap();
+    assert_eq!(
+        parsed.base_system_contracts_hashes.bootloader,
+        H256::repeat_byte(1)
+    );
+    assert_eq!(
+        parsed.base_system_contracts_hashes.default_aa,
+        H256::repeat_byte(2)
+    );
+    let expected_evm_emulator_hash = with_evm_emulator.then(|| H256::repeat_byte(3));
+    assert_eq!(
+        parsed.base_system_contracts_hashes.evm_emulator,
+        expected_evm_emulator_hash
+    );
+    assert_eq!(parsed.verifier_address, Address::repeat_byte(5));
+    assert_eq!(parsed.protocol_version_id, ProtocolVersionId::latest());
+}
+
+#[test_log::test(tokio::test)]
+async fn parsing_multicall_data_errors() {
+    let tester = EthSenderTester::new(
+        ConnectionPool::<Core>::test_pool().await,
+        vec![100; 100],
+        false,
+        true,
+        L1BatchCommitmentMode::Rollup,
+    )
+    .await;
 
     let original_wrong_form_data = vec![
         // should contain 5 tuples
@@ -723,7 +816,7 @@ async fn test_parse_multicall_data(commitment_mode: L1BatchCommitmentMode) {
         assert_matches!(
             tester
                 .aggregator
-                .parse_multicall_data(wrong_data_instance.clone()),
+                .parse_multicall_data(wrong_data_instance.clone(), true),
             Err(EthSenderError::Parse(Error::InvalidOutputType(_)))
         );
     }
@@ -740,6 +833,17 @@ async fn get_multicall_data(commitment_mode: L1BatchCommitmentMode) {
         commitment_mode,
     )
     .await;
-    let multicall_data = tester.aggregator.get_multicall_data().await;
-    assert!(multicall_data.is_ok());
+
+    let data = tester.aggregator.get_multicall_data().await.unwrap();
+    assert_eq!(
+        data.base_system_contracts_hashes.bootloader,
+        H256::repeat_byte(1)
+    );
+    assert_eq!(
+        data.base_system_contracts_hashes.default_aa,
+        H256::repeat_byte(2)
+    );
+    assert_eq!(data.base_system_contracts_hashes.evm_emulator, None);
+    assert_eq!(data.verifier_address, Address::repeat_byte(5));
+    assert_eq!(data.protocol_version_id, ProtocolVersionId::latest());
 }
diff --git a/core/node/eth_sender/src/zksync_functions.rs b/core/node/eth_sender/src/zksync_functions.rs
index 8f13f0e63ae..85508c71c03 100644
--- a/core/node/eth_sender/src/zksync_functions.rs
+++ b/core/node/eth_sender/src/zksync_functions.rs
@@ -12,6 +12,7 @@ pub(super) struct ZkSyncFunctions {
     pub(super) get_l2_bootloader_bytecode_hash: Function,
     pub(super) get_l2_default_account_bytecode_hash: Function,
     pub(super) get_verifier: Function,
+    pub(super) get_evm_emulator_bytecode_hash: Option<Function>,
     pub(super) get_verifier_params: Function,
     pub(super) get_protocol_version: Function,
 
@@ -59,6 +60,8 @@ impl Default for ZkSyncFunctions {
             get_function(&zksync_contract, "getL2BootloaderBytecodeHash");
         let get_l2_default_account_bytecode_hash =
             get_function(&zksync_contract, "getL2DefaultAccountBytecodeHash");
+        let get_evm_emulator_bytecode_hash =
+            get_optional_function(&zksync_contract, "getL2EvmSimulatorBytecodeHash");
         let get_verifier = get_function(&zksync_contract, "getVerifier");
         let get_verifier_params = get_function(&zksync_contract, "getVerifierParams");
         let get_protocol_version = get_function(&zksync_contract, "getProtocolVersion");
@@ -74,6 +77,7 @@ impl Default for ZkSyncFunctions {
             post_shared_bridge_execute,
             get_l2_bootloader_bytecode_hash,
             get_l2_default_account_bytecode_hash,
+            get_evm_emulator_bytecode_hash,
             get_verifier,
             get_verifier_params,
             get_protocol_version,
diff --git a/core/node/eth_watch/src/tests.rs b/core/node/eth_watch/src/tests.rs
index feb9eff35b5..d9faf7b664e 100644
--- a/core/node/eth_watch/src/tests.rs
+++ b/core/node/eth_watch/src/tests.rs
@@ -245,8 +245,11 @@ fn build_l1_tx(serial_id: u64, eth_block: u64) -> L1Tx {
         received_timestamp_ms: 0,
     };
     // Convert to abi::Transaction and back, so that canonical_tx_hash is computed.
-    let tx =
-        Transaction::try_from(abi::Transaction::try_from(Transaction::from(tx)).unwrap()).unwrap();
+    let tx = Transaction::from_abi(
+        abi::Transaction::try_from(Transaction::from(tx)).unwrap(),
+        false,
+    )
+    .unwrap();
     tx.try_into().unwrap()
 }
 
@@ -272,10 +275,13 @@ fn build_upgrade_tx(id: ProtocolVersionId, eth_block: u64) -> ProtocolUpgradeTx
         received_timestamp_ms: 0,
     };
     // Convert to abi::Transaction and back, so that canonical_tx_hash is computed.
-    Transaction::try_from(abi::Transaction::try_from(Transaction::from(tx)).unwrap())
-        .unwrap()
-        .try_into()
-        .unwrap()
+    Transaction::from_abi(
+        abi::Transaction::try_from(Transaction::from(tx)).unwrap(),
+        false,
+    )
+    .unwrap()
+    .try_into()
+    .unwrap()
 }
 
 async fn create_test_watcher(
diff --git a/core/node/genesis/src/lib.rs b/core/node/genesis/src/lib.rs
index 1f30d314bb0..5c17add2e98 100644
--- a/core/node/genesis/src/lib.rs
+++ b/core/node/genesis/src/lib.rs
@@ -104,6 +104,7 @@ impl GenesisParams {
             default_aa: config
                 .default_aa_hash
                 .ok_or(GenesisError::MalformedConfig("default_aa_hash"))?,
+            evm_emulator: config.evm_emulator_hash,
         };
         if base_system_contracts_hashes != base_system_contracts.hashes() {
             return Err(GenesisError::BaseSystemContractsHashes(Box::new(
@@ -124,15 +125,18 @@ impl GenesisParams {
     }
 
     pub fn load_genesis_params(config: GenesisConfig) -> Result<GenesisParams, GenesisError> {
-        let base_system_contracts = BaseSystemContracts::load_from_disk();
-        let system_contracts = get_system_smart_contracts();
+        let mut base_system_contracts = BaseSystemContracts::load_from_disk();
+        if config.evm_emulator_hash.is_some() {
+            base_system_contracts = base_system_contracts.with_latest_evm_emulator();
+        }
+        let system_contracts = get_system_smart_contracts(config.evm_emulator_hash.is_some());
         Self::from_genesis_config(config, base_system_contracts, system_contracts)
     }
 
     pub fn mock() -> Self {
         Self {
             base_system_contracts: BaseSystemContracts::load_from_disk(),
-            system_contracts: get_system_smart_contracts(),
+            system_contracts: get_system_smart_contracts(false),
             config: mock_genesis_config(),
         }
     }
@@ -172,6 +176,7 @@ pub fn mock_genesis_config() -> GenesisConfig {
         genesis_commitment: Some(H256::default()),
         bootloader_hash: Some(base_system_contracts_hashes.bootloader),
         default_aa_hash: Some(base_system_contracts_hashes.default_aa),
+        evm_emulator_hash: base_system_contracts_hashes.evm_emulator,
         l1_chain_id: L1ChainId(9),
         sl_chain_id: None,
         l2_chain_id: L2ChainId::default(),
@@ -235,6 +240,7 @@ pub async fn insert_genesis_batch(
             .config
             .default_aa_hash
             .ok_or(GenesisError::MalformedConfig("default_aa_hash"))?,
+        evm_emulator: genesis_params.config.evm_emulator_hash,
     };
     let commitment_input = CommitmentInput::for_genesis_batch(
         genesis_root_hash,
diff --git a/core/node/genesis/src/utils.rs b/core/node/genesis/src/utils.rs
index a6c9513dbde..6042513537c 100644
--- a/core/node/genesis/src/utils.rs
+++ b/core/node/genesis/src/utils.rs
@@ -130,7 +130,8 @@ pub(super) async fn insert_base_system_contracts_to_factory_deps(
     contracts: &BaseSystemContracts,
 ) -> Result<(), GenesisError> {
     let factory_deps = [&contracts.bootloader, &contracts.default_aa]
-        .iter()
+        .into_iter()
+        .chain(contracts.evm_emulator.as_ref())
         .map(|c| (c.hash, be_words_to_bytes(&c.code)))
         .collect();
 
diff --git a/core/node/node_framework/src/implementations/layers/da_clients/eigen_da.rs b/core/node/node_framework/src/implementations/layers/da_clients/eigen_da.rs
index b7c1025309c..1365e06f66e 100644
--- a/core/node/node_framework/src/implementations/layers/da_clients/eigen_da.rs
+++ b/core/node/node_framework/src/implementations/layers/da_clients/eigen_da.rs
@@ -1,9 +1,13 @@
 use zksync_config::configs::da_client::eigen_da::EigenDAConfig;
 use zksync_da_client::DataAvailabilityClient;
 use zksync_da_clients::eigen_da::EigenDAClient;
+use zksync_node_framework_derive::FromContext;
+use zksync_types::Address;
 
 use crate::{
-    implementations::resources::da_client::DAClientResource,
+    implementations::resources::{
+        da_client::DAClientResource, eth_interface::EthInterfaceResource,
+    },
     wiring_layer::{WiringError, WiringLayer},
     IntoContext,
 };
@@ -11,11 +15,15 @@ use crate::{
 #[derive(Debug, Default)]
 pub struct EigenDAWiringLayer {
     config: EigenDAConfig,
+    verifier_address: Address,
 }
 
 impl EigenDAWiringLayer {
-    pub fn new(config: EigenDAConfig) -> Self {
-        Self { config }
+    pub fn new(config: EigenDAConfig, verifier_address: Address) -> Self {
+        Self {
+            config,
+            verifier_address,
+        }
     }
 }
 
@@ -25,18 +33,25 @@ pub struct Output {
     pub client: DAClientResource,
 }
 
+#[derive(Debug, FromContext)]
+#[context(crate = crate)]
+pub struct Input {
+    pub eth_client: EthInterfaceResource,
+}
+
 #[async_trait::async_trait]
 impl WiringLayer for EigenDAWiringLayer {
-    type Input = ();
+    type Input = Input;
     type Output = Output;
 
     fn layer_name(&self) -> &'static str {
         "eigen_da_client_layer"
     }
 
-    async fn wire(self, _: Self::Input) -> Result<Self::Output, WiringError> {
+    async fn wire(self, input: Self::Input) -> Result<Self::Output, WiringError> {
+        let EthInterfaceResource(query_client) = input.eth_client;
         let client: Box<dyn DataAvailabilityClient> =
-            Box::new(EigenDAClient::new(self.config).await?);
+            Box::new(EigenDAClient::new(self.config, query_client, self.verifier_address).await?);
 
         Ok(Self::Output {
             client: DAClientResource(client),
diff --git a/core/node/node_sync/src/external_io.rs b/core/node/node_sync/src/external_io.rs
index 6075ff048bf..7687595740a 100644
--- a/core/node/node_sync/src/external_io.rs
+++ b/core/node/node_sync/src/external_io.rs
@@ -345,6 +345,7 @@ impl StateKeeperIO for ExternalIO {
         let default_account_code_hash = protocol_version
             .default_account_code_hash()
             .context("Missing default account code hash")?;
+        let evm_emulator_code_hash = protocol_version.evm_emulator_code_hash();
         let l2_system_upgrade_tx_hash = protocol_version.l2_system_upgrade_tx_hash();
         self.pool
             .connection_tagged("sync_layer")
@@ -362,6 +363,7 @@ impl StateKeeperIO for ExternalIO {
                 BaseSystemContractsHashes {
                     bootloader: bootloader_code_hash,
                     default_aa: default_account_code_hash,
+                    evm_emulator: evm_emulator_code_hash,
                 },
                 l2_system_upgrade_tx_hash,
             )
@@ -375,9 +377,22 @@ impl StateKeeperIO for ExternalIO {
             .get_base_system_contract(default_account_code_hash, cursor.next_l2_block)
             .await
             .with_context(|| format!("cannot fetch default AA code for {protocol_version:?}"))?;
+        let evm_emulator = if let Some(hash) = evm_emulator_code_hash {
+            Some(
+                self.get_base_system_contract(hash, cursor.next_l2_block)
+                    .await
+                    .with_context(|| {
+                        format!("cannot fetch EVM emulator code for {protocol_version:?}")
+                    })?,
+            )
+        } else {
+            None
+        };
+
         Ok(BaseSystemContracts {
             bootloader,
             default_aa,
+            evm_emulator,
         })
     }
 
diff --git a/core/node/node_sync/src/genesis.rs b/core/node/node_sync/src/genesis.rs
index ccc26b417e9..0ff8d0d448c 100644
--- a/core/node/node_sync/src/genesis.rs
+++ b/core/node/node_sync/src/genesis.rs
@@ -38,6 +38,7 @@ async fn create_genesis_params(
     let base_system_contracts_hashes = BaseSystemContractsHashes {
         bootloader: config.bootloader_hash.context("Genesis is not finished")?,
         default_aa: config.default_aa_hash.context("Genesis is not finished")?,
+        evm_emulator: config.evm_emulator_hash,
     };
 
     if zksync_chain_id != config.l2_chain_id {
@@ -47,10 +48,11 @@ async fn create_genesis_params(
     // Load the list of addresses that are known to contain system contracts at any point in time.
     // Not every of these addresses is guaranteed to be present in the genesis state, but we'll iterate through
     // them and try to fetch the contract bytecode for each of them.
-    let system_contract_addresses: Vec<_> = get_system_smart_contracts()
-        .into_iter()
-        .map(|contract| *contract.account_id.address())
-        .collect();
+    let system_contract_addresses: Vec<_> =
+        get_system_smart_contracts(config.evm_emulator_hash.is_some())
+            .into_iter()
+            .map(|contract| *contract.account_id.address())
+            .collect();
 
     // These have to be *initial* base contract hashes of main node
     // (those that were used during genesis), not necessarily the current ones.
@@ -103,6 +105,18 @@ async fn fetch_base_system_contracts(
         .fetch_system_contract_by_hash(contract_hashes.default_aa)
         .await?
         .context("default AA bytecode is missing on main node")?;
+    let evm_emulator = if let Some(hash) = contract_hashes.evm_emulator {
+        let bytes = client
+            .fetch_system_contract_by_hash(hash)
+            .await?
+            .context("EVM Simulator bytecode is missing on main node")?;
+        Some(SystemContractCode {
+            code: zksync_utils::bytes_to_be_words(bytes),
+            hash,
+        })
+    } else {
+        None
+    };
     Ok(BaseSystemContracts {
         bootloader: SystemContractCode {
             code: zksync_utils::bytes_to_be_words(bootloader_bytecode),
@@ -112,5 +126,6 @@ async fn fetch_base_system_contracts(
             code: zksync_utils::bytes_to_be_words(default_aa_bytecode),
             hash: contract_hashes.default_aa,
         },
+        evm_emulator,
     })
 }
diff --git a/core/node/node_sync/src/tests.rs b/core/node/node_sync/src/tests.rs
index d9a98c2bce3..3f5791cdf24 100644
--- a/core/node/node_sync/src/tests.rs
+++ b/core/node/node_sync/src/tests.rs
@@ -304,6 +304,7 @@ async fn external_io_works_without_local_protocol_version(snapshot_recovery: boo
         timestamp: snapshot.l2_block_timestamp + 1,
         bootloader_code_hash: Some(H256::repeat_byte(1)),
         default_account_code_hash: Some(H256::repeat_byte(1)),
+        evm_emulator_code_hash: Some(H256::repeat_byte(1)),
         ..api::ProtocolVersion::default()
     };
     client.insert_protocol_version(next_protocol_version.clone());
@@ -345,6 +346,13 @@ async fn external_io_works_without_local_protocol_version(snapshot_recovery: boo
         next_protocol_version.default_account_code_hash.unwrap()
     );
 
+    assert_eq!(
+        persisted_protocol_version
+            .base_system_contracts_hashes
+            .evm_emulator,
+        next_protocol_version.evm_emulator_code_hash
+    );
+
     let l2_block = storage
         .blocks_dal()
         .get_l2_block_header(snapshot.l2_block_number + 1)
diff --git a/core/node/proof_data_handler/src/tests.rs b/core/node/proof_data_handler/src/tests.rs
index 86cc5323448..8220aef5da0 100644
--- a/core/node/proof_data_handler/src/tests.rs
+++ b/core/node/proof_data_handler/src/tests.rs
@@ -62,6 +62,7 @@ async fn request_tee_proof_inputs() {
                     code: vec![U256([1; 4])],
                     hash: H256([1; 32]),
                 },
+                evm_emulator: None,
             },
             bootloader_gas_limit: 0,
             execution_mode: TxExecutionMode::VerifyExecute,
diff --git a/core/node/state_keeper/src/executor/mod.rs b/core/node/state_keeper/src/executor/mod.rs
index 2fa5c3b9c12..903dae2f1ca 100644
--- a/core/node/state_keeper/src/executor/mod.rs
+++ b/core/node/state_keeper/src/executor/mod.rs
@@ -40,7 +40,7 @@ impl TxExecutionResult {
             _ => Self::Success {
                 tx_metrics: Box::new(ExecutionMetricsForCriteria::new(Some(tx), &res.tx_result)),
                 gas_remaining: res.tx_result.statistics.gas_remaining,
-                tx_result: res.tx_result,
+                tx_result: res.tx_result.clone(),
                 compressed_bytecodes: res.compressed_bytecodes,
                 call_tracer_result: res.call_traces,
             },
diff --git a/core/node/state_keeper/src/executor/tests/tester.rs b/core/node/state_keeper/src/executor/tests/tester.rs
index 7a1871dbfea..79072f23aed 100644
--- a/core/node/state_keeper/src/executor/tests/tester.rs
+++ b/core/node/state_keeper/src/executor/tests/tester.rs
@@ -259,7 +259,7 @@ impl Tester {
                     patch: 0.into(),
                 },
                 &BASE_SYSTEM_CONTRACTS,
-                &get_system_smart_contracts(),
+                &get_system_smart_contracts(false),
                 Default::default(),
             )
             .await
diff --git a/core/node/state_keeper/src/io/persistence.rs b/core/node/state_keeper/src/io/persistence.rs
index 24b1ffca631..97340d6496a 100644
--- a/core/node/state_keeper/src/io/persistence.rs
+++ b/core/node/state_keeper/src/io/persistence.rs
@@ -347,7 +347,7 @@ impl StateKeeperOutputHandler for TreeWritesPersistence {
 
 #[cfg(test)]
 mod tests {
-    use std::collections::HashSet;
+    use std::collections::{HashMap, HashSet};
 
     use assert_matches::assert_matches;
     use futures::FutureExt;
@@ -462,6 +462,7 @@ mod tests {
             tx,
             tx_result,
             vec![],
+            HashMap::new(),
             BlockGasCount::default(),
             VmExecutionMetrics::default(),
             vec![],
diff --git a/core/node/state_keeper/src/io/tests/mod.rs b/core/node/state_keeper/src/io/tests/mod.rs
index 7ea01e6af1e..e2a90f30691 100644
--- a/core/node/state_keeper/src/io/tests/mod.rs
+++ b/core/node/state_keeper/src/io/tests/mod.rs
@@ -1,4 +1,4 @@
-use std::time::Duration;
+use std::{collections::HashMap, time::Duration};
 
 use test_casing::test_casing;
 use zksync_contracts::BaseSystemContractsHashes;
@@ -249,6 +249,7 @@ async fn processing_storage_logs_when_sealing_l2_block() {
         BlockGasCount::default(),
         VmExecutionMetrics::default(),
         vec![],
+        HashMap::new(),
         vec![],
     );
 
@@ -267,6 +268,7 @@ async fn processing_storage_logs_when_sealing_l2_block() {
         BlockGasCount::default(),
         VmExecutionMetrics::default(),
         vec![],
+        HashMap::new(),
         vec![],
     );
 
@@ -356,6 +358,7 @@ async fn processing_events_when_sealing_l2_block() {
             BlockGasCount::default(),
             VmExecutionMetrics::default(),
             vec![],
+            HashMap::new(),
             vec![],
         );
     }
@@ -457,6 +460,7 @@ async fn l2_block_processing_after_snapshot_recovery(commitment_mode: L1BatchCom
         tx.into(),
         create_execution_result([]),
         vec![],
+        HashMap::new(),
         BlockGasCount::default(),
         VmExecutionMetrics::default(),
         vec![],
diff --git a/core/node/state_keeper/src/io/tests/tester.rs b/core/node/state_keeper/src/io/tests/tester.rs
index 2dc45a5eaaa..02170283e94 100644
--- a/core/node/state_keeper/src/io/tests/tester.rs
+++ b/core/node/state_keeper/src/io/tests/tester.rs
@@ -156,7 +156,7 @@ impl Tester {
                     patch: 0.into(),
                 },
                 &self.base_system_contracts,
-                &get_system_smart_contracts(),
+                &get_system_smart_contracts(false),
                 L1VerifierConfig::default(),
             )
             .await
diff --git a/core/node/state_keeper/src/keeper.rs b/core/node/state_keeper/src/keeper.rs
index d36ceec7d70..22f24573070 100644
--- a/core/node/state_keeper/src/keeper.rs
+++ b/core/node/state_keeper/src/keeper.rs
@@ -498,8 +498,9 @@ impl ZkSyncStateKeeper {
 
                 updates_manager.extend_from_executed_transaction(
                     tx,
-                    *tx_result,
+                    *tx_result.clone(),
                     compressed_bytecodes,
+                    tx_result.new_known_factory_deps.unwrap_or_default(),
                     tx_l1_gas_this_tx,
                     tx_execution_metrics,
                     call_tracer_result,
@@ -624,8 +625,9 @@ impl ZkSyncStateKeeper {
                     } = *tx_metrics;
                     updates_manager.extend_from_executed_transaction(
                         tx,
-                        *tx_result,
+                        *tx_result.clone(),
                         compressed_bytecodes,
+                        tx_result.new_known_factory_deps.unwrap_or_default(),
                         tx_l1_gas_this_tx,
                         tx_execution_metrics,
                         call_tracer_result,
@@ -704,8 +706,9 @@ impl ZkSyncStateKeeper {
                 } = *tx_metrics;
                 updates_manager.extend_from_executed_transaction(
                     tx,
-                    *tx_result,
+                    *tx_result.clone(),
                     compressed_bytecodes,
+                    tx_result.new_known_factory_deps.unwrap_or_default(),
                     tx_l1_gas_this_tx,
                     tx_execution_metrics,
                     vec![],
diff --git a/core/node/state_keeper/src/seal_criteria/mod.rs b/core/node/state_keeper/src/seal_criteria/mod.rs
index e3fe849e802..962cc807318 100644
--- a/core/node/state_keeper/src/seal_criteria/mod.rs
+++ b/core/node/state_keeper/src/seal_criteria/mod.rs
@@ -277,6 +277,8 @@ impl L2BlockMaxPayloadSizeSealer {
 
 #[cfg(test)]
 mod tests {
+    use std::collections::HashMap;
+
     use zksync_utils::time::seconds_since_epoch;
 
     use super::*;
@@ -287,6 +289,7 @@ mod tests {
             tx,
             create_execution_result([]),
             vec![],
+            HashMap::new(),
             BlockGasCount::default(),
             VmExecutionMetrics::default(),
             vec![],
diff --git a/core/node/state_keeper/src/testonly/mod.rs b/core/node/state_keeper/src/testonly/mod.rs
index edcf3ccc4f5..d1e82c44bd6 100644
--- a/core/node/state_keeper/src/testonly/mod.rs
+++ b/core/node/state_keeper/src/testonly/mod.rs
@@ -33,6 +33,7 @@ pub(crate) fn successful_exec() -> BatchTransactionExecutionResult {
             logs: Default::default(),
             statistics: Default::default(),
             refunds: Default::default(),
+            new_known_factory_deps: None,
         }),
         compressed_bytecodes: vec![],
         call_traces: vec![],
diff --git a/core/node/state_keeper/src/testonly/test_batch_executor.rs b/core/node/state_keeper/src/testonly/test_batch_executor.rs
index ffca8dff864..cb282f3b7d6 100644
--- a/core/node/state_keeper/src/testonly/test_batch_executor.rs
+++ b/core/node/state_keeper/src/testonly/test_batch_executor.rs
@@ -264,6 +264,7 @@ pub(crate) fn successful_exec_with_log() -> BatchTransactionExecutionResult {
             },
             statistics: Default::default(),
             refunds: Default::default(),
+            new_known_factory_deps: None,
         }),
         compressed_bytecodes: vec![],
         call_traces: vec![],
@@ -278,6 +279,7 @@ pub(crate) fn rejected_exec(reason: Halt) -> BatchTransactionExecutionResult {
             logs: Default::default(),
             statistics: Default::default(),
             refunds: Default::default(),
+            new_known_factory_deps: None,
         }),
         compressed_bytecodes: vec![],
         call_traces: vec![],
diff --git a/core/node/state_keeper/src/tests/mod.rs b/core/node/state_keeper/src/tests/mod.rs
index 80de0f0beff..9e971541b20 100644
--- a/core/node/state_keeper/src/tests/mod.rs
+++ b/core/node/state_keeper/src/tests/mod.rs
@@ -138,6 +138,7 @@ pub(super) fn create_execution_result(
             circuit_statistic: Default::default(),
         },
         refunds: Refunds::default(),
+        new_known_factory_deps: None,
     }
 }
 
diff --git a/core/node/state_keeper/src/updates/l1_batch_updates.rs b/core/node/state_keeper/src/updates/l1_batch_updates.rs
index aa2e22cac48..2979ebbd8c2 100644
--- a/core/node/state_keeper/src/updates/l1_batch_updates.rs
+++ b/core/node/state_keeper/src/updates/l1_batch_updates.rs
@@ -49,6 +49,8 @@ impl L1BatchUpdates {
 
 #[cfg(test)]
 mod tests {
+    use std::collections::HashMap;
+
     use zksync_multivm::vm_latest::TransactionVmExt;
     use zksync_types::{L2BlockNumber, ProtocolVersionId, H256};
 
@@ -76,6 +78,7 @@ mod tests {
             BlockGasCount::default(),
             VmExecutionMetrics::default(),
             vec![],
+            HashMap::new(),
             vec![],
         );
 
diff --git a/core/node/state_keeper/src/updates/l2_block_updates.rs b/core/node/state_keeper/src/updates/l2_block_updates.rs
index d8673088dc3..27995b384ab 100644
--- a/core/node/state_keeper/src/updates/l2_block_updates.rs
+++ b/core/node/state_keeper/src/updates/l2_block_updates.rs
@@ -1,17 +1,14 @@
 use std::collections::HashMap;
 
-use once_cell::sync::Lazy;
 use zksync_multivm::{
     interface::{
         Call, CompressedBytecodeInfo, ExecutionResult, L2BlockEnv, TransactionExecutionResult,
         TxExecutionStatus, VmEvent, VmExecutionMetrics, VmExecutionResultAndLogs,
     },
-    vm_latest::TransactionVmExt,
+    vm_latest::{utils::extract_bytecodes_marked_as_known, TransactionVmExt},
 };
-use zksync_system_constants::KNOWN_CODES_STORAGE_ADDRESS;
 use zksync_types::{
     block::{BlockGasCount, L2BlockHasher},
-    ethabi,
     l2_to_l1_log::{SystemL2ToL1Log, UserL2ToL1Log},
     L2BlockNumber, ProtocolVersionId, StorageLogWithPreviousValue, Transaction, H256,
 };
@@ -19,27 +16,6 @@ use zksync_utils::bytecode::hash_bytecode;
 
 use crate::metrics::KEEPER_METRICS;
 
-/// Extracts all bytecodes marked as known on the system contracts.
-fn extract_bytecodes_marked_as_known(all_generated_events: &[VmEvent]) -> Vec<H256> {
-    static PUBLISHED_BYTECODE_SIGNATURE: Lazy<H256> = Lazy::new(|| {
-        ethabi::long_signature(
-            "MarkedAsKnown",
-            &[ethabi::ParamType::FixedBytes(32), ethabi::ParamType::Bool],
-        )
-    });
-
-    all_generated_events
-        .iter()
-        .filter(|event| {
-            // Filter events from the deployer contract that match the expected signature.
-            event.address == KNOWN_CODES_STORAGE_ADDRESS
-                && event.indexed_topics.len() == 3
-                && event.indexed_topics[0] == *PUBLISHED_BYTECODE_SIGNATURE
-        })
-        .map(|event| event.indexed_topics[1])
-        .collect()
-}
-
 #[derive(Debug, Clone, PartialEq)]
 pub struct L2BlockUpdates {
     pub executed_transactions: Vec<TransactionExecutionResult>,
@@ -104,6 +80,7 @@ impl L2BlockUpdates {
         self.block_execution_metrics += execution_metrics;
     }
 
+    #[allow(clippy::too_many_arguments)]
     pub(crate) fn extend_from_executed_transaction(
         &mut self,
         tx: Transaction,
@@ -111,6 +88,7 @@ impl L2BlockUpdates {
         tx_l1_gas_this_tx: BlockGasCount,
         execution_metrics: VmExecutionMetrics,
         compressed_bytecodes: Vec<CompressedBytecodeInfo>,
+        new_known_factory_deps: HashMap<H256, Vec<u8>>,
         call_traces: Vec<Call>,
     ) {
         let saved_factory_deps =
@@ -145,12 +123,15 @@ impl L2BlockUpdates {
 
         // Get transaction factory deps
         let factory_deps = &tx.execute.factory_deps;
-        let tx_factory_deps: HashMap<_, _> = factory_deps
+        let mut tx_factory_deps: HashMap<_, _> = factory_deps
             .iter()
-            .map(|bytecode| (hash_bytecode(bytecode), bytecode))
+            .map(|bytecode| (hash_bytecode(bytecode), bytecode.clone()))
             .collect();
+        // Ensure that *dynamic* factory deps (ones that may be created when executing EVM contracts)
+        // are added into the lookup map as well.
+        tx_factory_deps.extend(new_known_factory_deps);
 
-        // Save all bytecodes that were marked as known on the bootloader
+        // Save all bytecodes that were marked as known in the bootloader
         let known_bytecodes = saved_factory_deps.into_iter().map(|bytecode_hash| {
             let bytecode = tx_factory_deps.get(&bytecode_hash).unwrap_or_else(|| {
                 panic!(
@@ -230,6 +211,7 @@ mod tests {
             BlockGasCount::default(),
             VmExecutionMetrics::default(),
             vec![],
+            HashMap::new(),
             vec![],
         );
 
diff --git a/core/node/state_keeper/src/updates/mod.rs b/core/node/state_keeper/src/updates/mod.rs
index 2fad56a9929..0cebc5d8b47 100644
--- a/core/node/state_keeper/src/updates/mod.rs
+++ b/core/node/state_keeper/src/updates/mod.rs
@@ -1,3 +1,5 @@
+use std::collections::HashMap;
+
 use zksync_contracts::BaseSystemContractsHashes;
 use zksync_multivm::{
     interface::{
@@ -8,7 +10,7 @@ use zksync_multivm::{
 };
 use zksync_types::{
     block::BlockGasCount, fee_model::BatchFeeInput, Address, L1BatchNumber, L2BlockNumber,
-    ProtocolVersionId, Transaction,
+    ProtocolVersionId, Transaction, H256,
 };
 
 pub(crate) use self::{l1_batch_updates::L1BatchUpdates, l2_block_updates::L2BlockUpdates};
@@ -104,11 +106,13 @@ impl UpdatesManager {
         self.protocol_version
     }
 
+    #[allow(clippy::too_many_arguments)]
     pub fn extend_from_executed_transaction(
         &mut self,
         tx: Transaction,
         tx_execution_result: VmExecutionResultAndLogs,
         compressed_bytecodes: Vec<CompressedBytecodeInfo>,
+        new_known_factory_deps: HashMap<H256, Vec<u8>>,
         tx_l1_gas_this_tx: BlockGasCount,
         execution_metrics: VmExecutionMetrics,
         call_traces: Vec<Call>,
@@ -124,6 +128,7 @@ impl UpdatesManager {
             tx_l1_gas_this_tx,
             execution_metrics,
             compressed_bytecodes,
+            new_known_factory_deps,
             call_traces,
         );
         latency.observe();
@@ -233,6 +238,7 @@ mod tests {
             tx,
             create_execution_result([]),
             vec![],
+            HashMap::new(),
             new_block_gas_count(),
             VmExecutionMetrics::default(),
             vec![],
diff --git a/core/node/test_utils/src/lib.rs b/core/node/test_utils/src/lib.rs
index a065ebc7182..0179a9e4511 100644
--- a/core/node/test_utils/src/lib.rs
+++ b/core/node/test_utils/src/lib.rs
@@ -56,6 +56,7 @@ pub fn create_l1_batch(number: u32) -> L1BatchHeader {
         BaseSystemContractsHashes {
             bootloader: H256::repeat_byte(1),
             default_aa: H256::repeat_byte(42),
+            evm_emulator: None,
         },
         ProtocolVersionId::latest(),
     );
@@ -88,6 +89,7 @@ pub fn create_l1_batch_metadata(number: u32) -> L1BatchMetadata {
             zkporter_is_available: ZKPORTER_IS_AVAILABLE,
             bootloader_code_hash: BaseSystemContractsHashes::default().bootloader,
             default_aa_code_hash: BaseSystemContractsHashes::default().default_aa,
+            evm_emulator_code_hash: BaseSystemContractsHashes::default().evm_emulator,
             protocol_version: Some(ProtocolVersionId::latest()),
         },
         aux_data_hash: H256::zero(),
@@ -218,6 +220,7 @@ impl Snapshot {
             l2_block,
             factory_deps: [&contracts.bootloader, &contracts.default_aa]
                 .into_iter()
+                .chain(contracts.evm_emulator.as_ref())
                 .map(|c| (c.hash, zksync_utils::be_words_to_bytes(&c.code)))
                 .collect(),
             storage_logs,
diff --git a/core/node/vm_runner/src/impls/bwip.rs b/core/node/vm_runner/src/impls/bwip.rs
index 6c2933635b4..dc94752d988 100644
--- a/core/node/vm_runner/src/impls/bwip.rs
+++ b/core/node/vm_runner/src/impls/bwip.rs
@@ -209,6 +209,7 @@ async fn get_updates_manager_witness_input_data(
 ) -> anyhow::Result<VMRunWitnessInputData> {
     let initial_heap_content = output.batch.final_bootloader_memory.clone().unwrap(); // might be just empty
     let default_aa = system_env.base_system_smart_contracts.hashes().default_aa;
+    let evm_emulator = system_env.base_system_smart_contracts.hashes().evm_emulator;
     let bootloader = system_env.base_system_smart_contracts.hashes().bootloader;
     let bootloader_code_bytes = connection
         .factory_deps_dal()
@@ -240,6 +241,22 @@ async fn get_updates_manager_witness_input_data(
         used_bytecodes.insert(account_code_hash, account_bytecode);
     }
 
+    let evm_emulator_code_hash = if let Some(evm_emulator) = evm_emulator {
+        let evm_emulator_code_hash = h256_to_u256(evm_emulator);
+        if used_contract_hashes.contains(&evm_emulator_code_hash) {
+            let evm_emulator_bytecode = connection
+                .factory_deps_dal()
+                .get_sealed_factory_dep(evm_emulator)
+                .await?
+                .ok_or_else(|| anyhow!("EVM Simulator bytecode should exist"))?;
+            let evm_emulator_bytecode = bytes_to_chunks(&evm_emulator_bytecode);
+            used_bytecodes.insert(evm_emulator_code_hash, evm_emulator_bytecode);
+        }
+        Some(evm_emulator_code_hash)
+    } else {
+        None
+    };
+
     let storage_refunds = output.batch.final_execution_state.storage_refunds.clone();
     let pubdata_costs = output.batch.final_execution_state.pubdata_costs.clone();
     let witness_block_state = WitnessStorageState {
@@ -254,6 +271,7 @@ async fn get_updates_manager_witness_input_data(
         protocol_version: system_env.version,
         bootloader_code,
         default_account_code_hash: account_code_hash,
+        evm_emulator_code_hash,
         storage_refunds,
         pubdata_costs,
         witness_block_state,
diff --git a/core/node/vm_runner/src/tests/mod.rs b/core/node/vm_runner/src/tests/mod.rs
index 53bef106a8f..575fd59be04 100644
--- a/core/node/vm_runner/src/tests/mod.rs
+++ b/core/node/vm_runner/src/tests/mod.rs
@@ -322,6 +322,7 @@ async fn store_l1_batches(
             .iter()
             .map(|contract| hash_bytecode(&contract.bytecode))
             .chain([genesis_params.base_system_contracts().hashes().default_aa])
+            .chain(genesis_params.base_system_contracts().hashes().evm_emulator)
             .map(h256_to_u256)
             .collect();
 
diff --git a/core/node/vm_runner/src/tests/output_handler.rs b/core/node/vm_runner/src/tests/output_handler.rs
index 1bf30effdbe..f57814ea449 100644
--- a/core/node/vm_runner/src/tests/output_handler.rs
+++ b/core/node/vm_runner/src/tests/output_handler.rs
@@ -66,6 +66,7 @@ impl OutputHandlerTester {
                     code: vec![],
                     hash: Default::default(),
                 },
+                evm_emulator: None,
             },
             bootloader_gas_limit: 0,
             execution_mode: TxExecutionMode::VerifyExecute,
diff --git a/core/tests/test_account/src/lib.rs b/core/tests/test_account/src/lib.rs
index 999ea6eb6e0..39a36694526 100644
--- a/core/tests/test_account/src/lib.rs
+++ b/core/tests/test_account/src/lib.rs
@@ -154,7 +154,7 @@ impl Account {
         let max_fee_per_gas = U256::from(0u32);
         let gas_limit = U256::from(20_000_000);
         let factory_deps = execute.factory_deps;
-        abi::Transaction::L1 {
+        let tx = abi::Transaction::L1 {
             tx: abi::L2CanonicalTransaction {
                 tx_type: PRIORITY_OPERATION_L2_TX_TYPE.into(),
                 from: address_to_u256(&self.address),
@@ -186,9 +186,8 @@ impl Account {
             .into(),
             factory_deps,
             eth_block: 0,
-        }
-        .try_into()
-        .unwrap()
+        };
+        Transaction::from_abi(tx, false).unwrap()
     }
 
     pub fn get_test_contract_transaction(
diff --git a/docker-compose.yml b/docker-compose.yml
index d805ccc844e..1e3a273ec9a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.2"
+version: '3.2'
 services:
   reth:
     restart: always
@@ -15,6 +15,7 @@ services:
 
     command: node --dev --datadir /rethdata --http --http.addr 0.0.0.0 --http.port 8545 --http.corsdomain "*" --dev.block-time 300ms --chain /chaindata/reth_config
 
+  
   postgres:
     image: "postgres:14"
     command: postgres -c 'max_connections=1000'
@@ -55,9 +56,3 @@ services:
     profiles:
       - runner
     network_mode: host
-
-  eigenda-proxy:
-    image: ghcr.io/layr-labs/eigenda-proxy
-    ports:
-      - "4242:4242"
-    command: ./eigenda-proxy --addr 0.0.0.0 --port 4242 --memstore.enabled --eigenda-max-blob-length "2MiB"
diff --git a/docs/guides/build-docker.md b/docs/guides/build-docker.md
index 6b0608275d8..5dd9cff022b 100644
--- a/docs/guides/build-docker.md
+++ b/docs/guides/build-docker.md
@@ -10,8 +10,7 @@ Install prerequisites: see
 
 ## Build docker files
 
-You may build all images with [Makefile](../../docker/Makefile) located in [docker](../../docker) directory in this
-repository
+You may build all images with [Makefile](../../docker/Makefile) located in [docker](../../docker) directory in this repository
 
 > All commands should be run from the root directory of the repository
 
diff --git a/eigenda-integration.md b/eigenda-integration.md
index 7291971b304..f5606512f96 100644
--- a/eigenda-integration.md
+++ b/eigenda-integration.md
@@ -1,5 +1,33 @@
 # Zksync-era <> EigenDA Integration
 
+## Common changes
+
+Changes needed both for local and mainnet/testnet setup.
+
+1. Add `da_client` to `etc/env/file_based/general.yaml`:
+
+```yaml
+da_client:
+  eigen_da:
+    api_node_url: http://127.0.0.1:4242
+```
+
+2. Add `eigenda-proxy` to the `docker-compose.yml` file:
+
+```yaml
+eigenda-proxy:
+  image: ghcr.io/layr-labs/eigenda-proxy
+  ports:
+    - '4242:4242'
+  command: ./eigenda-proxy --addr 0.0.0.0 --port 4242 --memstore.enabled --eigenda-max-blob-length "2MiB"
+```
+
+3. (optional) for using pubdata with 2MiB (as per specification), modify `etc/env/file_based/general.yaml`:
+
+```yaml
+max_pubdata_per_batch: 2097152
+```
+
 ## Local Setup
 
 1. Install `zk_inception` & `zk_supervisor`
@@ -14,6 +42,12 @@
 zk_inception containers --observability true
 ```
 
+3. Add EigenDA Dashboard
+
+```bash
+mv era-observability/additional_dashboards/EigenDA.json era-observability/dashboards/EigenDA.json
+```
+
 3. Create `eigen_da` chain
 
 ```bash
@@ -39,8 +73,6 @@ zk_inception ecosystem init \
           --l1-rpc-url http://127.0.0.1:8545 \
           --server-db-url=postgres://postgres:notsecurepassword@localhost:5432 \
           --server-db-name=zksync_server_localhost_eigen_da \
-          --prover-db-url=postgres://postgres:notsecurepassword@localhost:5432 \
-          --prover-db-name=zksync_prover_localhost_eigen_da \
           --chain eigen_da \
           --verbose
 ```
@@ -72,7 +104,7 @@ zk_supervisor test integration --chain eigen_da
 
 Access Grafana at [http://localhost:3000/](http://localhost:3000/), go to dashboards and select `EigenDA`.
 
-## Holesky Setup
+## Mainnet/Testnet setup
 
 ### Modify localhost chain id number
 
diff --git a/etc/contracts-test-data/contracts/mock-evm/mock-evm.sol b/etc/contracts-test-data/contracts/mock-evm/mock-evm.sol
new file mode 100644
index 00000000000..5f4de59681f
--- /dev/null
+++ b/etc/contracts-test-data/contracts/mock-evm/mock-evm.sol
@@ -0,0 +1,92 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+
+pragma solidity ^0.8.0;
+
+/**
+ * Mock `KnownCodeStorage` counterpart producing `MarkedAsKnown` events and having `publishEVMBytecode` method
+ * added for EVM emulation, calls to which should be traced by the host.
+ */
+contract MockKnownCodeStorage {
+    event MarkedAsKnown(bytes32 indexed bytecodeHash, bool indexed sendBytecodeToL1);
+
+    function markFactoryDeps(bool _shouldSendToL1, bytes32[] calldata _hashes) external {
+        unchecked {
+            uint256 hashesLen = _hashes.length;
+            for (uint256 i = 0; i < hashesLen; ++i) {
+                _markBytecodeAsPublished(_hashes[i], _shouldSendToL1);
+            }
+        }
+    }
+
+    function markBytecodeAsPublished(bytes32 _bytecodeHash) external {
+        _markBytecodeAsPublished(_bytecodeHash, false);
+    }
+
+    function _markBytecodeAsPublished(bytes32 _bytecodeHash, bool _shouldSendToL1) internal {
+        if (getMarker(_bytecodeHash) == 0) {
+            assembly {
+                sstore(_bytecodeHash, 1)
+            }
+            emit MarkedAsKnown(_bytecodeHash, _shouldSendToL1);
+        }
+    }
+
+    bytes32 evmBytecodeHash; // For tests, it's OK to potentially collide with the marker slot for hash `bytes32(0)`
+
+    /// Sets the EVM bytecode hash to be used in the next `publishEVMBytecode` call.
+    function setEVMBytecodeHash(bytes32 _bytecodeHash) external {
+        evmBytecodeHash = _bytecodeHash;
+    }
+
+    function publishEVMBytecode(bytes calldata _bytecode) external {
+        bytes32 hash = evmBytecodeHash;
+        require(hash != bytes32(0), "EVM bytecode hash not set");
+
+        if (getMarker(evmBytecodeHash) == 0) {
+            assembly {
+                sstore(hash, 1)
+            }
+        }
+        emit MarkedAsKnown(hash, getMarker(hash) == 0);
+        evmBytecodeHash = bytes32(0);
+    }
+
+    function getMarker(bytes32 _hash) public view returns (uint256 marker) {
+        assembly {
+            marker := sload(_hash)
+        }
+    }
+}
+
+/**
+ * Mock `ContractDeployer` counterpart focusing on EVM bytecode deployment (via `create`; this isn't how real EVM bytecode deployment works,
+ * but it's good enough for low-level tests).
+ */
+contract MockContractDeployer {
+    enum AccountAbstractionVersion {
+        None,
+        Version1
+    }
+
+    address constant CODE_ORACLE_ADDR = address(0x8012);
+    MockKnownCodeStorage constant KNOWN_CODE_STORAGE_CONTRACT = MockKnownCodeStorage(address(0x8004));
+
+    /// The returned value is obviously incorrect in the general case, but works well enough when called by the bootloader.
+    function extendedAccountVersion(address _address) public view returns (AccountAbstractionVersion) {
+        return AccountAbstractionVersion.Version1;
+    }
+
+    /// Replaces real deployment with publishing a surrogate EVM "bytecode".
+    /// @param _salt bytecode hash
+    /// @param _bytecodeHash ignored, since it's not possible to set arbitrarily
+    /// @param _input bytecode to publish
+    function create(
+        bytes32 _salt,
+        bytes32 _bytecodeHash,
+        bytes calldata _input
+    ) external payable returns (address) {
+        KNOWN_CODE_STORAGE_CONTRACT.setEVMBytecodeHash(_salt);
+        KNOWN_CODE_STORAGE_CONTRACT.publishEVMBytecode(_input);
+        return address(0);
+    }
+}
diff --git a/etc/env/base/eigen_da_client.toml b/etc/env/base/eigen_da_client.toml
deleted file mode 100644
index 93a1c59fb0a..00000000000
--- a/etc/env/base/eigen_da_client.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[eigen_da_client]
-api_node_url = "http://127.0.0.1:4242"
diff --git a/etc/env/configs/dev_validium.toml b/etc/env/configs/dev_validium.toml
index 7b26cfe096f..5ed4ccb38e4 100644
--- a/etc/env/configs/dev_validium.toml
+++ b/etc/env/configs/dev_validium.toml
@@ -1,21 +1,21 @@
-__imports__ = ["base", "l1-inits/.init.env", "l2-inits/dev_validium.init.env"]
+__imports__ = [ "base", "l1-inits/.init.env", "l2-inits/dev_validium.init.env" ]
 
 [chain.state_keeper]
-compute_overhead_part = 1.0
-pubdata_overhead_part = 0.0
-batch_overhead_l1_gas = 1000000
+compute_overhead_part=1.0
+pubdata_overhead_part=0.0
+batch_overhead_l1_gas=1000000
 # This value should be higher for Validium, but now it is not compatible with the current blobs model.
 # For this config to be set to its proper value we need to fully integrate Validium + Blobs.
-max_pubdata_per_batch = 2097152
-fee_model_version = "V2"
-l1_batch_commit_data_generator_mode = "Validium"
+max_pubdata_per_batch=100000
+fee_model_version="V2"
+l1_batch_commit_data_generator_mode="Validium"
 
 [eth_sender]
-sender_pubdata_sending_mode = "Custom"
+sender_pubdata_sending_mode="Custom"
 
 # This override will be removed soon but it is needed for now.
 [eth_sender.gas_adjuster]
-max_blob_base_fee = 0
+max_blob_base_fee=0
 
 [_metadata]
-base = ['dev.toml']
+base=['dev.toml']
diff --git a/etc/env/file_based/general.yaml b/etc/env/file_based/general.yaml
index 8f1792e8907..a4ba8c0201a 100644
--- a/etc/env/file_based/general.yaml
+++ b/etc/env/file_based/general.yaml
@@ -375,7 +375,3 @@ da_dispatcher:
 
 external_proof_integration_api:
   http_port: 3073
-
-da_client:
-  eigen_da:
-    api_node_url: http://127.0.0.1:4242
diff --git a/etc/env/file_based/genesis.yaml b/etc/env/file_based/genesis.yaml
index 220a75944e0..b7d4ffebcf9 100644
--- a/etc/env/file_based/genesis.yaml
+++ b/etc/env/file_based/genesis.yaml
@@ -13,3 +13,5 @@ prover:
   recursion_scheduler_level_vk_hash: 0x14f97b81e54b35fe673d8708cc1a19e1ea5b5e348e12d31e39824ed4f42bbca2
   dummy_verifier: true
 l1_batch_commit_data_generator_mode: Rollup
+# Uncomment to enable EVM emulation (requires to run genesis)
+# evm_emulator_hash: 0x01000e53aa35d9d19fa99341c2e2901cf93b3668f01569dd5c6ca409c7696b91
diff --git a/infrastructure/zk/src/init.ts b/infrastructure/zk/src/init.ts
index 96194b169e9..6dbad67b489 100644
--- a/infrastructure/zk/src/init.ts
+++ b/infrastructure/zk/src/init.ts
@@ -15,13 +15,9 @@ import * as run from './run';
 import * as server from './server';
 import { createVolumes, up } from './up';
 
-const fs = require('fs');
-const yaml = require('yaml');
-
 // Checks if all required tools are installed with the correct versions
-const checkEnv = async (runObservability: boolean): Promise<void> => {
+const checkEnv = async (): Promise<void> => {
     const tools = ['node', 'yarn', 'docker', 'cargo'];
-
     for (const tool of tools) {
         await utils.exec(`which ${tool}`);
     }
@@ -41,36 +37,6 @@ const submoduleUpdate = async (): Promise<void> => {
     await utils.exec('git submodule update');
 };
 
-// clone dockprom and zksync-era dashboards
-const setupObservability = async (): Promise<void> => {
-    // clone dockprom, era-observability repos and export era dashboards to dockprom
-    await utils.spawn(
-        `rm -rf ./target/dockprom && git clone https://github.com/stefanprodan/dockprom.git ./target/dockprom \
-            && rm -rf ./target/era-observability && git clone https://github.com/matter-labs/era-observability.git ./target/era-observability \
-            && cp ./target/era-observability/dashboards/* ./target/dockprom/grafana/provisioning/dashboards
-        `
-    );
-
-    const fileContents = fs.readFileSync('./target/dockprom/prometheus/prometheus.yml', 'utf8');
-    let config = yaml.parse(fileContents);
-    config.scrape_configs.push({
-        job_name: 'proxy-blob-retriever',
-        scrape_interval: '5s',
-        honor_labels: true,
-        static_configs: [{ targets: ['host.docker.internal:7070'] }]
-    });
-    config.scrape_configs.push({
-        job_name: 'zksync',
-        scrape_interval: '5s',
-        honor_labels: true,
-        static_configs: [{ targets: ['host.docker.internal:3312'] }]
-    });
-    const newYaml = yaml.stringify(config);
-    fs.writeFileSync('./target/dockprom/prometheus/prometheus.yml', newYaml, 'utf8');
-
-    await utils.spawn('cp EigenDA.json ./target/dockprom/grafana/provisioning/dashboards/EigenDA.json');
-};
-
 // Sets up docker environment and compiles contracts
 type InitSetupOptions = {
     skipEnvSetup: boolean;
@@ -84,10 +50,6 @@ const initSetup = async ({
     runObservability,
     deploymentMode
 }: InitSetupOptions): Promise<void> => {
-    if (runObservability) {
-        await announced('Pulling observability repos', setupObservability());
-    }
-
     await announced(
         `Initializing in ${deploymentMode == contract.DeploymentMode.Validium ? 'Validium mode' : 'Roll-up mode'}`
     );
@@ -96,7 +58,7 @@ const initSetup = async ({
     }
     if (!process.env.CI && !skipEnvSetup) {
         await announced('Pulling images', docker.pull());
-        await announced('Checking environment', checkEnv(runObservability));
+        await announced('Checking environment', checkEnv());
         await announced('Checking git hooks', env.gitHooks());
         await announced('Create volumes', createVolumes());
         await announced('Setting up containers', up(runObservability));
diff --git a/prover/Cargo.lock b/prover/Cargo.lock
index 92366b0912b..22ec5c53485 100644
--- a/prover/Cargo.lock
+++ b/prover/Cargo.lock
@@ -7697,6 +7697,7 @@ dependencies = [
  "circuit_sequencer_api 0.141.2",
  "circuit_sequencer_api 0.142.2",
  "circuit_sequencer_api 0.150.5",
+ "ethabi",
  "hex",
  "itertools 0.10.5",
  "once_cell",
diff --git a/prover/crates/bin/witness_generator/src/rounds/basic_circuits/utils.rs b/prover/crates/bin/witness_generator/src/rounds/basic_circuits/utils.rs
index 23ae1b0f2af..a8bc59bd45e 100644
--- a/prover/crates/bin/witness_generator/src/rounds/basic_circuits/utils.rs
+++ b/prover/crates/bin/witness_generator/src/rounds/basic_circuits/utils.rs
@@ -114,6 +114,10 @@ pub(super) async fn generate_witness(
             }
         };
 
+        let evm_emulator_code_hash = input.vm_run_data.evm_emulator_code_hash;
+        // By convention, default AA is used instead of the EVM emulator if the latter is disabled.
+        let evm_emulator_code_hash =
+            evm_emulator_code_hash.unwrap_or(input.vm_run_data.default_account_code_hash);
         let (scheduler_witness, block_witness) = zkevm_test_harness::external_calls::run(
             Address::zero(),
             BOOTLOADER_ADDRESS,
@@ -121,8 +125,7 @@ pub(super) async fn generate_witness(
             bootloader_contents,
             false,
             input.vm_run_data.default_account_code_hash,
-            // NOTE: this will be evm_simulator_code_hash in future releases
-            input.vm_run_data.default_account_code_hash,
+            evm_emulator_code_hash,
             input.vm_run_data.used_bytecodes,
             Vec::default(),
             MAX_CYCLES_FOR_TX as usize,
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-41af30620f8a1f20b8a6c46be162601d35fd2881ac1fd070f0f1a8add4bc388d.json b/prover/crates/lib/prover_dal/.sqlx/query-095c459e05aa4c7fad0d1fa74b2d52314178f8ab2aea7efb69ae18fbf40e8994.json
similarity index 80%
rename from prover/crates/lib/prover_dal/.sqlx/query-41af30620f8a1f20b8a6c46be162601d35fd2881ac1fd070f0f1a8add4bc388d.json
rename to prover/crates/lib/prover_dal/.sqlx/query-095c459e05aa4c7fad0d1fa74b2d52314178f8ab2aea7efb69ae18fbf40e8994.json
index b65633a904e..435f6cd5a3b 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-41af30620f8a1f20b8a6c46be162601d35fd2881ac1fd070f0f1a8add4bc388d.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-095c459e05aa4c7fad0d1fa74b2d52314178f8ab2aea7efb69ae18fbf40e8994.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE recursion_tip_witness_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $3\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        l1_batch_number\n                    FROM\n                        recursion_tip_witness_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                        AND protocol_version_patch = $2\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                recursion_tip_witness_jobs_fri.l1_batch_number,\n                recursion_tip_witness_jobs_fri.number_of_final_node_jobs\n            ",
+  "query": "\n            UPDATE recursion_tip_witness_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $3\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        l1_batch_number\n                    FROM\n                        recursion_tip_witness_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                        AND protocol_version_patch = $2\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n            RETURNING\n            recursion_tip_witness_jobs_fri.l1_batch_number,\n            recursion_tip_witness_jobs_fri.number_of_final_node_jobs\n            ",
   "describe": {
     "columns": [
       {
@@ -26,5 +26,5 @@
       false
     ]
   },
-  "hash": "41af30620f8a1f20b8a6c46be162601d35fd2881ac1fd070f0f1a8add4bc388d"
+  "hash": "095c459e05aa4c7fad0d1fa74b2d52314178f8ab2aea7efb69ae18fbf40e8994"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-0a1ec4690d6b4a67d6ad16badcbf113a19feb73c4cf9876855523499998b99c0.json b/prover/crates/lib/prover_dal/.sqlx/query-0a1ec4690d6b4a67d6ad16badcbf113a19feb73c4cf9876855523499998b99c0.json
deleted file mode 100644
index b05230e1be4..00000000000
--- a/prover/crates/lib/prover_dal/.sqlx/query-0a1ec4690d6b4a67d6ad16badcbf113a19feb73c4cf9876855523499998b99c0.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                    INSERT INTO\n                        leaf_aggregation_witness_jobs_fri (\n                            l1_batch_number,\n                            circuit_id,\n                            closed_form_inputs_blob_url,\n                            number_of_basic_circuits,\n                            protocol_version,\n                            status,\n                            created_at,\n                            updated_at,\n                            protocol_version_patch\n                        )\n                    VALUES\n                        ($1, $2, $3, $4, $5, 'waiting_for_proofs', NOW(), NOW(), $6)\n                    ON CONFLICT (l1_batch_number, circuit_id) DO\n                    UPDATE\n                    SET\n                        updated_at = NOW()\n                    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int2",
-        "Text",
-        "Int4",
-        "Int4",
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "0a1ec4690d6b4a67d6ad16badcbf113a19feb73c4cf9876855523499998b99c0"
-}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-1080b95755b3047747a9fabc7c7c43ffc5f519d35c90c60f89579f0689906df5.json b/prover/crates/lib/prover_dal/.sqlx/query-1080b95755b3047747a9fabc7c7c43ffc5f519d35c90c60f89579f0689906df5.json
new file mode 100644
index 00000000000..4b1cb2fe98a
--- /dev/null
+++ b/prover/crates/lib/prover_dal/.sqlx/query-1080b95755b3047747a9fabc7c7c43ffc5f519d35c90c60f89579f0689906df5.json
@@ -0,0 +1,18 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            proof_compression_jobs_fri (\n                l1_batch_number,\n                fri_proof_blob_url,\n                status,\n                created_at,\n                updated_at,\n                protocol_version,\n                protocol_version_patch\n            )\n            VALUES\n            ($1, $2, $3, NOW(), NOW(), $4, $5)\n            ON CONFLICT (l1_batch_number) DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Text",
+        "Text",
+        "Int4",
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "1080b95755b3047747a9fabc7c7c43ffc5f519d35c90c60f89579f0689906df5"
+}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-eb2a85cb60c680a71203769db7baf89bbd72934e1405e320e746158e6d395d96.json b/prover/crates/lib/prover_dal/.sqlx/query-128b9be7a480a1ef132e5d477a43e4b3d55a0fee71105df880ff4f599844d06f.json
similarity index 81%
rename from prover/crates/lib/prover_dal/.sqlx/query-eb2a85cb60c680a71203769db7baf89bbd72934e1405e320e746158e6d395d96.json
rename to prover/crates/lib/prover_dal/.sqlx/query-128b9be7a480a1ef132e5d477a43e4b3d55a0fee71105df880ff4f599844d06f.json
index 27680c0bb46..e4e02b7e0df 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-eb2a85cb60c680a71203769db7baf89bbd72934e1405e320e746158e6d395d96.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-128b9be7a480a1ef132e5d477a43e4b3d55a0fee71105df880ff4f599844d06f.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                UPDATE proof_compression_jobs_fri\n                SET\n                    status = 'queued',\n                    updated_at = NOW(),\n                    processing_started_at = NOW()\n                WHERE\n                    (\n                        status = 'in_progress'\n                        AND processing_started_at <= NOW() - $1::INTERVAL\n                        AND attempts < $2\n                    )\n                    OR (\n                        status = 'failed'\n                        AND attempts < $2\n                    )\n                RETURNING\n                    l1_batch_number,\n                    status,\n                    attempts,\n                    error,\n                    picked_by\n                ",
+  "query": "\n                UPDATE proof_compression_jobs_fri\n                SET\n                    status = 'queued',\n                    updated_at = NOW(),\n                    processing_started_at = NOW()\n                WHERE\n                    (\n                        status = 'in_progress'\n                        AND processing_started_at <= NOW() - $1::INTERVAL\n                        AND attempts < $2\n                    )\n                    OR (\n                        status = 'failed'\n                        AND attempts < $2\n                    )\n                RETURNING\n                l1_batch_number,\n                status,\n                attempts,\n                error,\n                picked_by\n                ",
   "describe": {
     "columns": [
       {
@@ -43,5 +43,5 @@
       true
     ]
   },
-  "hash": "eb2a85cb60c680a71203769db7baf89bbd72934e1405e320e746158e6d395d96"
+  "hash": "128b9be7a480a1ef132e5d477a43e4b3d55a0fee71105df880ff4f599844d06f"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-29ff260b02f7b955f9fe0b657b87def3a97275b66ad33d214054dc9048ddf584.json b/prover/crates/lib/prover_dal/.sqlx/query-29ff260b02f7b955f9fe0b657b87def3a97275b66ad33d214054dc9048ddf584.json
deleted file mode 100644
index 85e66ed7824..00000000000
--- a/prover/crates/lib/prover_dal/.sqlx/query-29ff260b02f7b955f9fe0b657b87def3a97275b66ad33d214054dc9048ddf584.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                proof_compression_jobs_fri (\n                    l1_batch_number,\n                    fri_proof_blob_url,\n                    status,\n                    created_at,\n                    updated_at,\n                    protocol_version,\n                    protocol_version_patch\n                )\n            VALUES\n                ($1, $2, $3, NOW(), NOW(), $4, $5)\n            ON CONFLICT (l1_batch_number) DO NOTHING\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Text",
-        "Text",
-        "Int4",
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "29ff260b02f7b955f9fe0b657b87def3a97275b66ad33d214054dc9048ddf584"
-}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-d0be28042b50199075cb0eca26f6b93bfd5d96fdc68732fe38c79ccd44b84def.json b/prover/crates/lib/prover_dal/.sqlx/query-2d11a834e177596113b5ffd634067fadffc1d3091e8c050835d4f178a328fcc8.json
similarity index 82%
rename from prover/crates/lib/prover_dal/.sqlx/query-d0be28042b50199075cb0eca26f6b93bfd5d96fdc68732fe38c79ccd44b84def.json
rename to prover/crates/lib/prover_dal/.sqlx/query-2d11a834e177596113b5ffd634067fadffc1d3091e8c050835d4f178a328fcc8.json
index 3943480b896..c997a53e4d9 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-d0be28042b50199075cb0eca26f6b93bfd5d96fdc68732fe38c79ccd44b84def.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-2d11a834e177596113b5ffd634067fadffc1d3091e8c050835d4f178a328fcc8.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                UPDATE prover_jobs_fri\n                SET\n                    status = 'queued',\n                    updated_at = NOW(),\n                    processing_started_at = NOW()\n                WHERE\n                    id IN (\n                        SELECT\n                            id\n                        FROM\n                            prover_jobs_fri\n                        WHERE\n                            (\n                                status IN ('in_progress', 'in_gpu_proof')\n                                AND processing_started_at <= NOW() - $1::INTERVAL\n                                AND attempts < $2\n                            )\n                            OR (\n                                status = 'failed'\n                                AND attempts < $2\n                            )\n                        FOR UPDATE\n                            SKIP LOCKED\n                    )\n                RETURNING\n                    id,\n                    status,\n                    attempts,\n                    circuit_id,\n                    error,\n                    picked_by\n                ",
+  "query": "\n                UPDATE prover_jobs_fri\n                SET\n                    status = 'queued',\n                    updated_at = NOW(),\n                    processing_started_at = NOW()\n                WHERE\n                    id IN (\n                        SELECT\n                            id\n                        FROM\n                            prover_jobs_fri\n                        WHERE\n                            (\n                                status IN ('in_progress', 'in_gpu_proof')\n                                AND processing_started_at <= NOW() - $1::INTERVAL\n                                AND attempts < $2\n                            )\n                            OR (\n                                status = 'failed'\n                                AND attempts < $2\n                            )\n                        FOR UPDATE\n                        SKIP LOCKED\n                    )\n                RETURNING\n                id,\n                status,\n                attempts,\n                circuit_id,\n                error,\n                picked_by\n                ",
   "describe": {
     "columns": [
       {
@@ -49,5 +49,5 @@
       true
     ]
   },
-  "hash": "d0be28042b50199075cb0eca26f6b93bfd5d96fdc68732fe38c79ccd44b84def"
+  "hash": "2d11a834e177596113b5ffd634067fadffc1d3091e8c050835d4f178a328fcc8"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-2f194183f0140eee0dd801b2087c0a4dbcc7b955132056b5ff10f00cf5844874.json b/prover/crates/lib/prover_dal/.sqlx/query-2f194183f0140eee0dd801b2087c0a4dbcc7b955132056b5ff10f00cf5844874.json
new file mode 100644
index 00000000000..e60e0f543c4
--- /dev/null
+++ b/prover/crates/lib/prover_dal/.sqlx/query-2f194183f0140eee0dd801b2087c0a4dbcc7b955132056b5ff10f00cf5844874.json
@@ -0,0 +1,19 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            gpu_prover_queue_fri (\n                instance_host,\n                instance_port,\n                instance_status,\n                specialized_prover_group_id,\n                zone,\n                created_at,\n                updated_at,\n                protocol_version,\n                protocol_version_patch\n            )\n            VALUES\n            (CAST($1::TEXT AS INET), $2, 'available', $3, $4, NOW(), NOW(), $5, $6)\n            ON CONFLICT (instance_host, instance_port, zone) DO\n            UPDATE\n            SET\n            instance_status = 'available',\n            specialized_prover_group_id = $3,\n            zone = $4,\n            updated_at = NOW(),\n            protocol_version = $5,\n            protocol_version_patch = $6\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Int4",
+        "Int2",
+        "Text",
+        "Int4",
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "2f194183f0140eee0dd801b2087c0a4dbcc7b955132056b5ff10f00cf5844874"
+}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-102b79726652d9150c802350bdca80c233a9fd3e892b5a867a5517c2e04497a8.json b/prover/crates/lib/prover_dal/.sqlx/query-30128c0642524295ab05c37c60db2fd05e27e9df6d760173bba37446988d1b8e.json
similarity index 84%
rename from prover/crates/lib/prover_dal/.sqlx/query-102b79726652d9150c802350bdca80c233a9fd3e892b5a867a5517c2e04497a8.json
rename to prover/crates/lib/prover_dal/.sqlx/query-30128c0642524295ab05c37c60db2fd05e27e9df6d760173bba37446988d1b8e.json
index f912d06de81..10ca762aee2 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-102b79726652d9150c802350bdca80c233a9fd3e892b5a867a5517c2e04497a8.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-30128c0642524295ab05c37c60db2fd05e27e9df6d760173bba37446988d1b8e.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                UPDATE proof_compression_jobs_fri\n                SET\n                    status = 'queued',\n                    error = 'Manually requeued',\n                    attempts = 2,\n                    updated_at = NOW(),\n                    processing_started_at = NOW()\n                WHERE\n                    l1_batch_number = $1\n                    AND attempts >= $2\n                    AND (\n                        status = 'in_progress'\n                        OR status = 'failed'\n                    )\n                RETURNING\n                    status,\n                    attempts,\n                    error,\n                    picked_by\n                ",
+  "query": "\n                UPDATE proof_compression_jobs_fri\n                SET\n                    status = 'queued',\n                    error = 'Manually requeued',\n                    attempts = 2,\n                    updated_at = NOW(),\n                    processing_started_at = NOW()\n                WHERE\n                    l1_batch_number = $1\n                    AND attempts >= $2\n                    AND (\n                        status = 'in_progress'\n                        OR status = 'failed'\n                    )\n                RETURNING\n                status,\n                attempts,\n                error,\n                picked_by\n                ",
   "describe": {
     "columns": [
       {
@@ -37,5 +37,5 @@
       true
     ]
   },
-  "hash": "102b79726652d9150c802350bdca80c233a9fd3e892b5a867a5517c2e04497a8"
+  "hash": "30128c0642524295ab05c37c60db2fd05e27e9df6d760173bba37446988d1b8e"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-9895b2ded08be3e81a5357decf76b4d3d6a762761e45af2a73fe96da804e627e.json b/prover/crates/lib/prover_dal/.sqlx/query-332f1363f19160f9a7708635fd1691e08d28ca6796c0bbba95016d1899cf84fe.json
similarity index 84%
rename from prover/crates/lib/prover_dal/.sqlx/query-9895b2ded08be3e81a5357decf76b4d3d6a762761e45af2a73fe96da804e627e.json
rename to prover/crates/lib/prover_dal/.sqlx/query-332f1363f19160f9a7708635fd1691e08d28ca6796c0bbba95016d1899cf84fe.json
index 90ea9994206..a63ebc8f0e2 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-9895b2ded08be3e81a5357decf76b4d3d6a762761e45af2a73fe96da804e627e.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-332f1363f19160f9a7708635fd1691e08d28ca6796c0bbba95016d1899cf84fe.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                UPDATE prover_jobs_fri\n                SET\n                    status = 'queued',\n                    error = 'Manually requeued',\n                    attempts = 2,\n                    updated_at = NOW(),\n                    processing_started_at = NOW()\n                WHERE\n                    l1_batch_number = $1\n                    AND attempts >= $2\n                    AND (\n                        status = 'in_progress'\n                        OR status = 'failed'\n                    )\n                RETURNING\n                    id,\n                    status,\n                    attempts,\n                    circuit_id,\n                    error,\n                    picked_by\n                ",
+  "query": "\n                UPDATE prover_jobs_fri\n                SET\n                    status = 'queued',\n                    error = 'Manually requeued',\n                    attempts = 2,\n                    updated_at = NOW(),\n                    processing_started_at = NOW()\n                WHERE\n                    l1_batch_number = $1\n                    AND attempts >= $2\n                    AND (\n                        status = 'in_progress'\n                        OR status = 'failed'\n                    )\n                RETURNING\n                id,\n                status,\n                attempts,\n                circuit_id,\n                error,\n                picked_by\n                ",
   "describe": {
     "columns": [
       {
@@ -49,5 +49,5 @@
       true
     ]
   },
-  "hash": "9895b2ded08be3e81a5357decf76b4d3d6a762761e45af2a73fe96da804e627e"
+  "hash": "332f1363f19160f9a7708635fd1691e08d28ca6796c0bbba95016d1899cf84fe"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-340a84063719f9b837a61cbc63368ba43ba128a00a194dce65015bd9eeb1b42f.json b/prover/crates/lib/prover_dal/.sqlx/query-340a84063719f9b837a61cbc63368ba43ba128a00a194dce65015bd9eeb1b42f.json
new file mode 100644
index 00000000000..a49edd4737f
--- /dev/null
+++ b/prover/crates/lib/prover_dal/.sqlx/query-340a84063719f9b837a61cbc63368ba43ba128a00a194dce65015bd9eeb1b42f.json
@@ -0,0 +1,17 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                INSERT INTO\n                scheduler_witness_jobs_fri (\n                    l1_batch_number,\n                    scheduler_partial_input_blob_url,\n                    protocol_version,\n                    status,\n                    created_at,\n                    updated_at,\n                    protocol_version_patch\n                )\n                VALUES\n                ($1, $2, $3, 'waiting_for_proofs', NOW(), NOW(), $4)\n                ON CONFLICT (l1_batch_number) DO\n                UPDATE\n                SET\n                updated_at = NOW()\n                ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Text",
+        "Int4",
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "340a84063719f9b837a61cbc63368ba43ba128a00a194dce65015bd9eeb1b42f"
+}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-37fa629a87113f13c89ce5c1a8fffd15b636d553794900596528e8fb03ca5aed.json b/prover/crates/lib/prover_dal/.sqlx/query-37fa629a87113f13c89ce5c1a8fffd15b636d553794900596528e8fb03ca5aed.json
new file mode 100644
index 00000000000..3a8a78db9f0
--- /dev/null
+++ b/prover/crates/lib/prover_dal/.sqlx/query-37fa629a87113f13c89ce5c1a8fffd15b636d553794900596528e8fb03ca5aed.json
@@ -0,0 +1,17 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                INSERT INTO\n                recursion_tip_witness_jobs_fri (\n                    l1_batch_number,\n                    status,\n                    number_of_final_node_jobs,\n                    protocol_version,\n                    created_at,\n                    updated_at,\n                    protocol_version_patch\n                )\n                VALUES\n                ($1, 'waiting_for_proofs', $2, $3, NOW(), NOW(), $4)\n                ON CONFLICT (l1_batch_number) DO\n                UPDATE\n                SET\n                updated_at = NOW()\n                ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int4",
+        "Int4",
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "37fa629a87113f13c89ce5c1a8fffd15b636d553794900596528e8fb03ca5aed"
+}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-3941da180ee62a7c5d4e392ff4fe2d3a6ebb3657862b91e3ece34119f098fc2d.json b/prover/crates/lib/prover_dal/.sqlx/query-3941da180ee62a7c5d4e392ff4fe2d3a6ebb3657862b91e3ece34119f098fc2d.json
deleted file mode 100644
index d0dd5f6976b..00000000000
--- a/prover/crates/lib/prover_dal/.sqlx/query-3941da180ee62a7c5d4e392ff4fe2d3a6ebb3657862b91e3ece34119f098fc2d.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            UPDATE node_aggregation_witness_jobs_fri\n            SET\n                status = 'queued'\n            WHERE\n                (l1_batch_number, circuit_id, depth) IN (\n                    SELECT\n                        prover_jobs_fri.l1_batch_number,\n                        prover_jobs_fri.circuit_id,\n                        prover_jobs_fri.depth\n                    FROM\n                        prover_jobs_fri\n                        JOIN node_aggregation_witness_jobs_fri nawj ON prover_jobs_fri.l1_batch_number = nawj.l1_batch_number\n                        AND prover_jobs_fri.circuit_id = nawj.circuit_id\n                        AND prover_jobs_fri.depth = nawj.depth\n                    WHERE\n                        nawj.status = 'waiting_for_proofs'\n                        AND prover_jobs_fri.status = 'successful'\n                        AND prover_jobs_fri.aggregation_round = 2\n                    GROUP BY\n                        prover_jobs_fri.l1_batch_number,\n                        prover_jobs_fri.circuit_id,\n                        prover_jobs_fri.depth,\n                        nawj.number_of_dependent_jobs\n                    HAVING\n                        COUNT(*) = nawj.number_of_dependent_jobs\n                )\n            RETURNING\n                l1_batch_number,\n                circuit_id,\n                depth;\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "l1_batch_number",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "circuit_id",
-        "type_info": "Int2"
-      },
-      {
-        "ordinal": 2,
-        "name": "depth",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "3941da180ee62a7c5d4e392ff4fe2d3a6ebb3657862b91e3ece34119f098fc2d"
-}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-7d20c0bf35625185c1f6c675aa8fcddbb47c5e9965443f118f8edd7d562734a2.json b/prover/crates/lib/prover_dal/.sqlx/query-3b3193bfac70b5fe69bf3bb7ba5a234c19578572973094b21ddbb3876da6bb95.json
similarity index 79%
rename from prover/crates/lib/prover_dal/.sqlx/query-7d20c0bf35625185c1f6c675aa8fcddbb47c5e9965443f118f8edd7d562734a2.json
rename to prover/crates/lib/prover_dal/.sqlx/query-3b3193bfac70b5fe69bf3bb7ba5a234c19578572973094b21ddbb3876da6bb95.json
index 140b8f12675..962979344b4 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-7d20c0bf35625185c1f6c675aa8fcddbb47c5e9965443f118f8edd7d562734a2.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-3b3193bfac70b5fe69bf3bb7ba5a234c19578572973094b21ddbb3876da6bb95.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE prover_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $3\n            WHERE\n                id = (\n                    SELECT\n                        id\n                    FROM\n                        prover_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                        AND protocol_version_patch = $2\n                    ORDER BY\n                        l1_batch_number ASC,\n                        aggregation_round ASC,\n                        circuit_id ASC,\n                        id ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                prover_jobs_fri.id,\n                prover_jobs_fri.l1_batch_number,\n                prover_jobs_fri.circuit_id,\n                prover_jobs_fri.aggregation_round,\n                prover_jobs_fri.sequence_number,\n                prover_jobs_fri.depth,\n                prover_jobs_fri.is_node_final_proof\n            ",
+  "query": "\n            UPDATE prover_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $3\n            WHERE\n                id = (\n                    SELECT\n                        id\n                    FROM\n                        prover_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                        AND protocol_version_patch = $2\n                    ORDER BY\n                        l1_batch_number ASC,\n                        aggregation_round ASC,\n                        circuit_id ASC,\n                        id ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n            RETURNING\n            prover_jobs_fri.id,\n            prover_jobs_fri.l1_batch_number,\n            prover_jobs_fri.circuit_id,\n            prover_jobs_fri.aggregation_round,\n            prover_jobs_fri.sequence_number,\n            prover_jobs_fri.depth,\n            prover_jobs_fri.is_node_final_proof\n            ",
   "describe": {
     "columns": [
       {
@@ -56,5 +56,5 @@
       false
     ]
   },
-  "hash": "7d20c0bf35625185c1f6c675aa8fcddbb47c5e9965443f118f8edd7d562734a2"
+  "hash": "3b3193bfac70b5fe69bf3bb7ba5a234c19578572973094b21ddbb3876da6bb95"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-3e0a1ebc684810c09ff83784bdd0ad195b0dd2a8ce56b1a9eb531103130b5e3e.json b/prover/crates/lib/prover_dal/.sqlx/query-3e0a1ebc684810c09ff83784bdd0ad195b0dd2a8ce56b1a9eb531103130b5e3e.json
deleted file mode 100644
index 7646c87b847..00000000000
--- a/prover/crates/lib/prover_dal/.sqlx/query-3e0a1ebc684810c09ff83784bdd0ad195b0dd2a8ce56b1a9eb531103130b5e3e.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            UPDATE prover_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                processing_started_at = NOW(),\n                updated_at = NOW(),\n                picked_by = $5\n            WHERE\n                id = (\n                    SELECT\n                        pj.id\n                    FROM\n                        (\n                            SELECT\n                                *\n                            FROM\n                                UNNEST($1::SMALLINT[], $2::SMALLINT[])\n                        ) AS tuple (circuit_id, ROUND)\n                        JOIN LATERAL (\n                            SELECT\n                                *\n                            FROM\n                                prover_jobs_fri AS pj\n                            WHERE\n                                pj.status = 'queued'\n                                AND pj.protocol_version = $3\n                                AND pj.protocol_version_patch = $4\n                                AND pj.circuit_id = tuple.circuit_id\n                                AND pj.aggregation_round = tuple.round\n                            ORDER BY\n                                pj.l1_batch_number ASC,\n                                pj.id ASC\n                            LIMIT\n                                1\n                        ) AS pj ON TRUE\n                    ORDER BY\n                        pj.l1_batch_number ASC,\n                        pj.aggregation_round DESC,\n                        pj.id ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                prover_jobs_fri.id,\n                prover_jobs_fri.l1_batch_number,\n                prover_jobs_fri.circuit_id,\n                prover_jobs_fri.aggregation_round,\n                prover_jobs_fri.sequence_number,\n                prover_jobs_fri.depth,\n                prover_jobs_fri.is_node_final_proof\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "l1_batch_number",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 2,
-        "name": "circuit_id",
-        "type_info": "Int2"
-      },
-      {
-        "ordinal": 3,
-        "name": "aggregation_round",
-        "type_info": "Int2"
-      },
-      {
-        "ordinal": 4,
-        "name": "sequence_number",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 5,
-        "name": "depth",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 6,
-        "name": "is_node_final_proof",
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int2Array",
-        "Int2Array",
-        "Int4",
-        "Int4",
-        "Text"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "3e0a1ebc684810c09ff83784bdd0ad195b0dd2a8ce56b1a9eb531103130b5e3e"
-}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-216d0c263539739b53975a96a10332b826708800a2f72f09bd7aea08cf724e1a.json b/prover/crates/lib/prover_dal/.sqlx/query-3fead9a82ea277785a9ee5c075a2ad4da8f523aa84cd047216d8e3cf69c92106.json
similarity index 82%
rename from prover/crates/lib/prover_dal/.sqlx/query-216d0c263539739b53975a96a10332b826708800a2f72f09bd7aea08cf724e1a.json
rename to prover/crates/lib/prover_dal/.sqlx/query-3fead9a82ea277785a9ee5c075a2ad4da8f523aa84cd047216d8e3cf69c92106.json
index ec503eabee0..6a534c361e2 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-216d0c263539739b53975a96a10332b826708800a2f72f09bd7aea08cf724e1a.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-3fead9a82ea277785a9ee5c075a2ad4da8f523aa84cd047216d8e3cf69c92106.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE scheduler_witness_jobs_fri\n            SET\n                status = 'queued',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                (\n                    status = 'in_progress'\n                    AND processing_started_at <= NOW() - $1::INTERVAL\n                    AND attempts < $2\n                )\n                OR (\n                    status = 'failed'\n                    AND attempts < $2\n                )\n            RETURNING\n                l1_batch_number,\n                status,\n                attempts,\n                error,\n                picked_by\n            ",
+  "query": "\n            UPDATE scheduler_witness_jobs_fri\n            SET\n                status = 'queued',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                (\n                    status = 'in_progress'\n                    AND processing_started_at <= NOW() - $1::INTERVAL\n                    AND attempts < $2\n                )\n                OR (\n                    status = 'failed'\n                    AND attempts < $2\n                )\n            RETURNING\n            l1_batch_number,\n            status,\n            attempts,\n            error,\n            picked_by\n            ",
   "describe": {
     "columns": [
       {
@@ -43,5 +43,5 @@
       true
     ]
   },
-  "hash": "216d0c263539739b53975a96a10332b826708800a2f72f09bd7aea08cf724e1a"
+  "hash": "3fead9a82ea277785a9ee5c075a2ad4da8f523aa84cd047216d8e3cf69c92106"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-3ffc042b13c185ca6963fcb2d4d10c3b232bbaaa12747f72e3b8c5ad64702a79.json b/prover/crates/lib/prover_dal/.sqlx/query-3ffc042b13c185ca6963fcb2d4d10c3b232bbaaa12747f72e3b8c5ad64702a79.json
new file mode 100644
index 00000000000..a39cda265f0
--- /dev/null
+++ b/prover/crates/lib/prover_dal/.sqlx/query-3ffc042b13c185ca6963fcb2d4d10c3b232bbaaa12747f72e3b8c5ad64702a79.json
@@ -0,0 +1,32 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE node_aggregation_witness_jobs_fri\n            SET\n                status = 'queued'\n            WHERE\n                (l1_batch_number, circuit_id, depth) IN (\n                    SELECT\n                        prover_jobs_fri.l1_batch_number,\n                        prover_jobs_fri.circuit_id,\n                        prover_jobs_fri.depth\n                    FROM\n                        prover_jobs_fri\n                    JOIN node_aggregation_witness_jobs_fri nawj\n                        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\n                        nawj.status = 'waiting_for_proofs'\n                        AND prover_jobs_fri.status = 'successful'\n                        AND prover_jobs_fri.aggregation_round = 2\n                    GROUP BY\n                        prover_jobs_fri.l1_batch_number,\n                        prover_jobs_fri.circuit_id,\n                        prover_jobs_fri.depth,\n                        nawj.number_of_dependent_jobs\n                    HAVING\n                        COUNT(*) = nawj.number_of_dependent_jobs\n                )\n            RETURNING\n            l1_batch_number,\n            circuit_id,\n            depth;\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "l1_batch_number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "circuit_id",
+        "type_info": "Int2"
+      },
+      {
+        "ordinal": 2,
+        "name": "depth",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "3ffc042b13c185ca6963fcb2d4d10c3b232bbaaa12747f72e3b8c5ad64702a79"
+}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-bcc5d3d35652f49b41d4ee673b171570fc88c17822bebd5b92e3b2f726d9af3a.json b/prover/crates/lib/prover_dal/.sqlx/query-4580503b825352de7691478a5de103782558380c48caf8734cacee350e3841dd.json
similarity index 82%
rename from prover/crates/lib/prover_dal/.sqlx/query-bcc5d3d35652f49b41d4ee673b171570fc88c17822bebd5b92e3b2f726d9af3a.json
rename to prover/crates/lib/prover_dal/.sqlx/query-4580503b825352de7691478a5de103782558380c48caf8734cacee350e3841dd.json
index ab1c2dd6552..ee786a1cabe 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-bcc5d3d35652f49b41d4ee673b171570fc88c17822bebd5b92e3b2f726d9af3a.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-4580503b825352de7691478a5de103782558380c48caf8734cacee350e3841dd.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE witness_inputs_fri\n            SET\n                status = 'queued',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                (\n                    status = 'in_progress'\n                    AND processing_started_at <= NOW() - $1::INTERVAL\n                    AND attempts < $2\n                )\n                OR (\n                    status = 'failed'\n                    AND attempts < $2\n                )\n            RETURNING\n                l1_batch_number,\n                status,\n                attempts,\n                error,\n                picked_by\n            ",
+  "query": "\n            UPDATE witness_inputs_fri\n            SET\n                status = 'queued',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                (\n                    status = 'in_progress'\n                    AND processing_started_at <= NOW() - $1::INTERVAL\n                    AND attempts < $2\n                )\n                OR (\n                    status = 'failed'\n                    AND attempts < $2\n                )\n            RETURNING\n            l1_batch_number,\n            status,\n            attempts,\n            error,\n            picked_by\n            ",
   "describe": {
     "columns": [
       {
@@ -43,5 +43,5 @@
       true
     ]
   },
-  "hash": "bcc5d3d35652f49b41d4ee673b171570fc88c17822bebd5b92e3b2f726d9af3a"
+  "hash": "4580503b825352de7691478a5de103782558380c48caf8734cacee350e3841dd"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-48b57a279bfff34d44d1f5a6501e40978966fb2ad8b342907580dd17c0a52779.json b/prover/crates/lib/prover_dal/.sqlx/query-48b57a279bfff34d44d1f5a6501e40978966fb2ad8b342907580dd17c0a52779.json
new file mode 100644
index 00000000000..6e6a6b4ac1a
--- /dev/null
+++ b/prover/crates/lib/prover_dal/.sqlx/query-48b57a279bfff34d44d1f5a6501e40978966fb2ad8b342907580dd17c0a52779.json
@@ -0,0 +1,17 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            witness_inputs_fri (\n                l1_batch_number,\n                witness_inputs_blob_url,\n                protocol_version,\n                status,\n                created_at,\n                updated_at,\n                protocol_version_patch\n            )\n            VALUES\n            ($1, $2, $3, 'queued', NOW(), NOW(), $4)\n            ON CONFLICT (l1_batch_number) DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Text",
+        "Int4",
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "48b57a279bfff34d44d1f5a6501e40978966fb2ad8b342907580dd17c0a52779"
+}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-d5bb897092bce2788fe02f31c9de6dde4142e09330557cc627fee2db278ace50.json b/prover/crates/lib/prover_dal/.sqlx/query-54cc92f95c07effcb08fa0b174c742fde93ffb610bff173f04f1b80e30754ad5.json
similarity index 82%
rename from prover/crates/lib/prover_dal/.sqlx/query-d5bb897092bce2788fe02f31c9de6dde4142e09330557cc627fee2db278ace50.json
rename to prover/crates/lib/prover_dal/.sqlx/query-54cc92f95c07effcb08fa0b174c742fde93ffb610bff173f04f1b80e30754ad5.json
index 9df8f1c849c..5a5d61aa436 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-d5bb897092bce2788fe02f31c9de6dde4142e09330557cc627fee2db278ace50.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-54cc92f95c07effcb08fa0b174c742fde93ffb610bff173f04f1b80e30754ad5.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE leaf_aggregation_witness_jobs_fri\n            SET\n                status = 'queued',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                (\n                    status = 'in_progress'\n                    AND processing_started_at <= NOW() - $1::INTERVAL\n                    AND attempts < $2\n                )\n                OR (\n                    status = 'failed'\n                    AND attempts < $2\n                )\n            RETURNING\n                id,\n                status,\n                attempts,\n                circuit_id,\n                error,\n                picked_by\n            ",
+  "query": "\n            UPDATE leaf_aggregation_witness_jobs_fri\n            SET\n                status = 'queued',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                (\n                    status = 'in_progress'\n                    AND processing_started_at <= NOW() - $1::INTERVAL\n                    AND attempts < $2\n                )\n                OR (\n                    status = 'failed'\n                    AND attempts < $2\n                )\n            RETURNING\n            id,\n            status,\n            attempts,\n            circuit_id,\n            error,\n            picked_by\n            ",
   "describe": {
     "columns": [
       {
@@ -49,5 +49,5 @@
       true
     ]
   },
-  "hash": "d5bb897092bce2788fe02f31c9de6dde4142e09330557cc627fee2db278ace50"
+  "hash": "54cc92f95c07effcb08fa0b174c742fde93ffb610bff173f04f1b80e30754ad5"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-2b12c5d469e6220cc8ddc997c666e4aa4f797bcc6e05ec2f2e435a7e940d8cf9.json b/prover/crates/lib/prover_dal/.sqlx/query-6b7cf7ae3c66c46f4ecec2b0710f9f8bea0033f6727c2582f7f141330a47f440.json
similarity index 82%
rename from prover/crates/lib/prover_dal/.sqlx/query-2b12c5d469e6220cc8ddc997c666e4aa4f797bcc6e05ec2f2e435a7e940d8cf9.json
rename to prover/crates/lib/prover_dal/.sqlx/query-6b7cf7ae3c66c46f4ecec2b0710f9f8bea0033f6727c2582f7f141330a47f440.json
index 14b64e8122e..88afcf436c2 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-2b12c5d469e6220cc8ddc997c666e4aa4f797bcc6e05ec2f2e435a7e940d8cf9.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-6b7cf7ae3c66c46f4ecec2b0710f9f8bea0033f6727c2582f7f141330a47f440.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE node_aggregation_witness_jobs_fri\n            SET\n                status = 'queued',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                (\n                    status = 'in_progress'\n                    AND processing_started_at <= NOW() - $1::INTERVAL\n                    AND attempts < $2\n                )\n                OR (\n                    status = 'failed'\n                    AND attempts < $2\n                )\n            RETURNING\n                id,\n                status,\n                attempts,\n                circuit_id,\n                error,\n                picked_by\n            ",
+  "query": "\n            UPDATE node_aggregation_witness_jobs_fri\n            SET\n                status = 'queued',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                (\n                    status = 'in_progress'\n                    AND processing_started_at <= NOW() - $1::INTERVAL\n                    AND attempts < $2\n                )\n                OR (\n                    status = 'failed'\n                    AND attempts < $2\n                )\n            RETURNING\n            id,\n            status,\n            attempts,\n            circuit_id,\n            error,\n            picked_by\n            ",
   "describe": {
     "columns": [
       {
@@ -49,5 +49,5 @@
       true
     ]
   },
-  "hash": "2b12c5d469e6220cc8ddc997c666e4aa4f797bcc6e05ec2f2e435a7e940d8cf9"
+  "hash": "6b7cf7ae3c66c46f4ecec2b0710f9f8bea0033f6727c2582f7f141330a47f440"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-d272c91f1209c277189a31c59ee191a43dc8eafc33ee067bd41e20f25f7625f0.json b/prover/crates/lib/prover_dal/.sqlx/query-6c37c8a0a921408e3b812adf77d835d9a865ecbd87d38008a649e8943fdf8a43.json
similarity index 92%
rename from prover/crates/lib/prover_dal/.sqlx/query-d272c91f1209c277189a31c59ee191a43dc8eafc33ee067bd41e20f25f7625f0.json
rename to prover/crates/lib/prover_dal/.sqlx/query-6c37c8a0a921408e3b812adf77d835d9a865ecbd87d38008a649e8943fdf8a43.json
index 2c94853eacf..d2d8d265e69 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-d272c91f1209c277189a31c59ee191a43dc8eafc33ee067bd41e20f25f7625f0.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-6c37c8a0a921408e3b812adf77d835d9a865ecbd87d38008a649e8943fdf8a43.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE leaf_aggregation_witness_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $3\n            WHERE\n                id = (\n                    SELECT\n                        id\n                    FROM\n                        leaf_aggregation_witness_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                        AND protocol_version_patch = $2\n                    ORDER BY\n                        l1_batch_number ASC,\n                        id ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                leaf_aggregation_witness_jobs_fri.*\n            ",
+  "query": "\n            UPDATE leaf_aggregation_witness_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $3\n            WHERE\n                id = (\n                    SELECT\n                        id\n                    FROM\n                        leaf_aggregation_witness_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                        AND protocol_version_patch = $2\n                    ORDER BY\n                        l1_batch_number ASC,\n                        id ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n            RETURNING\n            leaf_aggregation_witness_jobs_fri.*\n            ",
   "describe": {
     "columns": [
       {
@@ -104,5 +104,5 @@
       false
     ]
   },
-  "hash": "d272c91f1209c277189a31c59ee191a43dc8eafc33ee067bd41e20f25f7625f0"
+  "hash": "6c37c8a0a921408e3b812adf77d835d9a865ecbd87d38008a649e8943fdf8a43"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-2dc6b7bf08cced8791354fc47e319d03f894f40d2ec528382b5643c3d51ec8e7.json b/prover/crates/lib/prover_dal/.sqlx/query-705e3880df382c3c25f41630d83f2186aa86751cb3b4de26a60af1cf987ca636.json
similarity index 92%
rename from prover/crates/lib/prover_dal/.sqlx/query-2dc6b7bf08cced8791354fc47e319d03f894f40d2ec528382b5643c3d51ec8e7.json
rename to prover/crates/lib/prover_dal/.sqlx/query-705e3880df382c3c25f41630d83f2186aa86751cb3b4de26a60af1cf987ca636.json
index 0ad6413e1ec..700a7e8bfd6 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-2dc6b7bf08cced8791354fc47e319d03f894f40d2ec528382b5643c3d51ec8e7.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-705e3880df382c3c25f41630d83f2186aa86751cb3b4de26a60af1cf987ca636.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE gpu_prover_queue_fri\n            SET\n                instance_status = 'reserved',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                id IN (\n                    SELECT\n                        id\n                    FROM\n                        gpu_prover_queue_fri\n                    WHERE\n                        specialized_prover_group_id = $2\n                        AND zone = $3\n                        AND protocol_version = $4\n                        AND protocol_version_patch = $5\n                        AND (\n                            instance_status = 'available'\n                            OR (\n                                instance_status = 'reserved'\n                                AND processing_started_at < NOW() - $1::INTERVAL\n                            )\n                        )\n                    ORDER BY\n                        updated_at ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                gpu_prover_queue_fri.*\n            ",
+  "query": "\n            UPDATE gpu_prover_queue_fri\n            SET\n                instance_status = 'reserved',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                id IN (\n                    SELECT\n                        id\n                    FROM\n                        gpu_prover_queue_fri\n                    WHERE\n                        specialized_prover_group_id = $2\n                        AND zone = $3\n                        AND protocol_version = $4\n                        AND protocol_version_patch = $5\n                        AND (\n                            instance_status = 'available'\n                            OR (\n                                instance_status = 'reserved'\n                                AND processing_started_at < NOW() - $1::INTERVAL\n                            )\n                        )\n                    ORDER BY\n                        updated_at ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n            RETURNING\n            gpu_prover_queue_fri.*\n            ",
   "describe": {
     "columns": [
       {
@@ -82,5 +82,5 @@
       false
     ]
   },
-  "hash": "2dc6b7bf08cced8791354fc47e319d03f894f40d2ec528382b5643c3d51ec8e7"
+  "hash": "705e3880df382c3c25f41630d83f2186aa86751cb3b4de26a60af1cf987ca636"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-7238cfe04ba59967fe5589665ad2c0214469edff6fc74965f1ec1366f8b46b8e.json b/prover/crates/lib/prover_dal/.sqlx/query-7238cfe04ba59967fe5589665ad2c0214469edff6fc74965f1ec1366f8b46b8e.json
new file mode 100644
index 00000000000..227ff7dbe26
--- /dev/null
+++ b/prover/crates/lib/prover_dal/.sqlx/query-7238cfe04ba59967fe5589665ad2c0214469edff6fc74965f1ec1366f8b46b8e.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            node_aggregation_witness_jobs_fri (\n                l1_batch_number,\n                circuit_id,\n                depth,\n                aggregations_url,\n                number_of_dependent_jobs,\n                protocol_version,\n                status,\n                created_at,\n                updated_at,\n                protocol_version_patch\n            )\n            VALUES\n            ($1, $2, $3, $4, $5, $6, 'waiting_for_proofs', NOW(), NOW(), $7)\n            ON CONFLICT (l1_batch_number, circuit_id, depth) DO\n            UPDATE\n            SET\n            updated_at = NOW()\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int2",
+        "Int4",
+        "Text",
+        "Int4",
+        "Int4",
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "7238cfe04ba59967fe5589665ad2c0214469edff6fc74965f1ec1366f8b46b8e"
+}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-73266a8526c6adc315900e2e95441976a264759c4060c1a38e466ee2052fc17d.json b/prover/crates/lib/prover_dal/.sqlx/query-73266a8526c6adc315900e2e95441976a264759c4060c1a38e466ee2052fc17d.json
deleted file mode 100644
index f8b141a8dac..00000000000
--- a/prover/crates/lib/prover_dal/.sqlx/query-73266a8526c6adc315900e2e95441976a264759c4060c1a38e466ee2052fc17d.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                recursion_tip_witness_jobs_fri (l1_batch_number, status, number_of_final_node_jobs, created_at, updated_at)\n            VALUES\n                ($1, 'waiting_for_proofs', 1, NOW(), NOW())\n            ON CONFLICT (l1_batch_number) DO\n            UPDATE\n            SET\n                status = $2\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "73266a8526c6adc315900e2e95441976a264759c4060c1a38e466ee2052fc17d"
-}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-8720d411e0c9640afd61e927a89c0b6c018e6a4d279acd24a4ea7d81b5cc5123.json b/prover/crates/lib/prover_dal/.sqlx/query-7493571411ee2cb4f7b09bcfc4eb86d3521faa0fbbfc7ca810c818ca9720b121.json
similarity index 77%
rename from prover/crates/lib/prover_dal/.sqlx/query-8720d411e0c9640afd61e927a89c0b6c018e6a4d279acd24a4ea7d81b5cc5123.json
rename to prover/crates/lib/prover_dal/.sqlx/query-7493571411ee2cb4f7b09bcfc4eb86d3521faa0fbbfc7ca810c818ca9720b121.json
index 12146fb75a9..9d10e7f7fd4 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-8720d411e0c9640afd61e927a89c0b6c018e6a4d279acd24a4ea7d81b5cc5123.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-7493571411ee2cb4f7b09bcfc4eb86d3521faa0fbbfc7ca810c818ca9720b121.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE prover_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $3\n            WHERE\n                id = (\n                    SELECT\n                        id\n                    FROM\n                        prover_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                        AND protocol_version_patch = $2\n                    ORDER BY\n                        aggregation_round DESC,\n                        l1_batch_number ASC,\n                        id ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                prover_jobs_fri.id,\n                prover_jobs_fri.l1_batch_number,\n                prover_jobs_fri.circuit_id,\n                prover_jobs_fri.aggregation_round,\n                prover_jobs_fri.sequence_number,\n                prover_jobs_fri.depth,\n                prover_jobs_fri.is_node_final_proof\n            ",
+  "query": "\n            UPDATE prover_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $3\n            WHERE\n                id = (\n                    SELECT\n                        id\n                    FROM\n                        prover_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                        AND protocol_version_patch = $2\n                    ORDER BY\n                        aggregation_round DESC,\n                        l1_batch_number ASC,\n                        id ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n            RETURNING\n            prover_jobs_fri.id,\n            prover_jobs_fri.l1_batch_number,\n            prover_jobs_fri.circuit_id,\n            prover_jobs_fri.aggregation_round,\n            prover_jobs_fri.sequence_number,\n            prover_jobs_fri.depth,\n            prover_jobs_fri.is_node_final_proof\n            ",
   "describe": {
     "columns": [
       {
@@ -56,5 +56,5 @@
       false
     ]
   },
-  "hash": "8720d411e0c9640afd61e927a89c0b6c018e6a4d279acd24a4ea7d81b5cc5123"
+  "hash": "7493571411ee2cb4f7b09bcfc4eb86d3521faa0fbbfc7ca810c818ca9720b121"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-749d18c0fdae16ce0ed4e3c23e543d01cff938d3aed44c9bb1d864bfdf69e39a.json b/prover/crates/lib/prover_dal/.sqlx/query-749d18c0fdae16ce0ed4e3c23e543d01cff938d3aed44c9bb1d864bfdf69e39a.json
new file mode 100644
index 00000000000..d01c5481fa6
--- /dev/null
+++ b/prover/crates/lib/prover_dal/.sqlx/query-749d18c0fdae16ce0ed4e3c23e543d01cff938d3aed44c9bb1d864bfdf69e39a.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            prover_jobs_fri (\n                l1_batch_number,\n                circuit_id,\n                circuit_blob_url,\n                aggregation_round,\n                sequence_number,\n                depth,\n                is_node_final_proof,\n                protocol_version,\n                status,\n                created_at,\n                updated_at,\n                protocol_version_patch\n            )\n            VALUES\n            ($1, $2, $3, $4, $5, $6, $7, $8, 'queued', NOW(), NOW(), $9)\n            ON CONFLICT (\n                l1_batch_number, aggregation_round, circuit_id, depth, sequence_number\n            ) DO\n            UPDATE\n            SET\n            updated_at = NOW()\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int2",
+        "Text",
+        "Int2",
+        "Int4",
+        "Int4",
+        "Bool",
+        "Int4",
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "749d18c0fdae16ce0ed4e3c23e543d01cff938d3aed44c9bb1d864bfdf69e39a"
+}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-764693ceeb45f8478a20242b592d419667f11d80036cda021ecbf23b0b5f7f42.json b/prover/crates/lib/prover_dal/.sqlx/query-764693ceeb45f8478a20242b592d419667f11d80036cda021ecbf23b0b5f7f42.json
deleted file mode 100644
index aac0fcd420c..00000000000
--- a/prover/crates/lib/prover_dal/.sqlx/query-764693ceeb45f8478a20242b592d419667f11d80036cda021ecbf23b0b5f7f42.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                node_aggregation_witness_jobs_fri (\n                    l1_batch_number,\n                    circuit_id,\n                    depth,\n                    aggregations_url,\n                    number_of_dependent_jobs,\n                    protocol_version,\n                    status,\n                    created_at,\n                    updated_at,\n                    protocol_version_patch\n                )\n            VALUES\n                ($1, $2, $3, $4, $5, $6, 'waiting_for_proofs', NOW(), NOW(), $7)\n            ON CONFLICT (l1_batch_number, circuit_id, depth) DO\n            UPDATE\n            SET\n                updated_at = NOW()\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int2",
-        "Int4",
-        "Text",
-        "Int4",
-        "Int4",
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "764693ceeb45f8478a20242b592d419667f11d80036cda021ecbf23b0b5f7f42"
-}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-776ef00deb25b0453c1eb38c5eaa81aef0d77e0a4b02307f59e289c0e61717c5.json b/prover/crates/lib/prover_dal/.sqlx/query-776ef00deb25b0453c1eb38c5eaa81aef0d77e0a4b02307f59e289c0e61717c5.json
deleted file mode 100644
index c39b660fa2e..00000000000
--- a/prover/crates/lib/prover_dal/.sqlx/query-776ef00deb25b0453c1eb38c5eaa81aef0d77e0a4b02307f59e289c0e61717c5.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                gpu_prover_queue_fri (\n                    instance_host,\n                    instance_port,\n                    instance_status,\n                    specialized_prover_group_id,\n                    zone,\n                    created_at,\n                    updated_at,\n                    protocol_version,\n                    protocol_version_patch\n                )\n            VALUES\n                (CAST($1::TEXT AS INET), $2, 'available', $3, $4, NOW(), NOW(), $5, $6)\n            ON CONFLICT (instance_host, instance_port, zone) DO\n            UPDATE\n            SET\n                instance_status = 'available',\n                specialized_prover_group_id = $3,\n                zone = $4,\n                updated_at = NOW(),\n                protocol_version = $5,\n                protocol_version_patch = $6\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Int4",
-        "Int2",
-        "Text",
-        "Int4",
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "776ef00deb25b0453c1eb38c5eaa81aef0d77e0a4b02307f59e289c0e61717c5"
-}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-7ab760de174d37c04373cf48489846983cb3f693c02159ba41c1a875aed7e03d.json b/prover/crates/lib/prover_dal/.sqlx/query-7ab760de174d37c04373cf48489846983cb3f693c02159ba41c1a875aed7e03d.json
new file mode 100644
index 00000000000..6e0c60eeab0
--- /dev/null
+++ b/prover/crates/lib/prover_dal/.sqlx/query-7ab760de174d37c04373cf48489846983cb3f693c02159ba41c1a875aed7e03d.json
@@ -0,0 +1,62 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE prover_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                processing_started_at = NOW(),\n                updated_at = NOW(),\n                picked_by = $5\n            WHERE\n                id = (\n                    SELECT\n                        pj.id\n                    FROM\n                        (\n                            SELECT\n                                *\n                            FROM\n                                UNNEST($1::SMALLINT [], $2::SMALLINT [])\n                        ) AS tuple (circuit_id, round)\n                    JOIN LATERAL (\n                        SELECT\n                            *\n                        FROM\n                            prover_jobs_fri AS pj\n                        WHERE\n                            pj.status = 'queued'\n                            AND pj.protocol_version = $3\n                            AND pj.protocol_version_patch = $4\n                            AND pj.circuit_id = tuple.circuit_id\n                            AND pj.aggregation_round = tuple.round\n                        ORDER BY\n                            pj.l1_batch_number ASC,\n                            pj.id ASC\n                        LIMIT\n                            1\n                    ) AS pj ON TRUE\n                    ORDER BY\n                        pj.l1_batch_number ASC,\n                        pj.aggregation_round DESC,\n                        pj.id ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n            RETURNING\n            prover_jobs_fri.id,\n            prover_jobs_fri.l1_batch_number,\n            prover_jobs_fri.circuit_id,\n            prover_jobs_fri.aggregation_round,\n            prover_jobs_fri.sequence_number,\n            prover_jobs_fri.depth,\n            prover_jobs_fri.is_node_final_proof\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "l1_batch_number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "circuit_id",
+        "type_info": "Int2"
+      },
+      {
+        "ordinal": 3,
+        "name": "aggregation_round",
+        "type_info": "Int2"
+      },
+      {
+        "ordinal": 4,
+        "name": "sequence_number",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 5,
+        "name": "depth",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 6,
+        "name": "is_node_final_proof",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int2Array",
+        "Int2Array",
+        "Int4",
+        "Int4",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "7ab760de174d37c04373cf48489846983cb3f693c02159ba41c1a875aed7e03d"
+}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-37ad15f54f4a6f4f79c71a857f3a8d4cc59246dda91b19526e73f27a17c8e3da.json b/prover/crates/lib/prover_dal/.sqlx/query-866bffdc527c079d128c1d21595ca5aec09b39b9d0367b0c29167f8a6a166d18.json
similarity index 83%
rename from prover/crates/lib/prover_dal/.sqlx/query-37ad15f54f4a6f4f79c71a857f3a8d4cc59246dda91b19526e73f27a17c8e3da.json
rename to prover/crates/lib/prover_dal/.sqlx/query-866bffdc527c079d128c1d21595ca5aec09b39b9d0367b0c29167f8a6a166d18.json
index c97fe7f4042..e5a8f575d01 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-37ad15f54f4a6f4f79c71a857f3a8d4cc59246dda91b19526e73f27a17c8e3da.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-866bffdc527c079d128c1d21595ca5aec09b39b9d0367b0c29167f8a6a166d18.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE recursion_tip_witness_jobs_fri\n            SET\n                status = 'queued',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                l1_batch_number = $1\n                AND attempts >= $2\n                AND (\n                    status = 'in_progress'\n                    OR status = 'failed'\n                )\n            RETURNING\n                l1_batch_number,\n                status,\n                attempts,\n                error,\n                picked_by\n            ",
+  "query": "\n            UPDATE recursion_tip_witness_jobs_fri\n            SET\n                status = 'queued',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                l1_batch_number = $1\n                AND attempts >= $2\n                AND (\n                    status = 'in_progress'\n                    OR status = 'failed'\n                )\n            RETURNING\n            l1_batch_number,\n            status,\n            attempts,\n            error,\n            picked_by\n            ",
   "describe": {
     "columns": [
       {
@@ -43,5 +43,5 @@
       true
     ]
   },
-  "hash": "37ad15f54f4a6f4f79c71a857f3a8d4cc59246dda91b19526e73f27a17c8e3da"
+  "hash": "866bffdc527c079d128c1d21595ca5aec09b39b9d0367b0c29167f8a6a166d18"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-89a25708d0b0a15e1e56ee8fd69f5a15d2fc5ad3e5ce738a2f6ee3eecfc96736.json b/prover/crates/lib/prover_dal/.sqlx/query-89a25708d0b0a15e1e56ee8fd69f5a15d2fc5ad3e5ce738a2f6ee3eecfc96736.json
deleted file mode 100644
index d8bd3223905..00000000000
--- a/prover/crates/lib/prover_dal/.sqlx/query-89a25708d0b0a15e1e56ee8fd69f5a15d2fc5ad3e5ce738a2f6ee3eecfc96736.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                prover_fri_protocol_versions (id, snark_wrapper_vk_hash, created_at, protocol_version_patch)\n            VALUES\n                ($1, $2, NOW(), $3)\n            ON CONFLICT (id, protocol_version_patch) DO NOTHING\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int4",
-        "Bytea",
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "89a25708d0b0a15e1e56ee8fd69f5a15d2fc5ad3e5ce738a2f6ee3eecfc96736"
-}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-28397b5a0b7af832d2a4d3d7011a68a48db6a64afcd41bbe0e17d98fa38fdb19.json b/prover/crates/lib/prover_dal/.sqlx/query-8c5aba6ce584c1671f2d65fb47701426d60c56b526af5ed2e0c602f881c3bbf0.json
similarity index 52%
rename from prover/crates/lib/prover_dal/.sqlx/query-28397b5a0b7af832d2a4d3d7011a68a48db6a64afcd41bbe0e17d98fa38fdb19.json
rename to prover/crates/lib/prover_dal/.sqlx/query-8c5aba6ce584c1671f2d65fb47701426d60c56b526af5ed2e0c602f881c3bbf0.json
index d6e77daaa92..fc0594f6443 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-28397b5a0b7af832d2a4d3d7011a68a48db6a64afcd41bbe0e17d98fa38fdb19.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-8c5aba6ce584c1671f2d65fb47701426d60c56b526af5ed2e0c602f881c3bbf0.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE scheduler_witness_jobs_fri\n            SET\n                status = 'queued'\n            WHERE\n                l1_batch_number IN (\n                    SELECT\n                        prover_jobs_fri.l1_batch_number\n                    FROM\n                        prover_jobs_fri\n                        JOIN scheduler_witness_jobs_fri swj ON prover_jobs_fri.l1_batch_number = swj.l1_batch_number\n                    WHERE\n                        swj.status = 'waiting_for_proofs'\n                        AND prover_jobs_fri.status = 'successful'\n                        AND prover_jobs_fri.aggregation_round = $1\n                )\n            RETURNING\n                l1_batch_number;\n            ",
+  "query": "\n            UPDATE scheduler_witness_jobs_fri\n            SET\n                status = 'queued'\n            WHERE\n                l1_batch_number IN (\n                    SELECT\n                        prover_jobs_fri.l1_batch_number\n                    FROM\n                        prover_jobs_fri\n                    JOIN\n                        scheduler_witness_jobs_fri swj\n                        ON prover_jobs_fri.l1_batch_number = swj.l1_batch_number\n                    WHERE\n                        swj.status = 'waiting_for_proofs'\n                        AND prover_jobs_fri.status = 'successful'\n                        AND prover_jobs_fri.aggregation_round = $1\n                )\n            RETURNING\n            l1_batch_number;\n            ",
   "describe": {
     "columns": [
       {
@@ -18,5 +18,5 @@
       false
     ]
   },
-  "hash": "28397b5a0b7af832d2a4d3d7011a68a48db6a64afcd41bbe0e17d98fa38fdb19"
+  "hash": "8c5aba6ce584c1671f2d65fb47701426d60c56b526af5ed2e0c602f881c3bbf0"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-926cddf712322b476064a6efb2a8594776d64b8b5a4094fef979e35ab76d5bcd.json b/prover/crates/lib/prover_dal/.sqlx/query-926cddf712322b476064a6efb2a8594776d64b8b5a4094fef979e35ab76d5bcd.json
new file mode 100644
index 00000000000..a2558f49e1b
--- /dev/null
+++ b/prover/crates/lib/prover_dal/.sqlx/query-926cddf712322b476064a6efb2a8594776d64b8b5a4094fef979e35ab76d5bcd.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            proof_compression_jobs_fri (l1_batch_number, status, created_at, updated_at)\n            VALUES\n            ($1, $2, NOW(), NOW())\n            ON CONFLICT (l1_batch_number) DO\n            UPDATE\n            SET\n            status = $2\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "926cddf712322b476064a6efb2a8594776d64b8b5a4094fef979e35ab76d5bcd"
+}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-929419ad8dcc70e8ce986f17075cd21d4645563f93afd4428734196c2b212276.json b/prover/crates/lib/prover_dal/.sqlx/query-929419ad8dcc70e8ce986f17075cd21d4645563f93afd4428734196c2b212276.json
deleted file mode 100644
index cf5fe8117b1..00000000000
--- a/prover/crates/lib/prover_dal/.sqlx/query-929419ad8dcc70e8ce986f17075cd21d4645563f93afd4428734196c2b212276.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                witness_inputs_fri (\n                    l1_batch_number,\n                    witness_inputs_blob_url,\n                    protocol_version,\n                    status,\n                    created_at,\n                    updated_at,\n                    protocol_version_patch\n                )\n            VALUES\n                ($1, $2, $3, 'queued', NOW(), NOW(), $4)\n            ON CONFLICT (l1_batch_number) DO NOTHING\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Text",
-        "Int4",
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "929419ad8dcc70e8ce986f17075cd21d4645563f93afd4428734196c2b212276"
-}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-9b713312b539b4eefa58346f0070767a2cd4488e670674cd9149f7a332c0198d.json b/prover/crates/lib/prover_dal/.sqlx/query-9b713312b539b4eefa58346f0070767a2cd4488e670674cd9149f7a332c0198d.json
deleted file mode 100644
index 2609a2ee0cf..00000000000
--- a/prover/crates/lib/prover_dal/.sqlx/query-9b713312b539b4eefa58346f0070767a2cd4488e670674cd9149f7a332c0198d.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            UPDATE recursion_tip_witness_jobs_fri\n            SET\n                status = 'queued'\n            WHERE\n                l1_batch_number IN (\n                    SELECT\n                        prover_jobs_fri.l1_batch_number\n                    FROM\n                        prover_jobs_fri\n                        JOIN recursion_tip_witness_jobs_fri rtwj ON prover_jobs_fri.l1_batch_number = rtwj.l1_batch_number\n                    WHERE\n                        rtwj.status = 'waiting_for_proofs'\n                        AND prover_jobs_fri.status = 'successful'\n                        AND prover_jobs_fri.aggregation_round = $1\n                        AND prover_jobs_fri.is_node_final_proof = TRUE\n                    GROUP BY\n                        prover_jobs_fri.l1_batch_number,\n                        rtwj.number_of_final_node_jobs\n                    HAVING\n                        COUNT(*) = rtwj.number_of_final_node_jobs\n                )\n            RETURNING\n                l1_batch_number;\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "l1_batch_number",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int2"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "9b713312b539b4eefa58346f0070767a2cd4488e670674cd9149f7a332c0198d"
-}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-e438a4f0c705fcb39e017912ce8e1bb675a86ae14a863fa31eb513af65d606ed.json b/prover/crates/lib/prover_dal/.sqlx/query-9f5f6d6da7dbb7292b7fe60283993e804b9c2af8c98ae64ccace8c5035b3c499.json
similarity index 80%
rename from prover/crates/lib/prover_dal/.sqlx/query-e438a4f0c705fcb39e017912ce8e1bb675a86ae14a863fa31eb513af65d606ed.json
rename to prover/crates/lib/prover_dal/.sqlx/query-9f5f6d6da7dbb7292b7fe60283993e804b9c2af8c98ae64ccace8c5035b3c499.json
index cf9ff8396ef..fe84883ccd0 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-e438a4f0c705fcb39e017912ce8e1bb675a86ae14a863fa31eb513af65d606ed.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-9f5f6d6da7dbb7292b7fe60283993e804b9c2af8c98ae64ccace8c5035b3c499.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE witness_inputs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $2\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        l1_batch_number\n                    FROM\n                        witness_inputs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                        AND protocol_version_patch = $3\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                witness_inputs_fri.l1_batch_number\n            ",
+  "query": "\n            UPDATE witness_inputs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $2\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        l1_batch_number\n                    FROM\n                        witness_inputs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                        AND protocol_version_patch = $3\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n            RETURNING\n            witness_inputs_fri.l1_batch_number\n            ",
   "describe": {
     "columns": [
       {
@@ -20,5 +20,5 @@
       false
     ]
   },
-  "hash": "e438a4f0c705fcb39e017912ce8e1bb675a86ae14a863fa31eb513af65d606ed"
+  "hash": "9f5f6d6da7dbb7292b7fe60283993e804b9c2af8c98ae64ccace8c5035b3c499"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-e9c9b69852fa68f463f17b6d63ab99cf505662036f2dd7a9f1807c4c1bad7c7b.json b/prover/crates/lib/prover_dal/.sqlx/query-a4407ac701423bc91505af3e7250ac1e4ed2a372922e55728de083bffb533e11.json
similarity index 60%
rename from prover/crates/lib/prover_dal/.sqlx/query-e9c9b69852fa68f463f17b6d63ab99cf505662036f2dd7a9f1807c4c1bad7c7b.json
rename to prover/crates/lib/prover_dal/.sqlx/query-a4407ac701423bc91505af3e7250ac1e4ed2a372922e55728de083bffb533e11.json
index 160eb31bf95..7a06e6557d6 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-e9c9b69852fa68f463f17b6d63ab99cf505662036f2dd7a9f1807c4c1bad7c7b.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-a4407ac701423bc91505af3e7250ac1e4ed2a372922e55728de083bffb533e11.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                protocol_version,\n                protocol_version_patch,\n                COUNT(*) FILTER (\n                    WHERE\n                        status = 'queued'\n                ) AS queued,\n                COUNT(*) FILTER (\n                    WHERE\n                        status = 'in_progress'\n                ) AS in_progress\n            FROM\n                proof_compression_jobs_fri\n            WHERE\n                protocol_version IS NOT NULL\n            GROUP BY\n                protocol_version,\n                protocol_version_patch\n            ",
+  "query": "\n            SELECT\n                protocol_version,\n                protocol_version_patch,\n                COUNT(*) FILTER (\n                    WHERE\n                    status = 'queued'\n                ) AS queued,\n                COUNT(*) FILTER (\n                    WHERE\n                    status = 'in_progress'\n                ) AS in_progress\n            FROM\n                proof_compression_jobs_fri\n            WHERE\n                protocol_version IS NOT NULL\n            GROUP BY\n                protocol_version,\n                protocol_version_patch\n            ",
   "describe": {
     "columns": [
       {
@@ -34,5 +34,5 @@
       null
     ]
   },
-  "hash": "e9c9b69852fa68f463f17b6d63ab99cf505662036f2dd7a9f1807c4c1bad7c7b"
+  "hash": "a4407ac701423bc91505af3e7250ac1e4ed2a372922e55728de083bffb533e11"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-35a76415cb746d03da31481edc65adefab0bf3abf6853a6d36123c8adcaf813b.json b/prover/crates/lib/prover_dal/.sqlx/query-a6848b0c4cb256ca1d79d83dc5cb8c88cdb52125daedbade044934761fe2147d.json
similarity index 83%
rename from prover/crates/lib/prover_dal/.sqlx/query-35a76415cb746d03da31481edc65adefab0bf3abf6853a6d36123c8adcaf813b.json
rename to prover/crates/lib/prover_dal/.sqlx/query-a6848b0c4cb256ca1d79d83dc5cb8c88cdb52125daedbade044934761fe2147d.json
index bf8db798e7d..270868d8981 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-35a76415cb746d03da31481edc65adefab0bf3abf6853a6d36123c8adcaf813b.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-a6848b0c4cb256ca1d79d83dc5cb8c88cdb52125daedbade044934761fe2147d.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE scheduler_witness_jobs_fri\n            SET\n                status = 'queued',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                l1_batch_number = $1\n                AND attempts >= $2\n                AND (\n                    status = 'in_progress'\n                    OR status = 'failed'\n                )\n            RETURNING\n                l1_batch_number,\n                status,\n                attempts,\n                error,\n                picked_by\n            ",
+  "query": "\n            UPDATE scheduler_witness_jobs_fri\n            SET\n                status = 'queued',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                l1_batch_number = $1\n                AND attempts >= $2\n                AND (\n                    status = 'in_progress'\n                    OR status = 'failed'\n                )\n            RETURNING\n            l1_batch_number,\n            status,\n            attempts,\n            error,\n            picked_by\n            ",
   "describe": {
     "columns": [
       {
@@ -43,5 +43,5 @@
       true
     ]
   },
-  "hash": "35a76415cb746d03da31481edc65adefab0bf3abf6853a6d36123c8adcaf813b"
+  "hash": "a6848b0c4cb256ca1d79d83dc5cb8c88cdb52125daedbade044934761fe2147d"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-a6eb7a1f1aa2f6f5d90fbe3b8c777313681560f538c6524c54648d6308533744.json b/prover/crates/lib/prover_dal/.sqlx/query-a6eb7a1f1aa2f6f5d90fbe3b8c777313681560f538c6524c54648d6308533744.json
new file mode 100644
index 00000000000..319b00b4c61
--- /dev/null
+++ b/prover/crates/lib/prover_dal/.sqlx/query-a6eb7a1f1aa2f6f5d90fbe3b8c777313681560f538c6524c54648d6308533744.json
@@ -0,0 +1,32 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE node_aggregation_witness_jobs_fri\n            SET\n                status = 'queued'\n            WHERE\n                (l1_batch_number, circuit_id, depth) IN (\n                    SELECT\n                        prover_jobs_fri.l1_batch_number,\n                        prover_jobs_fri.circuit_id,\n                        prover_jobs_fri.depth\n                    FROM\n                        prover_jobs_fri\n                    JOIN node_aggregation_witness_jobs_fri nawj\n                        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\n                        nawj.status = 'waiting_for_proofs'\n                        AND prover_jobs_fri.status = 'successful'\n                        AND prover_jobs_fri.aggregation_round = 1\n                        AND prover_jobs_fri.depth = 0\n                    GROUP BY\n                        prover_jobs_fri.l1_batch_number,\n                        prover_jobs_fri.circuit_id,\n                        prover_jobs_fri.depth,\n                        nawj.number_of_dependent_jobs\n                    HAVING\n                        COUNT(*) = nawj.number_of_dependent_jobs\n                )\n            RETURNING\n            l1_batch_number,\n            circuit_id,\n            depth;\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "l1_batch_number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "circuit_id",
+        "type_info": "Int2"
+      },
+      {
+        "ordinal": 2,
+        "name": "depth",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "a6eb7a1f1aa2f6f5d90fbe3b8c777313681560f538c6524c54648d6308533744"
+}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-a817f0fec85388b3e2510ce259208a01b63ae4aa03c983c3a52c802d585e5a80.json b/prover/crates/lib/prover_dal/.sqlx/query-a817f0fec85388b3e2510ce259208a01b63ae4aa03c983c3a52c802d585e5a80.json
deleted file mode 100644
index 93532150f7f..00000000000
--- a/prover/crates/lib/prover_dal/.sqlx/query-a817f0fec85388b3e2510ce259208a01b63ae4aa03c983c3a52c802d585e5a80.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                proof_compression_jobs_fri (l1_batch_number, status, created_at, updated_at)\n            VALUES\n                ($1, $2, NOW(), NOW())\n            ON CONFLICT (l1_batch_number) DO\n            UPDATE\n            SET\n                status = $2\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "a817f0fec85388b3e2510ce259208a01b63ae4aa03c983c3a52c802d585e5a80"
-}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-abc93d27a8673b23e18d050e84c43c868c63c853edb5c4f41e48a3cc6378eca9.json b/prover/crates/lib/prover_dal/.sqlx/query-abc93d27a8673b23e18d050e84c43c868c63c853edb5c4f41e48a3cc6378eca9.json
deleted file mode 100644
index fae5c1041a5..00000000000
--- a/prover/crates/lib/prover_dal/.sqlx/query-abc93d27a8673b23e18d050e84c43c868c63c853edb5c4f41e48a3cc6378eca9.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            UPDATE node_aggregation_witness_jobs_fri\n            SET\n                status = 'queued'\n            WHERE\n                (l1_batch_number, circuit_id, depth) IN (\n                    SELECT\n                        prover_jobs_fri.l1_batch_number,\n                        prover_jobs_fri.circuit_id,\n                        prover_jobs_fri.depth\n                    FROM\n                        prover_jobs_fri\n                        JOIN node_aggregation_witness_jobs_fri nawj ON prover_jobs_fri.l1_batch_number = nawj.l1_batch_number\n                        AND prover_jobs_fri.circuit_id = nawj.circuit_id\n                        AND prover_jobs_fri.depth = nawj.depth\n                    WHERE\n                        nawj.status = 'waiting_for_proofs'\n                        AND prover_jobs_fri.status = 'successful'\n                        AND prover_jobs_fri.aggregation_round = 1\n                        AND prover_jobs_fri.depth = 0\n                    GROUP BY\n                        prover_jobs_fri.l1_batch_number,\n                        prover_jobs_fri.circuit_id,\n                        prover_jobs_fri.depth,\n                        nawj.number_of_dependent_jobs\n                    HAVING\n                        COUNT(*) = nawj.number_of_dependent_jobs\n                )\n            RETURNING\n                l1_batch_number,\n                circuit_id,\n                depth;\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "l1_batch_number",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "circuit_id",
-        "type_info": "Int2"
-      },
-      {
-        "ordinal": 2,
-        "name": "depth",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "abc93d27a8673b23e18d050e84c43c868c63c853edb5c4f41e48a3cc6378eca9"
-}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-ec04b89218111a5dc8d5ade506ac3465e2211ef3013386feb12d4cc04e0eade9.json b/prover/crates/lib/prover_dal/.sqlx/query-b9aaf5fe4d0261f7b05c8601a96b3027b4c2ce405d3bcc9821440408a394d7f5.json
similarity index 73%
rename from prover/crates/lib/prover_dal/.sqlx/query-ec04b89218111a5dc8d5ade506ac3465e2211ef3013386feb12d4cc04e0eade9.json
rename to prover/crates/lib/prover_dal/.sqlx/query-b9aaf5fe4d0261f7b05c8601a96b3027b4c2ce405d3bcc9821440408a394d7f5.json
index 7c0264b5646..a7b33f51cb1 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-ec04b89218111a5dc8d5ade506ac3465e2211ef3013386feb12d4cc04e0eade9.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-b9aaf5fe4d0261f7b05c8601a96b3027b4c2ce405d3bcc9821440408a394d7f5.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE prover_jobs_fri\n            SET\n                status = 'successful',\n                updated_at = NOW(),\n                time_taken = $1,\n                proof_blob_url = $2\n            WHERE\n                id = $3\n            RETURNING\n                prover_jobs_fri.id,\n                prover_jobs_fri.l1_batch_number,\n                prover_jobs_fri.circuit_id,\n                prover_jobs_fri.aggregation_round,\n                prover_jobs_fri.sequence_number,\n                prover_jobs_fri.depth,\n                prover_jobs_fri.is_node_final_proof\n            ",
+  "query": "\n            UPDATE prover_jobs_fri\n            SET\n                status = 'successful',\n                updated_at = NOW(),\n                time_taken = $1,\n                proof_blob_url = $2\n            WHERE\n                id = $3\n            RETURNING\n            prover_jobs_fri.id,\n            prover_jobs_fri.l1_batch_number,\n            prover_jobs_fri.circuit_id,\n            prover_jobs_fri.aggregation_round,\n            prover_jobs_fri.sequence_number,\n            prover_jobs_fri.depth,\n            prover_jobs_fri.is_node_final_proof\n            ",
   "describe": {
     "columns": [
       {
@@ -56,5 +56,5 @@
       false
     ]
   },
-  "hash": "ec04b89218111a5dc8d5ade506ac3465e2211ef3013386feb12d4cc04e0eade9"
+  "hash": "b9aaf5fe4d0261f7b05c8601a96b3027b4c2ce405d3bcc9821440408a394d7f5"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-29f7a564a8373f7e44840e8e9e7d0cd5c6b1122c35d7ffdbbba30327ca3fb5a8.json b/prover/crates/lib/prover_dal/.sqlx/query-c01337f381828818b2b23a7fcc3d165108e64cc8cf1a2a5604cb180f6d8ac4fe.json
similarity index 57%
rename from prover/crates/lib/prover_dal/.sqlx/query-29f7a564a8373f7e44840e8e9e7d0cd5c6b1122c35d7ffdbbba30327ca3fb5a8.json
rename to prover/crates/lib/prover_dal/.sqlx/query-c01337f381828818b2b23a7fcc3d165108e64cc8cf1a2a5604cb180f6d8ac4fe.json
index 05163dcfa2e..6c583ea1994 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-29f7a564a8373f7e44840e8e9e7d0cd5c6b1122c35d7ffdbbba30327ca3fb5a8.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-c01337f381828818b2b23a7fcc3d165108e64cc8cf1a2a5604cb180f6d8ac4fe.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                SELECT\n                    protocol_version AS \"protocol_version!\",\n                    protocol_version_patch AS \"protocol_version_patch!\",\n                    COUNT(*) FILTER (\n                        WHERE\n                            status = 'queued'\n                    ) AS queued,\n                    COUNT(*) FILTER (\n                        WHERE\n                            status = 'in_progress'\n                    ) AS in_progress\n                FROM\n                    prover_jobs_fri\n                WHERE\n                    status IN ('queued', 'in_progress')\n                    AND protocol_version IS NOT NULL\n                GROUP BY\n                    protocol_version,\n                    protocol_version_patch\n                ",
+  "query": "\n                SELECT\n                    protocol_version AS \"protocol_version!\",\n                    protocol_version_patch AS \"protocol_version_patch!\",\n                    COUNT(*) FILTER (\n                        WHERE\n                        status = 'queued'\n                    ) AS queued,\n                    COUNT(*) FILTER (\n                        WHERE\n                        status = 'in_progress'\n                    ) AS in_progress\n                FROM\n                    prover_jobs_fri\n                WHERE\n                    status IN ('queued', 'in_progress')\n                    AND protocol_version IS NOT NULL\n                GROUP BY\n                    protocol_version,\n                    protocol_version_patch\n                ",
   "describe": {
     "columns": [
       {
@@ -34,5 +34,5 @@
       null
     ]
   },
-  "hash": "29f7a564a8373f7e44840e8e9e7d0cd5c6b1122c35d7ffdbbba30327ca3fb5a8"
+  "hash": "c01337f381828818b2b23a7fcc3d165108e64cc8cf1a2a5604cb180f6d8ac4fe"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-7effbacbdcc4bd762386351755f4f32042dfead8a37401558f5fd3b03480f2dd.json b/prover/crates/lib/prover_dal/.sqlx/query-c5569d55d77296b8c7180c95682423bb83b9fb0422b396cbd201f02ebce7b921.json
similarity index 93%
rename from prover/crates/lib/prover_dal/.sqlx/query-7effbacbdcc4bd762386351755f4f32042dfead8a37401558f5fd3b03480f2dd.json
rename to prover/crates/lib/prover_dal/.sqlx/query-c5569d55d77296b8c7180c95682423bb83b9fb0422b396cbd201f02ebce7b921.json
index 3064489830d..f25ad78910d 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-7effbacbdcc4bd762386351755f4f32042dfead8a37401558f5fd3b03480f2dd.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-c5569d55d77296b8c7180c95682423bb83b9fb0422b396cbd201f02ebce7b921.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE node_aggregation_witness_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $3\n            WHERE\n                id = (\n                    SELECT\n                        id\n                    FROM\n                        node_aggregation_witness_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                        AND protocol_version_patch = $2\n                    ORDER BY\n                        l1_batch_number ASC,\n                        depth ASC,\n                        id ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                node_aggregation_witness_jobs_fri.*\n            ",
+  "query": "\n            UPDATE node_aggregation_witness_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $3\n            WHERE\n                id = (\n                    SELECT\n                        id\n                    FROM\n                        node_aggregation_witness_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                        AND protocol_version_patch = $2\n                    ORDER BY\n                        l1_batch_number ASC,\n                        depth ASC,\n                        id ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n            RETURNING\n            node_aggregation_witness_jobs_fri.*\n            ",
   "describe": {
     "columns": [
       {
@@ -110,5 +110,5 @@
       false
     ]
   },
-  "hash": "7effbacbdcc4bd762386351755f4f32042dfead8a37401558f5fd3b03480f2dd"
+  "hash": "c5569d55d77296b8c7180c95682423bb83b9fb0422b396cbd201f02ebce7b921"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-081e2b928f0816c41d6645c1dedbb3402044d201e85e114ff4582394c32bd2bf.json b/prover/crates/lib/prover_dal/.sqlx/query-c6d02dc9cb9908a57c79729c759b9314a2ce0180c20126ad22ddaa20c7c32c2c.json
similarity index 66%
rename from prover/crates/lib/prover_dal/.sqlx/query-081e2b928f0816c41d6645c1dedbb3402044d201e85e114ff4582394c32bd2bf.json
rename to prover/crates/lib/prover_dal/.sqlx/query-c6d02dc9cb9908a57c79729c759b9314a2ce0180c20126ad22ddaa20c7c32c2c.json
index 918fb2817d2..8462680ad82 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-081e2b928f0816c41d6645c1dedbb3402044d201e85e114ff4582394c32bd2bf.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-c6d02dc9cb9908a57c79729c759b9314a2ce0180c20126ad22ddaa20c7c32c2c.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                comp.l1_batch_number,\n                (comp.updated_at - wit.created_at) AS time_taken,\n                wit.created_at\n            FROM\n                proof_compression_jobs_fri AS comp\n                JOIN witness_inputs_fri AS wit ON comp.l1_batch_number = wit.l1_batch_number\n            WHERE\n                wit.created_at > $1\n            ORDER BY\n                time_taken DESC;\n            ",
+  "query": "\n            SELECT\n                comp.l1_batch_number,\n                (comp.updated_at - wit.created_at) AS time_taken,\n                wit.created_at\n            FROM\n                proof_compression_jobs_fri AS comp\n            JOIN witness_inputs_fri AS wit ON comp.l1_batch_number = wit.l1_batch_number\n            WHERE\n                wit.created_at > $1\n            ORDER BY\n                time_taken DESC;\n            ",
   "describe": {
     "columns": [
       {
@@ -30,5 +30,5 @@
       false
     ]
   },
-  "hash": "081e2b928f0816c41d6645c1dedbb3402044d201e85e114ff4582394c32bd2bf"
+  "hash": "c6d02dc9cb9908a57c79729c759b9314a2ce0180c20126ad22ddaa20c7c32c2c"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-c8daa62b3835c15fafb3f83deabb5a4672ad50a9de92c84d939ac4c69842e355.json b/prover/crates/lib/prover_dal/.sqlx/query-c8daa62b3835c15fafb3f83deabb5a4672ad50a9de92c84d939ac4c69842e355.json
deleted file mode 100644
index cadc931fa1c..00000000000
--- a/prover/crates/lib/prover_dal/.sqlx/query-c8daa62b3835c15fafb3f83deabb5a4672ad50a9de92c84d939ac4c69842e355.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                node_aggregation_witness_jobs_fri (l1_batch_number, circuit_id, status, created_at, updated_at)\n            VALUES\n                ($1, $2, 'waiting_for_proofs', NOW(), NOW())\n            ON CONFLICT (l1_batch_number, circuit_id, depth) DO\n            UPDATE\n            SET\n                status = $3\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int2",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "c8daa62b3835c15fafb3f83deabb5a4672ad50a9de92c84d939ac4c69842e355"
-}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-caff620ae66d7fbe3caff7505173b6da86d1e693be03936730c340121167341f.json b/prover/crates/lib/prover_dal/.sqlx/query-caff620ae66d7fbe3caff7505173b6da86d1e693be03936730c340121167341f.json
deleted file mode 100644
index 403e34bb91c..00000000000
--- a/prover/crates/lib/prover_dal/.sqlx/query-caff620ae66d7fbe3caff7505173b6da86d1e693be03936730c340121167341f.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                INSERT INTO\n                    scheduler_witness_jobs_fri (\n                        l1_batch_number,\n                        scheduler_partial_input_blob_url,\n                        protocol_version,\n                        status,\n                        created_at,\n                        updated_at,\n                        protocol_version_patch\n                    )\n                VALUES\n                    ($1, $2, $3, 'waiting_for_proofs', NOW(), NOW(), $4)\n                ON CONFLICT (l1_batch_number) DO\n                UPDATE\n                SET\n                    updated_at = NOW()\n                ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Text",
-        "Int4",
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "caff620ae66d7fbe3caff7505173b6da86d1e693be03936730c340121167341f"
-}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-cb453f0677b92539747e175e796599bf65cbf2fd7c27a2dcad43e41a0f43cba0.json b/prover/crates/lib/prover_dal/.sqlx/query-cb453f0677b92539747e175e796599bf65cbf2fd7c27a2dcad43e41a0f43cba0.json
new file mode 100644
index 00000000000..5c5a9e288b2
--- /dev/null
+++ b/prover/crates/lib/prover_dal/.sqlx/query-cb453f0677b92539747e175e796599bf65cbf2fd7c27a2dcad43e41a0f43cba0.json
@@ -0,0 +1,26 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE leaf_aggregation_witness_jobs_fri\n            SET\n                status = 'queued'\n            WHERE\n                (l1_batch_number, circuit_id) IN (\n                    SELECT\n                        prover_jobs_fri.l1_batch_number,\n                        prover_jobs_fri.circuit_id\n                    FROM\n                        prover_jobs_fri\n                    JOIN leaf_aggregation_witness_jobs_fri lawj\n                        ON\n                            prover_jobs_fri.l1_batch_number = lawj.l1_batch_number\n                            AND prover_jobs_fri.circuit_id = lawj.circuit_id\n                    WHERE\n                        lawj.status = 'waiting_for_proofs'\n                        AND prover_jobs_fri.status = 'successful'\n                        AND prover_jobs_fri.aggregation_round = 0\n                    GROUP BY\n                        prover_jobs_fri.l1_batch_number,\n                        prover_jobs_fri.circuit_id,\n                        lawj.number_of_basic_circuits\n                    HAVING\n                        COUNT(*) = lawj.number_of_basic_circuits\n                )\n            RETURNING\n            l1_batch_number,\n            circuit_id;\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "l1_batch_number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "circuit_id",
+        "type_info": "Int2"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "cb453f0677b92539747e175e796599bf65cbf2fd7c27a2dcad43e41a0f43cba0"
+}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-cebbd80998bf2be10c735f6c414d023d9cce8cd66ad684475ece209832babd5e.json b/prover/crates/lib/prover_dal/.sqlx/query-cebbd80998bf2be10c735f6c414d023d9cce8cd66ad684475ece209832babd5e.json
new file mode 100644
index 00000000000..d56c7f3de74
--- /dev/null
+++ b/prover/crates/lib/prover_dal/.sqlx/query-cebbd80998bf2be10c735f6c414d023d9cce8cd66ad684475ece209832babd5e.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            node_aggregation_witness_jobs_fri (\n                l1_batch_number, circuit_id, status, created_at, updated_at\n            )\n            VALUES\n            ($1, $2, 'waiting_for_proofs', NOW(), NOW())\n            ON CONFLICT (l1_batch_number, circuit_id, depth) DO\n            UPDATE\n            SET\n            status = $3\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int2",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "cebbd80998bf2be10c735f6c414d023d9cce8cd66ad684475ece209832babd5e"
+}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-e2aceb9b86e74a3d119d383dcc729d1227a213b6cacb4c30a1f94c56f56cb4af.json b/prover/crates/lib/prover_dal/.sqlx/query-e2aceb9b86e74a3d119d383dcc729d1227a213b6cacb4c30a1f94c56f56cb4af.json
new file mode 100644
index 00000000000..0fc0f557b12
--- /dev/null
+++ b/prover/crates/lib/prover_dal/.sqlx/query-e2aceb9b86e74a3d119d383dcc729d1227a213b6cacb4c30a1f94c56f56cb4af.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            scheduler_witness_jobs_fri (\n                l1_batch_number,\n                scheduler_partial_input_blob_url,\n                status,\n                created_at,\n                updated_at\n            )\n            VALUES\n            ($1, '', 'waiting_for_proofs', NOW(), NOW())\n            ON CONFLICT (l1_batch_number) DO\n            UPDATE\n            SET\n            status = $2\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "e2aceb9b86e74a3d119d383dcc729d1227a213b6cacb4c30a1f94c56f56cb4af"
+}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-e65d9d8389b60f48468561984f0fb9c8674344921b98b8b26e4d85994b3d72af.json b/prover/crates/lib/prover_dal/.sqlx/query-e65d9d8389b60f48468561984f0fb9c8674344921b98b8b26e4d85994b3d72af.json
new file mode 100644
index 00000000000..65a473ddeee
--- /dev/null
+++ b/prover/crates/lib/prover_dal/.sqlx/query-e65d9d8389b60f48468561984f0fb9c8674344921b98b8b26e4d85994b3d72af.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE recursion_tip_witness_jobs_fri\n            SET\n                status = 'queued'\n            WHERE\n                l1_batch_number IN (\n                    SELECT\n                        prover_jobs_fri.l1_batch_number\n                    FROM\n                        prover_jobs_fri\n                    JOIN\n                        recursion_tip_witness_jobs_fri rtwj\n                        ON prover_jobs_fri.l1_batch_number = rtwj.l1_batch_number\n                    WHERE\n                        rtwj.status = 'waiting_for_proofs'\n                        AND prover_jobs_fri.status = 'successful'\n                        AND prover_jobs_fri.aggregation_round = $1\n                        AND prover_jobs_fri.is_node_final_proof = TRUE\n                    GROUP BY\n                        prover_jobs_fri.l1_batch_number,\n                        rtwj.number_of_final_node_jobs\n                    HAVING\n                        COUNT(*) = rtwj.number_of_final_node_jobs\n                )\n            RETURNING\n            l1_batch_number;\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "l1_batch_number",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int2"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "e65d9d8389b60f48468561984f0fb9c8674344921b98b8b26e4d85994b3d72af"
+}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-3727d5614d2fe2a4d96f880eb72cd48c95ca5b4520dde415a2b5ff32ece47c86.json b/prover/crates/lib/prover_dal/.sqlx/query-e6ddecc79d55bf5bd3e348a735b02757fe394fa096f09c62faa26f728a69d1ae.json
similarity index 79%
rename from prover/crates/lib/prover_dal/.sqlx/query-3727d5614d2fe2a4d96f880eb72cd48c95ca5b4520dde415a2b5ff32ece47c86.json
rename to prover/crates/lib/prover_dal/.sqlx/query-e6ddecc79d55bf5bd3e348a735b02757fe394fa096f09c62faa26f728a69d1ae.json
index d7eb6a32b42..a3da3036ab6 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-3727d5614d2fe2a4d96f880eb72cd48c95ca5b4520dde415a2b5ff32ece47c86.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-e6ddecc79d55bf5bd3e348a735b02757fe394fa096f09c62faa26f728a69d1ae.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE witness_inputs_fri\n            SET\n                status = 'queued',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                l1_batch_number = $1\n                AND attempts >= $2\n                AND (\n                    status = 'in_progress'\n                    OR status = 'failed'\n                )\n            RETURNING\n                l1_batch_number,\n                status,\n                attempts,\n                error,\n                picked_by\n            ",
+  "query": "\n            UPDATE witness_inputs_fri\n            SET\n                status = 'queued',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                l1_batch_number = $1\n                AND attempts >= $2\n                AND (\n                    status = 'in_progress'\n                    OR status = 'failed'\n                )\n            RETURNING\n            l1_batch_number,\n            status,\n            attempts,\n            error,\n            picked_by\n            ",
   "describe": {
     "columns": [
       {
@@ -43,5 +43,5 @@
       true
     ]
   },
-  "hash": "3727d5614d2fe2a4d96f880eb72cd48c95ca5b4520dde415a2b5ff32ece47c86"
+  "hash": "e6ddecc79d55bf5bd3e348a735b02757fe394fa096f09c62faa26f728a69d1ae"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-e743af4c18ec91eb46db5a19556fba74ec2cfc3c89c7e4e2ea475c3ce4092849.json b/prover/crates/lib/prover_dal/.sqlx/query-e743af4c18ec91eb46db5a19556fba74ec2cfc3c89c7e4e2ea475c3ce4092849.json
deleted file mode 100644
index af6210ae91e..00000000000
--- a/prover/crates/lib/prover_dal/.sqlx/query-e743af4c18ec91eb46db5a19556fba74ec2cfc3c89c7e4e2ea475c3ce4092849.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            UPDATE leaf_aggregation_witness_jobs_fri\n            SET\n                status = 'queued'\n            WHERE\n                (l1_batch_number, circuit_id) IN (\n                    SELECT\n                        prover_jobs_fri.l1_batch_number,\n                        prover_jobs_fri.circuit_id\n                    FROM\n                        prover_jobs_fri\n                        JOIN leaf_aggregation_witness_jobs_fri lawj ON prover_jobs_fri.l1_batch_number = lawj.l1_batch_number\n                        AND prover_jobs_fri.circuit_id = lawj.circuit_id\n                    WHERE\n                        lawj.status = 'waiting_for_proofs'\n                        AND prover_jobs_fri.status = 'successful'\n                        AND prover_jobs_fri.aggregation_round = 0\n                    GROUP BY\n                        prover_jobs_fri.l1_batch_number,\n                        prover_jobs_fri.circuit_id,\n                        lawj.number_of_basic_circuits\n                    HAVING\n                        COUNT(*) = lawj.number_of_basic_circuits\n                )\n            RETURNING\n                l1_batch_number,\n                circuit_id;\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "l1_batch_number",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "circuit_id",
-        "type_info": "Int2"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "e743af4c18ec91eb46db5a19556fba74ec2cfc3c89c7e4e2ea475c3ce4092849"
-}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-e875dcbbdaed6998dbea45d4eab5d005d8760c4809b7aef902155196873da66e.json b/prover/crates/lib/prover_dal/.sqlx/query-e875dcbbdaed6998dbea45d4eab5d005d8760c4809b7aef902155196873da66e.json
deleted file mode 100644
index 4ee9278fe42..00000000000
--- a/prover/crates/lib/prover_dal/.sqlx/query-e875dcbbdaed6998dbea45d4eab5d005d8760c4809b7aef902155196873da66e.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                scheduler_witness_jobs_fri (\n                    l1_batch_number,\n                    scheduler_partial_input_blob_url,\n                    status,\n                    created_at,\n                    updated_at\n                )\n            VALUES\n                ($1, '', 'waiting_for_proofs', NOW(), NOW())\n            ON CONFLICT (l1_batch_number) DO\n            UPDATE\n            SET\n                status = $2\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "e875dcbbdaed6998dbea45d4eab5d005d8760c4809b7aef902155196873da66e"
-}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-eec29cbff034818f4fb5ec1e6ad38e1010d7389457b3c97e9b238a3a0291a54e.json b/prover/crates/lib/prover_dal/.sqlx/query-eec29cbff034818f4fb5ec1e6ad38e1010d7389457b3c97e9b238a3a0291a54e.json
deleted file mode 100644
index f8e92b1ad66..00000000000
--- a/prover/crates/lib/prover_dal/.sqlx/query-eec29cbff034818f4fb5ec1e6ad38e1010d7389457b3c97e9b238a3a0291a54e.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                leaf_aggregation_witness_jobs_fri (\n                    l1_batch_number,\n                    circuit_id,\n                    status,\n                    number_of_basic_circuits,\n                    created_at,\n                    updated_at\n                )\n            VALUES\n                ($1, $2, 'waiting_for_proofs', 2, NOW(), NOW())\n            ON CONFLICT (l1_batch_number, circuit_id) DO\n            UPDATE\n            SET\n                status = $3\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int2",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "eec29cbff034818f4fb5ec1e6ad38e1010d7389457b3c97e9b238a3a0291a54e"
-}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-eef1b56e87eff63fcf6ffb98791583a7526ae38ceb4bf80543cfd3fb60492fb9.json b/prover/crates/lib/prover_dal/.sqlx/query-eef1b56e87eff63fcf6ffb98791583a7526ae38ceb4bf80543cfd3fb60492fb9.json
deleted file mode 100644
index fe481b4e54d..00000000000
--- a/prover/crates/lib/prover_dal/.sqlx/query-eef1b56e87eff63fcf6ffb98791583a7526ae38ceb4bf80543cfd3fb60492fb9.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                INSERT INTO\n                    recursion_tip_witness_jobs_fri (\n                        l1_batch_number,\n                        status,\n                        number_of_final_node_jobs,\n                        protocol_version,\n                        created_at,\n                        updated_at,\n                        protocol_version_patch\n                    )\n                VALUES\n                    ($1, 'waiting_for_proofs', $2, $3, NOW(), NOW(), $4)\n                ON CONFLICT (l1_batch_number) DO\n                UPDATE\n                SET\n                    updated_at = NOW()\n                ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int4",
-        "Int4",
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "eef1b56e87eff63fcf6ffb98791583a7526ae38ceb4bf80543cfd3fb60492fb9"
-}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-f05ea1f0ee0be1ac50c35f5dbf4bcaf4e7f673e9d9827427aa4bbedb3cae8b8f.json b/prover/crates/lib/prover_dal/.sqlx/query-f05ea1f0ee0be1ac50c35f5dbf4bcaf4e7f673e9d9827427aa4bbedb3cae8b8f.json
new file mode 100644
index 00000000000..d47714f9575
--- /dev/null
+++ b/prover/crates/lib/prover_dal/.sqlx/query-f05ea1f0ee0be1ac50c35f5dbf4bcaf4e7f673e9d9827427aa4bbedb3cae8b8f.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            recursion_tip_witness_jobs_fri (\n                l1_batch_number, status, number_of_final_node_jobs, created_at, updated_at\n            )\n            VALUES\n            ($1, 'waiting_for_proofs', 1, NOW(), NOW())\n            ON CONFLICT (l1_batch_number) DO\n            UPDATE\n            SET\n            status = $2\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "f05ea1f0ee0be1ac50c35f5dbf4bcaf4e7f673e9d9827427aa4bbedb3cae8b8f"
+}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-f294a1c32ffb957c901dcdfa942ea8e04c2c28771aa50a9e3ebb95c5e428be0e.json b/prover/crates/lib/prover_dal/.sqlx/query-f294a1c32ffb957c901dcdfa942ea8e04c2c28771aa50a9e3ebb95c5e428be0e.json
new file mode 100644
index 00000000000..76008be6c33
--- /dev/null
+++ b/prover/crates/lib/prover_dal/.sqlx/query-f294a1c32ffb957c901dcdfa942ea8e04c2c28771aa50a9e3ebb95c5e428be0e.json
@@ -0,0 +1,19 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                    INSERT INTO\n                    leaf_aggregation_witness_jobs_fri (\n                        l1_batch_number,\n                        circuit_id,\n                        closed_form_inputs_blob_url,\n                        number_of_basic_circuits,\n                        protocol_version,\n                        status,\n                        created_at,\n                        updated_at,\n                        protocol_version_patch\n                    )\n                    VALUES\n                    ($1, $2, $3, $4, $5, 'waiting_for_proofs', NOW(), NOW(), $6)\n                    ON CONFLICT (l1_batch_number, circuit_id) DO\n                    UPDATE\n                    SET\n                    updated_at = NOW()\n                    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int2",
+        "Text",
+        "Int4",
+        "Int4",
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "f294a1c32ffb957c901dcdfa942ea8e04c2c28771aa50a9e3ebb95c5e428be0e"
+}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-8357972a21b39644e4cbe4bedc3b6d9065bf4494daf8f7632ab2bfe055773f7b.json b/prover/crates/lib/prover_dal/.sqlx/query-f2ed1acf57927528cf978ad759ac92d6496147f6425c2485fc8a8f2739e65f80.json
similarity index 81%
rename from prover/crates/lib/prover_dal/.sqlx/query-8357972a21b39644e4cbe4bedc3b6d9065bf4494daf8f7632ab2bfe055773f7b.json
rename to prover/crates/lib/prover_dal/.sqlx/query-f2ed1acf57927528cf978ad759ac92d6496147f6425c2485fc8a8f2739e65f80.json
index 54fba3bbeac..a261f190acf 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-8357972a21b39644e4cbe4bedc3b6d9065bf4494daf8f7632ab2bfe055773f7b.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-f2ed1acf57927528cf978ad759ac92d6496147f6425c2485fc8a8f2739e65f80.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE recursion_tip_witness_jobs_fri\n            SET\n                status = 'queued',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                (\n                    status = 'in_progress'\n                    AND processing_started_at <= NOW() - $1::INTERVAL\n                    AND attempts < $2\n                )\n                OR (\n                    status = 'failed'\n                    AND attempts < $2\n                )\n            RETURNING\n                l1_batch_number,\n                status,\n                attempts,\n                error,\n                picked_by\n            ",
+  "query": "\n            UPDATE recursion_tip_witness_jobs_fri\n            SET\n                status = 'queued',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                (\n                    status = 'in_progress'\n                    AND processing_started_at <= NOW() - $1::INTERVAL\n                    AND attempts < $2\n                )\n                OR (\n                    status = 'failed'\n                    AND attempts < $2\n                )\n            RETURNING\n            l1_batch_number,\n            status,\n            attempts,\n            error,\n            picked_by\n            ",
   "describe": {
     "columns": [
       {
@@ -43,5 +43,5 @@
       true
     ]
   },
-  "hash": "8357972a21b39644e4cbe4bedc3b6d9065bf4494daf8f7632ab2bfe055773f7b"
+  "hash": "f2ed1acf57927528cf978ad759ac92d6496147f6425c2485fc8a8f2739e65f80"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-f3280a144a9aea48dae9b2914f0bf0344b237bf1914657d36f44b9d21ae966a6.json b/prover/crates/lib/prover_dal/.sqlx/query-f3280a144a9aea48dae9b2914f0bf0344b237bf1914657d36f44b9d21ae966a6.json
new file mode 100644
index 00000000000..1a5c178a900
--- /dev/null
+++ b/prover/crates/lib/prover_dal/.sqlx/query-f3280a144a9aea48dae9b2914f0bf0344b237bf1914657d36f44b9d21ae966a6.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            leaf_aggregation_witness_jobs_fri (\n                l1_batch_number,\n                circuit_id,\n                status,\n                number_of_basic_circuits,\n                created_at,\n                updated_at\n            )\n            VALUES\n            ($1, $2, 'waiting_for_proofs', 2, NOW(), NOW())\n            ON CONFLICT (l1_batch_number, circuit_id) DO\n            UPDATE\n            SET\n            status = $3\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int2",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "f3280a144a9aea48dae9b2914f0bf0344b237bf1914657d36f44b9d21ae966a6"
+}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-f68afde603675b0853547c61a74cbb33d511e07d80a5acd79bc559abdbda49bc.json b/prover/crates/lib/prover_dal/.sqlx/query-f68afde603675b0853547c61a74cbb33d511e07d80a5acd79bc559abdbda49bc.json
new file mode 100644
index 00000000000..3820754145d
--- /dev/null
+++ b/prover/crates/lib/prover_dal/.sqlx/query-f68afde603675b0853547c61a74cbb33d511e07d80a5acd79bc559abdbda49bc.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n            prover_fri_protocol_versions (\n                id, snark_wrapper_vk_hash, created_at, protocol_version_patch\n            )\n            VALUES\n            ($1, $2, NOW(), $3)\n            ON CONFLICT (id, protocol_version_patch) DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int4",
+        "Bytea",
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "f68afde603675b0853547c61a74cbb33d511e07d80a5acd79bc559abdbda49bc"
+}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-0b70c98c2edd8370ad09ac553c18dbc21cccb9a95e3db1c93da239845a5e9036.json b/prover/crates/lib/prover_dal/.sqlx/query-f70306e92c2a2d69e0e75eb0cf614f3cc4f9c96c2a51a157b83fff9b411beeb9.json
similarity index 80%
rename from prover/crates/lib/prover_dal/.sqlx/query-0b70c98c2edd8370ad09ac553c18dbc21cccb9a95e3db1c93da239845a5e9036.json
rename to prover/crates/lib/prover_dal/.sqlx/query-f70306e92c2a2d69e0e75eb0cf614f3cc4f9c96c2a51a157b83fff9b411beeb9.json
index 8b49fa11e63..344068b04e9 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-0b70c98c2edd8370ad09ac553c18dbc21cccb9a95e3db1c93da239845a5e9036.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-f70306e92c2a2d69e0e75eb0cf614f3cc4f9c96c2a51a157b83fff9b411beeb9.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE proof_compression_jobs_fri\n            SET\n                status = $1,\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $3\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        l1_batch_number\n                    FROM\n                        proof_compression_jobs_fri\n                    WHERE\n                        status = $2\n                        AND protocol_version = $4\n                        AND protocol_version_patch = $5\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                proof_compression_jobs_fri.l1_batch_number\n            ",
+  "query": "\n            UPDATE proof_compression_jobs_fri\n            SET\n                status = $1,\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $3\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        l1_batch_number\n                    FROM\n                        proof_compression_jobs_fri\n                    WHERE\n                        status = $2\n                        AND protocol_version = $4\n                        AND protocol_version_patch = $5\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n            RETURNING\n            proof_compression_jobs_fri.l1_batch_number\n            ",
   "describe": {
     "columns": [
       {
@@ -22,5 +22,5 @@
       false
     ]
   },
-  "hash": "0b70c98c2edd8370ad09ac553c18dbc21cccb9a95e3db1c93da239845a5e9036"
+  "hash": "f70306e92c2a2d69e0e75eb0cf614f3cc4f9c96c2a51a157b83fff9b411beeb9"
 }
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-f99c34313e2717ec74b4f274e33dae905acac53b46eeaeb059d23e48a71df3b4.json b/prover/crates/lib/prover_dal/.sqlx/query-f99c34313e2717ec74b4f274e33dae905acac53b46eeaeb059d23e48a71df3b4.json
deleted file mode 100644
index c0c2637fe5a..00000000000
--- a/prover/crates/lib/prover_dal/.sqlx/query-f99c34313e2717ec74b4f274e33dae905acac53b46eeaeb059d23e48a71df3b4.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                prover_jobs_fri (\n                    l1_batch_number,\n                    circuit_id,\n                    circuit_blob_url,\n                    aggregation_round,\n                    sequence_number,\n                    depth,\n                    is_node_final_proof,\n                    protocol_version,\n                    status,\n                    created_at,\n                    updated_at,\n                    protocol_version_patch\n                )\n            VALUES\n                ($1, $2, $3, $4, $5, $6, $7, $8, 'queued', NOW(), NOW(), $9)\n            ON CONFLICT (l1_batch_number, aggregation_round, circuit_id, depth, sequence_number) DO\n            UPDATE\n            SET\n                updated_at = NOW()\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int2",
-        "Text",
-        "Int2",
-        "Int4",
-        "Int4",
-        "Bool",
-        "Int4",
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "f99c34313e2717ec74b4f274e33dae905acac53b46eeaeb059d23e48a71df3b4"
-}
diff --git a/prover/crates/lib/prover_dal/.sqlx/query-28f03acf565c4b50fe86f606c18a8b699386b3c5b4e02d5ce046f0f2e0ddc388.json b/prover/crates/lib/prover_dal/.sqlx/query-fd29394931eed5b99d2fb4fac907218d106d5852fa6f65aca22e12b3a4b7f9c2.json
similarity index 92%
rename from prover/crates/lib/prover_dal/.sqlx/query-28f03acf565c4b50fe86f606c18a8b699386b3c5b4e02d5ce046f0f2e0ddc388.json
rename to prover/crates/lib/prover_dal/.sqlx/query-fd29394931eed5b99d2fb4fac907218d106d5852fa6f65aca22e12b3a4b7f9c2.json
index 89e159989ae..b3e3d945b32 100644
--- a/prover/crates/lib/prover_dal/.sqlx/query-28f03acf565c4b50fe86f606c18a8b699386b3c5b4e02d5ce046f0f2e0ddc388.json
+++ b/prover/crates/lib/prover_dal/.sqlx/query-fd29394931eed5b99d2fb4fac907218d106d5852fa6f65aca22e12b3a4b7f9c2.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE scheduler_witness_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $2\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        l1_batch_number\n                    FROM\n                        scheduler_witness_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                        AND protocol_version_patch = $3\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                scheduler_witness_jobs_fri.*\n            ",
+  "query": "\n            UPDATE scheduler_witness_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $2\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        l1_batch_number\n                    FROM\n                        scheduler_witness_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                        AND protocol_version_patch = $3\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                    SKIP LOCKED\n                )\n            RETURNING\n            scheduler_witness_jobs_fri.*\n            ",
   "describe": {
     "columns": [
       {
@@ -86,5 +86,5 @@
       false
     ]
   },
-  "hash": "28f03acf565c4b50fe86f606c18a8b699386b3c5b4e02d5ce046f0f2e0ddc388"
+  "hash": "fd29394931eed5b99d2fb4fac907218d106d5852fa6f65aca22e12b3a4b7f9c2"
 }
diff --git a/prover/crates/lib/prover_dal/src/cli_test_dal.rs b/prover/crates/lib/prover_dal/src/cli_test_dal.rs
index d0841820337..850e92b4136 100644
--- a/prover/crates/lib/prover_dal/src/cli_test_dal.rs
+++ b/prover/crates/lib/prover_dal/src/cli_test_dal.rs
@@ -51,20 +51,20 @@ impl CliTestDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                leaf_aggregation_witness_jobs_fri (
-                    l1_batch_number,
-                    circuit_id,
-                    status,
-                    number_of_basic_circuits,
-                    created_at,
-                    updated_at
-                )
+            leaf_aggregation_witness_jobs_fri (
+                l1_batch_number,
+                circuit_id,
+                status,
+                number_of_basic_circuits,
+                created_at,
+                updated_at
+            )
             VALUES
-                ($1, $2, 'waiting_for_proofs', 2, NOW(), NOW())
+            ($1, $2, 'waiting_for_proofs', 2, NOW(), NOW())
             ON CONFLICT (l1_batch_number, circuit_id) DO
             UPDATE
             SET
-                status = $3
+            status = $3
             "#,
             batch_number.0 as i64,
             circuit_id as i16,
@@ -84,13 +84,15 @@ impl CliTestDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                node_aggregation_witness_jobs_fri (l1_batch_number, circuit_id, status, created_at, updated_at)
+            node_aggregation_witness_jobs_fri (
+                l1_batch_number, circuit_id, status, created_at, updated_at
+            )
             VALUES
-                ($1, $2, 'waiting_for_proofs', NOW(), NOW())
+            ($1, $2, 'waiting_for_proofs', NOW(), NOW())
             ON CONFLICT (l1_batch_number, circuit_id, depth) DO
             UPDATE
             SET
-                status = $3
+            status = $3
             "#,
             batch_number.0 as i64,
             circuit_id as i16,
@@ -105,13 +107,15 @@ impl CliTestDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                recursion_tip_witness_jobs_fri (l1_batch_number, status, number_of_final_node_jobs, created_at, updated_at)
+            recursion_tip_witness_jobs_fri (
+                l1_batch_number, status, number_of_final_node_jobs, created_at, updated_at
+            )
             VALUES
-                ($1, 'waiting_for_proofs', 1, NOW(), NOW())
+            ($1, 'waiting_for_proofs', 1, NOW(), NOW())
             ON CONFLICT (l1_batch_number) DO
             UPDATE
             SET
-                status = $2
+            status = $2
             "#,
             batch_number.0 as i64,
             status.to_string(),
@@ -129,19 +133,19 @@ impl CliTestDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                scheduler_witness_jobs_fri (
-                    l1_batch_number,
-                    scheduler_partial_input_blob_url,
-                    status,
-                    created_at,
-                    updated_at
-                )
+            scheduler_witness_jobs_fri (
+                l1_batch_number,
+                scheduler_partial_input_blob_url,
+                status,
+                created_at,
+                updated_at
+            )
             VALUES
-                ($1, '', 'waiting_for_proofs', NOW(), NOW())
+            ($1, '', 'waiting_for_proofs', NOW(), NOW())
             ON CONFLICT (l1_batch_number) DO
             UPDATE
             SET
-                status = $2
+            status = $2
             "#,
             batch_number.0 as i64,
             status.to_string(),
@@ -159,13 +163,13 @@ impl CliTestDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                proof_compression_jobs_fri (l1_batch_number, status, created_at, updated_at)
+            proof_compression_jobs_fri (l1_batch_number, status, created_at, updated_at)
             VALUES
-                ($1, $2, NOW(), NOW())
+            ($1, $2, NOW(), NOW())
             ON CONFLICT (l1_batch_number) DO
             UPDATE
             SET
-                status = $2
+            status = $2
             "#,
             batch_number.0 as i64,
             status.to_string(),
diff --git a/prover/crates/lib/prover_dal/src/fri_gpu_prover_queue_dal.rs b/prover/crates/lib/prover_dal/src/fri_gpu_prover_queue_dal.rs
index 12f719d6401..63ae446d472 100644
--- a/prover/crates/lib/prover_dal/src/fri_gpu_prover_queue_dal.rs
+++ b/prover/crates/lib/prover_dal/src/fri_gpu_prover_queue_dal.rs
@@ -52,10 +52,10 @@ impl FriGpuProverQueueDal<'_, '_> {
                     LIMIT
                         1
                     FOR UPDATE
-                        SKIP LOCKED
+                    SKIP LOCKED
                 )
             RETURNING
-                gpu_prover_queue_fri.*
+            gpu_prover_queue_fri.*
             "#,
             &processing_timeout,
             i16::from(specialized_prover_group_id),
@@ -84,28 +84,28 @@ impl FriGpuProverQueueDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                gpu_prover_queue_fri (
-                    instance_host,
-                    instance_port,
-                    instance_status,
-                    specialized_prover_group_id,
-                    zone,
-                    created_at,
-                    updated_at,
-                    protocol_version,
-                    protocol_version_patch
-                )
+            gpu_prover_queue_fri (
+                instance_host,
+                instance_port,
+                instance_status,
+                specialized_prover_group_id,
+                zone,
+                created_at,
+                updated_at,
+                protocol_version,
+                protocol_version_patch
+            )
             VALUES
-                (CAST($1::TEXT AS INET), $2, 'available', $3, $4, NOW(), NOW(), $5, $6)
+            (CAST($1::TEXT AS INET), $2, 'available', $3, $4, NOW(), NOW(), $5, $6)
             ON CONFLICT (instance_host, instance_port, zone) DO
             UPDATE
             SET
-                instance_status = 'available',
-                specialized_prover_group_id = $3,
-                zone = $4,
-                updated_at = NOW(),
-                protocol_version = $5,
-                protocol_version_patch = $6
+            instance_status = 'available',
+            specialized_prover_group_id = $3,
+            zone = $4,
+            updated_at = NOW(),
+            protocol_version = $5,
+            protocol_version_patch = $6
             "#,
             address.host.to_string(),
             i32::from(address.port),
diff --git a/prover/crates/lib/prover_dal/src/fri_proof_compressor_dal.rs b/prover/crates/lib/prover_dal/src/fri_proof_compressor_dal.rs
index 31b121e51e4..205dbc784c4 100644
--- a/prover/crates/lib/prover_dal/src/fri_proof_compressor_dal.rs
+++ b/prover/crates/lib/prover_dal/src/fri_proof_compressor_dal.rs
@@ -27,17 +27,17 @@ impl FriProofCompressorDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                proof_compression_jobs_fri (
-                    l1_batch_number,
-                    fri_proof_blob_url,
-                    status,
-                    created_at,
-                    updated_at,
-                    protocol_version,
-                    protocol_version_patch
-                )
+            proof_compression_jobs_fri (
+                l1_batch_number,
+                fri_proof_blob_url,
+                status,
+                created_at,
+                updated_at,
+                protocol_version,
+                protocol_version_patch
+            )
             VALUES
-                ($1, $2, $3, NOW(), NOW(), $4, $5)
+            ($1, $2, $3, NOW(), NOW(), $4, $5)
             ON CONFLICT (l1_batch_number) DO NOTHING
             "#,
             i64::from(block_number.0),
@@ -80,10 +80,10 @@ impl FriProofCompressorDal<'_, '_> {
                     LIMIT
                         1
                     FOR UPDATE
-                        SKIP LOCKED
+                    SKIP LOCKED
                 )
             RETURNING
-                proof_compression_jobs_fri.l1_batch_number
+            proof_compression_jobs_fri.l1_batch_number
             "#,
             ProofCompressionJobStatus::InProgress.to_string(),
             ProofCompressionJobStatus::Queued.to_string(),
@@ -246,11 +246,11 @@ impl FriProofCompressorDal<'_, '_> {
                 protocol_version_patch,
                 COUNT(*) FILTER (
                     WHERE
-                        status = 'queued'
+                    status = 'queued'
                 ) AS queued,
                 COUNT(*) FILTER (
                     WHERE
-                        status = 'in_progress'
+                    status = 'in_progress'
                 ) AS in_progress
             FROM
                 proof_compression_jobs_fri
@@ -328,11 +328,11 @@ impl FriProofCompressorDal<'_, '_> {
                         AND attempts < $2
                     )
                 RETURNING
-                    l1_batch_number,
-                    status,
-                    attempts,
-                    error,
-                    picked_by
+                l1_batch_number,
+                status,
+                attempts,
+                error,
+                picked_by
                 "#,
                 &processing_timeout,
                 max_attempts as i32,
@@ -435,10 +435,10 @@ impl FriProofCompressorDal<'_, '_> {
                         OR status = 'failed'
                     )
                 RETURNING
-                    status,
-                    attempts,
-                    error,
-                    picked_by
+                status,
+                attempts,
+                error,
+                picked_by
                 "#,
                 i64::from(block_number.0),
                 max_attempts as i32,
diff --git a/prover/crates/lib/prover_dal/src/fri_protocol_versions_dal.rs b/prover/crates/lib/prover_dal/src/fri_protocol_versions_dal.rs
index 8c1c497eede..7128344e5b3 100644
--- a/prover/crates/lib/prover_dal/src/fri_protocol_versions_dal.rs
+++ b/prover/crates/lib/prover_dal/src/fri_protocol_versions_dal.rs
@@ -20,9 +20,11 @@ impl FriProtocolVersionsDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                prover_fri_protocol_versions (id, snark_wrapper_vk_hash, created_at, protocol_version_patch)
+            prover_fri_protocol_versions (
+                id, snark_wrapper_vk_hash, created_at, protocol_version_patch
+            )
             VALUES
-                ($1, $2, NOW(), $3)
+            ($1, $2, NOW(), $3)
             ON CONFLICT (id, protocol_version_patch) DO NOTHING
             "#,
             id.minor as i32,
diff --git a/prover/crates/lib/prover_dal/src/fri_prover_dal.rs b/prover/crates/lib/prover_dal/src/fri_prover_dal.rs
index 71d0c11728b..a0420b05612 100644
--- a/prover/crates/lib/prover_dal/src/fri_prover_dal.rs
+++ b/prover/crates/lib/prover_dal/src/fri_prover_dal.rs
@@ -93,16 +93,16 @@ impl FriProverDal<'_, '_> {
                     LIMIT
                         1
                     FOR UPDATE
-                        SKIP LOCKED
+                    SKIP LOCKED
                 )
             RETURNING
-                prover_jobs_fri.id,
-                prover_jobs_fri.l1_batch_number,
-                prover_jobs_fri.circuit_id,
-                prover_jobs_fri.aggregation_round,
-                prover_jobs_fri.sequence_number,
-                prover_jobs_fri.depth,
-                prover_jobs_fri.is_node_final_proof
+            prover_jobs_fri.id,
+            prover_jobs_fri.l1_batch_number,
+            prover_jobs_fri.circuit_id,
+            prover_jobs_fri.aggregation_round,
+            prover_jobs_fri.sequence_number,
+            prover_jobs_fri.depth,
+            prover_jobs_fri.is_node_final_proof
             "#,
             protocol_version.minor as i32,
             protocol_version.patch.0 as i32,
@@ -154,16 +154,16 @@ impl FriProverDal<'_, '_> {
                     LIMIT
                         1
                     FOR UPDATE
-                        SKIP LOCKED
+                    SKIP LOCKED
                 )
             RETURNING
-                prover_jobs_fri.id,
-                prover_jobs_fri.l1_batch_number,
-                prover_jobs_fri.circuit_id,
-                prover_jobs_fri.aggregation_round,
-                prover_jobs_fri.sequence_number,
-                prover_jobs_fri.depth,
-                prover_jobs_fri.is_node_final_proof
+            prover_jobs_fri.id,
+            prover_jobs_fri.l1_batch_number,
+            prover_jobs_fri.circuit_id,
+            prover_jobs_fri.aggregation_round,
+            prover_jobs_fri.sequence_number,
+            prover_jobs_fri.depth,
+            prover_jobs_fri.is_node_final_proof
             "#,
             protocol_version.minor as i32,
             protocol_version.patch.0 as i32,
@@ -216,25 +216,25 @@ impl FriProverDal<'_, '_> {
                             SELECT
                                 *
                             FROM
-                                UNNEST($1::SMALLINT[], $2::SMALLINT[])
-                        ) AS tuple (circuit_id, ROUND)
-                        JOIN LATERAL (
-                            SELECT
-                                *
-                            FROM
-                                prover_jobs_fri AS pj
-                            WHERE
-                                pj.status = 'queued'
-                                AND pj.protocol_version = $3
-                                AND pj.protocol_version_patch = $4
-                                AND pj.circuit_id = tuple.circuit_id
-                                AND pj.aggregation_round = tuple.round
-                            ORDER BY
-                                pj.l1_batch_number ASC,
-                                pj.id ASC
-                            LIMIT
-                                1
-                        ) AS pj ON TRUE
+                                UNNEST($1::SMALLINT [], $2::SMALLINT [])
+                        ) AS tuple (circuit_id, round)
+                    JOIN LATERAL (
+                        SELECT
+                            *
+                        FROM
+                            prover_jobs_fri AS pj
+                        WHERE
+                            pj.status = 'queued'
+                            AND pj.protocol_version = $3
+                            AND pj.protocol_version_patch = $4
+                            AND pj.circuit_id = tuple.circuit_id
+                            AND pj.aggregation_round = tuple.round
+                        ORDER BY
+                            pj.l1_batch_number ASC,
+                            pj.id ASC
+                        LIMIT
+                            1
+                    ) AS pj ON TRUE
                     ORDER BY
                         pj.l1_batch_number ASC,
                         pj.aggregation_round DESC,
@@ -242,16 +242,16 @@ impl FriProverDal<'_, '_> {
                     LIMIT
                         1
                     FOR UPDATE
-                        SKIP LOCKED
+                    SKIP LOCKED
                 )
             RETURNING
-                prover_jobs_fri.id,
-                prover_jobs_fri.l1_batch_number,
-                prover_jobs_fri.circuit_id,
-                prover_jobs_fri.aggregation_round,
-                prover_jobs_fri.sequence_number,
-                prover_jobs_fri.depth,
-                prover_jobs_fri.is_node_final_proof
+            prover_jobs_fri.id,
+            prover_jobs_fri.l1_batch_number,
+            prover_jobs_fri.circuit_id,
+            prover_jobs_fri.aggregation_round,
+            prover_jobs_fri.sequence_number,
+            prover_jobs_fri.depth,
+            prover_jobs_fri.is_node_final_proof
             "#,
             &circuit_ids[..],
             &aggregation_rounds[..],
@@ -332,13 +332,13 @@ impl FriProverDal<'_, '_> {
             WHERE
                 id = $3
             RETURNING
-                prover_jobs_fri.id,
-                prover_jobs_fri.l1_batch_number,
-                prover_jobs_fri.circuit_id,
-                prover_jobs_fri.aggregation_round,
-                prover_jobs_fri.sequence_number,
-                prover_jobs_fri.depth,
-                prover_jobs_fri.is_node_final_proof
+            prover_jobs_fri.id,
+            prover_jobs_fri.l1_batch_number,
+            prover_jobs_fri.circuit_id,
+            prover_jobs_fri.aggregation_round,
+            prover_jobs_fri.sequence_number,
+            prover_jobs_fri.depth,
+            prover_jobs_fri.is_node_final_proof
             "#,
             duration_to_naive_time(time_taken),
             blob_url,
@@ -394,15 +394,15 @@ impl FriProverDal<'_, '_> {
                                 AND attempts < $2
                             )
                         FOR UPDATE
-                            SKIP LOCKED
+                        SKIP LOCKED
                     )
                 RETURNING
-                    id,
-                    status,
-                    attempts,
-                    circuit_id,
-                    error,
-                    picked_by
+                id,
+                status,
+                attempts,
+                circuit_id,
+                error,
+                picked_by
                 "#,
                 &processing_timeout,
                 max_attempts as i32,
@@ -438,26 +438,28 @@ impl FriProverDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                prover_jobs_fri (
-                    l1_batch_number,
-                    circuit_id,
-                    circuit_blob_url,
-                    aggregation_round,
-                    sequence_number,
-                    depth,
-                    is_node_final_proof,
-                    protocol_version,
-                    status,
-                    created_at,
-                    updated_at,
-                    protocol_version_patch
-                )
+            prover_jobs_fri (
+                l1_batch_number,
+                circuit_id,
+                circuit_blob_url,
+                aggregation_round,
+                sequence_number,
+                depth,
+                is_node_final_proof,
+                protocol_version,
+                status,
+                created_at,
+                updated_at,
+                protocol_version_patch
+            )
             VALUES
-                ($1, $2, $3, $4, $5, $6, $7, $8, 'queued', NOW(), NOW(), $9)
-            ON CONFLICT (l1_batch_number, aggregation_round, circuit_id, depth, sequence_number) DO
+            ($1, $2, $3, $4, $5, $6, $7, $8, 'queued', NOW(), NOW(), $9)
+            ON CONFLICT (
+                l1_batch_number, aggregation_round, circuit_id, depth, sequence_number
+            ) DO
             UPDATE
             SET
-                updated_at = NOW()
+            updated_at = NOW()
             "#,
             i64::from(l1_batch_number.0),
             i16::from(circuit_id),
@@ -530,11 +532,11 @@ impl FriProverDal<'_, '_> {
                     protocol_version_patch AS "protocol_version_patch!",
                     COUNT(*) FILTER (
                         WHERE
-                            status = 'queued'
+                        status = 'queued'
                     ) AS queued,
                     COUNT(*) FILTER (
                         WHERE
-                            status = 'in_progress'
+                        status = 'in_progress'
                     ) AS in_progress
                 FROM
                     prover_jobs_fri
@@ -828,12 +830,12 @@ impl FriProverDal<'_, '_> {
                         OR status = 'failed'
                     )
                 RETURNING
-                    id,
-                    status,
-                    attempts,
-                    circuit_id,
-                    error,
-                    picked_by
+                id,
+                status,
+                attempts,
+                circuit_id,
+                error,
+                picked_by
                 "#,
                 i64::from(block_number.0),
                 max_attempts as i32,
diff --git a/prover/crates/lib/prover_dal/src/fri_witness_generator_dal.rs b/prover/crates/lib/prover_dal/src/fri_witness_generator_dal.rs
index 2040b444044..cd96edc21b0 100644
--- a/prover/crates/lib/prover_dal/src/fri_witness_generator_dal.rs
+++ b/prover/crates/lib/prover_dal/src/fri_witness_generator_dal.rs
@@ -49,17 +49,17 @@ impl FriWitnessGeneratorDal<'_, '_> {
         sqlx::query!(
             r#"
             INSERT INTO
-                witness_inputs_fri (
-                    l1_batch_number,
-                    witness_inputs_blob_url,
-                    protocol_version,
-                    status,
-                    created_at,
-                    updated_at,
-                    protocol_version_patch
-                )
+            witness_inputs_fri (
+                l1_batch_number,
+                witness_inputs_blob_url,
+                protocol_version,
+                status,
+                created_at,
+                updated_at,
+                protocol_version_patch
+            )
             VALUES
-                ($1, $2, $3, 'queued', NOW(), NOW(), $4)
+            ($1, $2, $3, 'queued', NOW(), NOW(), $4)
             ON CONFLICT (l1_batch_number) DO NOTHING
             "#,
             i64::from(block_number.0),
@@ -103,10 +103,10 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     LIMIT
                         1
                     FOR UPDATE
-                        SKIP LOCKED
+                    SKIP LOCKED
                 )
             RETURNING
-                witness_inputs_fri.l1_batch_number
+            witness_inputs_fri.l1_batch_number
             "#,
             protocol_version.minor as i32,
             picked_by,
@@ -207,11 +207,11 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     AND attempts < $2
                 )
             RETURNING
-                l1_batch_number,
-                status,
-                attempts,
-                error,
-                picked_by
+            l1_batch_number,
+            status,
+            attempts,
+            error,
+            picked_by
             "#,
             &processing_timeout,
             max_attempts as i32,
@@ -256,23 +256,23 @@ impl FriWitnessGeneratorDal<'_, '_> {
                 sqlx::query!(
                     r#"
                     INSERT INTO
-                        leaf_aggregation_witness_jobs_fri (
-                            l1_batch_number,
-                            circuit_id,
-                            closed_form_inputs_blob_url,
-                            number_of_basic_circuits,
-                            protocol_version,
-                            status,
-                            created_at,
-                            updated_at,
-                            protocol_version_patch
-                        )
+                    leaf_aggregation_witness_jobs_fri (
+                        l1_batch_number,
+                        circuit_id,
+                        closed_form_inputs_blob_url,
+                        number_of_basic_circuits,
+                        protocol_version,
+                        status,
+                        created_at,
+                        updated_at,
+                        protocol_version_patch
+                    )
                     VALUES
-                        ($1, $2, $3, $4, $5, 'waiting_for_proofs', NOW(), NOW(), $6)
+                    ($1, $2, $3, $4, $5, 'waiting_for_proofs', NOW(), NOW(), $6)
                     ON CONFLICT (l1_batch_number, circuit_id) DO
                     UPDATE
                     SET
-                        updated_at = NOW()
+                    updated_at = NOW()
                     "#,
                     i64::from(block_number.0),
                     i16::from(*circuit_id),
@@ -299,21 +299,21 @@ impl FriWitnessGeneratorDal<'_, '_> {
             sqlx::query!(
                 r#"
                 INSERT INTO
-                    recursion_tip_witness_jobs_fri (
-                        l1_batch_number,
-                        status,
-                        number_of_final_node_jobs,
-                        protocol_version,
-                        created_at,
-                        updated_at,
-                        protocol_version_patch
-                    )
+                recursion_tip_witness_jobs_fri (
+                    l1_batch_number,
+                    status,
+                    number_of_final_node_jobs,
+                    protocol_version,
+                    created_at,
+                    updated_at,
+                    protocol_version_patch
+                )
                 VALUES
-                    ($1, 'waiting_for_proofs', $2, $3, NOW(), NOW(), $4)
+                ($1, 'waiting_for_proofs', $2, $3, NOW(), NOW(), $4)
                 ON CONFLICT (l1_batch_number) DO
                 UPDATE
                 SET
-                    updated_at = NOW()
+                updated_at = NOW()
                 "#,
                 block_number.0 as i64,
                 closed_form_inputs_and_urls.len() as i32,
@@ -327,21 +327,21 @@ impl FriWitnessGeneratorDal<'_, '_> {
             sqlx::query!(
                 r#"
                 INSERT INTO
-                    scheduler_witness_jobs_fri (
-                        l1_batch_number,
-                        scheduler_partial_input_blob_url,
-                        protocol_version,
-                        status,
-                        created_at,
-                        updated_at,
-                        protocol_version_patch
-                    )
+                scheduler_witness_jobs_fri (
+                    l1_batch_number,
+                    scheduler_partial_input_blob_url,
+                    protocol_version,
+                    status,
+                    created_at,
+                    updated_at,
+                    protocol_version_patch
+                )
                 VALUES
-                    ($1, $2, $3, 'waiting_for_proofs', NOW(), NOW(), $4)
+                ($1, $2, $3, 'waiting_for_proofs', NOW(), NOW(), $4)
                 ON CONFLICT (l1_batch_number) DO
                 UPDATE
                 SET
-                    updated_at = NOW()
+                updated_at = NOW()
                 "#,
                 i64::from(block_number.0),
                 scheduler_partial_input_blob_url,
@@ -386,10 +386,10 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     LIMIT
                         1
                     FOR UPDATE
-                        SKIP LOCKED
+                    SKIP LOCKED
                 )
             RETURNING
-                leaf_aggregation_witness_jobs_fri.*
+            leaf_aggregation_witness_jobs_fri.*
             "#,
             protocol_version.minor as i32,
             protocol_version.patch.0 as i32,
@@ -464,8 +464,10 @@ impl FriWitnessGeneratorDal<'_, '_> {
                         prover_jobs_fri.circuit_id
                     FROM
                         prover_jobs_fri
-                        JOIN leaf_aggregation_witness_jobs_fri lawj ON prover_jobs_fri.l1_batch_number = lawj.l1_batch_number
-                        AND prover_jobs_fri.circuit_id = lawj.circuit_id
+                    JOIN leaf_aggregation_witness_jobs_fri lawj
+                        ON
+                            prover_jobs_fri.l1_batch_number = lawj.l1_batch_number
+                            AND prover_jobs_fri.circuit_id = lawj.circuit_id
                     WHERE
                         lawj.status = 'waiting_for_proofs'
                         AND prover_jobs_fri.status = 'successful'
@@ -478,8 +480,8 @@ impl FriWitnessGeneratorDal<'_, '_> {
                         COUNT(*) = lawj.number_of_basic_circuits
                 )
             RETURNING
-                l1_batch_number,
-                circuit_id;
+            l1_batch_number,
+            circuit_id;
             "#,
         )
         .fetch_all(self.storage.conn())
@@ -552,10 +554,10 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     LIMIT
                         1
                     FOR UPDATE
-                        SKIP LOCKED
+                    SKIP LOCKED
                 )
             RETURNING
-                node_aggregation_witness_jobs_fri.*
+            node_aggregation_witness_jobs_fri.*
             "#,
             protocol_version.minor as i32,
             protocol_version.patch.0 as i32,
@@ -617,24 +619,24 @@ impl FriWitnessGeneratorDal<'_, '_> {
         sqlx::query!(
             r#"
             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,
-                    protocol_version_patch
-                )
+            node_aggregation_witness_jobs_fri (
+                l1_batch_number,
+                circuit_id,
+                depth,
+                aggregations_url,
+                number_of_dependent_jobs,
+                protocol_version,
+                status,
+                created_at,
+                updated_at,
+                protocol_version_patch
+            )
             VALUES
-                ($1, $2, $3, $4, $5, $6, 'waiting_for_proofs', NOW(), NOW(), $7)
+            ($1, $2, $3, $4, $5, $6, 'waiting_for_proofs', NOW(), NOW(), $7)
             ON CONFLICT (l1_batch_number, circuit_id, depth) DO
             UPDATE
             SET
-                updated_at = NOW()
+            updated_at = NOW()
             "#,
             i64::from(block_number.0),
             i16::from(circuit_id),
@@ -663,9 +665,11 @@ impl FriWitnessGeneratorDal<'_, '_> {
                         prover_jobs_fri.depth
                     FROM
                         prover_jobs_fri
-                        JOIN node_aggregation_witness_jobs_fri nawj ON prover_jobs_fri.l1_batch_number = nawj.l1_batch_number
-                        AND prover_jobs_fri.circuit_id = nawj.circuit_id
-                        AND prover_jobs_fri.depth = nawj.depth
+                    JOIN node_aggregation_witness_jobs_fri nawj
+                        ON
+                            prover_jobs_fri.l1_batch_number = nawj.l1_batch_number
+                            AND prover_jobs_fri.circuit_id = nawj.circuit_id
+                            AND prover_jobs_fri.depth = nawj.depth
                     WHERE
                         nawj.status = 'waiting_for_proofs'
                         AND prover_jobs_fri.status = 'successful'
@@ -680,9 +684,9 @@ impl FriWitnessGeneratorDal<'_, '_> {
                         COUNT(*) = nawj.number_of_dependent_jobs
                 )
             RETURNING
-                l1_batch_number,
-                circuit_id,
-                depth;
+            l1_batch_number,
+            circuit_id,
+            depth;
             "#,
         )
         .fetch_all(self.storage.conn())
@@ -707,9 +711,11 @@ impl FriWitnessGeneratorDal<'_, '_> {
                         prover_jobs_fri.depth
                     FROM
                         prover_jobs_fri
-                        JOIN node_aggregation_witness_jobs_fri nawj ON prover_jobs_fri.l1_batch_number = nawj.l1_batch_number
-                        AND prover_jobs_fri.circuit_id = nawj.circuit_id
-                        AND prover_jobs_fri.depth = nawj.depth
+                    JOIN node_aggregation_witness_jobs_fri nawj
+                        ON
+                            prover_jobs_fri.l1_batch_number = nawj.l1_batch_number
+                            AND prover_jobs_fri.circuit_id = nawj.circuit_id
+                            AND prover_jobs_fri.depth = nawj.depth
                     WHERE
                         nawj.status = 'waiting_for_proofs'
                         AND prover_jobs_fri.status = 'successful'
@@ -723,9 +729,9 @@ impl FriWitnessGeneratorDal<'_, '_> {
                         COUNT(*) = nawj.number_of_dependent_jobs
                 )
             RETURNING
-                l1_batch_number,
-                circuit_id,
-                depth;
+            l1_batch_number,
+            circuit_id,
+            depth;
             "#,
         )
         .fetch_all(self.storage.conn())
@@ -748,7 +754,9 @@ impl FriWitnessGeneratorDal<'_, '_> {
                         prover_jobs_fri.l1_batch_number
                     FROM
                         prover_jobs_fri
-                        JOIN recursion_tip_witness_jobs_fri rtwj ON prover_jobs_fri.l1_batch_number = rtwj.l1_batch_number
+                    JOIN
+                        recursion_tip_witness_jobs_fri rtwj
+                        ON prover_jobs_fri.l1_batch_number = rtwj.l1_batch_number
                     WHERE
                         rtwj.status = 'waiting_for_proofs'
                         AND prover_jobs_fri.status = 'successful'
@@ -761,7 +769,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
                         COUNT(*) = rtwj.number_of_final_node_jobs
                 )
             RETURNING
-                l1_batch_number;
+            l1_batch_number;
             "#,
             AggregationRound::NodeAggregation as i64,
         )
@@ -785,14 +793,16 @@ impl FriWitnessGeneratorDal<'_, '_> {
                         prover_jobs_fri.l1_batch_number
                     FROM
                         prover_jobs_fri
-                        JOIN scheduler_witness_jobs_fri swj ON prover_jobs_fri.l1_batch_number = swj.l1_batch_number
+                    JOIN
+                        scheduler_witness_jobs_fri swj
+                        ON prover_jobs_fri.l1_batch_number = swj.l1_batch_number
                     WHERE
                         swj.status = 'waiting_for_proofs'
                         AND prover_jobs_fri.status = 'successful'
                         AND prover_jobs_fri.aggregation_round = $1
                 )
             RETURNING
-                l1_batch_number;
+            l1_batch_number;
             "#,
             AggregationRound::RecursionTip as i64,
         )
@@ -828,12 +838,12 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     AND attempts < $2
                 )
             RETURNING
-                id,
-                status,
-                attempts,
-                circuit_id,
-                error,
-                picked_by
+            id,
+            status,
+            attempts,
+            circuit_id,
+            error,
+            picked_by
             "#,
             &processing_timeout,
             max_attempts as i32,
@@ -877,12 +887,12 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     AND attempts < $2
                 )
             RETURNING
-                id,
-                status,
-                attempts,
-                circuit_id,
-                error,
-                picked_by
+            id,
+            status,
+            attempts,
+            circuit_id,
+            error,
+            picked_by
             "#,
             &processing_timeout,
             max_attempts as i32,
@@ -926,11 +936,11 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     AND attempts < $2
                 )
             RETURNING
-                l1_batch_number,
-                status,
-                attempts,
-                error,
-                picked_by
+            l1_batch_number,
+            status,
+            attempts,
+            error,
+            picked_by
             "#,
             &processing_timeout,
             max_attempts as i32,
@@ -979,11 +989,11 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     LIMIT
                         1
                     FOR UPDATE
-                        SKIP LOCKED
+                    SKIP LOCKED
                 )
             RETURNING
-                recursion_tip_witness_jobs_fri.l1_batch_number,
-                recursion_tip_witness_jobs_fri.number_of_final_node_jobs
+            recursion_tip_witness_jobs_fri.l1_batch_number,
+            recursion_tip_witness_jobs_fri.number_of_final_node_jobs
             "#,
             protocol_version.minor as i32,
             protocol_version.patch.0 as i32,
@@ -1042,11 +1052,11 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     AND attempts < $2
                 )
             RETURNING
-                l1_batch_number,
-                status,
-                attempts,
-                error,
-                picked_by
+            l1_batch_number,
+            status,
+            attempts,
+            error,
+            picked_by
             "#,
             &processing_timeout,
             max_attempts as i32,
@@ -1095,10 +1105,10 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     LIMIT
                         1
                     FOR UPDATE
-                        SKIP LOCKED
+                    SKIP LOCKED
                 )
             RETURNING
-                scheduler_witness_jobs_fri.*
+            scheduler_witness_jobs_fri.*
             "#,
             protocol_version.minor as i32,
             picked_by,
@@ -1586,11 +1596,11 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     OR status = 'failed'
                 )
             RETURNING
-                l1_batch_number,
-                status,
-                attempts,
-                error,
-                picked_by
+            l1_batch_number,
+            status,
+            attempts,
+            error,
+            picked_by
             "#,
             i64::from(block_number.0),
             max_attempts as i64
@@ -1656,11 +1666,11 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     OR status = 'failed'
                 )
             RETURNING
-                l1_batch_number,
-                status,
-                attempts,
-                error,
-                picked_by
+            l1_batch_number,
+            status,
+            attempts,
+            error,
+            picked_by
             "#,
             i64::from(block_number.0),
             max_attempts as i64
@@ -1700,11 +1710,11 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     OR status = 'failed'
                 )
             RETURNING
-                l1_batch_number,
-                status,
-                attempts,
-                error,
-                picked_by
+            l1_batch_number,
+            status,
+            attempts,
+            error,
+            picked_by
             "#,
             i64::from(block_number.0),
             max_attempts as i64
@@ -1793,7 +1803,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
                 wit.created_at
             FROM
                 proof_compression_jobs_fri AS comp
-                JOIN witness_inputs_fri AS wit ON comp.l1_batch_number = wit.l1_batch_number
+            JOIN witness_inputs_fri AS wit ON comp.l1_batch_number = wit.l1_batch_number
             WHERE
                 wit.created_at > $1
             ORDER BY
diff --git a/restore-ecosystem.sh b/restore-ecosystem.sh
index 7fbff3e9802..400f8ab69d1 100755
--- a/restore-ecosystem.sh
+++ b/restore-ecosystem.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# This script restores the Postgres databases and chain configuration files for a given ecosystem.
+# Allowing you to recover the L2 state from a previous backup.
+
 # Check if the ecosystem name was provided as an argument
 if [ -z "$1" ]; then
   echo "Usage: ./restore-ecosystem ECOSYSTEM_NAME"
diff --git a/zk_toolbox/Cargo.lock b/zk_toolbox/Cargo.lock
index 297ef404698..5dbe3089d0a 100644
--- a/zk_toolbox/Cargo.lock
+++ b/zk_toolbox/Cargo.lock
@@ -5165,8 +5165,9 @@ dependencies = [
 
 [[package]]
 name = "sqruff-lib"
-version = "0.18.2"
-source = "git+https://github.com/quarylabs/sqruff#1ccf18a620b93438c0c6b4f9fc88f402f45a1b29"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "676775189e83a98fc603d59fc6d760a66895d511502a538081dac993fde1a09a"
 dependencies = [
  "ahash",
  "anstyle",
@@ -5199,8 +5200,9 @@ dependencies = [
 
 [[package]]
 name = "sqruff-lib-core"
-version = "0.18.2"
-source = "git+https://github.com/quarylabs/sqruff#1ccf18a620b93438c0c6b4f9fc88f402f45a1b29"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48ec5ba65376ae9ba3e3dda153668dcb6452a7212ee7b4c9d48e053eb4f0f3fa"
 dependencies = [
  "ahash",
  "enum_dispatch",
@@ -5219,8 +5221,9 @@ dependencies = [
 
 [[package]]
 name = "sqruff-lib-dialects"
-version = "0.18.2"
-source = "git+https://github.com/quarylabs/sqruff#1ccf18a620b93438c0c6b4f9fc88f402f45a1b29"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00fa1cd168dad593f8f6996d805acc1fd52c6d0ad0f6f5847a9cc22a6198cfc2"
 dependencies = [
  "ahash",
  "itertools 0.13.0",
diff --git a/zk_toolbox/crates/common/src/git.rs b/zk_toolbox/crates/common/src/git.rs
index e44112842a8..ea6540c20b2 100644
--- a/zk_toolbox/crates/common/src/git.rs
+++ b/zk_toolbox/crates/common/src/git.rs
@@ -38,9 +38,3 @@ pub fn pull(shell: &Shell, link_to_code: PathBuf) -> anyhow::Result<()> {
     Cmd::new(cmd!(shell, "git pull origin {current_branch}")).run()?;
     Ok(())
 }
-
-pub fn checkout(shell: &Shell, path: PathBuf, branch: &str) -> anyhow::Result<()> {
-    let _dir_guard = shell.push_dir(path);
-    Cmd::new(cmd!(shell, "git checkout {branch}")).run()?;
-    Ok(())
-}
diff --git a/zk_toolbox/crates/config/src/consts.rs b/zk_toolbox/crates/config/src/consts.rs
index ab2935ac02d..80b204cc619 100644
--- a/zk_toolbox/crates/config/src/consts.rs
+++ b/zk_toolbox/crates/config/src/consts.rs
@@ -31,7 +31,7 @@ pub const ERA_OBSERVABILITY_COMPOSE_FILE: &str = "era-observability/docker-compo
 /// Path to era observability repository
 pub const ERA_OBSERBAVILITY_DIR: &str = "era-observability";
 /// Era observability repo link
-pub const ERA_OBSERBAVILITY_GIT_REPO: &str = "https://github.com/lambdaclass/era-observability";
+pub const ERA_OBSERBAVILITY_GIT_REPO: &str = "https://github.com/matter-labs/era-observability";
 pub(crate) const LOCAL_APPS_PATH: &str = "apps/";
 pub(crate) const LOCAL_CHAINS_PATH: &str = "chains/";
 pub(crate) const LOCAL_CONFIGS_PATH: &str = "configs/";
diff --git a/zk_toolbox/crates/config/src/contracts.rs b/zk_toolbox/crates/config/src/contracts.rs
index 8296aa18852..43fcf314470 100644
--- a/zk_toolbox/crates/config/src/contracts.rs
+++ b/zk_toolbox/crates/config/src/contracts.rs
@@ -71,6 +71,7 @@ impl ContractsConfig {
             .diamond_cut_data
             .clone_from(&deploy_l1_output.contracts_config.diamond_cut_data);
         self.l1.chain_admin_addr = deploy_l1_output.deployed_addresses.chain_admin;
+        self.l1.eigenda_verifier_addr = deploy_l1_output.deployed_addresses.eigenda_verifier_addr;
     }
 
     pub fn set_chain_contracts(&mut self, register_chain_output: &RegisterChainOutput) {
@@ -151,6 +152,7 @@ pub struct L1Contracts {
     pub verifier_addr: Address,
     pub validator_timelock_addr: Address,
     pub base_token_addr: Address,
+    pub eigenda_verifier_addr: Address,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone, Default)]
diff --git a/zk_toolbox/crates/config/src/forge_interface/deploy_ecosystem/input.rs b/zk_toolbox/crates/config/src/forge_interface/deploy_ecosystem/input.rs
index 30ec0eeb9c4..f338158b60a 100644
--- a/zk_toolbox/crates/config/src/forge_interface/deploy_ecosystem/input.rs
+++ b/zk_toolbox/crates/config/src/forge_interface/deploy_ecosystem/input.rs
@@ -31,6 +31,7 @@ pub struct InitialDeploymentConfig {
     pub validator_timelock_execution_delay: u64,
     pub token_weth_address: Address,
     pub bridgehub_create_new_chain_salt: u64,
+    pub eigen_service_manager: Address,
 }
 
 impl Default for InitialDeploymentConfig {
@@ -53,6 +54,8 @@ impl Default for InitialDeploymentConfig {
             // toml crate u64 support is backed by i64 implementation
             // https://github.com/toml-rs/toml/issues/705
             bridgehub_create_new_chain_salt: rand::thread_rng().gen_range(0..=i64::MAX) as u64,
+            eigen_service_manager: Address::from_str("0x0000000000000000000000000000000000000000")
+                .unwrap(),
         }
     }
 }
@@ -146,6 +149,7 @@ impl DeployL1Config {
                     .diamond_init_minimal_l2_gas_price,
                 bootloader_hash: genesis_config.bootloader_hash.unwrap(),
                 default_aa_hash: genesis_config.default_aa_hash.unwrap(),
+                evm_emulator_hash: genesis_config.evm_emulator_hash,
                 diamond_init_priority_tx_max_pubdata: initial_deployment_config
                     .diamond_init_priority_tx_max_pubdata,
                 diamond_init_pubdata_pricing_mode: initial_deployment_config
@@ -161,6 +165,7 @@ impl DeployL1Config {
                 priority_tx_max_gas_limit: initial_deployment_config.priority_tx_max_gas_limit,
                 validator_timelock_execution_delay: initial_deployment_config
                     .validator_timelock_execution_delay,
+                eigen_service_manager: initial_deployment_config.eigen_service_manager,
             },
             tokens: TokensDeployL1Config {
                 token_weth_address: initial_deployment_config.token_weth_address,
@@ -194,6 +199,8 @@ pub struct ContractsDeployL1Config {
     pub diamond_init_minimal_l2_gas_price: u64,
     pub bootloader_hash: H256,
     pub default_aa_hash: H256,
+    pub eigen_service_manager: Address,
+    pub evm_emulator_hash: Option<H256>,
 }
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
diff --git a/zk_toolbox/crates/config/src/forge_interface/deploy_ecosystem/output.rs b/zk_toolbox/crates/config/src/forge_interface/deploy_ecosystem/output.rs
index 7f35cf0357c..5e51634356c 100644
--- a/zk_toolbox/crates/config/src/forge_interface/deploy_ecosystem/output.rs
+++ b/zk_toolbox/crates/config/src/forge_interface/deploy_ecosystem/output.rs
@@ -48,6 +48,7 @@ pub struct DeployL1DeployedAddressesOutput {
     pub bridgehub: L1BridgehubOutput,
     pub bridges: L1BridgesOutput,
     pub state_transition: L1StateTransitionOutput,
+    pub eigenda_verifier_addr: Address,
 }
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
diff --git a/zk_toolbox/crates/zk_inception/src/commands/ecosystem/setup_observability.rs b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/setup_observability.rs
index 9dca67f3b25..f20c3c24157 100644
--- a/zk_toolbox/crates/zk_inception/src/commands/ecosystem/setup_observability.rs
+++ b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/setup_observability.rs
@@ -20,8 +20,6 @@ pub fn run(shell: &Shell) -> anyhow::Result<()> {
         ERA_OBSERBAVILITY_GIT_REPO,
         ERA_OBSERBAVILITY_DIR,
     )?;
-
-    git::checkout(shell, path_to_era_observability, "eigenda")?;
     spinner.finish();
 
     Ok(())
diff --git a/zk_toolbox/crates/zk_supervisor/Cargo.toml b/zk_toolbox/crates/zk_supervisor/Cargo.toml
index 158abe4e2ec..d343e7af43e 100644
--- a/zk_toolbox/crates/zk_supervisor/Cargo.toml
+++ b/zk_toolbox/crates/zk_supervisor/Cargo.toml
@@ -29,4 +29,4 @@ futures.workspace = true
 types.workspace = true
 serde_yaml.workspace = true
 zksync_basic_types.workspace = true
-sqruff-lib = { git = "https://github.com/quarylabs/sqruff", version = "0.18.2" }
+sqruff-lib = "0.19.0"