Add MEV-Boost package to Stakers Holesky (#1898)

* integrate mev boost holesky / wip * set up mev boost holesky / wip * Refactor mevBoost typing * Refactor network validation using Array.includes() * update minimum consensus versions --------- Co-authored-by: pablomendezroyo <41727368+pablomendezroyo@users.noreply.github.com> Co-authored-by: Marketen <marcfont12@gmail.com> Co-authored-by: Marc Font <36164126+Marketen@users.noreply.github.com>
dappnode · Apr 8, 2024 · a633036 · a633036
1 parent ed3cc8a
commit a633036
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 18 deletions.
diff --git a/packages/admin-ui/src/pages/stakers/components/StakerNetwork.tsx b/packages/admin-ui/src/pages/stakers/components/StakerNetwork.tsx
@@ -233,7 +233,7 @@ export default function StakerNetwork<T extends Network>({
                   isSelected={newEnableWeb3signer}
                 />
               </Col>
-              {(network === "prater" || network === "mainnet") && (
+              {["prater", "mainnet", "holesky"].includes(network) && (
                 <Col>
                   <SubTitle>Mev Boost</SubTitle>
                   <MevBoost
@@ -242,18 +242,13 @@ export default function StakerNetwork<T extends Network>({
                     newMevBoost={newMevBoost}
                     setNewMevBoost={setNewMevBoost}
                     isSelected={
-                      currentStakerConfigReq.data.mevBoost.dnpName ===
-                        newMevBoost?.dnpName
-                        ? true
-                        : false
+                      currentStakerConfigReq.data.mevBoost.dnpName === newMevBoost?.dnpName
                     }
                   />
                 </Col>
               )}
             </Row>
-
             <hr />
-
             <div>
               <div className="staker-buttons">
                 <Button

diff --git a/packages/admin-ui/src/pages/stakers/components/columns/MevBoost.tsx b/packages/admin-ui/src/pages/stakers/components/columns/MevBoost.tsx
@@ -177,8 +177,8 @@ function Relay<T extends Network>({
         {relay.ofacCompliant === undefined
           ? "-"
           : relay.ofacCompliant
-          ? "Yes"
-          : "No"}
+            ? "Yes"
+            : "No"}
       </td>
       <td>
         <Form.Check
@@ -288,6 +288,27 @@ const getDefaultRelays = <T extends Network>(network: T): RelayIface[] => {
             "https://0x8a72a5ec3e2909fff931c8b42c9e0e6c6e660ac48a98016777fc63a73316b3ffb5c622495106277f8dbcc17a06e92ca3@goerli-relay.securerpc.com/"
         }
       ];
+    case "holesky":
+      return [
+        {
+          operator: "Flashbots",
+          docs: "https://www.flashbots.net/",
+          url:
+            "https://0xafa4c6985aa049fb79dd37010438cfebeb0f2bd42b115b89dd678dab0670c1de38da0c4e9138c9290a398ecd9a0b3110@boost-relay-holesky.flashbots.net"
+        },
+        {
+          operator: "Aestus",
+          docs: "https://flashbots.notion.site/Relay-API-Documentation-5fb0819366954962bc02e81cb33840f5#417abe417dde45caaff3dc15aaae65dd",
+          url:
+            "https://0xab78bf8c781c58078c3beb5710c57940874dd96aef2835e7742c866b4c7c0406754376c2c8285a36c630346aa5c5f833@holesky.aestus.live"
+        },
+        {
+          operator: "Ultrasound",
+          docs: "https://github.com/ultrasoundmoney/frontend",
+          url:
+            "https://0xb1559beef7b5ba3127485bbbb090362d9f497ba64e177ee2c8e7db74746306efad687f2cf8574e38d70067d40ef136dc@relay-stag.ultrasound.money"
+        }
+      ];
     default:
       return [];
   }

diff --git a/packages/db/src/globalEnvs.ts b/packages/db/src/globalEnvs.ts
@@ -15,6 +15,7 @@ import {
   mevBoostLukso,
   mevBoostMainnet,
   mevBoostPrater,
+  mevBoostHolesky,
   consensusClientHolesky,
   executionClientHolesky,
 } from "./stakerConfig.js";
@@ -55,6 +56,7 @@ export function computeGlobalEnvsFromDb<B extends boolean>(
     [`${prefix}MEVBOOST_PRATER`]: mevBoostPrater.get(),
     [`${prefix}CONSENSUS_CLIENT_HOLESKY`]: consensusClientHolesky.get(),
     [`${prefix}EXECUTION_CLIENT_HOLESKY`]: executionClientHolesky.get(),
+    [`${prefix}MEVBOOST_HOLESKY`]: mevBoostHolesky.get(),
     [`${prefix}CONSENSUS_CLIENT_LUKSO`]: consensusClientLukso.get(),
     [`${prefix}EXECUTION_CLIENT_LUKSO`]: executionClientLukso.get(),
     [`${prefix}MEVBOOST_LUKSO`]: mevBoostLukso.get(),

diff --git a/packages/db/src/stakerConfig.ts b/packages/db/src/stakerConfig.ts
@@ -114,6 +114,7 @@ export const mevBoostPrater = interceptGlobalEnvOnSet(
 
 const CONSENSUS_CLIENT_HOLESKY = "consensus-client-holesky";
 const EXECUTION_CLIENT_HOLESKY = "execution-client-holesky";
+const MEVBOOST_HOLESKY = "mevboost-holesky";
 
 // Null means not set
 // Undefined means its set but the user has not selected any value
@@ -135,6 +136,11 @@ export const executionClientHolesky = interceptGlobalEnvOnSet(
   Object.keys({ EXECUTION_CLIENT_HOLESKY })[0]
 );
 
+export const mevBoostHolesky = interceptGlobalEnvOnSet(
+  dbMain.staticKey<boolean>(MEVBOOST_HOLESKY, false),
+  Object.keys({ MEVBOOST_HOLESKY })[0]
+);
+
 // LUKSO
 
 const CONSENSUS_CLIENT_LUKSO = "consensus-client-lukso";

diff --git a/packages/installer/src/calls/packageRemove.ts b/packages/installer/src/calls/packageRemove.ts
@@ -12,7 +12,7 @@ import {
 } from "@dappnode/dockerapi";
 import { httpsPortal } from "@dappnode/httpsportal";
 import * as db from "@dappnode/db";
-import { mevBoostMainnet, mevBoostPrater, stakerPkgs } from "@dappnode/types";
+import { mevBoostMainnet, mevBoostPrater, mevBoostHolesky, stakerPkgs } from "@dappnode/types";
 import { ethicalMetricsDnpName, unregister } from "@dappnode/ethicalmetrics";
 
 /**
@@ -161,6 +161,9 @@ async function removeStakerPkgFromDbIfSelected({
     case mevBoostPrater:
       await db.mevBoostPrater.set(false);
       break;
+    case mevBoostHolesky:
+      await db.mevBoostHolesky.set(false);
+      break;
     default:
       return;
   }

diff --git a/packages/stakers/src/get/getStakerDnpNamesByNetwork.ts b/packages/stakers/src/get/getStakerDnpNamesByNetwork.ts
@@ -10,6 +10,7 @@ import {
   executionClientsLukso,
   mevBoostMainnet,
   mevBoostPrater,
+  mevBoostHolesky,
   signerGnosis,
   signerMainnet,
   signerPrater,
@@ -49,7 +50,7 @@ export function getStakerDnpNamesByNetwork(
         executionClients: executionClientsHolesky,
         consensusClients: consensusClientsHolesky,
         signer: signerHolesky,
-        mevBoost: "",
+        mevBoost: mevBoostHolesky,
       };
     case "gnosis":
       return {

diff --git a/packages/stakers/src/set/getStakerCompatibleVersionsByNetwork.ts b/packages/stakers/src/set/getStakerCompatibleVersionsByNetwork.ts
@@ -179,23 +179,23 @@ export function getStakerCompatibleVersionsByNetwork<T extends Network>(
           {
             dnpName:
               "lighthouse-holesky.dnp.dappnode.eth" as ConsensusClient<T>,
-            minVersion: "0.1.0",
+            minVersion: "0.1.2",
           },
           {
             dnpName: "prysm-holesky.dnp.dappnode.eth" as ConsensusClient<T>,
-            minVersion: "0.1.0",
+            minVersion: "0.1.3",
           },
           {
             dnpName: "teku-holesky.dnp.dappnode.eth" as ConsensusClient<T>,
-            minVersion: "0.1.0",
+            minVersion: "0.1.2",
           },
           {
             dnpName: "nimbus-holesky.dnp.dappnode.eth" as ConsensusClient<T>,
-            minVersion: "0.1.0",
+            minVersion: "0.1.2",
           },
           {
             dnpName: "lodestar-holesky.dnp.dappnode.eth" as ConsensusClient<T>,
-            minVersion: "0.1.0",
+            minVersion: "0.1.3",
           },
         ],
         compatibleSigner: {

diff --git a/packages/stakers/src/set/setMevBoost.ts b/packages/stakers/src/set/setMevBoost.ts
@@ -4,6 +4,7 @@ import {
   InstalledPackageData,
   MevBoostMainnet,
   MevBoostPrater,
+  MevBoostHolesky,
   Network,
 } from "@dappnode/types";
 import {
@@ -22,7 +23,7 @@ export async function setMevBoost<T extends Network>({
   currentMevBoostPkg,
 }: {
   dappnodeInstaller: DappnodeInstaller;
-  mevBoost: T extends "mainnet" ? MevBoostMainnet : MevBoostPrater;
+  mevBoost: T extends "mainnet" ? MevBoostMainnet : (T extends "prater" ? MevBoostPrater : MevBoostHolesky);
   targetMevBoost?: StakerItemOk<T, "mev-boost">;
   currentMevBoostPkg?: InstalledPackageData;
 }): Promise<void> {

diff --git a/packages/stakers/src/set/setStakerConfig.ts b/packages/stakers/src/set/setStakerConfig.ts
@@ -190,6 +190,8 @@ async function setStakerConfigOnDb<T extends Network>(
         await db.consensusClientHolesky.set(
           consensusClient as ConsensusClientHolesky
         );
+      if (db.mevBoostHolesky.get() !== Boolean(mevBoost))
+        await db.mevBoostHolesky.set(mevBoost ? true : false);
       break;
 
     case "lukso":

diff --git a/packages/stakers/src/utils.ts b/packages/stakers/src/utils.ts
@@ -32,7 +32,7 @@ export function getStakerConfigByNetwork<T extends Network>(
       return {
         executionClient: db.executionClientHolesky.get() as ExecutionClient<T>,
         consensusClient: db.consensusClientHolesky.get() as ConsensusClient<T>,
-        isMevBoostSelected: false, // holesky doesn't support mevBoost
+        isMevBoostSelected: db.mevBoostHolesky.get(),
       };
     case "lukso":
       return {

diff --git a/packages/types/src/stakers.ts b/packages/types/src/stakers.ts
@@ -72,6 +72,9 @@ export const executionClientsHolesky = Object.freeze([
 export type SignerHolesky = "web3signer-holesky.dnp.dappnode.eth";
 export const signerHolesky: SignerHolesky =
   "web3signer-holesky.dnp.dappnode.eth";
+  export type MevBoostHolesky = "mev-boost-holesky.dnp.dappnode.eth";
+  export const mevBoostHolesky: MevBoostHolesky =
+    "mev-boost-holesky.dnp.dappnode.eth";
 
 // GNOSIS
 export type ConsensusClientGnosis = (typeof consensusClientsGnosis)[number];
@@ -133,6 +136,7 @@ export const signers = Object.freeze([
 export const mevBoosts = Object.freeze([
   mevBoostMainnet,
   mevBoostPrater,
+  mevBoostHolesky,
   //mevBoostGnosis,
 ] as const);
 
@@ -265,6 +269,8 @@ export type MevBoost<T extends Network> = T extends "mainnet"
   ? MevBoostMainnet
   : T extends "prater"
   ? MevBoostPrater
+  : T extends "holesky"
+  ? MevBoostHolesky
   : never;
 
 export interface StakerConfigByNetwork<T extends Network> {
@@ -301,6 +307,7 @@ export const stakerPkgs = Object.freeze([
   ...executionClientsHolesky,
   ...consensusClientsHolesky,
   signerHolesky,
+  mevBoostHolesky,
   ...executionClientsGnosis,
   ...consensusClientsGnosis,
   signerGnosis,