Rename CC to CL and EC to EL

haurog · May 7, 2022 · 6c0aa80 · 6c0aa80
1 parent 583d8c6
commit 6c0aa80
Show file tree

Hide file tree

Showing 19 changed files with 95 additions and 149 deletions.
diff --git a/besu.yml b/besu.yml
@@ -25,12 +25,8 @@ services:
       - besu-eth1-data:/var/lib/besu
       - /etc/localtime:/etc/localtime:ro
     ports:
-      - ${EC_P2P_PORT}:${EC_P2P_PORT}/tcp
-      - ${EC_P2P_PORT}:${EC_P2P_PORT}/udp
-    expose:
-      - ${EC_RPC_PORT}/tcp
-      - ${EC_WS_PORT}/tcp
-      - 9545/tcp
+      - ${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp
+      - ${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp
     networks:
       default:
         aliases:
@@ -41,27 +37,27 @@ services:
       - --data-path
       - /var/lib/besu
       - --p2p-port
-      - ${EC_P2P_PORT}
+      - ${EL_P2P_PORT:-30303}
       - --rpc-http-enabled
       - --rpc-http-api
       - "WEB3,ETH,NET"
       - --rpc-http-host
       - 0.0.0.0
       - --rpc-http-port
-      - ${EC_RPC_PORT}
+      - ${EL_RPC_PORT:-8545}
       - --rpc-http-cors-origins=*
       - --rpc-ws-enabled
       - --rpc-ws-api
       - "WEB3,ETH,NET"
       - --rpc-ws-host
       - 0.0.0.0
       - --rpc-ws-port
-      - ${EC_WS_PORT}
+      - ${EL_WS_PORT:-8546}
       - --host-allowlist=*
       - --logging
       - ${LOG_LEVEL}
       - --network
-      - ${EC_NETWORK}
+      - ${EL_NETWORK:-goerli}
       - --metrics-enabled
       - --metrics-host
       - 0.0.0.0

diff --git a/blox-ssv.yml b/blox-ssv.yml
@@ -10,7 +10,7 @@ x-logging: &logging
 services:
   ssv-node:
     restart: "${RESTART}"
-    image: bloxstaking/ssv-node:${SSV_NODE_TAG:-latest-ubuntu}
+    image: bloxstaking/ssv-node:${SSV_NODE_TAG:-latest}
     user: 12000:12000
     volumes:
       - ./blox-ssv-config.yaml:/config.yaml
@@ -29,7 +29,7 @@ services:
       - ssv-node
   ssv-generate-keys:
     restart: "no"
-    image: bloxstaking/ssv-node:${SSV_NODE_TAG:-latest-ubuntu}
+    image: bloxstaking/ssv-node:${SSV_NODE_TAG:-latest}
     command: /go/bin/ssvnode generate-operator-keys
 volumes:
   ssv-data:
diff --git a/default.env b/default.env
@@ -3,16 +3,16 @@ COMPOSE_FILE=teku-base.yml:geth.yml
 # Execution client endpoint / chain source. This default uses the execution node container.
 # For Teku and Lighthouse, you can specify multiple endpoints separated by commas
 # This needs to be ws:// or ws:// if using Nimbus, e.g. ws://execution:8546
-EC_NODE=http://execution:8545
+EL_NODE=http://execution:8545
 # Execution client fallback nodes, for Prysm or Nimbus. Can't be empty.
-EC_FALLBACK_NODE1=http://execution:8545
-EC_FALLBACK_NODE2=http://execution:8545
+EL_FALLBACK_NODE1=http://execution:8545
+EL_FALLBACK_NODE2=http://execution:8545
 # Graffiti to use for validator
 GRAFFITI=eth-docker
 # Network to use for consensus client. If using main net, set to mainnet.
 NETWORK=prater
 # Network to use for execution client. If using main net, set to mainnet.
-EC_NETWORK=goerli
+EL_NETWORK=goerli
 # Some clients suggest adjusting to higher (or lower) peer count. Adjust here, per client
 PRYSM_PEER_COUNT=45
 LH_PEER_COUNT=80
@@ -30,9 +30,8 @@ AWS_HOSTED_ZONE_ID=myzoneid
 GRAFANA_HOST=grafana
 PROM_HOST=prometheus
 PRYSM_HOST=prysm
-EC_HOST=ec
-EC_WS_HOST=ecws
-CC_HOST=cc
+EL_HOST=el
+EL_WS_HOST=elws
 DDNS_SUBDOMAIN=
 DDNS_PROXY=true
 
@@ -43,7 +42,7 @@ RAPID_SYNC_URL=
 
 # Consensus client address. This could be comma-separated for Lighthouse, with Infura as failover,
 # or could just be a remote consensus client URL for Teku, Lighthouse or Prysm "validator only" setups. Not in use for Nimbus.
-CC_NODE=http://consensus:5052
+CL_NODE=http://consensus:5052
 
 # Beaconcha.in API key for sending client stats. Used with lh-stats.yml or prysm-stats.yml,
 # source build only for Prysm as of Sept 2021.
@@ -53,8 +52,8 @@ BEACON_STATS_MACHINE=
 
 # P2P ports you will forward to your staking node. Adjust here if you are
 # going to use something other than defaults.
-EC_P2P_PORT=30303
-CC_P2P_PORT=9000
+EL_P2P_PORT=30303
+CL_P2P_PORT=9000
 PRYSM_PORT=9000
 PRYSM_UDP_PORT=9000
 # Local grafana dashboard port. Do not expose to Internet, it is insecure http
@@ -65,9 +64,9 @@ KEY_API_PORT=7500
 TRAEFIK_WEB_PORT=443
 TRAEFIK_WEB_HTTP_PORT=80
 # Execution client RPC port, important when using ec-shared.yml. Also insecure, do not expose to Internet.
-EC_RPC_PORT=8545
+EL_RPC_PORT=8545
 # Execution client WS port, used with Nimbus. Ditto insecure, do not expose to Internet.
-EC_WS_PORT=8546
+EL_WS_PORT=8546
 # SSV Node ports - note these conflict with Prysm by default
 SSV_P2P_PORT=13000
 SSV_P2P_PORT_UDP=12000

diff --git a/el-shared.yml b/el-shared.yml
@@ -1,9 +1,9 @@
-# To be used in conjunction with oe.yml, nm.yml, besu.yml or geth.yml
+# To be used in conjunction with erigon.yml, oe.yml, nm.yml, besu.yml or geth.yml
 version: "3.4"
 services:
   execution:
     ports:
-      - ${EC_RPC_PORT}:${EC_RPC_PORT}/tcp
-      - ${EC_WS_PORT}:${EC_WS_PORT}/tcp
+      - ${EL_RPC_PORT}:${EL_RPC_PORT:-8545}/tcp
+      - ${EL_WS_PORT}:${EL_WS_PORT:-8546}/tcp
   eth:
     image: tianon/true
diff --git a/el-traefik.yml b/el-traefik.yml
@@ -4,16 +4,16 @@ services:
   execution:
     labels:
       - traefik.enable=true
-      - traefik.http.routers.ec.service=ec
-      - traefik.http.routers.ec.entrypoints=websecure
-      - traefik.http.routers.ec.rule=Host(`${EC_HOST}.${DOMAIN}`)
-      - traefik.http.routers.ec.tls.certresolver=letsencrypt
-      - traefik.http.services.ec.loadbalancer.server.port=${EC_RPC_PORT}
-      - traefik.http.routers.ecws.service=ecws
-      - traefik.http.routers.ecws.entrypoints=websecure
-      - traefik.http.routers.ecws.rule=Host(`${EC_WS_HOST}.${DOMAIN}`)
-      - traefik.http.routers.ecws.tls.certresolver=letsencrypt
-      - traefik.http.services.ecws.loadbalancer.server.port=${EC_WS_PORT}
+      - traefik.http.routers.el.service=el
+      - traefik.http.routers.el.entrypoints=websecure
+      - traefik.http.routers.el.rule=Host(`${EL_HOST:-el}.${DOMAIN}`)
+      - traefik.http.routers.el.tls.certresolver=letsencrypt
+      - traefik.http.services.el.loadbalancer.server.port=${EL_RPC_PORT:-8545}
+      - traefik.http.routers.elws.service=elws
+      - traefik.http.routers.elws.entrypoints=websecure
+      - traefik.http.routers.elws.rule=Host(`${EL_WS_HOST:-elws}.${DOMAIN}`)
+      - traefik.http.routers.elws.tls.certresolver=letsencrypt
+      - traefik.http.services.elws.loadbalancer.server.port=${EL_WS_PORT:-8546}
 
   eth:
     image: tianon/true
diff --git a/erigon.yml b/erigon.yml
@@ -3,7 +3,7 @@ x-logging: &logging
   logging:
     driver: json-file
     options:
-      max-size: 10m
+      max-size: 100m
       max-file: "3"
       tag: '{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}'
 
@@ -23,11 +23,8 @@ services:
       - erigon-ec-data:/var/lib/erigon
       - /etc/localtime:/etc/localtime:ro
     ports:
-      - ${EC_P2P_PORT}:${EC_P2P_PORT}/tcp
-      - ${EC_P2P_PORT}:${EC_P2P_PORT}/udp
-    expose:
-      - 9090/tcp
-      - 6060/tcp
+      - ${EL_P2P_PORT}:${EL_P2P_PORT:-30303}/tcp
+      - ${EL_P2P_PORT}:${EL_P2P_PORT:-30303}/udp
     networks:
       default:
         aliases:
@@ -41,11 +38,11 @@ services:
       - --datadir
       - /var/lib/erigon
       - --port
-      - ${EC_P2P_PORT}
+      - ${EL_P2P_PORT:-30303}
       - --nat
       - any
       - --chain
-      - ${EC_NETWORK}
+      - ${EL_NETWORK:-goerli}
       - --prune=htc
       - --metrics
       - --metrics.addr
@@ -58,8 +55,6 @@ services:
     volumes:
       - erigon-ec-data:/var/lib/erigon
       - /etc/localtime:/etc/localtime:ro
-    expose:
-      - ${EC_RPC_PORT}/tcp
     depends_on:
       - erigon
     pid: service:erigon # Use erigon's PID namespace. It's required to open Erigon's DB from another process (RPCDaemon local-mode)
@@ -78,7 +73,7 @@ services:
       - --http.api
       - web3,eth,net
       - --http.port
-      - ${EC_RPC_PORT}
+      - ${EL_RPC_PORT:-8545}
       - --ws
   eth:
     depends_on:

diff --git a/ethd b/ethd
@@ -340,22 +340,24 @@ envmigrate() {
     if [ ! -f "./${ENV_FILE}" ]; then
         return
     fi
-    ALL_VARS=( COMPOSE_FILE EC_NODE EC_FALLBACK_NODE1 EC_FALLBACK_NODE2 GRAFFITI NETWORK EC_NETWORK \
+    ALL_VARS=( COMPOSE_FILE EL_NODE EL_FALLBACK_NODE1 EL_FALLBACK_NODE2 GRAFFITI NETWORK EL_NETWORK \
             PRYSM_PEER_COUNT LH_PEER_COUNT TEKU_PEER_COUNT NIM_PEER_COUNT DOMAIN ACME_EMAIL \
             CF_EMAIL CF_API_TOKEN AWS_PROFILE AWS_HOSTED_ZONE_ID GRAFANA_HOST PROM_HOST PRYSM_HOST \
-            EC_HOST EC_WS_HOST CC_HOST DDNS_SUBDOMAIN DDNS_PROXY RAPID_SYNC_URL \
-            CC_NODE BEACON_STATS_API BEACON_STATS_MACHINE EC_P2P_PORT CC_P2P_PORT PRYSM_PORT  \
+            EL_HOST EL_WS_HOST DDNS_SUBDOMAIN DDNS_PROXY RAPID_SYNC_URL \
+            CL_NODE BEACON_STATS_API BEACON_STATS_MACHINE EL_P2P_PORT CL_P2P_PORT PRYSM_PORT  \
             PRYSM_UDP_PORT GRAFANA_PORT KEY_API_PORT TRAEFIK_WEB_PORT TRAEFIK_WEB_HTTP_PORT \
-            EC_RPC_PORT EC_WS_PORT RESTART LOG_LEVEL GETH_CACHE SSV_P2P_PORT SSV_P2P_PORT_UDP )
+            EL_RPC_PORT EL_WS_PORT RESTART LOG_LEVEL GETH_CACHE SSV_P2P_PORT SSV_P2P_PORT_UDP )
     TARGET_VARS=( NIM_SRC_BUILD_TARGET NIM_DOCKER_TAG NIM_DOCKERFILE TEKU_SRC_BUILD_TARGET TEKU_DOCKER_TAG \
                 TEKU_DOCKERFILE LH_SRC_BUILD_TARGET LH_DOCKER_TAG LH_DOCKERFILE PRYSM_SRC_BUILD_TARGET \
                 PRYSM_DOCKER_TAG PRYSM_DOCKERFILE ERIGON_SRC_BUILD_TARGET ERIGON_DOCKER_TAG ERIGON_DOCKERFILE \
                 OE_SRC_BUILD_TARGET OE_DOCKER_TAG OE_DOCKERFILE GETH_SRC_BUILD_TARGET GETH_DOCKER_TAG \
                 GETH_DOCKERFILE NM_SRC_BUILD_TARGET NM_DOCKER_TAG NM_DOCKERFILE BESU_SRC_BUILD_TARGET \
                 BESU_DOCKER_TAG BESU_DOCKERFILE SSV_NODE_TAG DEPCLI_SRC_BUILD_TARGET DEPCLI_DOCKER_TAG DEPCLI_LOCALDIR \
                 NODE_EXPORTER_IGNORE_MOUNT_REGEX )
-    OLD_VARS=( LH_PORT PRYSM_WEB_PORT )
-    NEW_VARS=( CC_P2P_PORT KEY_API_PORT )
+    OLD_VARS=( LH_PORT PRYSM_WEB_PORT EC_NODE EC_FALLBACK_NODE1 EC_FALLBACK_NODE2 EC_NETWORK \
+	   EC_HOST EC_WS_HOST EC_P2P_PORT CC_P2P_PORT EC_RPC_PORT EC_WS_PORT )
+    NEW_VARS=( CC_P2P_PORT KEY_API_PORT EL_NODE EL_FALLBACK_NODE1 EL_FALLBACK_NODE2 EL_NETWORK \
+	   EL_HOST EL_WS_HOST EL_P2P_PORT CL_P2P_PORT EL_RPC_PORT EL_WS_PORT )
 
     # I had a "${BASH_SOURCE} envmigrate $@" so that new code would do the migration,
     # then dropped that way of doing things with the parameter and used an ENV
@@ -424,7 +426,7 @@ migrate_compose_file() {
     __old_grafana=0
     __new_grafana=0
     __grafana_regex=".+-grafana\.yml"
-    if git branch --show-current | grep -q rpc-nodes; then 
+    if git branch --show-current | grep -q rpc-nodes; then
         __rpc_branch=1
     else
         __rpc_branch=0
@@ -454,7 +456,7 @@ migrate_compose_file() {
             if [ "${__rpc_branch}" = 0 -a "${ADV_YML[index]}" = "${__ymlfile}" -a "${__switched_branch}" = 0 ]; then
                 __switched_branch=1
                 echo "Breaking change: Consensus and validator yml files are now only in rpc-nodes branch."
-                echo "Switching you over to that branch automatically." 
+                echo "Switching you over to that branch automatically."
                 git fetch origin rpc-nodes
                 git checkout rpc-nodes
                 break

diff --git a/geth.yml b/geth.yml
@@ -23,12 +23,8 @@ services:
       - geth-eth1-data:/var/lib/goethereum
       - /etc/localtime:/etc/localtime:ro
     ports:
-      - ${EC_P2P_PORT}:${EC_P2P_PORT}/tcp
-      - ${EC_P2P_PORT}:${EC_P2P_PORT}/udp
-    expose:
-      - ${EC_RPC_PORT}/tcp
-      - ${EC_WS_PORT}/tcp
-      - 6060/tcp
+      - ${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp
+      - ${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp
     networks:
       default:
         aliases:
@@ -47,17 +43,17 @@ services:
       - --datadir
       - /var/lib/goethereum
       - --port
-      - ${EC_P2P_PORT}
+      - ${EL_P2P_PORT:-30303}
       - --http.port
-      - ${EC_RPC_PORT}
+      - ${EL_RPC_PORT:-8545}
       - --ws
       - --ws.addr
       - 0.0.0.0
       - --ws.port
-      - ${EC_WS_PORT}
+      - ${EL_WS_PORT:-8546}
       - --ws.api
       - web3,eth,net
-      - --${EC_NETWORK}
+      - --${EL_NETWORK:-goerli}
       - --metrics
       - --metrics.expensive
       - --pprof

diff --git a/grafana.yml b/grafana.yml
@@ -19,8 +19,6 @@ services:
       - /etc/localtime:/etc/localtime:ro
     environment:
       - CLIENT=${COMPOSE_FILE}
-    expose:
-      - 9090/tcp
     entrypoint: choose-config.sh
     command: ["/bin/prometheus", "--storage.tsdb.path=/prometheus", "--web.console.libraries=/usr/share/prometheus/console_libraries", "--web.console.templates=/usr/share/prometheus/consoles"]
     <<: *logging
@@ -46,17 +44,13 @@ services:
       - /proc:/host/proc:ro
       - /sys:/host/sys:ro
       - /etc/localtime:/etc/localtime:ro
-    expose:
-      - 9100/tcp
     <<: *logging
   blackbox-exporter:
     restart: "${RESTART}"
     image: prom/blackbox-exporter:master
     volumes:
       - ./prometheus/blackbox.yml:/config/blackbox.yml
       - /etc/localtime:/etc/localtime:ro
-    expose:
-      - 9115/tcp
     <<: *logging
     command:
       - --config.file=/config/blackbox.yml
@@ -66,8 +60,6 @@ services:
     volumes:
       - ./prometheus/json.yml:/config/json.yml
       - /etc/localtime:/etc/localtime:ro
-    expose:
-      - 7979/tcp
     <<: *logging
     command:
       - --config.file
@@ -82,8 +74,6 @@ services:
       - CRYPTOWAT_PAIRS=ethusd,ethchf
       - CRYPTOWAT_CACHESECONDS=300
       - TZ=Europe/Zurich
-    expose:
-      - 9745/tcp
     <<: *logging
   promtail:
     image: grafana/promtail:latest
@@ -124,8 +114,6 @@ services:
       - prometheus
       - loki
       - promtail
-    expose:
-      - ${GRAFANA_PORT}/tcp
     entrypoint: ["provision-dashboards.sh"]
     command: /run.sh
     <<: *logging