From c4b11627be2330a4903bdf8231f1217ecfcf0b0f Mon Sep 17 00:00:00 2001 From: pablomendezroyo Date: Mon, 21 Oct 2024 17:57:56 +0200 Subject: [PATCH] Fix missing config for network ephimery --- packages/db/src/stakerConfig.ts | 25 +++++++++++++++++++++++++ packages/params/src/params.ts | 3 ++- packages/stakers/src/execution.ts | 7 ++----- packages/stakers/src/mevBoost.ts | 6 ++++-- packages/types/src/stakers.ts | 17 ++++++++++++++++- 5 files changed, 49 insertions(+), 9 deletions(-) diff --git a/packages/db/src/stakerConfig.ts b/packages/db/src/stakerConfig.ts index cc84e15e8..1e8f9b33d 100644 --- a/packages/db/src/stakerConfig.ts +++ b/packages/db/src/stakerConfig.ts @@ -129,3 +129,28 @@ export const mevBoostLukso = interceptGlobalEnvOnSet( dbMain.staticKey(MEVBOOST_LUKSO, false), Object.keys({ MEVBOOST_LUKSO })[0] ); + +// Ephemery + +const CONSENSUS_CLIENT_EPHEMERY = "consensus-client-ephemery"; +const EXECUTION_CLIENT_EPHEMERY = "execution-client-ephemery"; +const MEVBOOST_EPHEMERY = "mevboost-ephemery"; + +// Null means not set +// Undefined means its set but the user has not selected any value +export const consensusClientEphemery = interceptGlobalEnvOnSet( + dbMain.staticKey(CONSENSUS_CLIENT_EPHEMERY, null), + Object.keys({ CONSENSUS_CLIENT_EPHEMERY })[0] +); + +// Null means not set +// Undefined means its set but the user has not selected any value +export const executionClientEphemery = interceptGlobalEnvOnSet( + dbMain.staticKey(EXECUTION_CLIENT_EPHEMERY, null), + Object.keys({ EXECUTION_CLIENT_EPHEMERY })[0] +); + +export const mevBoostEphemery = interceptGlobalEnvOnSet( + dbMain.staticKey(MEVBOOST_EPHEMERY, false), + Object.keys({ MEVBOOST_EPHEMERY })[0] +); diff --git a/packages/params/src/params.ts b/packages/params/src/params.ts index 6778b5b2c..b2eb98d87 100644 --- a/packages/params/src/params.ts +++ b/packages/params/src/params.ts @@ -121,7 +121,8 @@ export const params = { [Network.Holesky]: "holesky_network", [Network.Prater]: "prater_network", [Network.Gnosis]: "gnosis_network", - [Network.Lukso]: "lukso_network" + [Network.Lukso]: "lukso_network", + [Network.Ephemery]: "ephemery_network" }, DOCKER_LEGACY_DNS: "172.33.1.2", BIND_IP: "172.33.1.2", // "10.20.0.2" diff --git a/packages/stakers/src/execution.ts b/packages/stakers/src/execution.ts index 7b345918a..527159afb 100644 --- a/packages/stakers/src/execution.ts +++ b/packages/stakers/src/execution.ts @@ -57,11 +57,8 @@ export class Execution extends StakerComponent { { dnpName: ExecutionClientHolesky.Nethermind, minVersion: "0.1.0" }, { dnpName: ExecutionClientHolesky.Besu, minVersion: "0.1.0" } ], - [Network.Lukso]: [ - { dnpName: ExecutionClientLukso.Geth, minVersion: "0.1.0" } - ], - [Network.Ephemery]: [ - { dnpName: ExecutionClientEphemery.Besu, minVersion: "0.1.0" }] + [Network.Lukso]: [{ dnpName: ExecutionClientLukso.Geth, minVersion: "0.1.0" }], + [Network.Ephemery]: [{ dnpName: ExecutionClientEphemery.Geth, minVersion: "0.1.0" }] }; constructor(dappnodeInstaller: DappnodeInstaller) { diff --git a/packages/stakers/src/mevBoost.ts b/packages/stakers/src/mevBoost.ts index 9d57c65c1..c8d022a07 100644 --- a/packages/stakers/src/mevBoost.ts +++ b/packages/stakers/src/mevBoost.ts @@ -12,7 +12,8 @@ export class MevBoost extends StakerComponent { [Network.Gnosis]: db.mevBoostGnosis, [Network.Prater]: db.mevBoostPrater, [Network.Holesky]: db.mevBoostHolesky, - [Network.Lukso]: db.mevBoostLukso + [Network.Lukso]: db.mevBoostLukso, + [Network.Ephemery]: db.mevBoostEphemery }; protected static readonly CompatibleMevBoost: Record = { @@ -29,7 +30,8 @@ export class MevBoost extends StakerComponent { dnpName: MevBoostHolesky.Mevboost, minVersion: "0.1.0" }, - [Network.Lukso]: null + [Network.Lukso]: null, + [Network.Ephemery]: null }; constructor(dappnodeInstaller: DappnodeInstaller) { diff --git a/packages/types/src/stakers.ts b/packages/types/src/stakers.ts index fbc0f736c..dcc86f7aa 100644 --- a/packages/types/src/stakers.ts +++ b/packages/types/src/stakers.ts @@ -7,7 +7,8 @@ export enum Network { Prater = "prater", Gnosis = "gnosis", Lukso = "lukso", - Holesky = "holesky" + Holesky = "holesky", + Ephemery = "ephemery" } // MAINNET @@ -32,6 +33,20 @@ export enum MevBoostMainnet { Mevboost = "mev-boost.dnp.dappnode.eth" } +// EPHEMERY +export enum ConsensusClientEphemery { + Lodestar = "lodestar-ephemery.dnp.dappnode.eth", + Teku = "teku-ephemery.dnp.dappnode.eth" +} + +export enum ExecutionClientEphemery { + Geth = "ephemery-geth.dnp.dappnode.eth" +} + +export enum SignerEphemery { + Web3signer = "web3signer-ephemery.dnp.dappnode.eth" +} + // PRATER export enum ConsensusClientPrater { Prysm = "prysm-prater.dnp.dappnode.eth",