Skip to content

Commit

Permalink
Update to recent versions of all el/cl/dv/vc (#133)
Browse files Browse the repository at this point in the history
* Update to recent versions of all el/cl/dv/vc

* Update versions and enable v2 block production
  • Loading branch information
OisinKyne authored Jan 16, 2024
1 parent e12bad2 commit d076845
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

######### Charon Config #########

# Charon docker container image version, e.g. `latest` or `v0.17.0`.
# Charon docker container image version, e.g. `latest` or `v0.19.0`.
# See available tags https://hub.docker.com/r/obolnetwork/charon/tags.
#CHARON_VERSION=

Expand Down
16 changes: 9 additions & 7 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3.8"
x-node-base:
# Pegged charon version (update this for each release).
&node-base
image: obolnetwork/charon:${CHARON_VERSION:-v0.17.0}
image: obolnetwork/charon:${CHARON_VERSION:-v0.19.0}
restart: unless-stopped
networks: [ cluster ]
depends_on: [ relay ]
Expand All @@ -29,7 +29,7 @@ services:
# | | | | __/ |_| | | | __/ | | | | | | | | | | | (_| |
# |_| |_|\___|\__|_| |_|\___|_| |_| |_| |_|_|_| |_|\__,_|
nethermind:
image: nethermind/nethermind:${NETHERMIND_VERSION:-1.20.3}
image: nethermind/nethermind:${NETHERMIND_VERSION:-1.25.0}
restart: unless-stopped
ports:
- ${NETHERMIND_PORT_P2P:-30303}:30303/tcp # P2P TCP
Expand Down Expand Up @@ -62,7 +62,7 @@ services:
# |___/

lighthouse:
image: sigp/lighthouse:${LIGHTHOUSE_VERSION:-v4.2.0}
image: sigp/lighthouse:${LIGHTHOUSE_VERSION:-v4.6.0-rc.0}
ports:
- ${LIGHTHOUSE_PORT_P2P:-9000}:9000/tcp # P2P TCP
- ${LIGHTHOUSE_PORT_P2P:-9000}:9000/udp # P2P UDP
Expand Down Expand Up @@ -167,7 +167,7 @@ services:
# \ V / (_| | | | (_| | (_| | || (_) | | \__ \
# \_/ \__,_|_|_|\__,_|\__,_|\__\___/|_| |___/
vc0-lighthouse:
image: sigp/lighthouse:${LIGHTHOUSE_VERSION:-v4.2.0}
image: sigp/lighthouse:${LIGHTHOUSE_VERSION:-v4.6.0-rc.0}
entrypoint: /opt/lighthouse/run.sh
networks: [ cluster ]
depends_on: [ node0 ]
Expand All @@ -180,14 +180,15 @@ services:
- .charon/cluster/node0/validator_keys:/opt/charon/keys

vc1-teku:
image: consensys/teku:${TEKU_VERSION:-23.5.0}
image: consensys/teku:${TEKU_VERSION:-24.1.0}
networks: [ cluster ]
depends_on: [ node1 ]
restart: unless-stopped
command: |
validator-client
--beacon-node-api-endpoint="http://node1:3600"
--config-file "/opt/charon/teku/teku-config.yaml"
--Xblock-v3-enabled=false
volumes:
- .charon/cluster/node1/validator_keys:/opt/charon/validator_keys
- ./teku:/opt/charon/teku
Expand All @@ -204,7 +205,7 @@ services:
- ./nimbus:/home/user/data

vc3-lighthouse:
image: sigp/lighthouse:${LIGHTHOUSE_VERSION:-v4.2.0}
image: sigp/lighthouse:${LIGHTHOUSE_VERSION:-v4.6.0-rc.0}
entrypoint: /opt/lighthouse/run.sh
networks: [ cluster ]
depends_on: [ node3 ]
Expand All @@ -217,14 +218,15 @@ services:
- .charon/cluster/node3/validator_keys:/opt/charon/keys

vc4-teku:
image: consensys/teku:${TEKU_VERSION:-23.5.0}
image: consensys/teku:${TEKU_VERSION:-24.1.0}
networks: [ cluster ]
depends_on: [ node4 ]
restart: unless-stopped
command: |
validator-client
--beacon-node-api-endpoint="http://node4:3600"
--config-file "/opt/charon/teku/teku-config.yaml"
--Xblock-v3-enabled=false
volumes:
- .charon/cluster/node4/validator_keys:/opt/charon/validator_keys
- ./teku:/opt/charon/teku
Expand Down
1 change: 1 addition & 0 deletions lighthouse/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ exec lighthouse --network "${ETH2_NETWORK}" validator \
--metrics-allow-origin "*" \
--metrics-port "5064" \
--use-long-timeouts \
--produce-block-v3=false
4 changes: 2 additions & 2 deletions nimbus/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM statusim/nimbus-eth2:multiarch-v23.9.0 as nimbusbn
FROM statusim/nimbus-eth2:multiarch-v24.1.1 as nimbusbn

FROM statusim/nimbus-validator-client:multiarch-v23.9.0
FROM statusim/nimbus-validator-client:multiarch-v24.1.1

COPY --from=nimbusbn /home/user/nimbus_beacon_node /home/user/nimbus_beacon_node

Expand Down

0 comments on commit d076845

Please sign in to comment.