Merge pull request #345 from dappnode/v0.2.27

v0.2.27 Release

Author: eduadiez

build/src/src/calls/fetchCoreUpdateData.ts

@@ -49,6 +49,10 @@ export async function getCoreUpdateData(
    */
   const coreDnp = dnpList.find(_dnp => _dnp.name === coreName);
   const coreRelease = coreDnpsToBeInstalled[coreName];
+  if (!coreRelease)
+    throw Error(
+      `No coreRelease found: ${Object.keys(coreDnpsToBeInstalled).join(", ")}`
+    );
   if (!coreDnp) delete coreDnpsToBeInstalled[coreName];
 
   const packages = Object.entries(coreDnpsToBeInstalled).map(

build/src/src/db/ethClient.ts

@@ -4,7 +4,8 @@ import {
   EthClientTarget,
   UserSettings,
   EthClientFallback,
-  EthClientStatus
+  EthClientStatus,
+  EthClientTargetPackage
 } from "../types";
 import { joinWithDot, stripDots } from "./dbUtils";
 import { EthClientInstallStatus } from "../modules/ethClient/types";
@@ -18,6 +19,8 @@ const ETH_CLIENT_USER_SETTINGS = "eth-client-user-settings";
 const ETH_CLIENT_INSTALL_STATUS = "eth-client-install-status";
 const ETH_CLIENT_STATUS = "eth-client-status";
 const ETH_PROVIDER_URL = "eth-provider-url";
+// Cached temp status
+const ETH_CLIENT_MIGRATION_TEMP_SETTINGS = "eth-client-migration-temp-status";
 
 // Re-export to consider the first value (when it's not set)
 // but do not allow to set null again. Using to express intentionality
@@ -96,3 +99,13 @@ function interceptOnSet<F extends Function, T extends { set: F }>(
     }
   };
 }
+
+/**
+ * Temporal cache settings that must survive a reset
+ * Store settings in the cache. It is possible that the migration is stopped
+ * because the DAPPMANAGER resets and then the eth client will not be installed
+ */
+export const ethClientMigrationTempSettings = dbCache.staticKey<{
+  target: EthClientTargetPackage;
+  EXTRA_OPTS: string;
+} | null>(ETH_CLIENT_MIGRATION_TEMP_SETTINGS, null);

build/src/src/modules/docker/listContainers.ts

@@ -106,7 +106,12 @@ export async function listContainerNoThrow(
   byName: string
 ): Promise<PackageContainer | null> {
   const containers = await dockerList({ filters: { name: [byName] } });
-  return containers[0] ? parseContainerInfo(containers[0]) : null;
+  if (!containers[0]) return null;
+  const container = parseContainerInfo(containers[0]);
+  // When querying "geth.dnp.dappnode.eth", if user has "goerli-geth.dnp.dappnode.eth"
+  // The latter can be returned as the original container.
+  if (container.name !== byName) return null;
+  else return container;
 }
 
 export async function listContainer(byName: string): Promise<PackageContainer> {
@@ -140,7 +145,7 @@ function parseContainerInfo(container: ContainerInfo): PackageContainer {
   const isDnp = packageName.includes(CONTAINER_NAME_PREFIX);
   const isCoreByName = packageName.includes(CONTAINER_CORE_NAME_PREFIX);
 
-  let name;
+  let name = "";
   if (isDnp) name = packageName.split(CONTAINER_NAME_PREFIX)[1] || "";
   else if (isCoreByName)
     name = packageName.split(CONTAINER_CORE_NAME_PREFIX)[1] || "";

build/src/src/modules/ethClient/changeEthMultiClient.ts

@@ -18,13 +18,12 @@ export async function changeEthMultiClient(
   userSettings?: UserSettings
 ): Promise<void> {
   const prevTarget = db.ethClientTarget.get();
-  if (prevTarget === nextTarget) throw Error("Same target");
 
   // Set user settings of next target if any
   if (userSettings) db.ethClientUserSettings.set(nextTarget, userSettings);
 
   // If the previous client is a client package, uninstall it
-  if (prevTarget && prevTarget !== "remote") {
+  if (prevTarget !== nextTarget && prevTarget && prevTarget !== "remote") {
     try {
       const clientData = ethClientData[prevTarget];
       if (clientData) {
@@ -40,7 +39,7 @@ export async function changeEthMultiClient(
 
   // Setting the status to selected will trigger an install
   db.ethClientTarget.set(nextTarget);
-  if (nextTarget !== "remote") {
+  if (prevTarget !== nextTarget && nextTarget !== "remote") {
     db.ethClientInstallStatus.set(nextTarget, { status: "TO_INSTALL" });
     eventBus.runEthClientInstaller.emit();
   }

build/src/src/modules/ethClient/migrateEthchain.ts

@@ -1,4 +1,5 @@
 import fs from "fs";
+import * as db from "../../db";
 import { changeEthMultiClient } from "./changeEthMultiClient";
 import { listContainerNoThrow } from "../../modules/docker/listContainers";
 import { dockerVolumesList, dockerDf } from "../../modules/docker/dockerApi";
@@ -8,6 +9,7 @@ import { getUserSettingsSafe } from "../../utils/dockerComposeFile";
 import * as getPath from "../../utils/getPath";
 import shell from "../../utils/shell";
 import Logs from "../../logs";
+import { EthClientTargetPackage } from "../../types";
 const logs = Logs(module);
 
 const ethchainDnpName = "ethchain.dnp.dappnode.eth";
@@ -46,6 +48,14 @@ export async function migrateEthchain(): Promise<void> {
     ...(userSettings.environment || {})
   };
   const isNextOpenEthereum = /parity/i.test(envs.DEFAULT_CLIENT || "");
+  let target: EthClientTargetPackage = isNextOpenEthereum
+    ? "openethereum"
+    : "geth";
+  let EXTRA_OPTS =
+    (isNextOpenEthereum ? envs.EXTRA_OPTS : envs.EXTRA_OPTS_GETH) || "";
+  // Store settings in the cache. It is possible that the migration is stopped
+  // because the DAPPMANAGER resets and then the eth client will not be installed
+  db.ethClientMigrationTempSettings.set({ target, EXTRA_OPTS });
 
   const volumesToMigrate = [
     {
@@ -142,16 +152,23 @@ export async function migrateEthchain(): Promise<void> {
   }
 
   // Install new package. fullnode.dappnode is assigned after install
-  if (ethchain) {
-    const target = isNextOpenEthereum ? "openethereum" : "geth";
-    const EXTRA_OPTS = isNextOpenEthereum
-      ? envs.EXTRA_OPTS
-      : envs.EXTRA_OPTS_GETH;
-    logs.info(`Installing eth multi-client ${target}: ${JSON.stringify(envs)}`);
+  const migrationTempSettings = db.ethClientMigrationTempSettings.get();
+  if (ethchain || migrationTempSettings) {
+    logs.info(
+      `Installing eth multi-client ${target}: with EXTRA_OPTS ${EXTRA_OPTS}`
+    );
+
+    if (migrationTempSettings) {
+      target = migrationTempSettings.target || target;
+      EXTRA_OPTS = migrationTempSettings.EXTRA_OPTS || EXTRA_OPTS;
+    }
 
     await changeEthMultiClient(target, false, {
       portMappings: userSettings.portMappings,
       environment: EXTRA_OPTS ? { EXTRA_OPTS } : undefined
     });
+
+    // Once the client has been successfully changed, delete temp migration settings
+    db.ethClientMigrationTempSettings.set(null);
   }
 }

dappnode_package.json

@@ -1,6 +1,6 @@
 {
   "name": "dappmanager.dnp.dappnode.eth",
-  "version": "0.2.26",
+  "version": "0.2.27",
   "description": "Dappnode package responsible for providing the DappNode Package Manager",
   "type": "dncore",
   "author": "DAppNode Association <admin@dappnode.io> (https://github.com/dappnode)",

docker-compose.yml

@@ -12,7 +12,7 @@ services:
     build:
       context: .
       dockerfile: ./build/Dockerfile
-    image: 'dappmanager.dnp.dappnode.eth:0.2.26'
+    image: 'dappmanager.dnp.dappnode.eth:0.2.27'
     container_name: DAppNodeCore-dappmanager.dnp.dappnode.eth
     restart: always
     volumes: