Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

holesky ready cdvn #254

Merged
merged 6 commits into from
Feb 12, 2024
Merged

holesky ready cdvn #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0ccfc9d
holesky ready cdvn
xenowits Feb 8, 2024
fb0edb3
update nethermind version
xenowits Feb 8, 2024
82e9771
fix example compose
xenowits Feb 8, 2024
7a42264
fix nethermind port
xenowits Feb 8, 2024
bc61c64
fix mevboost
xenowits Feb 8, 2024
1e49e7c
use mev-boost 1.6.1a3
xenowits Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions .env.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@
# Enables builder api for lodestar VC and charon services.
#BUILDER_API_ENABLED=

######### Geth Config #########
######### Nethermind Config #########

# Geth docker container image version, e.g. `latest` or `v1.13.11`.
# See available tags https://hub.docker.com/r/ethereum/client-go/tags
#GETH_VERSION=
# Nethermind docker container image version, e.g. `latest` or `1.25.3`.
# See available tags https://hub.docker.com/r/nethermind/nethermind/tags
#NETHERMIND_VERSION=

# Geth host exposed ports
#GETH_PORT_P2P=
# Nethermind host exposed ports
#NETHERMIND_PORT_P2P=
#NETHERMIND_PORT_HTTP=
#NETHERMIND_PORT_ENGINE=

######### Lighthouse Config #########

Expand Down Expand Up @@ -71,6 +73,7 @@
######### MEV-Boost Config #########

# MEV-Boost docker container image version, e.g. `latest` or `1.6`.
# Note that mev-boost tag 1.6.1a3 supports the holesky network.
#MEVBOOST_VERSION=

# Comma separated list of MEV-Boost relays.
Expand Down
14 changes: 8 additions & 6 deletions .env.sample.mainnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@ NETWORK=mainnet
# Enables builder api for lodestar VC and charon services.
#BUILDER_API_ENABLED=

######### Geth Config #########
######### Nethermind Config #########

# Geth docker container image version, e.g. `latest` or `v1.13.11`.
# See available tags https://hub.docker.com/r/ethereum/client-go/tags
#GETH_VERSION=
# Nethermind docker container image version, e.g. `latest` or `1.25.3`.
# See available tags https://hub.docker.com/r/nethermind/nethermind/tags
#NETHERMIND_VERSION=

# Geth host exposed ports
#GETH_PORT_P2P=
# Nethermind host exposed ports
#NETHERMIND_PORT_P2P=
#NETHERMIND_PORT_HTTP=
#NETHERMIND_PORT_ENGINE=

######### Lighthouse Config #########

Expand Down
6 changes: 3 additions & 3 deletions docker-compose.override.yml.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
# and how the local docker-compose.yml is configured.

#services:
#geth:
# Disable geth
#nethermind:
# Disable nethermind
#profiles: [disable]
# Bind geth internal ports to host ports
# Bind nethermind internal ports to host ports
#ports:
#- 8545:8545 # JSON-RPC
#- 8551:8551 # AUTH-RPC
Expand Down
64 changes: 30 additions & 34 deletions docker-compose.yml
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found it useful to set depends_on: for at least preventing starting other services. This keeps the log clearer, otherwise some services are restarting and therefore confusing for the user.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pinebit do you think we should add depends_on: for charon depending on lighthouse? which ones specifically you mean?

Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,34 @@ version: "3.8"
# ${VARIABLE-default} evaluates to default only if VARIABLE is unset in the environment.

services:
# _ _
# __ _ ___| |_| |__
# / _` |/ _ \ __| '_ \
# | (_| | __/ |_| | | |
# \__, |\___|\__|_| |_|
# |___/

geth:
image: ethereum/client-go:${GETH_VERSION:-v1.13.11}
# _ _ _ _
# _ __ ___| |_| |__ ___ _ __ _ __ ___ (_)_ __ __| |
# | '_ \ / _ \ __| '_ \ / _ \ '__| '_ ` _ \| | '_ \ / _` |
# | | | | __/ |_| | | | __/ | | | | | | | | | | | (_| |
# |_| |_|\___|\__|_| |_|\___|_| |_| |_| |_|_|_| |_|\__,_|
nethermind:
image: nethermind/nethermind:${NETHERMIND_VERSION:-1.25.3}
restart: unless-stopped
ports:
- ${GETH_PORT_P2P:-30303}:30303/tcp # P2P TCP
- ${GETH_PORT_P2P:-30303}:30303/udp # P2P UDP
- ${NETHERMIND_PORT_P2P:-30303}:30303/tcp # P2P TCP
- ${NETHERMIND_PORT_P2P:-30303}:30303/udp # P2P UDP
command: |
--${NETWORK:-goerli}
--http
--http.addr=0.0.0.0
--http.port=8545
--http.vhosts="*"
--http.api="db,eth,net,engine,rpc,web3"
--authrpc.jwtsecret="/root/jwt/jwt.hex"
--authrpc.addr=0.0.0.0
--authrpc.port=8551
--authrpc.vhosts="*"
--metrics
--metrics.addr=0.0.0.0
--metrics.port=6060
--config=${NETWORK:-holesky}
--datadir=data
--JsonRpc.Enabled=true
--JsonRpc.JwtSecretFile="/root/jwt/jwt.hex"
--JsonRpc.EngineHost=0.0.0.0
--JsonRpc.EnginePort=8551
--JsonRpc.Host=0.0.0.0
--JsonRpc.Port=8545
--Sync.SnapSync=true
--HealthChecks.Enabled=true
--Metrics.Enabled=true
--Metrics.ExposePort=8008
xenowits marked this conversation as resolved.
Show resolved Hide resolved
networks: [dvnode]
stop_grace_period: 2m
volumes:
- ./data/geth:/root/.ethereum
- ./data/nethermind:/nethermind/data
- ./jwt:/root/jwt
restart: unless-stopped

# _ _ _ _ _
# | (_) __ _| |__ | |_| |__ ___ _ _ ___ ___
Expand All @@ -52,9 +48,9 @@ services:
- ${LIGHTHOUSE_PORT_P2P:-9000}:9000/udp # P2P UDP
command: |
lighthouse bn
--network=${NETWORK:-goerli}
--checkpoint-sync-url=${LIGHTHOUSE_CHECKPOINT_SYNC_URL:-https://checkpoint-sync.goerli.ethpandaops.io}
--execution-endpoint=http://geth:8551
--network=${NETWORK:-holesky}
--checkpoint-sync-url=${LIGHTHOUSE_CHECKPOINT_SYNC_URL:-https://checkpoint-sync.holesky.ethpandaops.io}
--execution-endpoint=http://nethermind:8551
--execution-jwt=/opt/jwt/jwt.hex
--datadir=/opt/app/beacon/
--builder=http://mev-boost:18550
Expand Down Expand Up @@ -111,7 +107,7 @@ services:
networks: [dvnode]
environment:
BEACON_NODE_ADDRESS: http://charon:3600
NETWORK: ${NETWORK:-goerli}
NETWORK: ${NETWORK:-holesky}
BUILDER_API_ENABLED: ${BUILDER_API_ENABLED:-false}
volumes:
- ./lodestar/run.sh:/opt/lodestar/run.sh
Expand All @@ -125,14 +121,14 @@ services:
# | | | | | | __/\ V /_____| |_) | (_) | (_) \__ \ |_
# |_| |_| |_|\___| \_/ |_.__/ \___/ \___/|___/\__|
mev-boost:
image: flashbots/mev-boost:${MEVBOOST_VERSION:-1.6}
image: flashbots/mev-boost:${MEVBOOST_VERSION:-1.6.1a3}
networks: [dvnode]
command: |
-${NETWORK:-goerli}
-${NETWORK:-holesky}
-loglevel=debug
-addr=0.0.0.0:18550
-relay-check
-relays=${MEVBOOST_RELAYS:-"https://0xafa4c6985aa049fb79dd37010438cfebeb0f2bd42b115b89dd678dab0670c1de38da0c4e9138c9290a398ecd9a0b3110@boost-relay-goerli.flashbots.net"}
-relays=${MEVBOOST_RELAYS:-"https://0xafa4c6985aa049fb79dd37010438cfebeb0f2bd42b115b89dd678dab0670c1de38da0c4e9138c9290a398ecd9a0b3110@boost-relay-holesky.flashbots.net,https://0xaa58208899c6105603b74396734a6263cc7d947f444f396a90f7b7d3e65d102aec7e5e5291b27e08d02c50a050825c2f@holesky.titanrelay.xyz"}
restart: unless-stopped

# _ _ _
Expand Down
64 changes: 34 additions & 30 deletions examples/nethermind_teku_lighthouse.yml → examples/geth_teku_lighthouse.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,38 @@ version: "3.8"
# ${VARIABLE-default} evaluates to default only if VARIABLE is unset in the environment.

services:
# _ _ _ _
# _ __ ___| |_| |__ ___ _ __ _ __ ___ (_)_ __ __| |
# | '_ \ / _ \ __| '_ \ / _ \ '__| '_ ` _ \| | '_ \ / _` |
# | | | | __/ |_| | | | __/ | | | | | | | | | | | (_| |
# |_| |_|\___|\__|_| |_|\___|_| |_| |_| |_|_|_| |_|\__,_|
nethermind:
image: nethermind/nethermind:${NETHERMIND_VERSION:-1.19.1}
restart: unless-stopped
# _ _
# __ _ ___| |_| |__
# / _` |/ _ \ __| '_ \
# | (_| | __/ |_| | | |
# \__, |\___|\__|_| |_|
# |___/

geth:
image: ethereum/client-go:${GETH_VERSION:-v1.13.11}
ports:
- ${NETHERMIND_PORT_P2P:-30303}:30303/tcp # P2P TCP
- ${NETHERMIND_PORT_P2P:-30303}:30303/udp # P2P UDP
- ${GETH_PORT_P2P:-30303}:30303/tcp # P2P TCP
- ${GETH_PORT_P2P:-30303}:30303/udp # P2P UDP
command: |
--config=${NETWORK:-goerli}
--datadir=data
--JsonRpc.Enabled=true
--JsonRpc.JwtSecretFile="/root/jwt/jwt.hex"
--JsonRpc.EngineHost=0.0.0.0
--JsonRpc.EnginePort=8551
--JsonRpc.Host=0.0.0.0
--JsonRpc.Port=8545
--Sync.SnapSync=true
--HealthChecks.Enabled=true
--Metrics.Enabled=true
--Metrics.ExposePort=8008
--${NETWORK:-holesky}
--http
--http.addr=0.0.0.0
--http.port=8545
--http.vhosts="*"
--http.api="db,eth,net,engine,rpc,web3"
--authrpc.jwtsecret="/root/jwt/jwt.hex"
--authrpc.addr=0.0.0.0
--authrpc.port=8551
--authrpc.vhosts="*"
--metrics
--metrics.addr=0.0.0.0
--metrics.port=6060
networks: [dvnode]
stop_grace_period: 2m
volumes:
- ../data/nethermind:/nethermind/data
- ../jwt:/root/jwt
- ./data/geth:/root/.ethereum
- ./jwt:/root/jwt
restart: unless-stopped

# _ _
# _ __ ___ _____ __ | |__ ___ ___ ___| |_
Expand All @@ -43,11 +47,11 @@ services:
image: flashbots/mev-boost:${MEVBOOST_VERSION:-1.5.0}
networks: [dvnode]
command: |
-${NETWORK:-goerli}
-${NETWORK:-holesky}
-loglevel=debug
-addr=0.0.0.0:18550
-relay-check
-relays=${MEVBOOST_RELAYS:-"https://0xafa4c6985aa049fb79dd37010438cfebeb0f2bd42b115b89dd678dab0670c1de38da0c4e9138c9290a398ecd9a0b3110@boost-relay-goerli.flashbots.net"}
-relays=${MEVBOOST_RELAYS:-"https://0xafa4c6985aa049fb79dd37010438cfebeb0f2bd42b115b89dd678dab0670c1de38da0c4e9138c9290a398ecd9a0b3110@boost-relay-holesky.flashbots.net,https://0xaa58208899c6105603b74396734a6263cc7d947f444f396a90f7b7d3e65d102aec7e5e5291b27e08d02c50a050825c2f@holesky.titanrelay.xyz"}
restart: unless-stopped

# _ _
Expand All @@ -62,19 +66,19 @@ services:
- ${TEKU_PORT_P2P:-9000}:9000/tcp # P2P TCP
- ${TEKU_PORT_P2P:-9000}:9000/udp # P2P UDP
command: |
--network=${NETWORK:-goerli}
--network=${NETWORK:-holesky}
--rest-api-enabled=true
--rest-api-interface=0.0.0.0
--rest-api-port=4000
--rest-api-host-allowlist=*
--data-path=/opt/data
--ee-endpoint=http://nethermind:8551
--ee-endpoint=http://geth:8551
--ee-jwt-secret-file=/opt/jwt/jwt.hex
--metrics-enabled=true
--metrics-host-allowlist=*
--metrics-interface=0.0.0.0
--metrics-port=5054
--initial-state=https://goerli.checkpoint-sync.ethpandaops.io/eth/v2/debug/beacon/states/finalized
--initial-state=https://checkpoint-sync.holesky.ethpandaops.io/eth/v2/debug/beacon/states/finalized
--builder-endpoint=http://mev_boost:18550
networks: [dvnode]
volumes:
Expand Down Expand Up @@ -124,7 +128,7 @@ services:
restart: unless-stopped
environment:
LIGHTHOUSE_BEACON_NODE_ADDRESS: http://charon:3600
NETWORK: ${NETWORK:-goerli}
NETWORK: ${NETWORK:-holesky}
BUILDER_API_ENABLED: ${BUILDER_API_ENABLED:-false}
volumes:
- ./lighthouse/run.sh:/opt/lighthouse/run.sh
Expand Down
4 changes: 2 additions & 2 deletions prometheus/prometheus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ remote_write:
action: keep # Keeps charon metrics and drop metrics from other containers.

scrape_configs:
- job_name: "geth"
- job_name: "nethermind"
metrics_path: /debug/metrics/prometheus
static_configs:
- targets: ["geth:6060"]
- targets: ["nethermind:8008"]
- job_name: "lighthouse"
static_configs:
- targets: ["lighthouse:5054"]
Expand Down
Loading