Mirrors branch ago-hyperchain-pro-37 from private at 12eac32a1768e552…

…3970a78c0d8d4a7d09f15ce0
matter-labs · Oct 2, 2023 · d4c916e · d4c916e
1 parent d8ab843
commit d4c916e
Show file tree

Hide file tree

Showing 7 changed files with 189 additions and 123 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -2,4 +2,3 @@
 .github/release-please/** @RomanBrodetski @perekopskiy @Deniallugo @popzxc
 **/CHANGELOG.md @RomanBrodetski @perekopskiy @Deniallugo @popzxc
 CODEOWNERS @RomanBrodetski @perekopskiy @Deniallugo @popzxc
-.github/workflows/** @matter-labs/devops
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").unwrap_or_else(|_| ".".into());
+        let zksync_home = std::env::var("ZKSYNC_HOME").expect("ZKSYNC_HOME env variable not set.");
         let zksync_home = PathBuf::from(zksync_home);
         SystemContractsRepo {
             root: zksync_home.join("etc/system-contracts"),

diff --git 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@14
+brew install postgresql
 ```
 
 ### Cargo nextest

diff --git a/infrastructure/zk/src/env.ts b/infrastructure/zk/src/env.ts
@@ -57,7 +57,7 @@ export function set(env: string, print: boolean = false) {
     const envFile = (process.env.ENV_FILE = `etc/env/${env}.env`);
     if (!fs.existsSync(envFile)) {
         // No .env file found - we should compile it!
-        config.compileConfig();
+        config.compileConfig(env);
     }
     reload();
     get(print);