@layr-labs/ecloud-cli 0.2.0 → 0.2.2-dev

package/dist/commands/compute/app/upgrade.js

@@ -2,7 +2,7 @@
 
 // src/commands/compute/app/upgrade.ts
 import { Command, Args, Flags as Flags2 } from "@oclif/core";
-import { getEnvironmentConfig as getEnvironmentConfig3, UserApiClient as UserApiClient3, isMainnet } from "@layr-labs/ecloud-sdk";
+import { getEnvironmentConfig as getEnvironmentConfig4, UserApiClient as UserApiClient3, isMainnet } from "@layr-labs/ecloud-sdk";
 
 // src/telemetry.ts
 import {
@@ -209,9 +209,9 @@ import fs3 from "fs";
 import path3 from "path";
 import os3 from "os";
 import { isAddress as isAddress2 } from "viem";
-import { privateKeyToAccount as privateKeyToAccount2 } from "viem/accounts";
+import { privateKeyToAccount as privateKeyToAccount3 } from "viem/accounts";
 import {
-  getEnvironmentConfig,
+  getEnvironmentConfig as getEnvironmentConfig2,
   getAvailableEnvironments,
   isEnvironmentAvailable,
   getAllAppsByDeveloper as getAllAppsByDeveloper2,
@@ -228,12 +228,43 @@ import {
 
 // src/utils/appResolver.ts
 import { isAddress } from "viem";
-import { privateKeyToAccount } from "viem/accounts";
+import { privateKeyToAccount as privateKeyToAccount2 } from "viem/accounts";
 import {
   UserApiClient,
   getAllAppsByDeveloper
 } from "@layr-labs/ecloud-sdk";
 
+// src/utils/viemClients.ts
+import {
+  createPublicClient,
+  http
+} from "viem";
+import { privateKeyToAccount } from "viem/accounts";
+import {
+  getEnvironmentConfig,
+  addHexPrefix,
+  createViemClients as sdkCreateViemClients,
+  getChainFromID
+} from "@layr-labs/ecloud-sdk";
+function createViemClients(options) {
+  const privateKey = addHexPrefix(options.privateKey);
+  const environmentConfig = getEnvironmentConfig(options.environment);
+  const rpcUrl = options.rpcUrl || environmentConfig.defaultRPCURL;
+  const chain = getChainFromID(environmentConfig.chainID);
+  const { publicClient, walletClient } = sdkCreateViemClients({
+    privateKey,
+    rpcUrl,
+    chainId: environmentConfig.chainID
+  });
+  const account = privateKeyToAccount(privateKey);
+  return {
+    publicClient,
+    walletClient,
+    chain,
+    address: account.address
+  };
+}
+
 // src/utils/appNames.ts
 import * as fs2 from "fs";
 import * as path2 from "path";
@@ -280,7 +311,7 @@ function listApps(environment) {
 
 // src/utils/version.ts
 function getCliVersion() {
-  return true ? "0.2.0" : "0.0.0";
+  return true ? "0.2.2-dev" : "0.0.0";
 }
 function getClientId() {
   return `ecloud-cli/v${getCliVersion()}`;
@@ -303,7 +334,7 @@ async function getAppInfosChunked(userApiClient, appIds, addressCount) {
 }
 
 // src/utils/prompts.ts
-function addHexPrefix(value) {
+function addHexPrefix2(value) {
   if (value.startsWith("0x")) {
     return value;
   }
@@ -848,7 +879,7 @@ async function getOrPromptAppID(appIDOrOptions, environment) {
     };
   }
   if (options.appID) {
-    const normalized = typeof options.appID === "string" ? addHexPrefix(options.appID) : options.appID;
+    const normalized = typeof options.appID === "string" ? addHexPrefix2(options.appID) : options.appID;
     if (isAddress2(normalized)) {
       return normalized;
     }
@@ -864,7 +895,7 @@ async function getOrPromptAppID(appIDOrOptions, environment) {
     const apps = listApps(options.environment);
     const foundAppID = apps[options.appID];
     if (foundAppID) {
-      return addHexPrefix(foundAppID);
+      return addHexPrefix2(foundAppID);
     }
     throw new Error(
       `App name '${options.appID}' not found in environment '${options.environment}'`
@@ -875,18 +906,23 @@ async function getOrPromptAppID(appIDOrOptions, environment) {
 async function getAppIDInteractive(options) {
   const action = options.action || "view";
   const environment = options.environment || "sepolia";
-  const environmentConfig = getEnvironmentConfig(environment);
+  const environmentConfig = getEnvironmentConfig2(environment);
   if (!options.privateKey || !options.rpcUrl) {
     return getAppIDInteractiveFromRegistry(environment, action);
   }
   console.log(`
 Select an app to ${action}:
 `);
-  const privateKeyHex = addHexPrefix(options.privateKey);
-  const account = privateKeyToAccount2(privateKeyHex);
+  const privateKeyHex = addHexPrefix2(options.privateKey);
+  const account = privateKeyToAccount3(privateKeyHex);
   const developerAddr = account.address;
+  const { publicClient, walletClient } = createViemClients({
+    privateKey: options.privateKey,
+    rpcUrl: options.rpcUrl,
+    environment
+  });
   const { apps, appConfigs } = await getAllAppsByDeveloper2(
-    options.rpcUrl,
+    publicClient,
     environmentConfig,
     developerAddr
   );
@@ -899,9 +935,9 @@ Select an app to ${action}:
     try {
       const userApiClient = new UserApiClient2(
         environmentConfig,
-        options.privateKey,
-        options.rpcUrl,
-        getClientId()
+        walletClient,
+        publicClient,
+        { clientId: getClientId() }
       );
       const appInfos = await getAppInfosChunked(userApiClient, apps);
       const freshProfiles = {};
@@ -1025,14 +1061,14 @@ async function getAppIDInteractiveFromRegistry(environment, action) {
         if (!value) {
           return "App ID or name cannot be empty";
         }
-        const normalized2 = addHexPrefix(value);
+        const normalized2 = addHexPrefix2(value);
         if (isAddress2(normalized2)) {
           return true;
         }
         return "Invalid app ID address";
       }
     });
-    const normalized = addHexPrefix(appIDInput);
+    const normalized = addHexPrefix2(appIDInput);
     if (isAddress2(normalized)) {
       return normalized;
     }
@@ -1068,7 +1104,7 @@ Select an app to ${action}:`);
         if (!value) {
           return "App ID or name cannot be empty";
         }
-        const normalized2 = addHexPrefix(value);
+        const normalized2 = addHexPrefix2(value);
         if (isAddress2(normalized2)) {
           return true;
         }
@@ -1078,17 +1114,17 @@ Select an app to ${action}:`);
         return "Invalid app ID or name not found";
       }
     });
-    const normalized = addHexPrefix(appIDInput);
+    const normalized = addHexPrefix2(appIDInput);
     if (isAddress2(normalized)) {
       return normalized;
     }
     const foundAppID = allApps[appIDInput];
     if (foundAppID) {
-      return addHexPrefix(foundAppID);
+      return addHexPrefix2(foundAppID);
     }
     throw new Error(`Failed to resolve app ID from input: ${appIDInput}`);
   }
-  return addHexPrefix(selected);
+  return addHexPrefix2(selected);
 }
 async function getResourceUsageMonitoringInteractive(resourceUsageMonitoring) {
   if (resourceUsageMonitoring) {
@@ -1150,7 +1186,7 @@ async function getPrivateKeyInteractive(privateKey) {
 async function getEnvironmentInteractive(environment) {
   if (environment) {
     try {
-      getEnvironmentConfig(environment);
+      getEnvironmentConfig2(environment);
       if (!isEnvironmentAvailable(environment)) {
         throw new Error(`Environment ${environment} is not available in this build`);
       }
@@ -1163,7 +1199,7 @@ async function getEnvironmentInteractive(environment) {
   const configDefaultEnv = getDefaultEnvironment();
   if (configDefaultEnv && availableEnvs.includes(configDefaultEnv)) {
     try {
-      getEnvironmentConfig(configDefaultEnv);
+      getEnvironmentConfig2(configDefaultEnv);
       defaultEnv = configDefaultEnv;
     } catch {
     }
@@ -1230,14 +1266,14 @@ import {
   createComputeModule,
   createBillingModule,
   createBuildModule,
-  getEnvironmentConfig as getEnvironmentConfig2,
+  getEnvironmentConfig as getEnvironmentConfig3,
   requirePrivateKey,
   getPrivateKeyWithSource
 } from "@layr-labs/ecloud-sdk";
 async function createComputeClient(flags) {
   flags = await validateCommonFlags(flags);
   const environment = flags.environment;
-  const environmentConfig = getEnvironmentConfig2(environment);
+  const environmentConfig = getEnvironmentConfig3(environment);
   const rpcUrl = flags["rpc-url"] || environmentConfig.defaultRPCURL;
   const { key: privateKey, source } = await requirePrivateKey({
     privateKey: flags["private-key"]
@@ -1245,10 +1281,15 @@ async function createComputeClient(flags) {
   if (flags.verbose) {
     console.log(`Using private key from: ${source}`);
   }
-  return createComputeModule({
-    verbose: flags.verbose,
+  const { walletClient, publicClient } = createViemClients({
     privateKey,
     rpcUrl,
+    environment
+  });
+  return createComputeModule({
+    verbose: flags.verbose,
+    walletClient,
+    publicClient,
     environment,
     clientId: getClientId(),
     skipTelemetry: true
@@ -1257,10 +1298,21 @@ async function createComputeClient(flags) {
 }
 async function createBuildClient(flags) {
   flags = await validateCommonFlags(flags, { requirePrivateKey: false });
+  const environment = flags.environment || "mainnet";
+  const environmentConfig = getEnvironmentConfig3(environment);
+  const rpcUrl = flags["rpc-url"] || environmentConfig.defaultRPCURL;
+  let walletClient;
+  if (flags["private-key"]) {
+    walletClient = createViemClients({
+      privateKey: flags["private-key"],
+      rpcUrl,
+      environment
+    }).walletClient;
+  }
   return createBuildModule({
     verbose: flags.verbose,
-    privateKey: flags["private-key"],
-    environment: flags.environment,
+    walletClient,
+    environment,
     clientId: getClientId(),
     skipTelemetry: true
     // CLI already has telemetry, skip SDK telemetry
@@ -1345,6 +1397,17 @@ async function runVerifiableBuildAndVerify(client, request, options = {}) {
   return { build, verified: verify };
 }
 
+// src/utils/dashboard.ts
+var DASHBOARD_URLS = {
+  "sepolia-dev": "https://compute-dashboard-sepolia-dev.vercel.app",
+  sepolia: "https://verify-sepolia.eigencloud.xyz",
+  "mainnet-alpha": "https://verify.eigencloud.xyz"
+};
+function getDashboardUrl(environment, appAddress) {
+  const baseUrl = DASHBOARD_URLS[environment] || DASHBOARD_URLS["sepolia"];
+  return `${baseUrl}/app/${appAddress}`;
+}
+
 // src/utils/dockerhub.ts
 var DOCKERHUB_OWNER = "eigenlayer";
 var DOCKERHUB_REPO = "eigencloud-containers";
@@ -1507,6 +1570,11 @@ var AppUpgrade = class _AppUpgrade extends Command {
     "build-dependencies": Flags2.string({
       description: "Dependency digests for verifiable build (git source mode) (sha256:...)",
       multiple: true
+    }),
+    "build-caddyfile": Flags2.string({
+      description: "Optional path to Caddyfile inside the repo (relative to build context). If omitted, auto-detected from env file TLS settings",
+      required: false,
+      env: "ECLOUD_BUILD_CADDYFILE"
     })
   };
   async run() {
@@ -1514,7 +1582,7 @@ var AppUpgrade = class _AppUpgrade extends Command {
       const { args, flags } = await this.parse(_AppUpgrade);
       const compute = await createComputeClient(flags);
       const environment = flags.environment;
-      const environmentConfig = getEnvironmentConfig3(environment);
+      const environmentConfig = getEnvironmentConfig4(environment);
       const rpcUrl = flags["rpc-url"] || environmentConfig.defaultRPCURL;
       const privateKey = flags["private-key"];
       const appID = await getOrPromptAppID({
@@ -1575,7 +1643,7 @@ var AppUpgrade = class _AppUpgrade extends Command {
           repoUrl: flags.repo,
           gitRef: flags.commit,
           dockerfilePath: flags["build-dockerfile"],
-          caddyfilePath: void 0,
+          caddyfilePath: flags["build-caddyfile"],
           buildContextPath: flags["build-context"],
           dependencies: flags["build-dependencies"]
         } : await promptVerifiableGitSourceInputs();
@@ -1645,11 +1713,16 @@ var AppUpgrade = class _AppUpgrade extends Command {
       envFilePath = envFilePath ?? await getEnvFileInteractive(flags["env-file"]);
       let currentInstanceType = "";
       try {
-        const userApiClient = new UserApiClient3(
-          environmentConfig,
+        const { publicClient, walletClient } = createViemClients({
           privateKey,
           rpcUrl,
-          getClientId()
+          environment: environmentConfig.name
+        });
+        const userApiClient = new UserApiClient3(
+          environmentConfig,
+          walletClient,
+          publicClient,
+          { clientId: getClientId() }
         );
         const infos = await userApiClient.getInfos([appID], 1);
         if (infos.length > 0) {
@@ -1699,10 +1772,7 @@ ${chalk.gray(`Upgrade cancelled`)}`);
           return;
         }
       }
-      const res = await compute.app.executeUpgrade(prepared, {
-        maxFeePerGas: gasEstimate.maxFeePerGas,
-        maxPriorityFeePerGas: gasEstimate.maxPriorityFeePerGas
-      });
+      const res = await compute.app.executeUpgrade(prepared, gasEstimate);
       await compute.app.watchUpgrade(res.appId);
       try {
         const cwd = process.env.INIT_CWD || process.cwd();
@@ -1714,12 +1784,20 @@ ${chalk.gray(`Upgrade cancelled`)}`);
         `
 \u2705 ${chalk.green(`App upgraded successfully ${chalk.bold(`(id: ${res.appId}, image: ${res.imageRef})`)}`)}`
       );
+      const dashboardUrl = getDashboardUrl(environment, res.appId);
+      this.log(`
+${chalk.gray("View your app:")} ${chalk.blue.underline(dashboardUrl)}`);
     });
   }
 };
 async function fetchAvailableInstanceTypes(environmentConfig, privateKey, rpcUrl) {
   try {
-    const userApiClient = new UserApiClient3(environmentConfig, privateKey, rpcUrl, getClientId());
+    const { publicClient, walletClient } = createViemClients({
+      privateKey,
+      rpcUrl,
+      environment: environmentConfig.name
+    });
+    const userApiClient = new UserApiClient3(environmentConfig, walletClient, publicClient, { clientId: getClientId() });
     const skuList = await userApiClient.getSKUs();
     if (skuList.skus.length === 0) {
       throw new Error("No instance types available from server");