Skip to content

Commit

Permalink
Grandine support
Browse files Browse the repository at this point in the history
  • Loading branch information
yorickdowne committed Mar 26, 2024
1 parent aae8b45 commit e34a08c
Show file tree
Hide file tree
Showing 10 changed files with 586 additions and 18 deletions.
55 changes: 55 additions & 0 deletions .github/workflows/test-grandine-reth.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Test Grandine and Reth
run-name: Test Grandine and Reth

on:
push:
pull_request:
types: [opened, synchronize, labeled, unlabeled]
branches: [main]

jobs:
test-grandine-reth:
if: |
contains(github.event.pull_request.labels.*.name, 'test-grandine') ||
contains(github.event.pull_request.labels.*.name, 'test-all') ||
github.event_name == 'push'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Create .env file
run: cp default.env .env
- name: Set Grandine/Reth
run: |
source ./.github/helper.sh
COMPOSE_FILE=grandine-allin1.yml:reth.yml
var=COMPOSE_FILE
set_value_in_env
FEE_RECIPIENT=0xDccf8451070a86183eE70D330C4c43b686E9CF86
var=FEE_RECIPIENT
set_value_in_env
- name: Start Grandine/Reth
run: ./ethd up
- name: Pause for 30 seconds
run: sleep 30
- name: Test Reth
run: ./.github/check-service.sh execution
- name: Test Grandine CL
run: ./.github/check-service.sh consensus
# - name: Test Grandine VC
# run: ./.github/check-service.sh validator
- name: Set Grandine/Reth w/ Lighthouse VC
run: |
source ./.github/helper.sh
COMPOSE_FILE=grandine-cl-only.yml:lighthouse-vc-only.yml:reth.yml
var=COMPOSE_FILE
set_value_in_env
- name: Start Grandine/Reth
run: ./ethd up
- name: Pause for 30 seconds
run: sleep 30
- name: Test Reth
run: ./.github/check-service.sh execution
- name: Test Grandine CL
run: ./.github/check-service.sh consensus
- name: Test Lighthouse VC
run: ./.github/check-service.sh validator
10 changes: 9 additions & 1 deletion default.env
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,14 @@ LS_DOCKER_TAG=latest
LS_DOCKER_REPO=chainsafe/lodestar
LS_DOCKERFILE=Dockerfile.binary

# Grandine
# SRC build target can be a tag, a branch, or a pr as "pr-ID"
GRANDINE_SRC_BUILD_TARGET=master
GRANDINE_SRC_REPO=https://github.com/sifraitech/grandine
GRANDINE_DOCKER_TAG=latest
GRANDINE_DOCKER_REPO=sifrai/grandine
GRANDINE_DOCKERFILE=Dockerfile.binary

# Web3Signer
W3S_DOCKER_TAG=latest
W3S_DOCKER_REPO=consensys/web3signer
Expand Down Expand Up @@ -297,4 +305,4 @@ DDNS_TAG=v2
NODE_EXPORTER_IGNORE_MOUNT_REGEX='^/(dev|proc|sys|run|var/lib/docker/.+)($|/)'

# Used by ethd update - please do not adjust
ENV_VERSION=9
ENV_VERSION=10
50 changes: 36 additions & 14 deletions ethd
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,13 @@ source_build() {
docompose build --pull --no-cache consensus
fi
;;
*grandine.yml* | *grandine-allin1.yml* | *grandine-cl-only.yml* )
var="GRANDINE_DOCKERFILE"
build=$(sed -n -e "s/^${var}=\(.*\)/\1/p" "${ENV_FILE}" || true)
if [ "${build}" = "Dockerfile.source" ]; then
docompose build --pull --no-cache consensus
fi
;;
esac
}

Expand Down Expand Up @@ -960,6 +967,7 @@ envmigrate() {
BESU_SRC_BUILD_TARGET BESU_SRC_REPO BESU_DOCKER_TAG BESU_DOCKER_REPO BESU_DOCKERFILE SSV_NODE_TAG \
DEPCLI_SRC_BUILD_TARGET DEPCLI_SRC_REPO DEPCLI_DOCKER_TAG W3S_DOCKER_TAG W3S_DOCKER_REPO \
PG_DOCKER_TAG RETH_SRC_BUILD_TARGET RETH_SRC_REPO RETH_DOCKER_TAG RETH_DOCKER_REPO RETH_DOCKERFILE \
GRANDINE_SRC_BUILD_TARGET GRANDINE_SRC_REPO GRANDINE_DOCKER_TAG GRANDINE_DOCKER_REPO GRANDINE_DOCKERFILE \
SIREN_DOCKER_TAG SIREN_DOCKER_REPO NODE_EXPORTER_IGNORE_MOUNT_REGEX )
OLD_VARS=( LH_PORT PRYSM_WEB_PORT EC_NODE REWARDS_TO GETH_CACHE CF_API_TOKEN \
EC_HOST EC_LB EC_WS_HOST EC_WS_LB CC_HOST CC_LB EC_P2P_PORT CC_NODE CC_P2P_PORT EC_RPC_PORT EC_WS_PORT )
Expand Down Expand Up @@ -2094,6 +2102,9 @@ __keys_usage() {
echo " get-prysm-wallet"
echo " Print Prysm's wallet password"
echo
echo " get-grandine-wallet"
echo " Print Grandine's wallet password"
echo
echo " prepare-address-change"
echo " Create an offline-preparation.json with ethdo"
echo " send-address-change"
Expand Down Expand Up @@ -2548,8 +2559,6 @@ query_consensus_client() {
"teku.yml" "Teku (Java) - consensus and validator client" \
"lodestar.yml" "Lodestar (Javascript) - consensus and validator client" \
"nimbus.yml" "Nimbus (Nim) - consensus and validator client" 3>&1 1>&2 2>&3)
elif [ "${NETWORK}" = "zhejiang" ]; then
CONSENSUS_CLIENT=lodestar.yml
elif uname -a | grep -q aarch64; then
CONSENSUS_CLIENT=$(whiptail --notags --title "Select consensus client" --menu \
"Which consensus client do you want to run?" 11 65 4 \
Expand All @@ -2559,11 +2568,12 @@ query_consensus_client() {
"teku.yml" "Teku (Java) - consensus and validator client" 3>&1 1>&2 2>&3)
else
CONSENSUS_CLIENT=$(whiptail --notags --title "Select consensus client" --menu \
"Which consensus client do you want to run?" 12 65 5 \
"Which consensus client do you want to run?" 13 65 6 \
"teku.yml" "Teku (Java) - consensus and validator client" \
"lighthouse.yml" "Lighthouse (Rust) - consensus and validator client" \
"nimbus.yml" "Nimbus (Nim) - consensus and validator client" \
"lodestar.yml" "Lodestar (Javascript) - consensus and validator client" \
"grandine-allin1.yml" "Grandine (Rust) - consensus and validator client" \
"prysm.yml" "Prysm (Go) - consensus and validator client" 3>&1 1>&2 2>&3)
fi

Expand All @@ -2588,11 +2598,12 @@ query_consensus_only_client() {
"teku-cl-only.yml" "Teku (Java) - consensus client" 3>&1 1>&2 2>&3)
else
CONSENSUS_CLIENT=$(whiptail --notags --title "Select consensus client" --menu \
"Which consensus client do you want to run?" 12 65 5 \
"Which consensus client do you want to run?" 13 65 6 \
"teku-cl-only.yml" "Teku (Java) - consensus client" \
"lighthouse-cl-only.yml" "Lighthouse (Rust) - consensus client" \
"nimbus-cl-only.yml" "Nimbus (Nim) - consensus client" \
"lodestar-cl-only.yml" "Lodestar (Javascript) - consensus client" \
"grandine-cl-only.yml" "Grandine (Rust) - consensus client" \
"prysm-cl-only.yml" "Prysm (Go) - consensus client" 3>&1 1>&2 2>&3)
fi

Expand Down Expand Up @@ -2967,11 +2978,13 @@ check_legacy() {

# Literal match intended
# shellcheck disable=SC2076
if [[ "${value}" =~ "-allin1.yml" ]]; then
if [[ "${value}" =~ "-allin1.yml" && ! "${value}" =~ "grandine-allin1.yml" ]]; then # Warn re Grandine once VC
if [[ "${value}" =~ "teku-allin1.yml" ]]; then
__client="Teku"
elif [[ "${value}" =~ "nimbus-allin1.yml" ]]; then
__client="Nimbus"
elif [[ "${value}" =~ "grandine-allin1.yml" ]]; then
__client="Grandine"
else
__client="Mystery"
fi
Expand Down Expand Up @@ -3194,6 +3207,14 @@ version() {
docompose exec validator /opt/teku/bin/teku --version
echo
;;&
*grandine.yml* | *grandine-allin1.yml* | *grandine-cl-only* )
docompose exec consensus grandine --version
echo
;;&
*grandine-vc-only* )
docompose exec validator grandine --version
echo
;;&
*geth.yml* )
docompose exec execution geth version
echo
Expand Down Expand Up @@ -3384,6 +3405,16 @@ if [ "${__old_compose}" -eq 1 ]; then
exit 0
fi

if [ "${__old_docker}" -eq 1 ]; then
echo
echo "Docker version ${__docker_version} detected. This version is no longer supported."
echo "Please update to a current version. Supported versions can be seen at https://endoflife.date/docker-engine."
echo
echo "This should be as simple as \"sudo apt update && sudo apt dist-upgrade\" on Debian/Ubuntu"
echo "or updating Docker Desktop on macOS and Windows."
exit 0
fi

if ! type -P whiptail >/dev/null 2>&1; then
echo "Please install the package whiptail or newt before running ${__project_name}."
exit 0
Expand Down Expand Up @@ -3422,12 +3453,3 @@ if [ "${__compose_upgraded}" -eq 1 ]; then
echo "Optionally, you can switch to docker-ce."
echo "Please see https://ethdocker.com/Usage/Prerequisites#switching-from-dockerio-to-docker-ce for instructions."
fi

if [ "${__old_docker}" -eq 1 ]; then
echo
echo "Docker version ${__docker_version} detected. This version no longer receives security updates."
echo "Please update to a current version."
echo
echo "This should be as simple as \"sudo apt update && sudo apt dist-upgrade\" on Debian/Ubuntu"
echo "or updating Docker Desktop on macOS and Windows."
fi
143 changes: 143 additions & 0 deletions grandine-allin1.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
x-logging: &logging
logging:
driver: json-file
options:
max-size: 100m
max-file: "3"
tag: '{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}'


x-build: &gr-build
context: ./grandine
dockerfile: ${GRANDINE_DOCKERFILE:-Dockerfile.binary}
args:
- BUILD_TARGET=${GRANDINE_SRC_BUILD_TARGET:-master}
- SRC_REPO=${GRANDINE_SRC_REPO:-https://github.com/sifraitech/grandine}
- DOCKER_TAG=${GRANDINE_DOCKER_TAG:-latest}
- DOCKER_REPO=${GRANDINE_DOCKER_REPO:-sifrai/grandine}

services:
consensus:
restart: "unless-stopped"
build:
<<: *gr-build
image: grandine:${NETWORK}
pull_policy: never
user: gdconsensus
stop_grace_period: 1m
volumes:
- grandineconsensus-data:/var/lib/grandine
- /etc/localtime:/etc/localtime:ro
- jwtsecret:/var/lib/grandine/ee-secret
environment:
- RAPID_SYNC_URL=${RAPID_SYNC_URL}
- JWT_SECRET=${JWT_SECRET}
- MEV_BOOST=${MEV_BOOST}
- MEV_NODE=${MEV_NODE}
- BEACON_STATS_API=${BEACON_STATS_API}
- BEACON_STATS_MACHINE=${BEACON_STATS_MACHINE}
- EMBEDDED_VC=true
- CL_EXTRAS=${CL_EXTRAS:-}
- VC_EXTRAS=${VC_EXTRAS:-}
- GRAFFITI=${GRAFFITI:-}
- DEFAULT_GRAFFITI=${DEFAULT_GRAFFITI:-false}
- WEB3SIGNER=${WEB3SIGNER:-false}
- DOPPELGANGER=${DOPPELGANGER:-false}
- ARCHIVE_NODE=${ARCHIVE_NODE:-false}
- IPV6=${IPV6:-false}
- CL_P2P_PORT=${CL_P2P_PORT:-9000}
- CL_QUIC_PORT=${CL_QUIC_PORT:-9001}
- NETWORK=${NETWORK}
ports:
- ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp
- ${HOST_IP:-}:${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp
- ${HOST_IP:-}:${CL_QUIC_PORT:-9001}:${CL_QUIC_PORT:-9001}/udp
networks:
default:
aliases:
- eth2
<<: *logging
entrypoint:
- docker-entrypoint.sh
- grandine
- --disable-upnp
- --data-dir
- /var/lib/grandine
- --http-address
- 0.0.0.0
- --http-port
- ${CL_REST_PORT:-5052}
- --http-allowed-origins=*
- --listen-address
- 0.0.0.0
- --libp2p-port
- ${CL_P2P_PORT:-9000}
- --discovery-port
- ${CL_P2P_PORT:-9000}
- --quic-port
- ${CL_QUIC_PORT:-9001}
- --target-peers
- ${CL_MAX_PEER_COUNT:-80}
- --back-sync
- --eth1-rpc-urls
- ${EL_NODE}
- --jwt-secret
- /var/lib/grandine/ee-secret/jwtsecret
- --metrics
- --metrics-address
- 0.0.0.0
- --metrics-port
- "8008"
- --suggested-fee-recipient
- ${FEE_RECIPIENT}
- --track-liveness
- --keystore-storage-password-file
- /var/lib/grandine/wallet-password.txt
- --enable-validator-api
- --validator-api-address
- 0.0.0.0
- --validator-api-port
- ${KEY_API_PORT:-7500}
- --validator-api-allowed-origins=*
labels:
- metrics.scrape=true
- metrics.path=/metrics
- metrics.port=8008
- metrics.instance=consensus

validator-keys:
profiles: ["tools"]
restart: "no"
build:
context: ./vc-utils
image: vc-utils:local
pull_policy: never
# The API token has 640 permissions. Root copies it,
# then switches to the local user's UID or if not provided,
# 1000. The UID has to be able to write .eth/validator_keys
# for the "keys delete" command.
user: root
volumes:
- grandineconsensus-data:/var/lib/grandine
- ./.eth/validator_keys:/validator_keys
- ./.eth/exit_messages:/exit_messages
- /etc/localtime:/etc/localtime:ro
environment:
- KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD:-}
- KEY_API_PORT=${KEY_API_PORT:-7500}
- WEB3SIGNER=${WEB3SIGNER:-false}
- CL_NODE=${CL_NODE}
depends_on:
- consensus
entrypoint:
- keymanager.sh
- /var/lib/grandine/${NETWORK}/validator/api-token.txt
- consensus

volumes:
grandineconsensus-data:
jwtsecret:

networks:
default:
enable_ipv6: ${IPV6:-false}
Loading

0 comments on commit e34a08c

Please sign in to comment.