diff --git a/packages/dappmanager/src/index.ts b/packages/dappmanager/src/index.ts index e0e4e42d4..d0bab4af0 100644 --- a/packages/dappmanager/src/index.ts +++ b/packages/dappmanager/src/index.ts @@ -5,7 +5,7 @@ import initializeDb from "./initializeDb"; import { createGlobalEnvsEnvFile } from "./modules/globalEnvs"; import { generateKeyPair } from "./utils/publickeyEncryption"; import { copyHostScripts } from "./modules/hostScripts"; -import { switchEthClientIfOpenethereum } from "./modules/ethClient"; +import { switchEthClientIfOpenethereumOrGethLight } from "./modules/ethClient"; import { runLegacyActions } from "./modules/legacy"; import { migrateUserActionLogs } from "./logUserAction"; import { postRestartPatch } from "./modules/installer/restartPatch"; @@ -51,8 +51,8 @@ const server = startDappmanager({ // Deprecate openethereum. MUST be executed before EthClientInstaller daemon to avoid have the error: // `Error on eth client installer daemon Error: No client data for target: openethereum` -switchEthClientIfOpenethereum().catch(e => - logs.error("Error switch client openethereum", e) +switchEthClientIfOpenethereumOrGethLight().catch(e => + logs.error("Error deprecating ethereum client: ", e) ); // Initialize DB diff --git a/packages/dappmanager/src/modules/ethClient/index.ts b/packages/dappmanager/src/modules/ethClient/index.ts index a6259f2eb..23a55bfc2 100644 --- a/packages/dappmanager/src/modules/ethClient/index.ts +++ b/packages/dappmanager/src/modules/ethClient/index.ts @@ -1,4 +1,4 @@ export * from "./changeEthMultiClient"; export * from "./ethersProvider"; -export * from "./switchEthClientIfOpenethereum"; +export * from "./switchEthClientIfOpenethereumOrGethLight"; export * from "./localFallbackVersions"; diff --git a/packages/dappmanager/src/modules/ethClient/switchEthClientIfOpenethereum.ts b/packages/dappmanager/src/modules/ethClient/switchEthClientIfOpenethereumOrGethLight.ts similarity index 79% rename from packages/dappmanager/src/modules/ethClient/switchEthClientIfOpenethereum.ts rename to packages/dappmanager/src/modules/ethClient/switchEthClientIfOpenethereumOrGethLight.ts index 9c3f76839..3bce8b322 100644 --- a/packages/dappmanager/src/modules/ethClient/switchEthClientIfOpenethereum.ts +++ b/packages/dappmanager/src/modules/ethClient/switchEthClientIfOpenethereumOrGethLight.ts @@ -8,11 +8,12 @@ import { ethClientData } from "../../params"; /** * Switches ethClientTarget in the following preference order: geth > nethermind > remote */ -export async function switchEthClientIfOpenethereum(): Promise { +export async function switchEthClientIfOpenethereumOrGethLight(): Promise { const ethClientTarget = db.ethClientTarget.get() as | EthClientTarget | null - | "openethereum"; // Add old deprecated type + | "openethereum" // Add old deprecated type + | "geth-light"; // Add old deprecated type if (ethClientTarget === "openethereum") { // Check for geth @@ -45,5 +46,10 @@ export async function switchEthClientIfOpenethereum(): Promise { logs.info("Setting ethClientTarget to remote"); db.ethClientTarget.set("remote"); + } else if (ethClientTarget === "geth-light") { + logs.info( + "Execution client geth-light deprecated in release v0.2.59. Using remote" + ); + db.ethClientTarget.set("remote"); } }