From aa5e92a5df79bad7815976ecf99384ffb5f22e9b Mon Sep 17 00:00:00 2001
From: Sebastian <379651+czarly@users.noreply.github.com>
Date: Wed, 19 Mar 2025 13:36:37 +0100
Subject: [PATCH] fix

---
 berachain-bepolia.yml            | 27 ++++-----------------------
 berachain/bepolia/script/init.sh | 26 +++++++++++++++++---------
 2 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/berachain-bepolia.yml b/berachain-bepolia.yml
index b0e909ef..df17d23f 100644
--- a/berachain-bepolia.yml
+++ b/berachain-bepolia.yml
@@ -1,4 +1,5 @@
 services:
+
   berachain-bepolia:
     image: ghcr.io/paradigmxyz/reth:${RETH_VERSION:-v1.3.2}
     user: root
@@ -33,39 +34,19 @@ services:
     networks:
       - chains
 
-  # berachain-bepolia-node-prepare:
-  #   image: icculp/berachain_beacon:v1.1.1
-  #   environment:
-  #     - "MONIKER=d${DOMAIN}"
-  #   command: init ${MONIKER} --chain-id bepolia-beacon-80069 --consensus-key-algo bls12_381 --home /root/.beacond/ --overwrite
-  #   volumes:
-  #     - "berachain-bepolia-node:/root/.beacond/data"
-  #     - "./berachain/bepolia/config:/root/.beacond/config"
-
-  berachain-bepolia-node-init:
-    image: alpine:latest
-    environment:
-      - "MONIKER=d${DOMAIN}"
-    volumes:
-      - "berachain-bepolia-node:/root/.beacond/data"
-      - "./berachain/bepolia/script/init.sh:/init.sh"
-      - "./berachain/bepolia/config:/root/.beacond/config"
-    entrypoint: [ "sh", "/init.sh" ]
-    command: init ${MONIKER} --chain-id bepolia-beacon-80069 --consensus-key-algo bls12_381 --home /root/.beacond/
-
   berachain-bepolia-node:
     image: icculp/berachain_beacon:v1.1.1
-    depends_on:
-      - "berachain-bepolia-node-init"
     expose:
       - 26657 #rpc
     ports:
       - "9692:9692"
       - "9692:9692/udp"
-    command: start --minimum-gas-prices 0atom --beacon-kit.engine.jwt-secret-path /jwtsecret --beacon-kit.kzg.trusted-setup-path /root/.beacond/config/kzg-trusted-setup.json
+    entrypoint: [ "sh", "/init.sh" ]
+    command: --beacon-kit.engine.jwt-secret-path /jwtsecret
     networks:
       - chains
     volumes:
+      - "./berachain/bepolia/script/init.sh:/init.sh"      
       - "berachain-bepolia-node:/root/.beacond/data"
       - "./berachain/bepolia/config:/root/.beacond/config"
       - ".jwtsecret:/jwtsecret"
diff --git a/berachain/bepolia/script/init.sh b/berachain/bepolia/script/init.sh
index 6b2df04d..64a10199 100644
--- a/berachain/bepolia/script/init.sh
+++ b/berachain/bepolia/script/init.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 
-exec apk add --no-cache curl
+set -e  # Exit on failure
+
+apk add --no-cache curl
+
+# this goes first because it won't overwrite shit
+/usr/bin/beacond init ${MONIKER} --chain-id bepolia-beacon-80069 --consensus-key-algo bls12_381 --home /root/.beacond/
 
 # Define variables
 CONFIG_DIR="/root/.beacond/config"
@@ -8,15 +13,15 @@ CONFIG_TOML_URL="https://raw.githubusercontent.com/berachain/beacon-kit/main/tes
 APP_TOML_URL="https://raw.githubusercontent.com/berachain/beacon-kit/main/testing/networks/80069/app.toml"
 SEEDS_URL="https://raw.githubusercontent.com/berachain/beacon-kit/main/testing/networks/80069/cl-seeds.txt"
 
-# Create config directory if it doesn't exist
+# Create config directory
 mkdir -p "$CONFIG_DIR"
 
-# Download the config files
+# Download config files
 curl -sL "$CONFIG_TOML_URL" -o "$CONFIG_DIR/config.toml"
 curl -sL "$APP_TOML_URL" -o "$CONFIG_DIR/app.toml"
 
-# Update moniker
-if [ -n "$MONIKER" ]; then
+# Update moniker if set
+if [ -n "$MONIKER" ] && [ -f "$CONFIG_DIR/config.toml" ]; then
   sed -i "s/^moniker = \".*\"/moniker = \"$MONIKER\"/" "$CONFIG_DIR/config.toml"
 fi
 
@@ -24,12 +29,15 @@ fi
 SEEDS=$(curl -s "$SEEDS_URL" | tail -n +2 | tr '\n' ',' | sed 's/,$//')
 
 # Update seeds and persistent_peers
-if [ -n "$SEEDS" ]; then
+if [ -n "$SEEDS" ] && [ -f "$CONFIG_DIR/config.toml" ]; then
   sed -i "s/^seeds = \".*\"/seeds = \"$SEEDS\"/" "$CONFIG_DIR/config.toml"
   sed -i "s/^persistent_peers = \".*\"/persistent_peers = \"$SEEDS\"/" "$CONFIG_DIR/config.toml"
 fi
 
-sed -i "s|^rpc-dial-url = \".*\"|rpc-dial-url = \"http://berachain-bepolia:8551\"|" "$CONFIG_DIR/app.toml";
-
-exec /usr/bin/beacond "$@"
+# Update RPC dial URL in app.toml
+if [ -f "$CONFIG_DIR/app.toml" ]; then
+  sed -i "s|^rpc-dial-url = \".*\"|rpc-dial-url = \"http://berachain-bepolia:8551\"|" "$CONFIG_DIR/app.toml"
+fi
 
+# Execute beacond
+exec /usr/bin/beacond start --beacon-kit.kzg.trusted-setup-path /root/.beacond/config/kzg-trusted-setup.json --minimum-gas-prices 0atom "$@"