From c03c2e3df71b5737cbdae889c8330511345c52c2 Mon Sep 17 00:00:00 2001 From: perekopskiy <53865202+perekopskiy@users.noreply.github.com> Date: Mon, 22 Jan 2024 14:42:44 +0200 Subject: [PATCH 1/3] fix(witness-generator): Update era-zkevm_test_harness (#912) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## What ❔ Update era-zkevm_test_harness ## Why ❔ It has a fix for witness generation ## Checklist - [ ] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [ ] Tests for the changes have been added / updated. - [ ] Documentation comments have been added / updated. - [ ] Code has been formatted via `zk fmt` and `zk lint`. - [ ] Spellcheck has been run via `zk spellcheck`. --- Cargo.lock | 8 ++++---- prover/Cargo.lock | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6aae513b69a..07350714517 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/prover/Cargo.lock b/prover/Cargo.lock index bf566686a31..9058558159f 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", @@ -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)", From f141a00cd25ae5e5d2a054aa4ecda544a2abbbd7 Mon Sep 17 00:00:00 2001 From: perekopskiy <53865202+perekopskiy@users.noreply.github.com> Date: Mon, 22 Jan 2024 16:51:25 +0200 Subject: [PATCH 2/3] fix(prover): Update shivini (#915) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## What ❔ Update shivini ## Why ❔ ## Checklist - [ ] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [ ] Tests for the changes have been added / updated. - [ ] Documentation comments have been added / updated. - [ ] Code has been formatted via `zk fmt` and `zk lint`. - [ ] Spellcheck has been run via `zk spellcheck`. --- prover/Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prover/Cargo.lock b/prover/Cargo.lock index 9058558159f..bea7839b2c3 100644 --- a/prover/Cargo.lock +++ b/prover/Cargo.lock @@ -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)", From 62d3beff0648cab24136f08d049e37e302d53c5d Mon Sep 17 00:00:00 2001 From: Danil Date: Mon, 22 Jan 2024 16:35:22 +0100 Subject: [PATCH 3/3] fix(zk-stack): Remove remapping docker containers (#903) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## What ❔ Remove remapping urls for zk stack initialization ## Why ❔ Meanwhile it's good to not expose ports, especially on linux machine. It's hardly complicated to work with it from localhost environment. And we hope, that users won't use our docker-composes for production environment ## Checklist - [ ] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [ ] Tests for the changes have been added / updated. - [ ] Documentation comments have been added / updated. - [ ] Code has been formatted via `zk fmt` and `zk lint`. - [ ] Spellcheck has been run via `zk spellcheck`. Signed-off-by: Danil --- infrastructure/zk/src/hyperchain_wizard.ts | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/infrastructure/zk/src/hyperchain_wizard.ts b/infrastructure/zk/src/hyperchain_wizard.ts index 73e3f69d7a1..cf79d01c025 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';