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

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

@@ -2,7 +2,7 @@
 
 // src/commands/compute/app/releases.ts
 import { Command, Args, Flags as Flags2 } from "@oclif/core";
-import { getEnvironmentConfig as getEnvironmentConfig2, UserApiClient as UserApiClient3 } from "@layr-labs/ecloud-sdk";
+import { getEnvironmentConfig as getEnvironmentConfig3, UserApiClient as UserApiClient3 } from "@layr-labs/ecloud-sdk";
 
 // src/flags.ts
 import { Flags } from "@oclif/core";
@@ -14,9 +14,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,
@@ -33,12 +33,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/globalConfig.ts
 import * as fs from "fs";
 import * as path from "path";
@@ -205,7 +236,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()}`;
@@ -228,7 +259,7 @@ async function getAppInfosChunked(userApiClient, appIds, addressCount) {
 }
 
 // src/utils/prompts.ts
-function addHexPrefix(value) {
+function addHexPrefix2(value) {
   if (value.startsWith("0x")) {
     return value;
   }
@@ -292,7 +323,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;
     }
@@ -308,7 +339,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}'`
@@ -319,18 +350,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
   );
@@ -343,9 +379,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 = {};
@@ -469,14 +505,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;
     }
@@ -512,7 +548,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;
         }
@@ -522,17 +558,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 getPrivateKeyInteractive(privateKey) {
   if (privateKey) {
@@ -564,7 +600,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`);
       }
@@ -577,7 +613,7 @@ async function getEnvironmentInteractive(environment) {
   const configDefaultEnv = getDefaultEnvironment();
   if (configDefaultEnv && availableEnvs.includes(configDefaultEnv)) {
     try {
-      getEnvironmentConfig(configDefaultEnv);
+      getEnvironmentConfig2(configDefaultEnv);
       defaultEnv = configDefaultEnv;
     } catch {
     }
@@ -835,15 +871,7 @@ function formatAppRelease(release, index) {
   return lines;
 }
 
-// src/commands/compute/app/releases.ts
-import { isAddress as isAddress3 } from "viem";
-import Table from "cli-table3";
-
 // src/utils/cliFormat.ts
-function terminalWidth(fallback = 120) {
-  const cols = typeof process.stdout.columns === "number" ? process.stdout.columns : void 0;
-  return cols && cols > 0 ? cols : fallback;
-}
 function formatHumanTime(value) {
   const raw = String(value ?? "").trim();
   if (!raw) return "-";
@@ -958,13 +986,9 @@ var AppReleases = class _AppReleases extends Command {
   async run() {
     return withTelemetry(this, async () => {
       const { args, flags } = await this.parse(_AppReleases);
-      const rawAppId = args["app-id"];
-      const needsPrivateKey = !rawAppId || !isAddress3(rawAppId);
-      const validatedFlags = await validateCommonFlags(flags, {
-        requirePrivateKey: needsPrivateKey
-      });
+      const validatedFlags = await validateCommonFlags(flags);
       const environment = validatedFlags.environment || "sepolia";
-      const environmentConfig = getEnvironmentConfig2(environment);
+      const environmentConfig = getEnvironmentConfig3(environment);
       const rpcUrl = validatedFlags["rpc-url"] || environmentConfig.defaultRPCURL;
       const privateKey = validatedFlags["private-key"];
       const appID = await getOrPromptAppID({
@@ -974,7 +998,14 @@ var AppReleases = class _AppReleases extends Command {
         rpcUrl,
         action: "view releases for"
       });
-      const userApiClient = new UserApiClient3(environmentConfig, privateKey, rpcUrl, getClientId());
+      const { publicClient, walletClient } = createViemClients({
+        privateKey,
+        rpcUrl,
+        environment
+      });
+      const userApiClient = new UserApiClient3(environmentConfig, walletClient, publicClient, {
+        clientId: getClientId()
+      });
       const data = await userApiClient.getApp(appID);
       const releases = sortReleasesOldestFirst(data.releases);
       if (releases.length === 0) {
@@ -999,7 +1030,8 @@ ${separator()}
         }
         return;
       }
-      const rows = releases.map((r, i) => {
+      for (let i = 0; i < releases.length; i++) {
+        const r = releases[i];
         const rel = r.rmsReleaseId ?? String(i);
         const block = r.createdAtBlock ? String(r.createdAtBlock) : "-";
         const created = r.createdAt ? formatHumanTime(r.createdAt) : "-";
@@ -1009,89 +1041,19 @@ ${separator()}
         const image = formatImageDisplay(r.build?.imageUrl ?? r.registryUrl ?? "-");
         const build = r.build?.buildId ?? "-";
         const prov = provenanceSummaryFromBuild(r.build);
-        const depCount = r.build?.dependencies ? Object.keys(r.build.dependencies).length : 0;
-        const deps = depCount > 0 ? `deps:${depCount}` : "-";
-        return { rel, block, created, repo, commit, digest, image, build, prov, deps };
-      });
-      const headers = {
-        rel: chalk2.bold("Rel"),
-        block: chalk2.bold("Block"),
-        created: chalk2.bold("Created"),
-        repo: chalk2.bold("Repo"),
-        commit: chalk2.bold("Commit"),
-        digest: chalk2.bold("Digest"),
-        image: chalk2.bold("Image"),
-        build: chalk2.bold("Build"),
-        prov: chalk2.bold("Prov"),
-        deps: chalk2.bold("Deps")
-      };
-      const tw = terminalWidth();
-      const shouldStack = tw < 140;
-      if (shouldStack) {
-        for (const r of rows) {
-          this.log(`${chalk2.cyan(r.rel)}  ${r.created}  (block ${r.block})`);
-          this.log(`  Repo:   ${r.repo}`);
-          this.log(`  Commit: ${r.commit}`);
-          this.log(`  Digest: ${r.digest}`);
-          this.log(`  Image:  ${r.image}`);
-          this.log(`  Build:  ${r.build}`);
-          this.log(`  Provenance: ${r.prov}`);
-          const relObj = releases.find((x, idx) => (x.rmsReleaseId ?? String(idx)) === r.rel);
-          const depLines = formatDepLines(relObj?.build?.dependencies);
-          if (depLines.length) {
-            for (const l of depLines) this.log(l);
-          }
-          this.log(chalk2.gray("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
+        this.log(`${chalk2.cyan(rel)}  ${created}  (block ${block})`);
+        this.log(`  Repo:   ${repo}`);
+        this.log(`  Commit: ${commit}`);
+        this.log(`  Digest: ${digest}`);
+        this.log(`  Image:  ${image}`);
+        this.log(`  Build:  ${build}`);
+        this.log(`  Provenance: ${prov}`);
+        const depLines = formatDepLines(r.build?.dependencies);
+        if (depLines.length) {
+          for (const l of depLines) this.log(l);
         }
-        this.log("");
-        this.log(
-          chalk2.gray(
-            `Tip: use ${chalk2.yellow("--full")} for detailed release output, ${chalk2.yellow(
-              "--json"
-            )} to copy/paste, and ${chalk2.yellow(
-              "ecloud compute build info <buildId>"
-            )} for full build/provenance details.`
-          )
-        );
-        return;
-      }
-      const fixed = 6 + 10 + 20 + 36 + 12 + 8 + 10;
-      const remaining = Math.max(60, tw - fixed);
-      const repoW = Math.max(18, Math.floor(remaining * 0.25));
-      const digestW = Math.max(18, Math.floor(remaining * 0.35));
-      const imageW = Math.max(18, remaining - repoW - digestW);
-      const table = new Table({
-        head: [
-          headers.rel,
-          headers.block,
-          headers.created,
-          headers.repo,
-          headers.commit,
-          headers.digest,
-          headers.image,
-          headers.build,
-          headers.prov,
-          headers.deps
-        ],
-        colWidths: [6, 10, 20, repoW, 10, digestW, imageW, 36, 12, 8],
-        wordWrap: true,
-        style: { "padding-left": 0, "padding-right": 1, head: [], border: [] }
-      });
-      for (const r of rows) {
-        table.push([
-          r.rel,
-          r.block,
-          r.created,
-          r.repo,
-          r.commit,
-          r.digest,
-          r.image,
-          r.build,
-          r.prov,
-          r.deps
-        ]);
+        this.log(chalk2.gray("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
       }
-      this.log(table.toString());
       this.log("");
       this.log(
         chalk2.gray(