diff --git a/lodestar-vc-only.yml b/lodestar-vc-only.yml index 8c1eba33..a1a20bea 100644 --- a/lodestar-vc-only.yml +++ b/lodestar-vc-only.yml @@ -92,6 +92,7 @@ services: - ${LOG_LEVEL} - --network - ${NETWORK} + - --force validator-keys: profiles: ["tools"] diff --git a/lodestar.yml b/lodestar.yml index 3d190d4f..67b5130f 100644 --- a/lodestar.yml +++ b/lodestar.yml @@ -153,6 +153,7 @@ services: - ${LOG_LEVEL} - --network - ${NETWORK} + - --force validator-keys: profiles: ["tools"] diff --git a/nimbus-cl-only.yml b/nimbus-cl-only.yml index b5d37cba..02099b64 100644 --- a/nimbus-cl-only.yml +++ b/nimbus-cl-only.yml @@ -44,6 +44,8 @@ services: - ARCHIVE_NODE=${ARCHIVE_NODE:-} - GRAFFITI=${GRAFFITI:-} - DEFAULT_GRAFFITI=true + - WEB3SIGNER=false + - EMBEDDED_VC=false ports: - ${HOST_IP:-}${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp - ${HOST_IP:-}${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp diff --git a/nimbus-vc-only.yml b/nimbus-vc-only.yml index 920f45bf..9b16f0d6 100644 --- a/nimbus-vc-only.yml +++ b/nimbus-vc-only.yml @@ -37,6 +37,7 @@ services: - VC_EXTRAS=${VC_EXTRAS:-} - GRAFFITI=${GRAFFITI:-} - DEFAULT_GRAFFITI=${DEFAULT_GRAFFITI:-false} + - WEB3SIGNER=${WEB3SIGNER:-false} networks: default: aliases: diff --git a/nimbus.yml b/nimbus.yml index 8116c24c..92441e87 100644 --- a/nimbus.yml +++ b/nimbus.yml @@ -44,6 +44,8 @@ services: - ARCHIVE_NODE=${ARCHIVE_NODE:-} - GRAFFITI=${GRAFFITI:-} - DEFAULT_GRAFFITI=${DEFAULT_GRAFFITI:-false} + - WEB3SIGNER=${WEB3SIGNER:-false} + - EMBEDDED_VC=true ports: - ${HOST_IP:-}${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/tcp - ${HOST_IP:-}${CL_P2P_PORT:-9000}:${CL_P2P_PORT:-9000}/udp diff --git a/nimbus/docker-entrypoint-vc.sh b/nimbus/docker-entrypoint-vc.sh index 1b1a2755..dacbe5cb 100755 --- a/nimbus/docker-entrypoint-vc.sh +++ b/nimbus/docker-entrypoint-vc.sh @@ -34,12 +34,19 @@ fi __log_level="--log-level=${LOG_LEVEL^^}" +# Web3signer URL +if [ "${WEB3SIGNER}" = "true" ]; then + __w3s_url="--web3-signer-url=http://web3signer:9000" +else + __w3s_url="" +fi + if [ "${DEFAULT_GRAFFITI}" = "true" ]; then # Word splitting is desired for the command line parameters # shellcheck disable=SC2086 - exec "$@" ${__log_level} ${__doppel} ${__mev_boost} ${VC_EXTRAS} + exec "$@" ${__w3s_url} ${__log_level} ${__doppel} ${__mev_boost} ${VC_EXTRAS} else # Word splitting is desired for the command line parameters # shellcheck disable=SC2086 - exec "$@" "--graffiti=${GRAFFITI}" ${__log_level} ${__doppel} ${__mev_boost} ${VC_EXTRAS} + exec "$@" ${__w3s_url} "--graffiti=${GRAFFITI}" ${__log_level} ${__doppel} ${__mev_boost} ${VC_EXTRAS} fi diff --git a/nimbus/docker-entrypoint.sh b/nimbus/docker-entrypoint.sh index a8315c54..fb900766 100755 --- a/nimbus/docker-entrypoint.sh +++ b/nimbus/docker-entrypoint.sh @@ -94,12 +94,19 @@ else __prune="--history=prune" fi +# Web3signer URL +if [[ "${EMBEDDED_VC}" = "true" && "${WEB3SIGNER}" = "true" ]]; then + __w3s_url="--web3-signer-url=http://web3signer:9000" +else + __w3s_url="" +fi + if [ "${DEFAULT_GRAFFITI}" = "true" ]; then # Word splitting is desired for the command line parameters # shellcheck disable=SC2086 - exec "$@" ${__network} ${__mev_boost} ${__log_level} ${__doppel} ${__prune} ${CL_EXTRAS} ${VC_EXTRAS} + exec "$@" ${__network} ${__w3s_url} ${__mev_boost} ${__log_level} ${__doppel} ${__prune} ${CL_EXTRAS} ${VC_EXTRAS} else # Word splitting is desired for the command line parameters # shellcheck disable=SC2086 - exec "$@" ${__network} "--graffiti=${GRAFFITI}" ${__mev_boost} ${__log_level} ${__doppel} ${__prune} ${CL_EXTRAS} ${VC_EXTRAS} + exec "$@" ${__network} ${__w3s_url} "--graffiti=${GRAFFITI}" ${__mev_boost} ${__log_level} ${__doppel} ${__prune} ${CL_EXTRAS} ${VC_EXTRAS} fi