@layr-labs/ecloud-cli 0.4.0-dev.1 → 0.4.0-dev.3

package/dist/commands/billing/subscribe.js

@@ -10,9 +10,7 @@ import {
   createBillingModule,
   createBuildModule,
   getEnvironmentConfig as getEnvironmentConfig3,
-  requirePrivateKey,
-  getPrivateKeyWithSource,
-  addHexPrefix as addHexPrefix2
+  requirePrivateKey
 } from "@layr-labs/ecloud-sdk";
 
 // src/flags.ts
@@ -63,6 +61,24 @@ import {
   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";
@@ -149,6 +165,7 @@ var CONFIG_DIR = path2.join(os2.homedir(), ".eigenx");
 var APPS_DIR = path2.join(CONFIG_DIR, "apps");
 
 // src/utils/prompts.ts
+import { execSync } from "child_process";
 async function getPrivateKeyInteractive(privateKey) {
   if (privateKey) {
     if (!validatePrivateKeyFormat(privateKey)) {
@@ -156,8 +173,8 @@ async function getPrivateKeyInteractive(privateKey) {
     }
     return privateKey;
   }
-  const { getPrivateKeyWithSource: getPrivateKeyWithSource2 } = await import("@layr-labs/ecloud-sdk");
-  const result = await getPrivateKeyWithSource2({ privateKey: void 0 });
+  const { getPrivateKeyWithSource } = await import("@layr-labs/ecloud-sdk");
+  const result = await getPrivateKeyWithSource({ privateKey: void 0 });
   if (result) {
     return result.key;
   }
@@ -176,6 +193,50 @@ async function getPrivateKeyInteractive(privateKey) {
   });
   return key.trim();
 }
+async function getEnvironmentInteractive(environment) {
+  if (environment) {
+    try {
+      getEnvironmentConfig2(environment);
+      if (!isEnvironmentAvailable(environment)) {
+        throw new Error(`Environment ${environment} is not available in this build`);
+      }
+      return environment;
+    } catch {
+    }
+  }
+  const availableEnvs = getAvailableEnvironments();
+  let defaultEnv;
+  const configDefaultEnv = getDefaultEnvironment();
+  if (configDefaultEnv && availableEnvs.includes(configDefaultEnv)) {
+    try {
+      getEnvironmentConfig2(configDefaultEnv);
+      defaultEnv = configDefaultEnv;
+    } catch {
+    }
+  }
+  const choices = [];
+  if (availableEnvs.includes("sepolia")) {
+    choices.push({ name: "sepolia - Ethereum Sepolia testnet", value: "sepolia" });
+  }
+  if (availableEnvs.includes("sepolia-dev")) {
+    choices.push({ name: "sepolia-dev - Ethereum Sepolia testnet (dev)", value: "sepolia-dev" });
+  }
+  if (availableEnvs.includes("mainnet-alpha")) {
+    choices.push({
+      name: "mainnet-alpha - Ethereum mainnet (\u26A0\uFE0F  uses real funds)",
+      value: "mainnet-alpha"
+    });
+  }
+  if (choices.length === 0) {
+    throw new Error("No environments available in this build");
+  }
+  const env = await select({
+    message: "Select environment:",
+    choices,
+    default: defaultEnv
+  });
+  return env;
+}
 var MAX_IMAGE_SIZE = 4 * 1024 * 1024;
 
 // src/flags.ts
@@ -202,29 +263,37 @@ var commonFlags = {
     default: false
   })
 };
+async function validateCommonFlags(flags, options) {
+  flags["environment"] = await getEnvironmentInteractive(flags["environment"]);
+  if (options?.requirePrivateKey !== false) {
+    flags["private-key"] = await getPrivateKeyInteractive(flags["private-key"]);
+  }
+  return flags;
+}
 
 // src/client.ts
-import { createWalletClient, custom } from "viem";
-import { privateKeyToAccount as privateKeyToAccount4 } from "viem/accounts";
 async function createBillingClient(flags) {
-  const result = await getPrivateKeyWithSource({
+  flags = await validateCommonFlags(flags);
+  const environment = flags.environment;
+  const environmentConfig = getEnvironmentConfig3(environment);
+  const rpcUrl = flags["rpc-url"] || environmentConfig.billingRPCURL || environmentConfig.defaultRPCURL;
+  const { key: privateKey, source } = await requirePrivateKey({
     privateKey: flags["private-key"]
   });
-  const privateKey = await getPrivateKeyInteractive(result?.key);
-  const account = privateKeyToAccount4(addHexPrefix2(privateKey));
-  const walletClient = createWalletClient({
-    account,
-    transport: custom({
-      async request() {
-        throw new Error("RPC not available - billing uses local signing only");
-      }
-    })
+  if (flags.verbose) {
+    console.log(`Using private key from: ${source}`);
+  }
+  const { walletClient, publicClient } = createViemClients({
+    privateKey,
+    rpcUrl,
+    environment
   });
   return createBillingModule({
-    verbose: flags.verbose ?? false,
+    verbose: flags.verbose,
     walletClient,
+    publicClient,
+    environment,
     skipTelemetry: true
-    // CLI already has telemetry, skip SDK telemetry
   });
 }