Check available ETH provider on first attempt

dappnode · Mar 19, 2024 · f322199 · f322199
1 parent 9b517ee
commit f322199
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/src/commands/githubActions/bumpUpstream/index.ts b/src/commands/githubActions/bumpUpstream/index.ts
@@ -11,7 +11,6 @@ import {
   writeCompose
 } from "../../../files/index.js";
 import { getNextVersionFromApm } from "../../../utils/versions/getNextVersionFromApm.js";
-import { getFirstAvailableEthProvider } from "../../../utils/tryEthProviders.js";
 import { Compose } from "@dappnode/types";
 import { isEmpty } from "lodash-es";
 import { UpstreamSettings, UpstreamRepoMap, VersionsToUpdate } from "./types.js";
@@ -58,9 +57,9 @@ async function gaBumpUpstreamHandler({
   use_fallback: useFallback,
 }: CliCommandOptions): Promise<void> {
 
-  const { upstreamSettings, manifestData: { manifest, format }, compose, gitSettings, ethProviders } = await readInitialSetup({ dir, userEthProvider, useFallback });
+  const { upstreamSettings, manifestData: { manifest, format }, compose, gitSettings, ethProvider } = await readInitialSetup({ dir, userEthProvider, useFallback });
 
-  printSettings(upstreamSettings, gitSettings, manifest, compose, ethProviders);
+  printSettings(upstreamSettings, gitSettings, manifest, compose, ethProvider);
 
   const upstreamRepoVersions = await getUpstreamRepoVersions(upstreamSettings);
 
@@ -85,14 +84,7 @@ async function gaBumpUpstreamHandler({
 
   manifest.upstreamVersion = getUpstreamVersionTag(versionsToUpdate);
 
-  const ethProviderAvailable = await getFirstAvailableEthProvider({
-    providers: ethProviders
-  });
-
-  if (!ethProviderAvailable)
-    throw Error(`No eth provider available. Tried: ${ethProviders.join(", ")}`);
-
-  manifest.version = await getNewManifestVersion({ dir, ethProviderAvailable });
+  manifest.version = await getNewManifestVersion({ dir, ethProvider });
 
   writeManifest(manifest, format, { dir });
   writeCompose(compose, { dir });
@@ -209,16 +201,16 @@ function getVersionsToUpdate(compose: Compose, upstreamRepoVersions: UpstreamRep
 }
 
 async function getNewManifestVersion({
-  ethProviderAvailable,
+  ethProvider,
   dir
 }: {
-  ethProviderAvailable: string;
+  ethProvider: string;
   dir: string;
 }): Promise<string> {
   try {
     return await getNextVersionFromApm({
       type: "patch",
-      ethProvider: ethProviderAvailable,
+      ethProvider,
       dir
     });
   } catch (e) {

diff --git a/src/commands/githubActions/bumpUpstream/setup.ts b/src/commands/githubActions/bumpUpstream/setup.ts
@@ -4,6 +4,7 @@ import { arrIsUnique } from "../../../utils/array";
 import { parseCsv } from "../../../utils/csv";
 import { readBuildSdkEnvFileNotThrow } from "../../../utils/readBuildSdkEnv";
 import { GitSettings, InitialSetupData, UpstreamSettings } from "./types";
+import { getFirstAvailableEthProvider } from "../../../utils/tryEthProviders";
 
 export async function readInitialSetup({ dir, userEthProvider, useFallback }: { dir: string, userEthProvider: string, useFallback: boolean }): Promise<InitialSetupData> {
     const envFileArgs = readBuildSdkEnvFileNotThrow(dir);
@@ -29,12 +30,19 @@ export async function readInitialSetup({ dir, userEthProvider, useFallback }: {
 
     const ethProviders = getEthProviders(useFallback, userEthProvider);
 
+    const ethProviderAvailable = await getFirstAvailableEthProvider({
+        providers: ethProviders
+    });
+
+    if (!ethProviderAvailable)
+        throw Error(`No eth provider available. Tried: ${ethProviders.join(", ")}`);
+
     return {
         upstreamSettings,
         manifestData: { manifest, format },
         compose,
         gitSettings,
-        ethProviders,
+        ethProvider: ethProviderAvailable,
     };
 }
 
@@ -73,7 +81,7 @@ export function validateUpstreamData(upstreamRepos: string[], upstreamArgs: stri
 }
 
 
-export function printSettings(upstreamSettings: UpstreamSettings[], gitSettings: GitSettings, manifest: Manifest, compose: Compose, ethProviders: string[]): void {
+export function printSettings(upstreamSettings: UpstreamSettings[], gitSettings: GitSettings, manifest: Manifest, compose: Compose, ethProvider: string): void {
 
     console.log(`
   
@@ -85,7 +93,7 @@ export function printSettings(upstreamSettings: UpstreamSettings[], gitSettings:
     
     Compose - ${JSON.stringify(compose, null, 2)}
     
-    ETH Providers - ${JSON.stringify(ethProviders, null, 2)}
+    ETH Provider - ${ethProvider}
   
     `);
 }
diff --git a/src/commands/githubActions/bumpUpstream/types.ts b/src/commands/githubActions/bumpUpstream/types.ts
@@ -32,7 +32,7 @@ export interface InitialSetupData {
     };
     compose: Compose;
     gitSettings: GitSettings;
-    ethProviders: string[];
+    ethProvider: string;
 }
 
 export type UpstreamRepo = {