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

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

@@ -8,7 +8,7 @@ import {
   createComputeModule,
   createBillingModule,
   createBuildModule,
-  getEnvironmentConfig as getEnvironmentConfig2,
+  getEnvironmentConfig as getEnvironmentConfig3,
   requirePrivateKey,
   getPrivateKeyWithSource
 } from "@layr-labs/ecloud-sdk";
@@ -23,9 +23,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,
@@ -42,12 +42,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";
@@ -214,7 +245,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()}`;
@@ -237,7 +268,7 @@ async function getAppInfosChunked(userApiClient, appIds, addressCount) {
 }
 
 // src/utils/prompts.ts
-function addHexPrefix(value) {
+function addHexPrefix2(value) {
   if (value.startsWith("0x")) {
     return value;
   }
@@ -301,7 +332,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;
     }
@@ -317,7 +348,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}'`
@@ -328,18 +359,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
   );
@@ -352,9 +388,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 = {};
@@ -478,14 +514,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;
     }
@@ -521,7 +557,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;
         }
@@ -531,17 +567,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 confirm(prompt) {
   return confirmWithDefault(prompt, false);
@@ -582,7 +618,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`);
       }
@@ -595,7 +631,7 @@ async function getEnvironmentInteractive(environment) {
   const configDefaultEnv = getDefaultEnvironment();
   if (configDefaultEnv && availableEnvs.includes(configDefaultEnv)) {
     try {
-      getEnvironmentConfig(configDefaultEnv);
+      getEnvironmentConfig2(configDefaultEnv);
       defaultEnv = configDefaultEnv;
     } catch {
     }
@@ -661,7 +697,7 @@ async function validateCommonFlags(flags, options) {
 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"]
@@ -669,10 +705,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
@@ -682,7 +723,7 @@ async function createComputeClient(flags) {
 
 // src/commands/compute/app/stop.ts
 import {
-  getEnvironmentConfig as getEnvironmentConfig3,
+  getEnvironmentConfig as getEnvironmentConfig4,
   estimateTransactionGas,
   encodeStopAppData,
   isMainnet
@@ -764,7 +805,7 @@ var AppLifecycleStop = class _AppLifecycleStop extends Command {
       const { args, flags } = await this.parse(_AppLifecycleStop);
       const compute = await createComputeClient(flags);
       const environment = flags.environment;
-      const environmentConfig = getEnvironmentConfig3(environment);
+      const environmentConfig = getEnvironmentConfig4(environment);
       const rpcUrl = flags.rpcUrl || environmentConfig.defaultRPCURL;
       const privateKey = flags["private-key"] || await getPrivateKeyInteractive(environment);
       const appId = await getOrPromptAppID({
@@ -774,11 +815,15 @@ var AppLifecycleStop = class _AppLifecycleStop extends Command {
         rpcUrl,
         action: "stop"
       });
-      const callData = encodeStopAppData(appId);
-      const estimate = await estimateTransactionGas({
+      const { publicClient, address } = createViemClients({
         privateKey,
         rpcUrl,
-        environmentConfig,
+        environment
+      });
+      const callData = encodeStopAppData(appId);
+      const estimate = await estimateTransactionGas({
+        publicClient,
+        from: address,
         to: environmentConfig.appControllerAddress,
         data: callData
       });
@@ -793,10 +838,7 @@ ${chalk.gray(`Stop cancelled`)}`);
         }
       }
       const res = await compute.app.stop(appId, {
-        gas: {
-          maxFeePerGas: estimate.maxFeePerGas,
-          maxPriorityFeePerGas: estimate.maxPriorityFeePerGas
-        }
+        gas: estimate
       });
       if (!res.tx) {
         this.log(`