diff --git a/Cargo.lock b/Cargo.lock
index 32c3e364f90..e57439a3b24 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -183,7 +183,7 @@ dependencies = [
  "serde_urlencoded",
  "smallvec",
  "socket2",
- "time 0.3.22",
+ "time",
  "url",
 ]
 
@@ -673,7 +673,7 @@ dependencies = [
 [[package]]
 name = "bellman_ce"
 version = "0.3.2"
-source = "git+https://github.com/matter-labs/bellman?branch=dev#bbac0559fdc440b2331eca1c347a30559a3dd969"
+source = "git+https://github.com/matter-labs/bellman?branch=dev#5520aa2274afe73d281373c92b007a2ecdebfbea"
 dependencies = [
  "arrayvec 0.7.3",
  "bit-vec",
@@ -814,7 +814,7 @@ dependencies = [
 [[package]]
 name = "blake2s_const"
 version = "0.6.0"
-source = "git+https://github.com/matter-labs/bellman?branch=dev#bbac0559fdc440b2331eca1c347a30559a3dd969"
+source = "git+https://github.com/matter-labs/bellman?branch=dev#5520aa2274afe73d281373c92b007a2ecdebfbea"
 dependencies = [
  "arrayref",
  "arrayvec 0.5.2",
@@ -1069,18 +1069,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.26"
+version = "0.4.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
  "serde",
- "time 0.1.43",
  "wasm-bindgen",
- "winapi 0.3.9",
+ "windows-targets 0.48.0",
 ]
 
 [[package]]
@@ -1122,7 +1121,7 @@ dependencies = [
 [[package]]
 name = "circuit_testing"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/circuit_testing.git?branch=main#028864449036071cfb4e9ebe7ee4c5be59893031"
+source = "git+https://github.com/matter-labs/era-circuit_testing.git?branch=main#164c0adac85be39ee44bd9456b2b91cdede5af80"
 dependencies = [
  "bellman_ce",
 ]
@@ -1228,7 +1227,7 @@ dependencies = [
 [[package]]
 name = "codegen"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/solidity_plonk_verifier.git?branch=dev#07954802c13fb087efb5874c2ce521f843d614fd"
+source = "git+https://github.com/matter-labs/solidity_plonk_verifier.git?branch=dev#82f96b7156551087f1c9bfe4f0ea68845b6debfc"
 dependencies = [
  "ethereum-types 0.14.1",
  "franklin-crypto",
@@ -1318,7 +1317,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
 dependencies = [
  "percent-encoding",
- "time 0.3.22",
+ "time",
  "version_check",
 ]
 
@@ -1625,7 +1624,7 @@ dependencies = [
 [[package]]
 name = "cs_derive"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/sync_vm.git?branch=v1.3.3#c0cbd48fd38c18fb3746140c9018b855c56ed69d"
+source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#3a21c8dee43c77604350fdf33c1615e25bf1dacd"
 dependencies = [
  "proc-macro-error",
  "proc-macro2 1.0.66",
@@ -1904,19 +1903,6 @@ dependencies = [
  "termcolor",
 ]
 
-[[package]]
-name = "env_logger"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
-dependencies = [
- "humantime",
- "is-terminal",
- "log",
- "regex",
- "termcolor",
-]
-
 [[package]]
 name = "envy"
 version = "0.4.2"
@@ -2165,7 +2151,7 @@ dependencies = [
 [[package]]
 name = "franklin-crypto"
 version = "0.0.5"
-source = "git+https://github.com/matter-labs/franklin-crypto?branch=dev#5922873d25ecec827cd60420ca8cd84a188bb965"
+source = "git+https://github.com/matter-labs/franklin-crypto?branch=dev#5695d07c7bc604c2c39a27712ffac171d39ee1ed"
 dependencies = [
  "arr_macro",
  "bellman_ce",
@@ -2472,7 +2458,7 @@ dependencies = [
  "serde",
  "serde_json",
  "thiserror",
- "time 0.3.22",
+ "time",
  "tokio",
  "tracing",
  "urlencoding",
@@ -2513,7 +2499,7 @@ dependencies = [
  "serde_json",
  "sha2 0.10.6",
  "thiserror",
- "time 0.3.22",
+ "time",
  "tokio",
  "tracing",
  "url",
@@ -4158,11 +4144,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.54"
+version = "0.10.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69b3f656a17a6cbc115b5c7a40c616947d213ba182135b014d6051b73ab6f019"
+checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.3.2",
  "cfg-if 1.0.0",
  "foreign-types",
  "libc",
@@ -4190,9 +4176,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.88"
+version = "0.9.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617"
+checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d"
 dependencies = [
  "cc",
  "libc",
@@ -5170,7 +5156,7 @@ dependencies = [
 [[package]]
 name = "rescue_poseidon"
 version = "0.4.1"
-source = "git+https://github.com/matter-labs/rescue-poseidon#f611a3353e48cf42153e44d89ed90da9bc5934e8"
+source = "git+https://github.com/matter-labs/rescue-poseidon#d059b5042df5ed80e151f05751410b524a54d16c"
 dependencies = [
  "addchain",
  "arrayvec 0.7.3",
@@ -5324,7 +5310,7 @@ checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f"
 dependencies = [
  "log",
  "ring",
- "rustls-webpki 0.100.1",
+ "rustls-webpki 0.100.3",
  "sct",
 ]
 
@@ -5351,9 +5337,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.100.1"
+version = "0.100.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b"
+checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3"
 dependencies = [
  "ring",
  "untrusted",
@@ -5361,9 +5347,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.101.1"
+version = "0.101.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e"
+checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe"
 dependencies = [
  "ring",
  "untrusted",
@@ -5632,7 +5618,7 @@ dependencies = [
  "serde",
  "serde_json",
  "thiserror",
- "time 0.3.22",
+ "time",
  "url",
  "uuid",
 ]
@@ -5856,7 +5842,7 @@ dependencies = [
  "num-bigint 0.4.3",
  "num-traits",
  "thiserror",
- "time 0.3.22",
+ "time",
 ]
 
 [[package]]
@@ -6193,7 +6179,7 @@ dependencies = [
 [[package]]
 name = "sync_vm"
 version = "1.3.3"
-source = "git+https://github.com/matter-labs/sync_vm.git?branch=v1.3.3#c0cbd48fd38c18fb3746140c9018b855c56ed69d"
+source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#3a21c8dee43c77604350fdf33c1615e25bf1dacd"
 dependencies = [
  "arrayvec 0.7.3",
  "cs_derive",
@@ -6343,16 +6329,6 @@ dependencies = [
  "tikv-jemalloc-sys",
 ]
 
-[[package]]
-name = "time"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "time"
 version = "0.3.22"
@@ -6683,7 +6659,7 @@ dependencies = [
  "sharded-slab",
  "smallvec",
  "thread_local",
- "time 0.3.22",
+ "time",
  "tracing",
  "tracing-core",
  "tracing-log",
@@ -7200,9 +7176,9 @@ dependencies = [
 
 [[package]]
 name = "webpki"
-version = "0.22.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
+checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e"
 dependencies = [
  "ring",
  "untrusted",
@@ -7223,7 +7199,7 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888"
 dependencies = [
- "rustls-webpki 0.101.1",
+ "rustls-webpki 0.101.6",
 ]
 
 [[package]]
@@ -7513,7 +7489,7 @@ dependencies = [
 [[package]]
 name = "zk_evm"
 version = "1.3.3"
-source = "git+https://github.com/matter-labs/zk_evm.git?branch=v1.3.3#96a0b2bfc4cb50dfc0cce8114a13432827a27631"
+source = "git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.3.3#fe8215a7047d24430ad470cf15a19bedb4d6ba0b"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -7528,7 +7504,7 @@ dependencies = [
 [[package]]
 name = "zk_evm_abstractions"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/zk_evm_abstractions.git#839721a4ae2093c5c0aa8ffd49758f32ecd172ed"
+source = "git+https://github.com/matter-labs/era-zk_evm_abstractions.git#7502a661d7d38906d849dcd3e7a15e5848af6581"
 dependencies = [
  "anyhow",
  "serde",
@@ -7541,7 +7517,7 @@ name = "zkevm-assembly"
 version = "1.3.1"
 source = "git+https://github.com/matter-labs/era-zkEVM-assembly.git?tag=v1.3.1-rc0#dabbb07e84dd886ee90dde2b5dde0acbf9b0123a"
 dependencies = [
- "env_logger 0.9.3",
+ "env_logger",
  "hex",
  "lazy_static",
  "log",
@@ -7558,16 +7534,15 @@ dependencies = [
 [[package]]
 name = "zkevm-assembly"
 version = "1.3.2"
-source = "git+https://github.com/matter-labs/zkEVM-assembly.git?branch=v1.3.2#a276422b9f874242eeaeecd1434542565064f85e"
+source = "git+https://github.com/matter-labs/era-zkEVM-assembly.git?branch=v1.3.2#3c61d450cbe6548068be8f313ed02f1bd229a865"
 dependencies = [
- "env_logger 0.9.3",
+ "env_logger",
  "hex",
  "lazy_static",
  "log",
  "nom",
  "num-bigint 0.4.3",
  "num-traits",
- "regex",
  "sha3 0.10.6",
  "smallvec",
  "structopt",
@@ -7578,7 +7553,7 @@ dependencies = [
 [[package]]
 name = "zkevm_opcode_defs"
 version = "1.3.1"
-source = "git+https://github.com/matter-labs/era-zkevm_opcode_defs.git?branch=v1.3.1#e33a7cc625bf40c42e41a730005dbc6fe8025279"
+source = "git+https://github.com/matter-labs/era-zkevm_opcode_defs.git?branch=v1.3.1#00d4ad2292bd55374a0fa10fe11686d7a109d8a0"
 dependencies = [
  "bitflags 1.3.2",
  "ethereum-types 0.14.1",
@@ -7589,7 +7564,7 @@ dependencies = [
 [[package]]
 name = "zkevm_opcode_defs"
 version = "1.3.2"
-source = "git+https://github.com/matter-labs/zkevm_opcode_defs.git?branch=v1.3.2#780ce4129a95ab9a68abf0d60c156ee8df6008c2"
+source = "git+https://github.com/matter-labs/era-zkevm_opcode_defs.git?branch=v1.3.2#c7ab62f4c60b27dfc690c3ab3efb5fff1ded1a25"
 dependencies = [
  "bitflags 2.3.2",
  "blake2 0.10.6",
@@ -7603,14 +7578,14 @@ dependencies = [
 [[package]]
 name = "zkevm_test_harness"
 version = "1.3.3"
-source = "git+https://github.com/matter-labs/zkevm_test_harness.git?branch=v1.3.3#681a72c9d120e7b11283bc06087217ecbad88c5c"
+source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.3.3#d26aa4133f2b5e114c0bf084b8c3f1eca9aa9929"
 dependencies = [
  "bincode",
  "circuit_testing",
  "codegen 0.2.0",
  "crossbeam 0.8.2",
  "derivative",
- "env_logger 0.10.0",
+ "env_logger",
  "hex",
  "num-bigint 0.4.3",
  "num-integer",
diff --git a/core/bin/storage_logs_dedup_migration/Cargo.toml b/core/bin/storage_logs_dedup_migration/Cargo.toml
index 44e8057aa93..700ffa6e3ab 100644
--- a/core/bin/storage_logs_dedup_migration/Cargo.toml
+++ b/core/bin/storage_logs_dedup_migration/Cargo.toml
@@ -2,6 +2,7 @@
 name = "storage_logs_dedup_migration"
 version = "0.1.0"
 edition = "2021"
+license = "MIT OR Apache-2.0"
 
 [[bin]]
 name = "storage_logs_dedup_migration"
diff --git a/core/bin/verification_key_generator_and_server/Cargo.toml b/core/bin/verification_key_generator_and_server/Cargo.toml
index ede633eb1e7..b49683424a4 100644
--- a/core/bin/verification_key_generator_and_server/Cargo.toml
+++ b/core/bin/verification_key_generator_and_server/Cargo.toml
@@ -2,6 +2,7 @@
 name = "zksync_verification_key_generator_and_server"
 version = "0.1.0"
 edition = "2018"
+license = "MIT OR Apache-2.0"
 
 [lib]
 name = "zksync_verification_key_server"
@@ -23,7 +24,7 @@ path = "src/commitment_generator.rs"
 zksync_types = { path = "../../lib/types" }
 zksync_prover_utils = { path = "../../lib/prover_utils" }
 vlog = { path = "../../lib/vlog" }
-circuit_testing = { git = "https://github.com/matter-labs/circuit_testing.git", branch = "main" }
+circuit_testing = { git = "https://github.com/matter-labs/era-circuit_testing.git", branch = "main" }
 itertools = "0.10.5"
 bincode = "1.3.3"
 
diff --git a/core/lib/contracts/src/lib.rs b/core/lib/contracts/src/lib.rs
index 20111285e86..1fb12da5531 100644
--- a/core/lib/contracts/src/lib.rs
+++ b/core/lib/contracts/src/lib.rs
@@ -180,7 +180,7 @@ pub struct SystemContractsRepo {
 impl SystemContractsRepo {
     /// Returns the default system contracts repo with directory based on the ZKSYNC_HOME environment variable.
     pub fn from_env() -> Self {
-        let zksync_home = std::env::var("ZKSYNC_HOME").expect("ZKSYNC_HOME env variable not set.");
+        let zksync_home = std::env::var("ZKSYNC_HOME").unwrap_or_else(|_| ".".into());
         let zksync_home = PathBuf::from(zksync_home);
         SystemContractsRepo {
             root: zksync_home.join("etc/system-contracts"),
diff --git a/core/lib/dal/src/models/storage_block.rs b/core/lib/dal/src/models/storage_block.rs
index 0b48c11756c..d0077a2f7a1 100644
--- a/core/lib/dal/src/models/storage_block.rs
+++ b/core/lib/dal/src/models/storage_block.rs
@@ -363,21 +363,21 @@ impl StorageBlockDetails {
                 .map(|hash| H256::from_str(hash).expect("Incorrect commit_tx hash")),
             committed_at: self
                 .committed_at
-                .map(|committed_at| DateTime::<Utc>::from_utc(committed_at, Utc)),
+                .map(|committed_at| DateTime::from_naive_utc_and_offset(committed_at, Utc)),
             prove_tx_hash: self
                 .prove_tx_hash
                 .as_deref()
                 .map(|hash| H256::from_str(hash).expect("Incorrect prove_tx hash")),
             proven_at: self
                 .proven_at
-                .map(|proven_at| DateTime::<Utc>::from_utc(proven_at, Utc)),
+                .map(|proven_at| DateTime::<Utc>::from_naive_utc_and_offset(proven_at, Utc)),
             execute_tx_hash: self
                 .execute_tx_hash
                 .as_deref()
                 .map(|hash| H256::from_str(hash).expect("Incorrect execute_tx hash")),
             executed_at: self
                 .executed_at
-                .map(|executed_at| DateTime::<Utc>::from_utc(executed_at, Utc)),
+                .map(|executed_at| DateTime::<Utc>::from_naive_utc_and_offset(executed_at, Utc)),
             l1_gas_price: self.l1_gas_price as u64,
             l2_fair_gas_price: self.l2_fair_gas_price as u64,
             base_system_contracts_hashes: convert_base_system_contracts_hashes(
@@ -439,21 +439,21 @@ impl From<StorageL1BatchDetails> for api::L1BatchDetails {
                 .map(|hash| H256::from_str(hash).expect("Incorrect commit_tx hash")),
             committed_at: details
                 .committed_at
-                .map(|committed_at| DateTime::<Utc>::from_utc(committed_at, Utc)),
+                .map(|committed_at| DateTime::<Utc>::from_naive_utc_and_offset(committed_at, Utc)),
             prove_tx_hash: details
                 .prove_tx_hash
                 .as_deref()
                 .map(|hash| H256::from_str(hash).expect("Incorrect prove_tx hash")),
             proven_at: details
                 .proven_at
-                .map(|proven_at| DateTime::<Utc>::from_utc(proven_at, Utc)),
+                .map(|proven_at| DateTime::<Utc>::from_naive_utc_and_offset(proven_at, Utc)),
             execute_tx_hash: details
                 .execute_tx_hash
                 .as_deref()
                 .map(|hash| H256::from_str(hash).expect("Incorrect execute_tx hash")),
             executed_at: details
                 .executed_at
-                .map(|executed_at| DateTime::<Utc>::from_utc(executed_at, Utc)),
+                .map(|executed_at| DateTime::<Utc>::from_naive_utc_and_offset(executed_at, Utc)),
             l1_gas_price: details.l1_gas_price as u64,
             l2_fair_gas_price: details.l2_fair_gas_price as u64,
             base_system_contracts_hashes: convert_base_system_contracts_hashes(
diff --git a/core/lib/dal/src/models/storage_prover_job_info.rs b/core/lib/dal/src/models/storage_prover_job_info.rs
index 485d126ece5..facec83e0c2 100644
--- a/core/lib/dal/src/models/storage_prover_job_info.rs
+++ b/core/lib/dal/src/models/storage_prover_job_info.rs
@@ -32,7 +32,7 @@ pub struct StorageProverJobInfo {
 impl From<StorageProverJobInfo> for ProverJobInfo {
     fn from(x: StorageProverJobInfo) -> Self {
         fn nt2d(nt: NaiveDateTime) -> DateTime<Utc> {
-            DateTime::from_utc(nt, Utc)
+            DateTime::from_naive_utc_and_offset(nt, Utc)
         }
 
         let status = match ProverJobStatus::from_str(x.status.as_str())
diff --git a/core/lib/dal/src/models/storage_sync.rs b/core/lib/dal/src/models/storage_sync.rs
index 127d6442c4a..f68908dc118 100644
--- a/core/lib/dal/src/models/storage_sync.rs
+++ b/core/lib/dal/src/models/storage_sync.rs
@@ -53,21 +53,21 @@ impl StorageSyncBlock {
                 .map(|hash| H256::from_str(hash).expect("Incorrect commit_tx hash")),
             committed_at: self
                 .committed_at
-                .map(|committed_at| DateTime::<Utc>::from_utc(committed_at, Utc)),
+                .map(|committed_at| DateTime::<Utc>::from_naive_utc_and_offset(committed_at, Utc)),
             prove_tx_hash: self
                 .prove_tx_hash
                 .as_deref()
                 .map(|hash| H256::from_str(hash).expect("Incorrect prove_tx hash")),
             proven_at: self
                 .proven_at
-                .map(|proven_at| DateTime::<Utc>::from_utc(proven_at, Utc)),
+                .map(|proven_at| DateTime::<Utc>::from_naive_utc_and_offset(proven_at, Utc)),
             execute_tx_hash: self
                 .execute_tx_hash
                 .as_deref()
                 .map(|hash| H256::from_str(hash).expect("Incorrect execute_tx hash")),
             executed_at: self
                 .executed_at
-                .map(|executed_at| DateTime::<Utc>::from_utc(executed_at, Utc)),
+                .map(|executed_at| DateTime::<Utc>::from_naive_utc_and_offset(executed_at, Utc)),
             l1_gas_price: self.l1_gas_price as u64,
             l2_fair_gas_price: self.l2_fair_gas_price as u64,
             // TODO (SMA-1635): Make these filed non optional in database
diff --git a/core/lib/dal/src/models/storage_token.rs b/core/lib/dal/src/models/storage_token.rs
index 8b9779577d4..1c1e3539f06 100644
--- a/core/lib/dal/src/models/storage_token.rs
+++ b/core/lib/dal/src/models/storage_token.rs
@@ -34,7 +34,7 @@ impl From<StorageTokenPrice> for Option<TokenPrice> {
         match (&price.usd_price, price.usd_price_updated_at) {
             (Some(usd_price), Some(updated_at)) => Some(TokenPrice {
                 usd_price: big_decimal_to_ratio(usd_price).unwrap(),
-                last_updated: DateTime::<Utc>::from_utc(updated_at, Utc),
+                last_updated: DateTime::<Utc>::from_naive_utc_and_offset(updated_at, Utc),
             }),
             (None, None) => None,
             _ => {
@@ -62,7 +62,7 @@ impl From<StorageTokenMarketVolume> for Option<TokenMarketVolume> {
             .as_ref()
             .map(|volume| TokenMarketVolume {
                 market_volume: big_decimal_to_ratio(volume).unwrap(),
-                last_updated: DateTime::<Utc>::from_utc(
+                last_updated: DateTime::<Utc>::from_naive_utc_and_offset(
                     market_volume
                         .market_volume_updated_at
                         .expect("If `market_volume` is Some then `updated_at` must be Some"),
diff --git a/core/lib/dal/src/models/storage_transaction.rs b/core/lib/dal/src/models/storage_transaction.rs
index 1cf20a7dc19..738cf3356f3 100644
--- a/core/lib/dal/src/models/storage_transaction.rs
+++ b/core/lib/dal/src/models/storage_transaction.rs
@@ -452,7 +452,7 @@ impl From<StorageTransactionDetails> for TransactionDetails {
             bigdecimal_to_u256(tx_details.gas_per_pubdata_limit.unwrap_or_default());
 
         let initiator_address = H160::from_slice(tx_details.initiator_address.as_slice());
-        let received_at = DateTime::<Utc>::from_utc(tx_details.received_at, Utc);
+        let received_at = DateTime::<Utc>::from_naive_utc_and_offset(tx_details.received_at, Utc);
 
         let eth_commit_tx_hash = tx_details
             .eth_commit_tx_hash
diff --git a/core/lib/dal/src/models/storage_witness_job_info.rs b/core/lib/dal/src/models/storage_witness_job_info.rs
index 1f551fd4761..1aa41032cfa 100644
--- a/core/lib/dal/src/models/storage_witness_job_info.rs
+++ b/core/lib/dal/src/models/storage_witness_job_info.rs
@@ -23,7 +23,7 @@ pub struct StorageWitnessJobInfo {
 impl From<StorageWitnessJobInfo> for WitnessJobInfo {
     fn from(x: StorageWitnessJobInfo) -> Self {
         fn nt2d(nt: NaiveDateTime) -> DateTime<Utc> {
-            DateTime::from_utc(nt, Utc)
+            DateTime::from_naive_utc_and_offset(nt, Utc)
         }
 
         let status =
diff --git a/core/lib/db_test_macro/Cargo.toml b/core/lib/db_test_macro/Cargo.toml
index 201990f7a2c..40d0b4563de 100644
--- a/core/lib/db_test_macro/Cargo.toml
+++ b/core/lib/db_test_macro/Cargo.toml
@@ -3,6 +3,7 @@ name = "db_test_macro"
 version = "0.1.0"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 edition = "2018"
+license = "MIT OR Apache-2.0"
 
 [lib]
 proc-macro = true
diff --git a/core/lib/types/Cargo.toml b/core/lib/types/Cargo.toml
index 86949f3e861..27220908aa2 100644
--- a/core/lib/types/Cargo.toml
+++ b/core/lib/types/Cargo.toml
@@ -18,8 +18,8 @@ zksync_contracts = { path = "../contracts" }
 zksync_mini_merkle_tree = { path = "../mini_merkle_tree" }
 # We need this import because we wanat DAL to be responsible for (de)serialization
 codegen = { git = "https://github.com/matter-labs/solidity_plonk_verifier.git", branch = "dev" }
-zkevm_test_harness = { git = "https://github.com/matter-labs/zkevm_test_harness.git", branch = "v1.3.3" }
-zk_evm = { git = "https://github.com/matter-labs/zk_evm.git", branch = "v1.3.3" }
+zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.3.3" }
+zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.3.3" }
 
 chrono = { version = "0.4", features = ["serde"] }
 num = { version = "0.3.1", features = ["serde"] }
diff --git a/core/lib/utils/Cargo.toml b/core/lib/utils/Cargo.toml
index 60a038a250c..1397f80fa8a 100644
--- a/core/lib/utils/Cargo.toml
+++ b/core/lib/utils/Cargo.toml
@@ -11,7 +11,7 @@ categories = ["cryptography"]
 
 [dependencies]
 zksync_basic_types = { path = "../../lib/basic_types" }
-zk_evm = { git = "https://github.com/matter-labs/zk_evm.git", branch = "v1.3.3" }
+zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.3.3" }
 vlog = { path = "../../lib/vlog" }
 
 num = { version = "0.3.1", features = ["serde"] }
diff --git a/core/lib/vm/Cargo.toml b/core/lib/vm/Cargo.toml
index a4f816f4f2f..eecf1322c03 100644
--- a/core/lib/vm/Cargo.toml
+++ b/core/lib/vm/Cargo.toml
@@ -11,7 +11,7 @@ categories = ["cryptography"]
 
 [dependencies]
 vise = { git = "https://github.com/matter-labs/vise.git", version = "0.1.0", rev = "9d097ab747b037b6e62504df1db5b975425b6bdd" }
-zk_evm = { git = "https://github.com/matter-labs/zk_evm.git", branch = "v1.3.3" }
+zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.3.3" }
 zksync_config = { path = "../config" }
 zksync_types = { path = "../types" }
 zksync_utils = { path = "../utils" }
diff --git a/core/lib/vm/src/tests/refunds.rs b/core/lib/vm/src/tests/refunds.rs
index 47f5ede58b3..07dd3a9decc 100644
--- a/core/lib/vm/src/tests/refunds.rs
+++ b/core/lib/vm/src/tests/refunds.rs
@@ -152,104 +152,3 @@ fn test_predetermined_refunded_gas() {
     );
 }
 
-/// Regression test against a bug that allowed spending of pubdata without ever paying for it
-#[test]
-fn pubdata_is_paid_for() {
-    let code = zksync_contracts::read_bytecode(
-        "etc/contracts-test-data/artifacts-zk/contracts/pubdata/Exploit.sol/Exploit.json",
-    );
-
-    let do_nothing_calldata = vec![0x32, 0x1f, 0x00, 0x13];
-    let use_storage_calldata = vec![0x57, 0x97, 0xd9, 0xa4];
-
-    let with_exploit = {
-        let mut vm = VmTesterBuilder::new()
-            .with_empty_in_memory_storage()
-            .with_execution_mode(TxExecutionMode::VerifyExecute)
-            .with_random_rich_accounts(1)
-            .build();
-
-        let DeployContractsTx {
-            tx: deploy_tx,
-            bytecode_hash: _,
-            address: _,
-        } = vm.rich_accounts[0].get_deploy_tx(&code, None, TxType::L2);
-
-        vm.execute_tx_and_verify(TransactionTestInfo::new_processed(deploy_tx, false));
-        let exploit_address =
-            zksync_types::utils::deployed_address_create(vm.rich_accounts[0].address, U256::zero());
-
-        let do_nothing_tx = vm.rich_accounts[0].get_l2_tx_for_execute(
-            Execute {
-                contract_address: exploit_address,
-                calldata: do_nothing_calldata,
-                value: U256::zero(),
-                factory_deps: None,
-            },
-            None,
-        );
-        vm.execute_tx_and_verify(TransactionTestInfo::new_processed(do_nothing_tx, false));
-
-        let use_storage_tx = vm.rich_accounts[0].get_l2_tx_for_execute(
-            Execute {
-                contract_address: exploit_address,
-                calldata: use_storage_calldata.clone(),
-                value: U256::zero(),
-                factory_deps: None,
-            },
-            None,
-        );
-        let zksync_types::ExecuteTransactionCommon::L2(ref d) = use_storage_tx.common_data else {
-            unreachable!()
-        };
-        let gas_limit = d.fee.gas_limit.low_u32();
-
-        gas_limit
-            - vm.execute_tx_and_verify(TransactionTestInfo::new_processed(use_storage_tx, false))
-                .refunds
-                .operator_suggested_refund
-    };
-
-    let without_exploit = {
-        let mut vm = VmTesterBuilder::new()
-            .with_empty_in_memory_storage()
-            .with_execution_mode(TxExecutionMode::VerifyExecute)
-            .with_random_rich_accounts(1)
-            .build();
-
-        let DeployContractsTx {
-            tx: deploy_tx,
-            bytecode_hash: _,
-            address: _,
-        } = vm.rich_accounts[0].get_deploy_tx(&code, None, TxType::L2);
-
-        vm.execute_tx_and_verify(TransactionTestInfo::new_processed(deploy_tx, false));
-        let exploit_address =
-            zksync_types::utils::deployed_address_create(vm.rich_accounts[0].address, U256::zero());
-
-        let use_storage_tx = vm.rich_accounts[0].get_l2_tx_for_execute(
-            Execute {
-                contract_address: exploit_address,
-                calldata: use_storage_calldata,
-                value: U256::zero(),
-                factory_deps: None,
-            },
-            None,
-        );
-        let zksync_types::ExecuteTransactionCommon::L2(ref d) = use_storage_tx.common_data else {
-            unreachable!()
-        };
-        let gas_limit = d.fee.gas_limit.low_u32();
-
-        gas_limit
-            - vm.execute_tx_and_verify(TransactionTestInfo::new_processed(use_storage_tx, false))
-                .refunds
-                .operator_suggested_refund
-    };
-
-    assert_eq!(
-        with_exploit, without_exploit,
-        "Contract that didn't pay for any pubdata affected pricing of the next."
-    );
-    assert_eq!(with_exploit, 42917137);
-}
diff --git a/core/lib/zksync_core/src/data_fetchers/token_price/coingecko.rs b/core/lib/zksync_core/src/data_fetchers/token_price/coingecko.rs
index e4ae5f5910f..3b7125f8c63 100644
--- a/core/lib/zksync_core/src/data_fetchers/token_price/coingecko.rs
+++ b/core/lib/zksync_core/src/data_fetchers/token_price/coingecko.rs
@@ -141,7 +141,7 @@ impl FetcherImpl for CoinGeckoFetcher {
                     let naive_last_updated =
                         NaiveDateTime::from_timestamp_opt(coingecko_token_price.last_updated_at, 0)
                             .unwrap();
-                    DateTime::<Utc>::from_utc(naive_last_updated, Utc)
+                    DateTime::<Utc>::from_naive_utc_and_offset(naive_last_updated, Utc)
                 };
 
                 let token_price = TokenPrice {
diff --git a/core/multivm_deps/vm_1_3_2/Cargo.toml b/core/multivm_deps/vm_1_3_2/Cargo.toml
index 61381a6b70b..9c77ced9093 100644
--- a/core/multivm_deps/vm_1_3_2/Cargo.toml
+++ b/core/multivm_deps/vm_1_3_2/Cargo.toml
@@ -10,8 +10,8 @@ keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [dependencies]
-zkevm-assembly = { git = "https://github.com/matter-labs/zkEVM-assembly.git", branch = "v1.3.2" }
-zk_evm = { git = "https://github.com/matter-labs/zk_evm.git", branch = "v1.3.3" }
+zkevm-assembly = { git = "https://github.com/matter-labs/era-zkEVM-assembly.git", branch = "v1.3.2" }
+zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.3.3" }
 
 zksync_config = { path = "../../lib/config" }
 zksync_types = { path = "../../lib/types" }
diff --git a/core/tests/vm-benchmark/Cargo.toml b/core/tests/vm-benchmark/Cargo.toml
index bb39d306719..2ca45866bfd 100644
--- a/core/tests/vm-benchmark/Cargo.toml
+++ b/core/tests/vm-benchmark/Cargo.toml
@@ -2,6 +2,7 @@
 name = "vm-benchmark"
 version = "0.1.0"
 edition = "2021"
+license = "MIT OR Apache-2.0"
 
 [dependencies]
 vm-benchmark-harness = {path = "harness"}
diff --git a/core/tests/vm-benchmark/harness/Cargo.toml b/core/tests/vm-benchmark/harness/Cargo.toml
index 97358190831..ca02305030e 100644
--- a/core/tests/vm-benchmark/harness/Cargo.toml
+++ b/core/tests/vm-benchmark/harness/Cargo.toml
@@ -2,6 +2,7 @@
 name = "vm-benchmark-harness"
 version = "0.1.0"
 edition = "2021"
+license = "MIT OR Apache-2.0"
 
 [dependencies]
 vm = { path = "../../../lib/vm" }
@@ -10,5 +11,5 @@ zksync_state = { path = "../../../lib/state" }
 zksync_utils = { path = "../../../lib/utils" }
 zksync_config = { path = "../../../lib/config" }
 zksync_contracts = { path = "../../../lib/contracts" }
-zk_evm = { git = "https://github.com/matter-labs/zk_evm.git", branch = "v1.3.3" }
+zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.3.3" }
 once_cell = "1.17"
diff --git a/docs/setup-dev.md b/docs/setup-dev.md
index 6f31a6afa6d..ea7289b902e 100644
--- a/docs/setup-dev.md
+++ b/docs/setup-dev.md
@@ -172,7 +172,7 @@ Rust toolchain as well.
 Install the latest postgres.
 
 ```bash
-brew install postgresql
+brew install postgresql@14
 ```
 
 ### Cargo nextest
diff --git a/etc/scripts/prepare_era_bellman_cuda.sh b/etc/scripts/prepare_era_bellman_cuda.sh
new file mode 100755
index 00000000000..270c326217b
--- /dev/null
+++ b/etc/scripts/prepare_era_bellman_cuda.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+set -e
+
+source="$1"
+binary="$2"
+
+curl --silent --location "${source}" --output bellman-cuda-source.tar.gz
+curl --silent --location "${binary}" --output bellman-cuda.tar.gz
+mkdir -p bellman-cuda
+tar xvfz bellman-cuda.tar.gz -C ./bellman-cuda
+tar xvfz bellman-cuda-source.tar.gz -C ./bellman-cuda --strip-components=1
diff --git a/prover/CHANGELOG.md b/prover/CHANGELOG.md
index 253ed9055fe..eb34a927e9b 100644
--- a/prover/CHANGELOG.md
+++ b/prover/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [7.1.1](https://github.com/matter-labs/zksync-2-dev/compare/prover-v7.1.0...prover-v7.1.1) (2023-09-27)
+
+
+### Bug Fixes
+
+* **crypto:** update harness to fix snark proof verification ([#2659](https://github.com/matter-labs/zksync-2-dev/issues/2659)) ([b48248b](https://github.com/matter-labs/zksync-2-dev/commit/b48248babb6200bb3735715a51a7fac01c5353d3))
+
 ## [7.1.0](https://github.com/matter-labs/zksync-2-dev/compare/prover-v7.0.1...prover-v7.1.0) (2023-09-26)
 
 
diff --git a/prover/Cargo.lock b/prover/Cargo.lock
index e589729d892..c5dde4ef70d 100644
--- a/prover/Cargo.lock
+++ b/prover/Cargo.lock
@@ -147,7 +147,7 @@ checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
 [[package]]
 name = "api"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/heavy-ops-service.git?branch=v1.3.3#b46ecf3ea167456554e3fac69b33a1e56f6a47b2"
+source = "git+https://github.com/matter-labs/era-heavy-ops-service.git?branch=v1.3.3#0dd1f5dbba7eee194e660dfaaaf026a174e5ad9e"
 dependencies = [
  "bellman_ce 0.3.2 (git+https://github.com/matter-labs/bellman?branch=dev)",
  "cfg-if 1.0.0",
@@ -212,7 +212,7 @@ checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
 dependencies = [
  "async-stream-impl",
  "futures-core",
- "pin-project-lite 0.2.10",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -281,7 +281,7 @@ dependencies = [
  "fastrand 1.9.0",
  "futures-core",
  "pin-project",
- "tokio 1.29.1",
+ "tokio",
 ]
 
 [[package]]
@@ -326,7 +326,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 [[package]]
 name = "bellman_ce"
 version = "0.3.2"
-source = "git+https://github.com/matter-labs/bellman?branch=dev#bbac0559fdc440b2331eca1c347a30559a3dd969"
+source = "git+https://github.com/matter-labs/bellman?branch=dev#5520aa2274afe73d281373c92b007a2ecdebfbea"
 dependencies = [
  "arrayvec 0.7.4",
  "bit-vec",
@@ -349,7 +349,7 @@ dependencies = [
 [[package]]
 name = "bellman_ce"
 version = "0.3.2"
-source = "git+https://github.com/matter-labs/bellman?branch=snark-wrapper#796bfe6b5b49c70393833fe786a22cd6f9c96c60"
+source = "git+https://github.com/matter-labs/bellman?branch=snark-wrapper#1f05c528c392ea9eadb99b22431659c113bc0af4"
 dependencies = [
  "arrayvec 0.7.4",
  "bit-vec",
@@ -434,29 +434,6 @@ dependencies = [
  "syn 2.0.28",
 ]
 
-[[package]]
-name = "bindgen"
-version = "0.66.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7"
-dependencies = [
- "bitflags 2.3.3",
- "cexpr",
- "clang-sys",
- "lazy_static",
- "lazycell",
- "log",
- "peeking_take_while",
- "prettyplease",
- "proc-macro2 1.0.66",
- "quote 1.0.32",
- "regex",
- "rustc-hash",
- "shlex",
- "syn 2.0.28",
- "which",
-]
-
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -545,7 +522,7 @@ dependencies = [
 [[package]]
 name = "blake2s_const"
 version = "0.6.0"
-source = "git+https://github.com/matter-labs/bellman?branch=dev#bbac0559fdc440b2331eca1c347a30559a3dd969"
+source = "git+https://github.com/matter-labs/bellman?branch=dev#5520aa2274afe73d281373c92b007a2ecdebfbea"
 dependencies = [
  "arrayref",
  "arrayvec 0.5.2",
@@ -555,7 +532,7 @@ dependencies = [
 [[package]]
 name = "blake2s_const"
 version = "0.6.0"
-source = "git+https://github.com/matter-labs/bellman?branch=snark-wrapper#796bfe6b5b49c70393833fe786a22cd6f9c96c60"
+source = "git+https://github.com/matter-labs/bellman?branch=snark-wrapper#1f05c528c392ea9eadb99b22431659c113bc0af4"
 dependencies = [
  "arrayref",
  "arrayvec 0.5.2",
@@ -611,16 +588,16 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
 [[package]]
 name = "boojum"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/boojum?branch=main#ee2f6c64a65144032f2f6e3b00ef1e78f94c6503"
+source = "git+https://github.com/matter-labs/era-boojum?branch=main#2771569baab9a59690d88cee6ba9b295c8a1e4c4"
 dependencies = [
  "arrayvec 0.7.4",
  "bincode",
  "blake2 0.10.6",
  "const_format",
  "convert_case 0.6.0",
- "crossbeam 0.8.2",
+ "crossbeam 0.7.3",
  "crypto-bigint 0.5.2",
- "cs_derive 0.1.0 (git+https://github.com/matter-labs/boojum?branch=main)",
+ "cs_derive 0.1.0 (git+https://github.com/matter-labs/era-boojum?branch=main)",
  "derivative",
  "ethereum-types 0.14.1",
  "firestorm",
@@ -643,7 +620,7 @@ dependencies = [
 [[package]]
 name = "boojum-cuda"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/boojum-cuda?branch=main#db94ea167d55dbe8ce8e5f494a83887a131585cf"
+source = "git+https://github.com/matter-labs/era-boojum-cuda?branch=main#75ee5596114bd7fcb7df08b834e64123522653e1"
 dependencies = [
  "boojum",
  "cmake",
@@ -677,12 +654,6 @@ version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
-[[package]]
-name = "bytes"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
-
 [[package]]
 name = "bytes"
 version = "1.4.0"
@@ -769,19 +740,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.26"
+version = "0.4.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
- "rustc-serialize",
  "serde",
- "time 0.1.43",
  "wasm-bindgen",
- "winapi",
+ "windows-targets",
 ]
 
 [[package]]
@@ -823,7 +792,7 @@ dependencies = [
 [[package]]
 name = "circuit_definitions"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/zkevm_test_harness.git?branch=v1.4.0#6eeb313653982a8f69b56df35735f11ef4b2ab95"
+source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.0#3cd647aa57fc2e1180bab53f7a3b61ec47502a46"
 dependencies = [
  "crossbeam 0.8.2",
  "derivative",
@@ -838,7 +807,7 @@ dependencies = [
 [[package]]
 name = "circuit_testing"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/circuit_testing.git?branch=main#028864449036071cfb4e9ebe7ee4c5be59893031"
+source = "git+https://github.com/matter-labs/era-circuit_testing.git?branch=main#164c0adac85be39ee44bd9456b2b91cdede5af80"
 dependencies = [
  "bellman_ce 0.3.2 (git+https://github.com/matter-labs/bellman?branch=dev)",
 ]
@@ -943,7 +912,7 @@ version = "4.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
 dependencies = [
- "bytes 1.4.0",
+ "bytes",
  "memchr",
 ]
 
@@ -1286,7 +1255,7 @@ dependencies = [
 [[package]]
 name = "cs_derive"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/boojum?branch=main#ee2f6c64a65144032f2f6e3b00ef1e78f94c6503"
+source = "git+https://github.com/matter-labs/era-boojum?branch=main#2771569baab9a59690d88cee6ba9b295c8a1e4c4"
 dependencies = [
  "proc-macro-error",
  "proc-macro2 1.0.66",
@@ -1297,7 +1266,7 @@ dependencies = [
 [[package]]
 name = "cs_derive"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/sync_vm.git?branch=v1.3.3#c0cbd48fd38c18fb3746140c9018b855c56ed69d"
+source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#3a21c8dee43c77604350fdf33c1615e25bf1dacd"
 dependencies = [
  "proc-macro-error",
  "proc-macro2 1.0.66",
@@ -1328,7 +1297,7 @@ dependencies = [
 [[package]]
 name = "cudart"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/boojum-cuda?branch=main#db94ea167d55dbe8ce8e5f494a83887a131585cf"
+source = "git+https://github.com/matter-labs/era-boojum-cuda?branch=main#75ee5596114bd7fcb7df08b834e64123522653e1"
 dependencies = [
  "bitflags 2.3.3",
  "criterion",
@@ -1338,9 +1307,9 @@ dependencies = [
 [[package]]
 name = "cudart-sys"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/boojum-cuda?branch=main#db94ea167d55dbe8ce8e5f494a83887a131585cf"
+source = "git+https://github.com/matter-labs/era-boojum-cuda?branch=main#75ee5596114bd7fcb7df08b834e64123522653e1"
 dependencies = [
- "bindgen 0.66.1",
+ "bindgen 0.59.2",
 ]
 
 [[package]]
@@ -1842,37 +1811,7 @@ dependencies = [
 [[package]]
 name = "franklin-crypto"
 version = "0.0.5"
-source = "git+ssh://git@github.com/matter-labs/franklin-crypto?branch=dev#a5e55f5fc6e718e8ab2e727ce21c0fa599eaf79b"
-dependencies = [
- "arr_macro",
- "bellman_ce 0.3.2 (git+https://github.com/matter-labs/bellman?branch=dev)",
- "bit-vec",
- "blake2 0.9.2",
- "blake2-rfc_bellman_edition",
- "blake2s_simd",
- "byteorder",
- "digest 0.9.0",
- "hex",
- "indexmap 1.9.3",
- "itertools 0.10.5",
- "lazy_static",
- "num-bigint 0.4.3",
- "num-derive 0.2.5",
- "num-integer",
- "num-traits",
- "rand 0.4.6",
- "serde",
- "sha2 0.9.9",
- "sha3 0.9.1",
- "smallvec",
- "splitmut",
- "tiny-keccak 1.5.0",
-]
-
-[[package]]
-name = "franklin-crypto"
-version = "0.0.5"
-source = "git+https://github.com/matter-labs/franklin-crypto?branch=dev#5922873d25ecec827cd60420ca8cd84a188bb965"
+source = "git+https://github.com/matter-labs/franklin-crypto?branch=dev#5695d07c7bc604c2c39a27712ffac171d39ee1ed"
 dependencies = [
  "arr_macro",
  "bellman_ce 0.3.2 (git+https://github.com/matter-labs/bellman?branch=dev)",
@@ -1902,7 +1841,7 @@ dependencies = [
 [[package]]
 name = "franklin-crypto"
 version = "0.0.5"
-source = "git+https://github.com/matter-labs/franklin-crypto?branch=snark_wrapper#6eaf7f71468725569e23ca9dea5d894d84b18998"
+source = "git+https://github.com/matter-labs/franklin-crypto?branch=snark_wrapper#13b493d7619945b035cbbc79d74212298f0b7a26"
 dependencies = [
  "arr_macro",
  "bellman_ce 0.3.2 (git+https://github.com/matter-labs/bellman?branch=snark-wrapper)",
@@ -2017,12 +1956,13 @@ checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
 
 [[package]]
 name = "futures-locks"
-version = "0.6.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c4e684ddb2d8a4db5ca8a02b35156da129674ba4412b6f528698d58c594954"
+checksum = "45ec6fe3675af967e67c5536c0b9d44e34e6c52f86bedc4ea49c5317b8e94d06"
 dependencies = [
- "futures 0.3.28",
- "tokio 0.2.25",
+ "futures-channel",
+ "futures-task",
+ "tokio",
 ]
 
 [[package]]
@@ -2068,7 +2008,7 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project-lite 0.2.10",
+ "pin-project-lite",
  "pin-utils",
  "slab",
 ]
@@ -2133,8 +2073,8 @@ dependencies = [
  "serde",
  "serde_json",
  "thiserror",
- "time 0.3.24",
- "tokio 1.29.1",
+ "time",
+ "tokio",
  "tracing",
  "urlencoding",
 ]
@@ -2147,7 +2087,7 @@ checksum = "96e4ad0802d3f416f62e7ce01ac1460898ee0efc98f8b45cd4aab7611607012f"
 dependencies = [
  "reqwest",
  "thiserror",
- "tokio 1.29.1",
+ "tokio",
 ]
 
 [[package]]
@@ -2158,7 +2098,7 @@ checksum = "215abab97e07d144428425509c1dad07e57ea72b84b21bcdb6a8a5f12a5c4932"
 dependencies = [
  "async-stream",
  "base64 0.21.2",
- "bytes 1.4.0",
+ "bytes",
  "futures-util",
  "google-cloud-auth",
  "google-cloud-metadata",
@@ -2174,8 +2114,8 @@ dependencies = [
  "serde_json",
  "sha2 0.10.6",
  "thiserror",
- "time 0.3.24",
- "tokio 1.29.1",
+ "time",
+ "tokio",
  "tracing",
  "url",
 ]
@@ -2192,10 +2132,10 @@ dependencies = [
 [[package]]
 name = "gpu-ffi"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/heavy-ops-service.git?branch=v1.3.3#b46ecf3ea167456554e3fac69b33a1e56f6a47b2"
+source = "git+https://github.com/matter-labs/era-heavy-ops-service.git?branch=v1.3.3#0dd1f5dbba7eee194e660dfaaaf026a174e5ad9e"
 dependencies = [
  "bindgen 0.59.2",
- "crossbeam 0.8.2",
+ "crossbeam 0.7.3",
  "derivative",
  "futures 0.3.28",
  "futures-locks",
@@ -2205,12 +2145,12 @@ dependencies = [
 [[package]]
 name = "gpu-prover"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/heavy-ops-service.git?branch=v1.3.3#b46ecf3ea167456554e3fac69b33a1e56f6a47b2"
+source = "git+https://github.com/matter-labs/era-heavy-ops-service.git?branch=v1.3.3#0dd1f5dbba7eee194e660dfaaaf026a174e5ad9e"
 dependencies = [
  "bit-vec",
  "cfg-if 1.0.0",
- "crossbeam 0.8.2",
- "franklin-crypto 0.0.5 (git+ssh://git@github.com/matter-labs/franklin-crypto?branch=dev)",
+ "crossbeam 0.7.3",
+ "franklin-crypto 0.0.5 (git+https://github.com/matter-labs/franklin-crypto?branch=dev)",
  "gpu-ffi",
  "itertools 0.11.0",
  "num_cpus",
@@ -2235,7 +2175,7 @@ version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
 dependencies = [
- "bytes 1.4.0",
+ "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
@@ -2243,7 +2183,7 @@ dependencies = [
  "http",
  "indexmap 1.9.3",
  "slab",
- "tokio 1.29.1",
+ "tokio",
  "tokio-util",
  "tracing",
 ]
@@ -2315,7 +2255,7 @@ checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584"
 dependencies = [
  "base64 0.13.1",
  "bitflags 1.3.2",
- "bytes 1.4.0",
+ "bytes",
  "headers-core",
  "http",
  "httpdate",
@@ -2425,7 +2365,7 @@ version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
 dependencies = [
- "bytes 1.4.0",
+ "bytes",
  "fnv",
  "itoa",
 ]
@@ -2436,9 +2376,9 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
 dependencies = [
- "bytes 1.4.0",
+ "bytes",
  "http",
- "pin-project-lite 0.2.10",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -2465,7 +2405,7 @@ version = "0.14.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
 dependencies = [
- "bytes 1.4.0",
+ "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
@@ -2475,9 +2415,9 @@ dependencies = [
  "httparse",
  "httpdate",
  "itoa",
- "pin-project-lite 0.2.10",
+ "pin-project-lite",
  "socket2",
- "tokio 1.29.1",
+ "tokio",
  "tower-service",
  "tracing",
  "want",
@@ -2493,7 +2433,7 @@ dependencies = [
  "http",
  "hyper",
  "rustls",
- "tokio 1.29.1",
+ "tokio",
  "tokio-rustls",
 ]
 
@@ -2503,10 +2443,10 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
- "bytes 1.4.0",
+ "bytes",
  "hyper",
  "native-tls",
- "tokio 1.29.1",
+ "tokio",
  "tokio-native-tls",
 ]
 
@@ -2953,7 +2893,7 @@ dependencies = [
  "metrics-util",
  "quanta",
  "thiserror",
- "tokio 1.29.1",
+ "tokio",
  "tracing",
 ]
 
@@ -3707,12 +3647,6 @@ dependencies = [
  "syn 2.0.28",
 ]
 
-[[package]]
-name = "pin-project-lite"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
-
 [[package]]
 name = "pin-project-lite"
 version = "0.2.10"
@@ -3927,7 +3861,7 @@ dependencies = [
  "anyhow",
  "metrics",
  "metrics-exporter-prometheus",
- "tokio 1.29.1",
+ "tokio",
  "vise-exporter",
 ]
 
@@ -3954,7 +3888,7 @@ dependencies = [
 [[package]]
 name = "prover-service"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/heavy-ops-service.git?branch=v1.3.3#b46ecf3ea167456554e3fac69b33a1e56f6a47b2"
+source = "git+https://github.com/matter-labs/era-heavy-ops-service.git?branch=v1.3.3#0dd1f5dbba7eee194e660dfaaaf026a174e5ad9e"
 dependencies = [
  "api",
  "bincode",
@@ -4353,7 +4287,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
 dependencies = [
  "base64 0.21.2",
- "bytes 1.4.0",
+ "bytes",
  "encoding_rs",
  "futures-core",
  "futures-util",
@@ -4371,13 +4305,13 @@ dependencies = [
  "native-tls",
  "once_cell",
  "percent-encoding",
- "pin-project-lite 0.2.10",
+ "pin-project-lite",
  "rustls",
  "rustls-pemfile",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "tokio 1.29.1",
+ "tokio",
  "tokio-native-tls",
  "tokio-rustls",
  "tokio-util",
@@ -4394,7 +4328,7 @@ dependencies = [
 [[package]]
 name = "rescue_poseidon"
 version = "0.4.1"
-source = "git+https://github.com/matter-labs/rescue-poseidon.git?branch=poseidon2#5731618417b425e19552c4730f3a8945c5c01054"
+source = "git+https://github.com/matter-labs/rescue-poseidon.git?branch=poseidon2#d6903256fa17815b86d4d78ddcae9e5cd920e22c"
 dependencies = [
  "addchain",
  "arrayvec 0.7.4",
@@ -4417,7 +4351,7 @@ dependencies = [
 [[package]]
 name = "rescue_poseidon"
 version = "0.4.1"
-source = "git+https://github.com/matter-labs/rescue-poseidon.git#f611a3353e48cf42153e44d89ed90da9bc5934e8"
+source = "git+https://github.com/matter-labs/rescue-poseidon.git#d059b5042df5ed80e151f05751410b524a54d16c"
 dependencies = [
  "addchain",
  "arrayvec 0.7.4",
@@ -4477,7 +4411,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec"
 dependencies = [
- "bytes 1.4.0",
+ "bytes",
  "rustc-hex",
 ]
 
@@ -4529,12 +4463,6 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
 
-[[package]]
-name = "rustc-serialize"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
-
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
@@ -4769,7 +4697,7 @@ dependencies = [
  "sentry-debug-images",
  "sentry-panic",
  "sentry-tracing",
- "tokio 1.29.1",
+ "tokio",
  "ureq",
 ]
 
@@ -4857,7 +4785,7 @@ dependencies = [
  "serde",
  "serde_json",
  "thiserror",
- "time 0.3.24",
+ "time",
  "url",
  "uuid",
 ]
@@ -5025,7 +4953,7 @@ dependencies = [
 [[package]]
 name = "shivini"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/shivini.git?branch=main#50b36e549b5ca1f7f0190e08fa9e1b202005bd1d"
+source = "git+https://github.com/matter-labs/era-shivini.git?branch=main#77f0f45c125345db2377bf7fa021792f8a583b12"
 dependencies = [
  "bincode",
  "blake2 0.10.6",
@@ -5075,7 +5003,7 @@ dependencies = [
  "num-bigint 0.4.3",
  "num-traits",
  "thiserror",
- "time 0.3.24",
+ "time",
 ]
 
 [[package]]
@@ -5120,7 +5048,7 @@ dependencies = [
 [[package]]
 name = "snark_wrapper"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/snark-wrapper.git?branch=main#5333c5c98142c6d4aad8d991973ba8c58fee4a01"
+source = "git+https://github.com/matter-labs/snark-wrapper.git?branch=main#9929fefddaedc48716bdcaf716134c552ab24a26"
 dependencies = [
  "boojum",
  "derivative",
@@ -5203,7 +5131,7 @@ dependencies = [
  "bigdecimal",
  "bitflags 1.3.2",
  "byteorder",
- "bytes 1.4.0",
+ "bytes",
  "chrono",
  "crc",
  "crossbeam-queue 0.3.8",
@@ -5274,7 +5202,7 @@ checksum = "4db708cd3e459078f85f39f96a00960bd841f66ee2a669e90bf36907f5a79aae"
 dependencies = [
  "native-tls",
  "once_cell",
- "tokio 1.29.1",
+ "tokio",
  "tokio-native-tls",
 ]
 
@@ -5400,10 +5328,10 @@ dependencies = [
 [[package]]
 name = "sync_vm"
 version = "1.3.3"
-source = "git+https://github.com/matter-labs/sync_vm.git?branch=v1.3.3#c0cbd48fd38c18fb3746140c9018b855c56ed69d"
+source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#3a21c8dee43c77604350fdf33c1615e25bf1dacd"
 dependencies = [
  "arrayvec 0.7.4",
- "cs_derive 0.1.0 (git+https://github.com/matter-labs/sync_vm.git?branch=v1.3.3)",
+ "cs_derive 0.1.0 (git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3)",
  "derivative",
  "franklin-crypto 0.0.5 (git+https://github.com/matter-labs/franklin-crypto?branch=dev)",
  "hex",
@@ -5507,16 +5435,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "time"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "time"
 version = "0.3.24"
@@ -5588,17 +5506,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
-[[package]]
-name = "tokio"
-version = "0.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092"
-dependencies = [
- "bytes 0.5.6",
- "pin-project-lite 0.1.12",
- "slab",
-]
-
 [[package]]
 name = "tokio"
 version = "1.29.1"
@@ -5607,12 +5514,12 @@ checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
 dependencies = [
  "autocfg 1.1.0",
  "backtrace",
- "bytes 1.4.0",
+ "bytes",
  "libc",
  "mio",
  "num_cpus",
  "parking_lot 0.12.1",
- "pin-project-lite 0.2.10",
+ "pin-project-lite",
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
@@ -5637,7 +5544,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
 dependencies = [
  "native-tls",
- "tokio 1.29.1",
+ "tokio",
 ]
 
 [[package]]
@@ -5647,7 +5554,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
  "rustls",
- "tokio 1.29.1",
+ "tokio",
 ]
 
 [[package]]
@@ -5657,8 +5564,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
 dependencies = [
  "futures-core",
- "pin-project-lite 0.2.10",
- "tokio 1.29.1",
+ "pin-project-lite",
+ "tokio",
 ]
 
 [[package]]
@@ -5667,11 +5574,11 @@ version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
 dependencies = [
- "bytes 1.4.0",
+ "bytes",
  "futures-core",
  "futures-sink",
- "pin-project-lite 0.2.10",
- "tokio 1.29.1",
+ "pin-project-lite",
+ "tokio",
  "tracing",
 ]
 
@@ -5716,7 +5623,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
  "cfg-if 1.0.0",
- "pin-project-lite 0.2.10",
+ "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
 ]
@@ -5778,7 +5685,7 @@ dependencies = [
  "sharded-slab",
  "smallvec",
  "thread_local",
- "time 0.3.24",
+ "time",
  "tracing",
  "tracing-core",
  "tracing-log",
@@ -5997,7 +5904,7 @@ dependencies = [
  "hyper",
  "metrics-exporter-prometheus",
  "once_cell",
- "tokio 1.29.1",
+ "tokio",
  "tracing",
  "vise",
 ]
@@ -6203,7 +6110,7 @@ checksum = "5388522c899d1e1c96a4c307e3797e0f697ba7c77dd8e0e625ecba9dd0342937"
 dependencies = [
  "arrayvec 0.7.4",
  "base64 0.21.2",
- "bytes 1.4.0",
+ "bytes",
  "derive_more",
  "ethabi",
  "ethereum-types 0.14.1",
@@ -6414,7 +6321,7 @@ checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
 [[package]]
 name = "zk_evm"
 version = "1.3.3"
-source = "git+https://github.com/matter-labs/zk_evm.git?branch=v1.3.3#96a0b2bfc4cb50dfc0cce8114a13432827a27631"
+source = "git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.3.3#fe8215a7047d24430ad470cf15a19bedb4d6ba0b"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -6429,7 +6336,7 @@ dependencies = [
 [[package]]
 name = "zk_evm"
 version = "1.4.0"
-source = "git+https://github.com/matter-labs/zk_evm.git?branch=v1.4.0#8f698ddb398c52e4c743455cce420887a5edd36d"
+source = "git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.4.0#e33a5ded1b53e35d261fdb46e6d16f2c900b217f"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -6444,7 +6351,7 @@ dependencies = [
 [[package]]
 name = "zk_evm_abstractions"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/zk_evm_abstractions.git#839721a4ae2093c5c0aa8ffd49758f32ecd172ed"
+source = "git+https://github.com/matter-labs/era-zk_evm_abstractions.git#7502a661d7d38906d849dcd3e7a15e5848af6581"
 dependencies = [
  "anyhow",
  "serde",
@@ -6455,7 +6362,7 @@ dependencies = [
 [[package]]
 name = "zkevm-assembly"
 version = "1.3.2"
-source = "git+https://github.com/matter-labs/zkEVM-assembly.git?branch=v1.3.2#fcfeb51e45544a629d4279b3455def847dcc2505"
+source = "git+https://github.com/matter-labs/era-zkEVM-assembly.git?branch=v1.3.2#3c61d450cbe6548068be8f313ed02f1bd229a865"
 dependencies = [
  "env_logger 0.9.3",
  "hex",
@@ -6474,12 +6381,12 @@ dependencies = [
 [[package]]
 name = "zkevm_circuits"
 version = "1.4.0"
-source = "git+https://github.com/matter-labs/zkevm_circuits.git?branch=main#2b88bf8e6fcfbf78f6f06baf62e80542f43cefbc"
+source = "git+https://github.com/matter-labs/era-zkevm_circuits.git?branch=main#4fba537ccecc238e2da9c80844dc8c185e42466f"
 dependencies = [
  "arrayvec 0.7.4",
  "bincode",
  "boojum",
- "cs_derive 0.1.0 (git+https://github.com/matter-labs/boojum?branch=main)",
+ "cs_derive 0.1.0 (git+https://github.com/matter-labs/era-boojum?branch=main)",
  "derivative",
  "hex",
  "itertools 0.10.5",
@@ -6494,7 +6401,7 @@ dependencies = [
 [[package]]
 name = "zkevm_opcode_defs"
 version = "1.3.2"
-source = "git+https://github.com/matter-labs/zkevm_opcode_defs.git?branch=v1.3.2#780ce4129a95ab9a68abf0d60c156ee8df6008c2"
+source = "git+https://github.com/matter-labs/era-zkevm_opcode_defs.git?branch=v1.3.2#c7ab62f4c60b27dfc690c3ab3efb5fff1ded1a25"
 dependencies = [
  "bitflags 2.3.3",
  "blake2 0.10.6",
@@ -6508,7 +6415,7 @@ dependencies = [
 [[package]]
 name = "zkevm_test_harness"
 version = "1.3.3"
-source = "git+https://github.com/matter-labs/zkevm_test_harness.git?branch=v1.3.3#681a72c9d120e7b11283bc06087217ecbad88c5c"
+source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.3.3#d26aa4133f2b5e114c0bf084b8c3f1eca9aa9929"
 dependencies = [
  "bincode",
  "circuit_testing",
@@ -6535,7 +6442,7 @@ dependencies = [
 [[package]]
 name = "zkevm_test_harness"
 version = "1.4.0"
-source = "git+https://github.com/matter-labs/zkevm_test_harness.git?branch=v1.4.0#6eeb313653982a8f69b56df35735f11ef4b2ab95"
+source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.0#3cd647aa57fc2e1180bab53f7a3b61ec47502a46"
 dependencies = [
  "bincode",
  "circuit_definitions",
@@ -6577,7 +6484,7 @@ dependencies = [
  "metrics",
  "serde_json",
  "thiserror",
- "tokio 1.29.1",
+ "tokio",
  "tracing",
  "zksync_config",
  "zksync_contracts",
@@ -6599,7 +6506,7 @@ dependencies = [
  "prover-service",
  "structopt",
  "thiserror",
- "tokio 1.29.1",
+ "tokio",
  "tracing",
  "vlog",
  "zkevm_test_harness 1.3.3",
@@ -6675,7 +6582,7 @@ dependencies = [
  "sqlx",
  "strum",
  "thiserror",
- "tokio 1.29.1",
+ "tokio",
  "tracing",
  "vise",
  "zksync_config",
@@ -6695,7 +6602,7 @@ dependencies = [
  "jsonrpc-core",
  "serde",
  "thiserror",
- "tokio 1.29.1",
+ "tokio",
  "tracing",
  "vise",
  "zksync_config",
@@ -6730,7 +6637,7 @@ dependencies = [
  "futures 0.3.28",
  "serde",
  "serde_json",
- "tokio 1.29.1",
+ "tokio",
  "tracing",
 ]
 
@@ -6753,7 +6660,7 @@ dependencies = [
  "google-cloud-auth",
  "google-cloud-storage",
  "http",
- "tokio 1.29.1",
+ "tokio",
  "tracing",
  "vise",
  "zksync_config",
@@ -6772,7 +6679,7 @@ dependencies = [
  "metrics",
  "prometheus_exporter",
  "structopt",
- "tokio 1.29.1",
+ "tokio",
  "tracing",
  "vk_setup_data_generator_server_fri",
  "vlog",
@@ -6809,7 +6716,7 @@ dependencies = [
  "serde_json",
  "setup_key_generator_and_server",
  "thiserror",
- "tokio 1.29.1",
+ "tokio",
  "tracing",
  "vlog",
  "zkevm_test_harness 1.3.3",
@@ -6838,7 +6745,7 @@ dependencies = [
  "prometheus_exporter",
  "serde",
  "shivini",
- "tokio 1.29.1",
+ "tokio",
  "tracing",
  "vk_setup_data_generator_server_fri",
  "vlog",
@@ -6867,7 +6774,7 @@ dependencies = [
  "prometheus_exporter",
  "reqwest",
  "serde",
- "tokio 1.29.1",
+ "tokio",
  "tracing",
  "vlog",
  "zksync_config",
@@ -6911,7 +6818,7 @@ dependencies = [
  "futures 0.3.28",
  "regex",
  "reqwest",
- "tokio 1.29.1",
+ "tokio",
  "toml_edit 0.14.4",
  "tracing",
  "zksync_config",
@@ -6926,7 +6833,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "tokio 1.29.1",
+ "tokio",
  "tracing",
  "zksync_utils",
 ]
@@ -6937,7 +6844,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "mini-moka",
- "tokio 1.29.1",
+ "tokio",
  "tracing",
  "vise",
  "zksync_dal",
@@ -6990,7 +6897,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "bigdecimal",
- "envy",
  "futures 0.3.28",
  "hex",
  "itertools 0.10.5",
@@ -6999,7 +6905,7 @@ dependencies = [
  "reqwest",
  "serde",
  "thiserror",
- "tokio 1.29.1",
+ "tokio",
  "tracing",
  "vlog",
  "zk_evm 1.3.3",
@@ -7042,7 +6948,7 @@ dependencies = [
  "serde",
  "serde_json",
  "structopt",
- "tokio 1.29.1",
+ "tokio",
  "tracing",
  "vk_setup_data_generator_server_fri",
  "vlog",
@@ -7075,7 +6981,7 @@ dependencies = [
  "queues",
  "serde",
  "structopt",
- "tokio 1.29.1",
+ "tokio",
  "tracing",
  "vk_setup_data_generator_server_fri",
  "vlog",
diff --git a/prover/circuit_synthesizer/Cargo.toml b/prover/circuit_synthesizer/Cargo.toml
index 8e045b5edcd..3bee4194af9 100644
--- a/prover/circuit_synthesizer/Cargo.toml
+++ b/prover/circuit_synthesizer/Cargo.toml
@@ -20,9 +20,9 @@ prometheus_exporter = { path = "../../core/lib/prometheus_exporter" }
 zksync_prover_utils = { path = "../../core/lib/prover_utils" }
 zksync_verification_key_generator_and_server = { path = "../../core/bin/verification_key_generator_and_server" }
 
-zkevm_test_harness = { git = "https://github.com/matter-labs/zkevm_test_harness.git", branch = "v1.3.3" }
+zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.3.3" }
 
-prover-service = { git = "https://github.com/matter-labs/heavy-ops-service.git", branch = "v1.3.3", features = [
+prover-service = { git = "https://github.com/matter-labs/era-heavy-ops-service.git", branch = "v1.3.3", features = [
     "legacy",
 ], default-features = false }
 
diff --git a/prover/proof_fri_compressor/Cargo.toml b/prover/proof_fri_compressor/Cargo.toml
index f0c42ae0b4d..02ba39e393c 100644
--- a/prover/proof_fri_compressor/Cargo.toml
+++ b/prover/proof_fri_compressor/Cargo.toml
@@ -18,7 +18,7 @@ vk_setup_data_generator_server_fri = { path = "../vk_setup_data_generator_server
 vlog = { path = "../../core/lib/vlog" }
 zksync_prover_utils = { path = "../../core/lib/prover_utils" }
 
-zkevm_test_harness = { git = "https://github.com/matter-labs/zkevm_test_harness.git", branch = "v1.4.0" }
+zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.0" }
 
 anyhow = "1.0"
 tracing = "0.1"
diff --git a/prover/prover/Cargo.toml b/prover/prover/Cargo.toml
index a5da6a78c3e..4a710f2678a 100644
--- a/prover/prover/Cargo.toml
+++ b/prover/prover/Cargo.toml
@@ -24,14 +24,14 @@ zksync_verification_key_generator_and_server = { path = "../../core/bin/verifica
 zksync_object_store = { path = "../../core/lib/object_store" }
 setup_key_generator_and_server = { path = "../setup_key_generator_and_server" }
 
-api = { git = "https://github.com/matter-labs/heavy-ops-service.git", branch = "v1.3.3", features = [
+api = { git = "https://github.com/matter-labs/era-heavy-ops-service.git", branch = "v1.3.3", features = [
     "gpu",
 ], default-features = false }
-prover-service = { git = "https://github.com/matter-labs/heavy-ops-service.git", branch = "v1.3.3", features = [
+prover-service = { git = "https://github.com/matter-labs/era-heavy-ops-service.git", branch = "v1.3.3", features = [
     "gpu",
 ], default-features = false }
 
-zkevm_test_harness = { git = "https://github.com/matter-labs/zkevm_test_harness.git", branch = "v1.3.3" }
+zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.3.3" }
 
 anyhow = "1.0"
 tracing = "0.1"
diff --git a/prover/prover_fri/Cargo.toml b/prover/prover_fri/Cargo.toml
index 149671cdf4f..b351b6bf604 100644
--- a/prover/prover_fri/Cargo.toml
+++ b/prover/prover_fri/Cargo.toml
@@ -18,13 +18,13 @@ zksync_prover_fri_utils = { path = "../prover_fri_utils" }
 zksync_prover_fri_types = { path = "../prover_fri_types" }
 zksync_utils = { path = "../../core/lib/utils" }
 vk_setup_data_generator_server_fri = { path = "../vk_setup_data_generator_server_fri" }
-shivini = { git = "https://github.com/matter-labs/shivini.git", branch = "main", optional = true, features = [
+shivini = { git = "https://github.com/matter-labs/era-shivini.git", branch = "main", optional = true, features = [
     "circuit_definitions",
     "zksync",
 ] }
 
-zkevm_test_harness = { git = "https://github.com/matter-labs/zkevm_test_harness.git", branch = "v1.4.0" }
-circuit_definitions = { git = "https://github.com/matter-labs/zkevm_test_harness.git", branch = "v1.4.0", features = [
+zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.0" }
+circuit_definitions = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.0", features = [
     "log_tracing",
 ] }
 
diff --git a/prover/prover_fri_types/Cargo.toml b/prover/prover_fri_types/Cargo.toml
index c42730ae009..9f84afe2207 100644
--- a/prover/prover_fri_types/Cargo.toml
+++ b/prover/prover_fri_types/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 zksync_object_store = { path = "../../core/lib/object_store" }
 zksync_types = { path = "../../core/lib/types" }
 
-circuit_definitions = { git = "https://github.com/matter-labs/zkevm_test_harness.git", branch = "v1.4.0", features = [
+circuit_definitions = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.0", features = [
     "log_tracing",
 ] }
 
diff --git a/prover/setup_key_generator_and_server/Cargo.toml b/prover/setup_key_generator_and_server/Cargo.toml
index 9ce0d3d0aa7..08f1ab5339d 100644
--- a/prover/setup_key_generator_and_server/Cargo.toml
+++ b/prover/setup_key_generator_and_server/Cargo.toml
@@ -22,14 +22,14 @@ zksync_types = { path = "../../core/lib/types" }
 vlog = { path = "../../core/lib/vlog" }
 zksync_config = { path = "../../core/lib/config" }
 
-circuit_testing = { git = "https://github.com/matter-labs/circuit_testing.git", branch = "main" }
-api = { git = "https://github.com/matter-labs/heavy-ops-service.git", branch = "v1.3.3", features = [
+circuit_testing = { git = "https://github.com/matter-labs/era-circuit_testing.git", branch = "main" }
+api = { git = "https://github.com/matter-labs/era-heavy-ops-service.git", branch = "v1.3.3", features = [
     "gpu",
 ], default-features = false }
-prover-service = { git = "https://github.com/matter-labs/heavy-ops-service.git", branch = "v1.3.3", features = [
+prover-service = { git = "https://github.com/matter-labs/era-heavy-ops-service.git", branch = "v1.3.3", features = [
     "gpu",
 ], default-features = false }
-zkevm_test_harness = { git = "https://github.com/matter-labs/zkevm_test_harness.git", branch = "v1.3.3" }
+zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.3.3" }
 
 anyhow = "1.0"
 tracing = "0.1"
diff --git a/prover/vk_setup_data_generator_server_fri/Cargo.toml b/prover/vk_setup_data_generator_server_fri/Cargo.toml
index 8f584df8cda..bae690ed041 100644
--- a/prover/vk_setup_data_generator_server_fri/Cargo.toml
+++ b/prover/vk_setup_data_generator_server_fri/Cargo.toml
@@ -26,11 +26,11 @@ zksync_types = { path = "../../core/lib/types" }
 zksync_prover_utils = { path = "../../core/lib/prover_utils" }
 zksync_prover_fri_types = { path = "../prover_fri_types" }
 
-zkevm_test_harness = { git = "https://github.com/matter-labs/zkevm_test_harness.git", branch = "v1.4.0" }
-circuit_definitions = { git = "https://github.com/matter-labs/zkevm_test_harness.git", branch = "v1.4.0", features = [
+zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.0" }
+circuit_definitions = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.0", features = [
     "log_tracing",
 ] }
-shivini = { git = "https://github.com/matter-labs/shivini.git", branch = "main", optional = true }
+shivini = { git = "https://github.com/matter-labs/era-shivini.git", branch = "main", optional = true }
 zksync_config = { path = "../../core/lib/config" }
 
 anyhow = "1.0"
diff --git a/prover/vk_setup_data_generator_server_fri/data/snark_verification_scheduler_key.json b/prover/vk_setup_data_generator_server_fri/data/snark_verification_scheduler_key.json
index 0b86b255b8a..d6914e6b915 100644
--- a/prover/vk_setup_data_generator_server_fri/data/snark_verification_scheduler_key.json
+++ b/prover/vk_setup_data_generator_server_fri/data/snark_verification_scheduler_key.json
@@ -6,121 +6,121 @@
   "gate_setup_commitments": [
     {
       "x": [
-        17594402018597181026,
-        13727266004857936655,
-        4714664015870427948,
-        1394303137462233376
+        2224517667504888251,
+        5912818835784168526,
+        1111535000905649453,
+        319269576845656765
       ],
       "y": [
-        6526005704359308625,
-        10449694427901360145,
-        15086455287830986775,
-        1864377956597492555
+        11120788872048639870,
+        13123473843834118559,
+        11006337926588718399,
+        1693094874597911874
       ],
       "infinity": false
     },
     {
       "x": [
-        6442869886292765702,
-        470631830099167485,
-        13697958512656395863,
-        3239349454957439636
+        5457926983430946348,
+        1784628442640157138,
+        2074237947226170917,
+        3131060963334690615
       ],
       "y": [
-        1348452587747815007,
-        6856197573863561089,
-        8497780716227515051,
-        3328886581758369840
+        18014312862553006877,
+        5243048625117866465,
+        6340542352833718166,
+        2320619889276266916
       ],
       "infinity": false
     },
     {
       "x": [
-        10989820805534739564,
-        9824454085984454699,
-        6358142065374293007,
-        249913521573460057
+        6347927895162865476,
+        5050704860500628368,
+        10361897337252099655,
+        2828521412425376780
       ],
       "y": [
-        16228101767241488970,
-        983709565083361956,
-        18382922608176957791,
-        927347524962839017
+        9661852756269533844,
+        10526327507022735828,
+        11278750718834251862,
+        1315379733045685397
       ],
       "infinity": false
     },
     {
       "x": [
-        295140417017791555,
-        18197624951429329770,
-        15774295153400712824,
-        297838786969948511
+        4042671629442164837,
+        11959950196860309953,
+        2078800086028040039,
+        94403960025997529
       ],
       "y": [
-        17493664288906300385,
-        3401716771771611019,
-        151838409744935293,
-        1081243118696697250
+        3135015680945171083,
+        12893163496512433740,
+        8699261953191062297,
+        3320226233593777137
       ],
       "infinity": false
     },
     {
       "x": [
-        2504896301341419231,
-        5579815447832193044,
-        7906209143481974004,
-        72896210632653506
+        4177624058108552844,
+        7496286594337546064,
+        12327303478390769977,
+        1884447338697134452
       ],
       "y": [
-        4041048381320048971,
-        11710775402846905317,
-        15015043042208331520,
-        2457322459333810210
+        11592594644619014749,
+        1292793399956228893,
+        17148866035827453124,
+        2259449579930654777
       ],
       "infinity": false
     },
     {
       "x": [
-        11984418274823067266,
-        16496616136320482352,
-        8690364473909850702,
-        2783152610280540254
+        18120818717781619238,
+        16711368075993785449,
+        16673817803744408050,
+        700058928459046347
       ],
       "y": [
-        16762671120895705772,
-        15455915706676685959,
-        15137619686845663149,
-        86889243887511321
+        7622480271915550714,
+        13902980411406060504,
+        6164172017934139902,
+        1836938876363296665
       ],
       "infinity": false
     },
     {
       "x": [
-        6562547500299311125,
-        12023322154563159589,
-        8300642285034494632,
-        564372035602029711
+        16821965459015940209,
+        16502520825403405563,
+        4933134856324568875,
+        971914902671623933
       ],
       "y": [
-        4065818489027077486,
-        16782980764869638854,
-        187491978679299427,
-        1653699293812850565
+        8708758630145674281,
+        11568462267224108675,
+        15920534706957442557,
+        2205222521283673407
       ],
       "infinity": false
     },
     {
       "x": [
-        7272437807968051018,
-        16383173516966693760,
-        5233705855304303396,
-        2084843580173829559
+        13887807756011277977,
+        6633952600242750048,
+        12933639896153908639,
+        1634594860965316349
       ],
       "y": [
-        1945545285616405347,
-        11090657413754499713,
-        1584981444845638692,
-        15483990457410158
+        5219211762505995590,
+        3805451927973946744,
+        18239167495029817450,
+        1620516238642646611
       ],
       "infinity": false
     }
@@ -128,31 +128,31 @@
   "gate_selectors_commitments": [
     {
       "x": [
-        2495673539683036265,
-        1632020303066964133,
-        12421251226958024413,
-        1766824016630474366
+        9648237812026707665,
+        3394846795043056222,
+        4629068839178038498,
+        1935924284954725357
       ],
       "y": [
-        16593891732304238653,
-        679560656365323651,
-        12609189231331785957,
-        986143182483620695
+        7429667519719510580,
+        9655284945806121212,
+        10303170318619716429,
+        1450391691397826178
       ],
       "infinity": false
     },
     {
       "x": [
-        5488925323379543169,
-        15884434430617404984,
-        2619482091093058395,
-        2403360174105428831
+        12328426125821267783,
+        14677689403443047323,
+        2357692814373165823,
+        3268494923353713205
       ],
       "y": [
-        18424859552366064337,
-        3217074203004732159,
-        3381839436033938516,
-        2282990107042495498
+        9394214569640955242,
+        450630302635608118,
+        1477019964334489453,
+        1150908451828220680
       ],
       "infinity": false
     }
@@ -160,61 +160,61 @@
   "permutation_commitments": [
     {
       "x": [
-        14205482285409103588,
-        4293533900329639146,
-        15044988907843772443,
-        3397035731454034821
+        14847495908726407963,
+        16855284351914487461,
+        18211889533001639981,
+        2155135400931744246
       ],
       "y": [
-        9091290462832666755,
-        13035068257032586999,
-        6653434361897150475,
-        2202511038693632069
+        10702169610220940865,
+        9956121846187196036,
+        8949798846882497976,
+        2163047794650360669
       ],
       "infinity": false
     },
     {
       "x": [
-        10595701783879761616,
-        1760419279745939647,
-        9629156082297835016,
-        1336725125155475644
+        378831953168999386,
+        9293735894762022592,
+        14386665413246396021,
+        3071878788754443116
       ],
       "y": [
-        2372896239977265980,
-        13229998910487288740,
-        4800586654752505377,
-        1126182427080184770
+        15896087542596050393,
+        17239768855300757555,
+        1302380423903460425,
+        1070516261187880368
       ],
       "infinity": false
     },
     {
       "x": [
-        5502581077816805325,
-        17655298669514830221,
-        7817421360364638165,
-        3469705148393998329
+        15681530546748660775,
+        15325947204107855582,
+        6169941741627651138,
+        1438247605769128980
       ],
       "y": [
-        9463722688892810660,
-        12340769565473406466,
-        11232888947078289597,
-        2312085159346807385
+        1709841937332991257,
+        3205925128833409221,
+        10381982057624226277,
+        3302314191697651889
       ],
       "infinity": false
     },
     {
       "x": [
-        13692318898109463281,
-        919764237998990260,
-        2432207090405589511,
-        756920509450475008
+        7915449484973597791,
+        14858122728404062261,
+        17806747946577351454,
+        1879592080912408858
       ],
       "y": [
-        11815954022684911057,
-        10901711436478333928,
-        7848970102084501121,
-        1813849435398644774
+        15677256576208223457,
+        8628800709300512291,
+        18168431650113296999,
+        252714218130055622
       ],
       "infinity": false
     }
@@ -222,16 +222,16 @@
   "total_lookup_entries_length": 1786644,
   "lookup_selector_commitment": {
     "x": [
-      1078318040483818758,
-      8661469016704600898,
-      793379326661434476,
-      3459366369695274876
+      9218954341000481996,
+      1038591043397823945,
+      2355917848722531772,
+      1603833229224637991
     ],
     "y": [
-      7529564463317884817,
-      6617424140244288891,
-      650928162673930424,
-      3245921848148438629
+      9294257929334679357,
+      9665091690516467420,
+      7057032139323633744,
+      2846067557162208306
     ],
     "infinity": false
   },
@@ -299,16 +299,16 @@
   ],
   "lookup_table_type_commitment": {
     "x": [
-      8190232998277167582,
-      10118567615888234126,
-      16238500941812062054,
-      31348628753253395
+      2681380516794566972,
+      967983640969946255,
+      2727464508424142824,
+      1972327038478390223
     ],
     "y": [
-      9940345244426584302,
-      5217477231979664240,
-      7040994619944981908,
-      1753321375162811736
+      7977458078956869600,
+      12274734452276806231,
+      29244742286950686,
+      667948288229117220
     ],
     "infinity": false
   },
diff --git a/prover/witness_generator/Cargo.toml b/prover/witness_generator/Cargo.toml
index ec21da8b1a8..104cd5fdb50 100644
--- a/prover/witness_generator/Cargo.toml
+++ b/prover/witness_generator/Cargo.toml
@@ -26,11 +26,11 @@ zksync_prover_utils = { path = "../../core/lib/prover_utils" }
 zksync_prover_fri_types = { path = "../prover_fri_types" }
 zksync_prover_fri_utils = { path = "../prover_fri_utils" }
 
-zkevm_test_harness = { git = "https://github.com/matter-labs/zkevm_test_harness.git", branch = "v1.4.0" }
-circuit_definitions = { git = "https://github.com/matter-labs/zkevm_test_harness.git", branch = "v1.4.0", features = [
+zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.0" }
+circuit_definitions = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.0", features = [
     "log_tracing",
 ] }
-zk_evm = { git = "https://github.com/matter-labs/zk_evm.git", branch = "v1.4.0" }
+zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.4.0" }
 
 anyhow = "1.0"
 tracing = "0.1"
diff --git a/sdk/zksync-rs/Cargo.toml b/sdk/zksync-rs/Cargo.toml
index 6cf7ff69b40..fe7243c39b1 100644
--- a/sdk/zksync-rs/Cargo.toml
+++ b/sdk/zksync-rs/Cargo.toml
@@ -3,6 +3,7 @@ name = "zksync"
 version = "0.4.0"
 authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
 edition = "2018"
+license = "MIT OR Apache-2.0"
 
 [dependencies]
 zksync_types = { path = "../../core/lib/types" }