Merge pull request #657 from chainbound/lore/chore/docker-holesky

chore(docker/holesky): cleanup docker compose files

testnets/holesky/bolt-sidecar.env.example

@@ -4,12 +4,12 @@
 # port should be open on your firewall in order to receive external requests!
 BOLT_SIDECAR_PORT=8017
 # Execution client API URL
-BOLT_SIDECAR_EXECUTION_API_URL="http://172.56.0.1:8545"
+BOLT_SIDECAR_EXECUTION_API_URL="http://host.docker.internal:8545"
 # URL for the beacon client
-BOLT_SIDECAR_BEACON_API_URL="http://172.56.0.1:5052"
+BOLT_SIDECAR_BEACON_API_URL="http://host.docker.internal:5052"
 # Execution client Engine API URL. This is needed for fallback block building
 # and must be a synced Geth node
-BOLT_SIDECAR_ENGINE_API_URL="http://172.56.0.1:8551"
+BOLT_SIDECAR_ENGINE_API_URL="http://host.docker.internal:8551"
 # The port from which the Bolt sidecar will receive Builder-API requests from the Beacon client
 BOLT_SIDECAR_CONSTRAINTS_PROXY_PORT=18550
 # URL to forward the constraints produced by the Bolt sidecar to a server

testnets/holesky/docker-compose.pbs.yml

@@ -32,7 +32,7 @@ services:
       ADMINER_PLUGINS: tables-filter tinymce
 
   builder:
-    image: ghcr.io/chainbound/bolt-builder:v0.3.0-alpha.rc1
+    image: ghcr.io/chainbound/bolt-builder:v0.3.0-alpha.rc3
     restart: unless-stopped
     volumes:
       - "chaindata:/var/lib/chaindata"
@@ -62,6 +62,7 @@ services:
       - "41050:50050/udp"
     entrypoint:
       ["/bin/sh", "-c", "chmod +x /scripts/run-bn.sh && /scripts/run-bn.sh"]
+    # In case the sidecar on `docker-compose.yml` needs to connect to it
 
   helix-relay:
     image: ghcr.io/chainbound/helix:v0.3.0-alpha.rc4
@@ -74,7 +75,8 @@ services:
     volumes:
       - "./helix-config.yml:/helix-config.yml"
     ports:
-      - "44040:4040"
+      - "44040:4040" # api
+      - "48080:8080" # relay website
     environment:
       - RELAY_KEY=0x607a11b45a7219cc61a3d9c5fd08c7eebd602a6a19a977f8d3771d5711a550f2
       - RUST_LOG=helix_cmd=debug,helix_api=debug,helix_common=debug,helix_datastore=debug,helix_housekeeper=debug,helix_database=debug,helix_beacon_client=debug,helix_website=debug

testnets/holesky/docker-compose.yml

@@ -21,17 +21,19 @@ services:
       - ${BOLT_SIDECAR_DELEGATIONS_PATH:-/dev/null}:/etc/delegations.json
       - ${BOLT_SIDECAR_KEYSTORE_PATH:-/dev/null}:/etc/keystores
       - ${BOLT_SIDECAR_KEYSTORE_SECRETS_PATH:-/dev/null}:/etc/secrets
-    networks:
-      - bolt-default
+    # Allows the sidecar to reach EL and CL on this host
+    extra_hosts:
+      - host.docker.internal:host-gateway
 
   bolt-mev-boost-holesky:
     image: ghcr.io/chainbound/bolt-mev-boost:v0.3.0-alpha
     container_name: bolt-mev-boost-holesky
     restart: unless-stopped
     env_file: ./mev-boost.env
     entrypoint: /bin/sh -c '/app/mev-boost'
-    networks:
-      - bolt-default
+    # Allows to reach a relay running on this host
+    extra_hosts:
+      - host.docker.internal:host-gateway
 
   bolt-prometheus-holesky:
     image: prom/prometheus:v2.55.1
@@ -42,8 +44,6 @@ services:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml
       - ./targets.json:/etc/prometheus/targets.json
       - prometheus-data:/prometheus
-    networks:
-      - bolt-default
 
   bolt-cadvisor-holesky:
     image: gcr.io/cadvisor/cadvisor:latest
@@ -55,8 +55,6 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - /sys:/sys:ro
       - /var/lib/docker/:/var/lib/docker:ro
-    networks:
-      - bolt-default
     command:
       - --housekeeping_interval=10s
       - --docker_only
@@ -70,22 +68,9 @@ services:
       - ./grafana/dashboards:/etc/grafana/provisioning/dashboards
       - ./grafana/datasources:/etc/grafana/provisioning/datasources
       - grafana-data:/var/lib/grafana
-    networks:
-      - bolt-default
-    depends_on:
-      - bolt-prometheus-holesky
 
 volumes:
   prometheus-data:
     driver: local
   grafana-data:
     driver: local
-
-networks:
-  bolt-default:
-    driver: bridge
-    ipam:
-      driver: default
-      config:
-        - subnet: 172.56.0.0/16
-          gateway: 172.56.0.1

testnets/holesky/helix-config.yml

@@ -28,3 +28,15 @@ router_config:
   enabled_routes: []
 
 network_config: !Holesky
+
+website:
+  enabled: true
+  port: 8080
+  listen_address: "0.0.0.0"
+  show_config_details: false
+  network_name: "holesky"
+  relay_url: https://0xa55c1285d84ba83a5ad26420cd5ad3091e49c55a813eee651cd467db38a8c8e63192f47955e9376f6b42f6d190571cb5@relay-holesky.bolt.chainbound.io
+  relay_pubkey: 0xa55c1285d84ba83a5ad26420cd5ad3091e49c55a813eee651cd467db38a8c8e63192f47955e9376f6b42f6d190571cb5
+  link_beaconchain: https://holesky.beaconcha.in
+  link_etherscan: https://holesky.etherscan.io
+  link_data_api: https://relay-holesky.bolt.chainbound.io

testnets/holesky/scripts/run-bn.sh

@@ -1,28 +1,28 @@
 #!/bin/sh
 
 lighthouse beacon_node \
-        --network=holesky \
-        --debug-level=info \
-        --datadir=/var/lib/chaindata \
-        --disable-enr-auto-update \
-        --enr-udp-port=50050 \
-        --enr-tcp-port=50050 \
-        --listen-address=0.0.0.0 \
-        --port=50050 \
-        --http \
-        --http-address=0.0.0.0 \
-        --http-port=4000 \
-        --http-allow-sync-stalled \
-        --always-prepare-payload \
-        --prepare-payload-lookahead=12000 \
-        --slots-per-restore-point=32 \
-        --disable-packet-filter \
-        --checkpoint-sync-url=https://holesky.beaconstate.info \
-        --execution-endpoints=http://builder:8551 \
-        --subscribe-all-subnets \
-        --metrics \
-        --metrics-address=0.0.0.0 \
-        --metrics-allow-origin=* \
-        --metrics-port=5054 \
-        --enable-private-discovery \
-        --jwt-secrets=/var/lib/shared/jwtsecret
+  --network=holesky \
+  --debug-level=info \
+  --datadir=/var/lib/chaindata \
+  --disable-enr-auto-update \
+  --enr-udp-port=50050 \
+  --enr-tcp-port=50050 \
+  --listen-address=0.0.0.0 \
+  --port=50050 \
+  --http \
+  --http-address=0.0.0.0 \
+  --http-port=4000 \
+  --http-allow-sync-stalled \
+  --always-prepare-payload \
+  --prepare-payload-lookahead=12000 \
+  --slots-per-restore-point=32 \
+  --disable-packet-filter \
+  --checkpoint-sync-url=https://holesky.beaconstate.info \
+  --execution-endpoints=http://builder:8551 \
+  --subscribe-all-subnets \
+  --metrics \
+  --metrics-address=0.0.0.0 \
+  --metrics-allow-origin=* \
+  --metrics-port=5054 \
+  --enable-private-discovery \
+  --jwt-secrets=/var/lib/shared/jwtsecret

testnets/holesky/scripts/run-builder.sh

@@ -1,33 +1,34 @@
 #!/bin/sh
 
 geth --datadir=/var/lib/chaindata/geth \
-        --holesky \
-        --syncmode=full \
-        --gcmode=archive \
-        --state.scheme=hash \
-        --verbosity=3 \
-        --http \
-        --http.port=8545 \
-        --http.addr=0.0.0.0 \
-        --http.vhosts=* \
-        --http.corsdomain=* \
-        --http.api=admin,engine,net,eth,web3,debug,flashbots,txpool \
-        --ws \
-        --ws.addr=0.0.0.0 \
-        --ws.port=8546 \
-        --ws.api=admin,engine,net,eth,web3,debug,flashbots,txpool \
-        --ws.origins=* \
-        --authrpc.port=8551 \
-        --authrpc.addr=0.0.0.0 \
-        --authrpc.vhosts=* \
-        --authrpc.jwtsecret=/var/lib/shared/jwtsecret \
-        --metrics \
-        --metrics.addr=0.0.0.0 \
-        --metrics.port=6060 \
-        --port=30303 \
-        --builder \
-        --builder.remote_relay_endpoint=http://helix-relay:4040 \
-        --builder.beacon_endpoints=http://beacon:4000 \
-        --builder.genesis_fork_version=0x01017000 \
-        --miner.etherbase=0x614561D2d143621E126e87831AEF287678B442b8 \
-        --miner.extradata="Bolt Builder"
+  --holesky \
+  --syncmode=full \
+  --gcmode=archive \
+  --state.scheme=hash \
+  --verbosity=3 \
+  --http \
+  --http.port=8545 \
+  --http.addr=0.0.0.0 \
+  --http.vhosts=* \
+  --http.corsdomain=* \
+  --http.api=admin,engine,net,eth,web3,debug,flashbots,txpool \
+  --ws \
+  --ws.addr=0.0.0.0 \
+  --ws.port=8546 \
+  --ws.api=admin,engine,net,eth,web3,debug,flashbots,txpool \
+  --ws.origins=* \
+  --authrpc.port=8551 \
+  --authrpc.addr=0.0.0.0 \
+  --authrpc.vhosts=* \
+  --authrpc.jwtsecret=/var/lib/shared/jwtsecret \
+  --metrics \
+  --metrics.addr=0.0.0.0 \
+  --metrics.port=6060 \
+  --port=30303 \
+  --builder \
+  --builder.remote_relay_endpoint=http://helix-relay:4040 \
+  --builder.secondary_remote_relay_endpoints=https://holesky-preconf.titanrelay.xyz,https://preconfs-holesky.aestus.live,https://bloxroute.holesky.blxrbdn.com \
+  --builder.beacon_endpoints=http://beacon:4000 \
+  --builder.genesis_fork_version=0x01017000 \
+  --miner.etherbase=0x614561D2d143621E126e87831AEF287678B442b8 \
+  --miner.extradata="Bolt Builder"