Mirrors branch jms-timeless-history2 from private at a9acf2741f6ddb1e…

…d431d8143e0f1ed41672173d
matter-labs · Oct 2, 2023 · 5b951c2 · 5b951c2
1 parent f4f9e69
commit 5b951c2
Show file tree

Hide file tree

Showing 33 changed files with 346 additions and 542 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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"),