Merge branch 'gprusak-consensus-config-again' of http://github.com/ma…

…tter-labs/zksync-era into gprusak-consensus-config-again

infrastructure/zk/src/hyperchain_wizard.ts

@@ -43,9 +43,6 @@ export interface BasePromptOptions {
     skip?: ((state: object) => boolean | Promise<boolean>) | 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';