From 555727d5866fcc8280a57280b65e6c909b365a7d Mon Sep 17 00:00:00 2001
From: Ivan Schasny <31857042+ischasny@users.noreply.github.com>
Date: Mon, 4 Mar 2024 16:55:54 +0000
Subject: [PATCH] fix: use pos l1 in zk stack (#1341)

`blobVersionedHashRetriever` contract fails to deploy to geth with
clique consensus, however it deploys fine with PoS consensus. This
commit updates `zk stack` to use PoS consensus, reusing docker-compose
configuration from `zk init`.
---
 docker-compose-zkstack-common.yml          | 35 ----------------------
 infrastructure/zk/src/hyperchain_wizard.ts |  2 +-
 2 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 docker-compose-zkstack-common.yml

diff --git a/docker-compose-zkstack-common.yml b/docker-compose-zkstack-common.yml
deleted file mode 100644
index 5d92de5d31d2..000000000000
--- a/docker-compose-zkstack-common.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-version: '3.2'
-networks:
-  zkstack:
-    driver: bridge
-services:
-  geth:
-    image: "matterlabs/geth:latest"
-    ports:
-      - "127.0.0.1:8545:8545"
-      - "127.0.0.1:8546:8546"
-    volumes:
-    - type: bind
-      source: ./volumes/geth
-      target: /var/lib/geth/data
-    networks:
-      - zkstack
-    container_name: geth
-  postgres:
-    image: "postgres:14"
-    container_name: postgres
-    ports:
-      - "127.0.0.1:5432:5432"
-    volumes:
-      - type: bind
-        source: ./volumes/postgres
-        target: /var/lib/postgresql/data
-    environment:
-      # We bind only to 127.0.0.1, so setting insecure password is acceptable here
-      - POSTGRES_PASSWORD=notsecurepassword
-    command:
-      - "postgres"
-      - "-c"
-      - "max_connections=1000"
-    networks:
-      - zkstack
diff --git a/infrastructure/zk/src/hyperchain_wizard.ts b/infrastructure/zk/src/hyperchain_wizard.ts
index 32f8c38484df..964eb480aae4 100644
--- a/infrastructure/zk/src/hyperchain_wizard.ts
+++ b/infrastructure/zk/src/hyperchain_wizard.ts
@@ -288,7 +288,7 @@ async function setHyperchainMetadata() {
         feeReceiver = undefined;
         feeReceiverAddress = richWallets[3].address;
 
-        await up('docker-compose-zkstack-common.yml');
+        await up();
         await announced('Ensuring databases are up', db.wait({ server: true, prover: false }));
     }