From 24ae12c8e73721949d72e15b5c71c35f33379975 Mon Sep 17 00:00:00 2001
From: Jeb Bearer <jeb@espressosys.com>
Date: Tue, 9 Apr 2024 17:29:17 +0300
Subject: [PATCH] Demo fixes

* Some config fixes suggested by Informal Systems
* Fix name of builder docker image
---
 .env                | 12 ++++++------
 docker-compose.yaml |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.env b/.env
index eee98b246..8500aa624 100644
--- a/.env
+++ b/.env
@@ -24,25 +24,25 @@ ESPRESSO_ORCHESTRATOR_MIN_PROPOSE_TIME=1s
 ESPRESSO_ORCHESTRATOR_MAX_PROPOSE_TIME=2s
 ESPRESSO_CONSENSUS_SERVER_PORT=40002
 ESPRESSO_DA_SERVER_PORT=40003
-ESPRESSO_SEQUENCER_DA_SERVER_URL=http://da-server:$ESPRESSO_WEB_SERVER_PORT
-ESPRESSO_SEQUENCER_CONSENSUS_SERVER_URL=http://consensus-server:$ESPRESSO_WEB_SERVER_PORT
-ESPRESSO_SEQUENCER_ORCHESTRATOR_URL=http://orchestrator:$ESPRESSO_ORCHESTRATOR_PORT
+ESPRESSO_SEQUENCER_DA_SERVER_URL=http://da-server:${ESPRESSO_WEB_SERVER_PORT}
+ESPRESSO_SEQUENCER_CONSENSUS_SERVER_URL=http://consensus-server:${ESPRESSO_WEB_SERVER_PORT}
+ESPRESSO_SEQUENCER_ORCHESTRATOR_URL=http://orchestrator:${ESPRESSO_ORCHESTRATOR_PORT}
 ESPRESSO_SEQUENCER_API_PORT=50000
 ESPRESSO_SEQUENCER1_API_PORT=50001
 ESPRESSO_SEQUENCER2_API_PORT=50002
 ESPRESSO_SEQUENCER3_API_PORT=50003
 ESPRESSO_SEQUENCER4_API_PORT=50004
-ESPRESSO_SEQUENCER_URL=http://sequencer0:$ESPRESSO_SEQUENCER_API_PORT
+ESPRESSO_SEQUENCER_URL=http://sequencer0:${ESPRESSO_SEQUENCER_API_PORT}
 ESPRESSO_SEQUENCER_STORAGE_PATH=/store/sequencer
 ESPRESSO_SEQUENCER_L1_PORT=8545
 ESPRESSO_SEQUENCER_L1_WS_PORT=8546
-ESPRESSO_SEQUENCER_L1_PROVIDER=http://demo-l1-network:$ESPRESSO_SEQUENCER_L1_PORT
+ESPRESSO_SEQUENCER_L1_PROVIDER=http://demo-l1-network:${ESPRESSO_SEQUENCER_L1_PORT}
 ESPRESSO_SEQUENCER_ETH_MNEMONIC="test test test test test test test test test test test junk"
 ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS=0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f
 ESPRESSO_COMMITMENT_TASK_PORT=60000
 ESPRESSO_SEQUENCER_DB_PORT=5432
 ESPRESSO_STATE_RELAY_SERVER_PORT=40004
-ESPRESSO_STATE_RELAY_SERVER_URL=http://state-relay-server:$ESPRESSO_STATE_RELAY_SERVER_PORT
+ESPRESSO_STATE_RELAY_SERVER_URL=http://state-relay-server:${ESPRESSO_STATE_RELAY_SERVER_PORT}
 
 # Ethereum accounts (note 11-15 are used by the sequencer nodes)
 ESPRESSO_SEQUENCER_HOTSHOT_ACCOUNT_INDEX=5
diff --git a/docker-compose.yaml b/docker-compose.yaml
index e8c31e6f6..d9e7c9aac 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -156,7 +156,7 @@ services:
       - ESPRESSO_SEQUENCER_API_PEERS=http://sequencer2:$ESPRESSO_SEQUENCER_API_PORT
       - ESPRESSO_SEQUENCER_STATE_PEERS=http://sequencer2:$ESPRESSO_SEQUENCER_API_PORT
       - ESPRESSO_SEQUENCER_POSTGRES_HOST=sequencer-db
-      - ESPRESSO_SEQUENCER_POSTGRES_USER=postgres
+      - ESPRESSO_SEQUENCER_POSTGRES_USER=root
       - ESPRESSO_SEQUENCER_POSTGRES_PASSWORD=password
       - ESPRESSO_SEQUENCER_L1_PROVIDER
       - ESPRESSO_STATE_RELAY_SERVER_URL
@@ -302,7 +302,7 @@ services:
         condition: service_healthy
 
   permissionless-builder:
-    image: ghcr.io/espressosystems/espresso-sequencer/permissionless-builder:main
+    image: ghcr.io/espressosystems/espresso-sequencer/builder:main
     ports:
       - "$ESPRESSO_BUILDER_SERVER_PORT:$ESPRESSO_BUILDER_SERVER_PORT"
     environment:
@@ -342,6 +342,7 @@ services:
       - "$ESPRESSO_SEQUENCER_DB_PORT:5432"
     environment:
       - POSTGRES_PASSWORD=password
+      - POSTGRES_USER=root
     healthcheck:
       # Postgres can be falsely "ready" once before running init scripts.
       # See https://github.com/docker-library/postgres/issues/146 for discussion.