Revert "Add noRecreate based on containers running condition (#2408)" (#2412)

pablomendezroyo · web-flow · commit d247daf84949 · 2026-03-10T14:04:01.000+01:00
This reverts commit 84b779b.
diff --git a/packages/stakers/src/consensus.ts b/packages/stakers/src/consensus.ts
@@ -134,17 +134,17 @@ export class Consensus extends StakerComponent {
   async persistSelectedConsensusIfInstalled(network: Network): Promise<void> {
     const currentConsensusDnpName = this.DbHandlers[network].get();
     if (currentConsensusDnpName) {
-      const pkg = await listPackageNoThrow({ dnpName: currentConsensusDnpName });
+      const isInstalled = await this.isPackageInstalled(currentConsensusDnpName);
 
-      if (!pkg) {
+      if (!isInstalled) {
         // update status in db
         this.DbHandlers[network].set(undefined);
         return;
       }
 
       const userSettings = await this.getUserSettings(network, currentConsensusDnpName);
 
-      await this.setStakerPkgConfig({ dnpName: currentConsensusDnpName, pkg, userSettings });
+      await this.setStakerPkgConfig({ dnpName: currentConsensusDnpName, isInstalled, userSettings });
 
       await this.DbHandlers[network].set(currentConsensusDnpName);
     }
@@ -196,8 +196,8 @@ export class Consensus extends StakerComponent {
     }
 
     try {
-      const pkg = await listPackageNoThrow({ dnpName: prevConsClientDnpName });
-      if (pkg) {
+      const isPrevInstalled = await this.isPackageInstalled(prevConsClientDnpName);
+      if (isPrevInstalled) {
         const composeEditor = new ComposeFileEditor(prevConsClientDnpName, false);
         const validatorService = composeEditor.services()["validator"]; // WARNING: assumes service is named "validator"
         if (validatorService) {
@@ -221,8 +221,8 @@ export class Consensus extends StakerComponent {
   ): Promise<UserSettings> {
     if (!newConsensusDnpName) return {};
 
-    const pkg = await listPackageNoThrow({ dnpName: newConsensusDnpName });
-    let environment = pkg ? {} : getDefaultConsensusUserSettings({ network }).environment;
+    const isPkgInstalled = await this.isPackageInstalled(newConsensusDnpName);
+    let environment = isPkgInstalled ? {} : getDefaultConsensusUserSettings({ network }).environment;
 
     // Only for Mainnet, Gnosis and Hoodi, try to get backup beacon node
     if (network === Network.Mainnet || network === Network.Gnosis || network === Network.Hoodi) {
diff --git a/packages/stakers/src/execution.ts b/packages/stakers/src/execution.ts
@@ -16,7 +16,7 @@ import { StakerComponent } from "./stakerComponent.js";
 import { DappnodeInstaller } from "@dappnode/installer";
 import * as db from "@dappnode/db";
 import { params } from "@dappnode/params";
-import { listPackageNoThrow } from "@dappnode/dockerapi";
+import { listPackage } from "@dappnode/dockerapi";
 import { logs } from "@dappnode/logger";
 import { gt } from "semver";
 
@@ -30,16 +30,16 @@ export class Execution extends StakerComponent {
       set: (globEnvValue: string | null | undefined) => Promise<void>;
     }
   > = {
-    [Network.Mainnet]: db.executionClientMainnet,
-    [Network.Gnosis]: db.executionClientGnosis,
-    [Network.Prater]: db.executionClientPrater,
-    [Network.Holesky]: db.executionClientHolesky,
-    [Network.Sepolia]: db.executionClientSepolia,
-    [Network.Hoodi]: db.executionClientHoodi,
-    [Network.Lukso]: db.executionClientLukso,
-    [Network.StarknetMainnet]: db.executionStarknetMainnet,
-    [Network.StarknetSepolia]: db.executionStarknetSepolia
-  };
+      [Network.Mainnet]: db.executionClientMainnet,
+      [Network.Gnosis]: db.executionClientGnosis,
+      [Network.Prater]: db.executionClientPrater,
+      [Network.Holesky]: db.executionClientHolesky,
+      [Network.Sepolia]: db.executionClientSepolia,
+      [Network.Hoodi]: db.executionClientHoodi,
+      [Network.Lukso]: db.executionClientLukso,
+      [Network.StarknetMainnet]: db.executionStarknetMainnet,
+      [Network.StarknetSepolia]: db.executionStarknetSepolia
+    };
 
   protected static readonly CompatibleExecutions: Record<Network, { dnpName: string; minVersion: string }[]> = {
     [Network.Mainnet]: [
@@ -104,21 +104,17 @@ export class Execution extends StakerComponent {
   async persistSelectedExecutionIfInstalled(network: Network): Promise<void> {
     const currentExecutionDnpName = this.DbHandlers[network].get();
     if (currentExecutionDnpName) {
-      const pkg = await listPackageNoThrow({ dnpName: currentExecutionDnpName });
+      const isInstalled = await this.isPackageInstalled(currentExecutionDnpName);
 
-      if (!pkg) {
+      if (!isInstalled) {
         // update status in db
         this.DbHandlers[network].set(undefined);
         return;
       }
 
       const userSettings = await this.getUserSettings(network, currentExecutionDnpName);
 
-      await this.setStakerPkgConfig({
-        dnpName: currentExecutionDnpName,
-        pkg,
-        userSettings
-      });
+      await this.setStakerPkgConfig({ dnpName: currentExecutionDnpName, isInstalled, userSettings });
 
       await this.DbHandlers[network].set(currentExecutionDnpName);
     }
@@ -197,10 +193,10 @@ export class Execution extends StakerComponent {
   }
 
   private async getExecutionVersion(dnpName: string): Promise<string> {
-    const pkg = await listPackageNoThrow({ dnpName });
+    const isInstalled = await this.isPackageInstalled(dnpName);
 
-    if (pkg) {
-      const version = pkg.version;
+    if (isInstalled) {
+      const version = (await listPackage({ dnpName })).version;
       logs.info(`Execution ${dnpName} is installed. Using version ${version}`);
       return version;
     } else {
diff --git a/packages/stakers/src/mevBoost.ts b/packages/stakers/src/mevBoost.ts
@@ -90,7 +90,7 @@ export class MevBoost extends StakerComponent {
 
       await this.setStakerPkgConfig({
         dnpName: mevBoostDnpName,
-        pkg: mevBoostDnp,
+        isInstalled: true,
         userSettings
       });
 
@@ -120,14 +120,14 @@ export class MevBoost extends StakerComponent {
       // If the package is not installed, we use the default environment
       environment: newRelays
         ? {
-            [mevBoostServiceName]: {
-              ["RELAYS"]:
-                newRelays
-                  .join(",")
-                  .trim()
-                  .replace(/(^,)|(,$)/g, "") || ""
-            }
+          [mevBoostServiceName]: {
+            ["RELAYS"]:
+              newRelays
+                .join(",")
+                .trim()
+                .replace(/(^,)|(,$)/g, "") || ""
           }
+        }
         : {},
       networks: this.getStakerNetworkSettings(network)
     };
diff --git a/packages/stakers/src/signer.ts b/packages/stakers/src/signer.ts
@@ -44,7 +44,7 @@ export class Signer extends StakerComponent {
       minVersion: "0.1.0"
     },
     [Network.Sepolia]: {
-      dnpName: SignerSepolia.Web3signer,
+      dnpName: SignerSepolia.Web3signer, 
       minVersion: "0.1.0"
     },
     // TODO: dont exist but need to be added
@@ -78,7 +78,7 @@ export class Signer extends StakerComponent {
       const dnpName = Signer.CompatibleSigners[network].dnpName;
       const userSettings = this.getUserSettings(network);
 
-      await this.setStakerPkgConfig({ dnpName, pkg: signerDnp, userSettings });
+      await this.setStakerPkgConfig({ dnpName, isInstalled: true, userSettings });
     }
   }
 
diff --git a/packages/stakers/src/stakerComponent.ts b/packages/stakers/src/stakerComponent.ts
@@ -14,19 +14,19 @@ export class StakerComponent {
     this.dappnodeInstaller = dappnodeInstaller;
   }
 
-  protected async getAll({
-    dnpNames,
-    currentClient,
-    relays,
-    starknetSignerOperationalAddress,
-    starknetSignerPrivateKey
-  }: {
-    dnpNames: string[];
-    currentClient?: boolean | string | null;
-    relays?: string[];
-    starknetSignerOperationalAddress?: string;
-    starknetSignerPrivateKey?: string;
-  }): Promise<StakerItem[]> {
+protected async getAll({
+  dnpNames,
+  currentClient,
+  relays,
+  starknetSignerOperationalAddress,
+  starknetSignerPrivateKey
+}: {
+  dnpNames: string[];
+  currentClient?: boolean | string | null;
+  relays?: string[];
+  starknetSignerOperationalAddress?: string;
+  starknetSignerPrivateKey?: string;
+}): Promise<StakerItem[]> {
     const dnpList = await listPackages();
 
     return await Promise.all(
@@ -95,15 +95,20 @@ export class StakerComponent {
     }
 
     if (!newStakerDnpName) return;
-
     // set staker config
     await this.setStakerPkgConfig({
       dnpName: newStakerDnpName,
-      pkg: await listPackageNoThrow({ dnpName: newStakerDnpName }),
+      isInstalled: Boolean(await listPackageNoThrow({ dnpName: newStakerDnpName })),
       userSettings
     });
   }
 
+  protected async isPackageInstalled(dnpName: string): Promise<boolean> {
+    const dnp = await listPackageNoThrow({ dnpName });
+
+    return Boolean(dnp);
+  }
+
   protected getComposeRootNetworks(network: Network): NonNullable<UserSettings["networks"]>["rootNetworks"] {
     return {
       [params.DOCKER_STAKER_NETWORKS[network]]: {
@@ -124,15 +129,15 @@ export class StakerComponent {
    */
   protected async setStakerPkgConfig({
     dnpName,
-    pkg,
+    isInstalled,
     userSettings
   }: {
     dnpName: string;
-    pkg: InstalledPackageData | null;
+    isInstalled: boolean;
     userSettings: UserSettings;
   }): Promise<void> {
-    if (pkg) {
-      await this.setInstalledStakerPkgConfig({ dnpName, pkg, userSettings });
+    if (isInstalled) {
+      await this.setInstalledStakerPkgConfig({ dnpName, userSettings });
     } else {
       await packageInstall(this.dappnodeInstaller, {
         name: dnpName,
@@ -143,11 +148,9 @@ export class StakerComponent {
 
   private async setInstalledStakerPkgConfig({
     dnpName,
-    pkg,
     userSettings
   }: {
     dnpName: string;
-    pkg: InstalledPackageData;
     userSettings: UserSettings;
   }): Promise<void> {
     if (userSettings) {
@@ -158,18 +161,12 @@ export class StakerComponent {
       composeEditor.write();
     }
 
-    // only recreate containers if any container is not running.
-    // we can't ensure the changes of the compose file are due to meaningful changes or just due to
-    // normalization of the compose file such as quotes or order of the keys, so we want to avoid recreating the containers
-    // if not needed as it can cause unnecessary downtime to the users
-    if (pkg.containers.some((c) => !c.running)) {
-      logs.info(`At least one container of ${dnpName} is not running, recreating containers to apply changes`);
-      // start all containers
-      await dockerComposeUpPackage({
-        composeArgs: { dnpName },
-        upAll: true
-      });
-    }
+    // start all containers
+    await dockerComposeUpPackage({
+      composeArgs: { dnpName },
+      upAll: true
+      // dockerComposeUpOptions: { noRecreate: true }
+    });
   }
 
   /**
