diff --git a/Cargo.lock b/Cargo.lock index 26be92dea12d..9cb0feaced6f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1314,7 +1314,7 @@ dependencies = [ [[package]] name = "circuit_definitions" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.1#44975f894aff0893b5f98e34d0e364375390bcb8" +source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.1#49028029f0a9a4b399ada3f0c5bdbc31cd368a3e" dependencies = [ "crossbeam 0.8.2", "derivative", @@ -6542,9 +6542,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" @@ -8688,7 +8688,7 @@ dependencies = [ [[package]] name = "zkevm_test_harness" version = "1.4.1" -source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.1#44975f894aff0893b5f98e34d0e364375390bcb8" +source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.1#49028029f0a9a4b399ada3f0c5bdbc31cd368a3e" dependencies = [ "bincode", "circuit_definitions 0.1.0 (git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.1)", diff --git a/infrastructure/zk/src/hyperchain_wizard.ts b/infrastructure/zk/src/hyperchain_wizard.ts index 73e3f69d7a10..cf79d01c025d 100644 --- a/infrastructure/zk/src/hyperchain_wizard.ts +++ b/infrastructure/zk/src/hyperchain_wizard.ts @@ -43,9 +43,6 @@ export interface BasePromptOptions { skip?: ((state: object) => boolean | Promise) | boolean; } -// PLA:681 -let isLocalhost = false; - // An init command that allows configuring and spinning up a new hyperchain network. async function initHyperchain() { await announced('Initializing hyperchain creation', setupConfiguration()); @@ -72,15 +69,6 @@ async function initHyperchain() { await init(initArgs); - // if we used matterlabs/geth network, we need custom ENV file for hyperchain compose parts - // This breaks `zk status prover` command, but neccessary for working in isolated docker-network - // TODO: Think about better implementation - // PLA:681 - if (isLocalhost) { - wrapEnvModify('ETH_CLIENT_WEB3_URL', 'http://geth:8545'); - wrapEnvModify('DATABASE_URL', 'postgres://postgres:notsecurepassword@postgres:5432/zksync_local'); - } - env.mergeInitToEnv(); console.log(announce(`\nYour hyperchain configuration is available at ${process.env.ENV_FILE}\n`)); @@ -262,8 +250,6 @@ async function setHyperchainMetadata() { feeReceiverAddress = keyResults.feeReceiver; } } else { - // PLA:681 - isLocalhost = true; l1Rpc = 'http://localhost:8545'; l1Id = 9; databaseUrl = 'postgres://postgres:notsecurepassword@localhost:5432/zksync_local'; diff --git a/prover/Cargo.lock b/prover/Cargo.lock index bf566686a31c..bea7839b2c3c 100644 --- a/prover/Cargo.lock +++ b/prover/Cargo.lock @@ -888,7 +888,7 @@ dependencies = [ [[package]] name = "circuit_definitions" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.1#44975f894aff0893b5f98e34d0e364375390bcb8" +source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.1#49028029f0a9a4b399ada3f0c5bdbc31cd368a3e" dependencies = [ "crossbeam 0.8.4", "derivative", @@ -5493,7 +5493,7 @@ dependencies = [ [[package]] name = "shivini" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-shivini.git?branch=v1.4.1#a788f4007c4a63529f6715897556f169938a6a36" +source = "git+https://github.com/matter-labs/era-shivini.git?branch=v1.4.1#011aaabcfb77ad3dc189086012267161375d9cc2" dependencies = [ "bincode", "blake2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -7424,7 +7424,7 @@ dependencies = [ [[package]] name = "zkevm_test_harness" version = "1.4.1" -source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.1#44975f894aff0893b5f98e34d0e364375390bcb8" +source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.1#49028029f0a9a4b399ada3f0c5bdbc31cd368a3e" dependencies = [ "bincode", "circuit_definitions 0.1.0 (git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.1)",