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

package/dist/commands/billing/top-up.js

@@ -9,9 +9,7 @@ import {
   createBillingModule,
   createBuildModule,
   getEnvironmentConfig as getEnvironmentConfig3,
-  requirePrivateKey,
-  getPrivateKeyWithSource,
-  addHexPrefix as addHexPrefix2
+  requirePrivateKey
 } from "@layr-labs/ecloud-sdk";
 
 // src/flags.ts
@@ -166,6 +164,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)) {
@@ -173,8 +172,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;
   }
@@ -193,6 +192,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
@@ -219,38 +262,41 @@ 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
   });
 }
 
 // src/commands/billing/top-up.ts
-import {
-  getEnvironmentConfig as getEnvironmentConfig4,
-  USDCCreditsABI,
-  ERC20ABI
-} from "@layr-labs/ecloud-sdk";
 import { formatUnits } from "viem";
 import chalk2 from "chalk";
 import { input as input2 } from "@inquirer/prompts";
@@ -340,19 +386,7 @@ var BillingTopUp = class _BillingTopUp extends Command {
     return withTelemetry(this, async () => {
       const { flags } = await this.parse(_BillingTopUp);
       const billing = await createBillingClient(flags);
-      const privateKey = await getPrivateKeyInteractive(flags["private-key"]);
-      const { publicClient, walletClient, address: walletAddress } = createViemClients({
-        privateKey,
-        rpcUrl: flags["rpc-url"],
-        environment: flags.environment
-      });
-      const environmentConfig = getEnvironmentConfig4(flags.environment);
-      const usdcCreditsAddress = environmentConfig.usdcCreditsAddress;
-      if (!usdcCreditsAddress) {
-        this.error(
-          `USDCCredits contract is not configured for environment "${flags.environment}". USDC credit purchasing is only available on environments with a deployed USDCCredits contract.`
-        );
-      }
+      const walletAddress = billing.address;
       const targetAccount = flags.account ?? walletAddress;
       this.log(`
 ${chalk2.bold("Purchase EigenCompute credits")}`);
@@ -362,34 +396,22 @@ ${chalk2.bold("Purchase EigenCompute credits")}`);
       if (targetAccount !== walletAddress) {
         this.log(`  ${chalk2.bold("Target:")}  ${targetAccount}`);
       }
-      let currentCredits;
+      let baselineTotal;
       try {
         const status = await billing.getStatus({
           productId: flags.product
         });
-        currentCredits = status.remainingCredits;
-        if (currentCredits !== void 0) {
-          this.log(`  ${chalk2.bold("Credits:")} ${chalk2.cyan(`$${currentCredits.toFixed(2)}`)}`);
+        const remaining = status.remainingCredits ?? 0;
+        const applied = status.creditsApplied ?? 0;
+        baselineTotal = remaining + applied;
+        if (status.remainingCredits !== void 0) {
+          this.log(`  ${chalk2.bold("Credits:")} ${chalk2.cyan(`$${status.remainingCredits.toFixed(2)}`)}`);
         }
       } catch {
         this.debug("Could not fetch current credit balance");
       }
-      const usdcAddress = await publicClient.readContract({
-        address: usdcCreditsAddress,
-        abi: USDCCreditsABI,
-        functionName: "usdc"
-      });
-      const minimumPurchase = await publicClient.readContract({
-        address: usdcCreditsAddress,
-        abi: USDCCreditsABI,
-        functionName: "minimumPurchase"
-      });
-      const usdcBalance = await publicClient.readContract({
-        address: usdcAddress,
-        abi: ERC20ABI,
-        functionName: "balanceOf",
-        args: [walletAddress]
-      });
+      const onChainState = await billing.getTopUpInfo();
+      const { usdcBalance, minimumPurchase } = onChainState;
       const balanceFormatted = formatUnits(usdcBalance, 6);
       this.log(`  ${chalk2.bold("USDC:")}    ${balanceFormatted} USDC`);
       if (usdcBalance === BigInt(0)) {
@@ -426,36 +448,11 @@ ${chalk2.yellow("  No USDC in wallet.")}`);
       }
       this.log(`
   Purchasing ${chalk2.bold(`$${amountFloat.toFixed(2)}`)} in credits...`);
-      const currentAllowance = await publicClient.readContract({
-        address: usdcAddress,
-        abi: ERC20ABI,
-        functionName: "allowance",
-        args: [walletAddress, usdcCreditsAddress]
-      });
-      if (currentAllowance < amountRaw) {
-        this.log(chalk2.gray("  Approving USDC spend..."));
-        const approveTx = await walletClient.writeContract({
-          address: usdcAddress,
-          abi: ERC20ABI,
-          functionName: "approve",
-          args: [usdcCreditsAddress, amountRaw],
-          chain: walletClient.chain,
-          account: walletClient.account
-        });
-        await publicClient.waitForTransactionReceipt({ hash: approveTx });
-        this.log(`  ${chalk2.green("\u2713")} Approved`);
-      }
-      this.log(chalk2.gray("  Submitting credit purchase..."));
-      const purchaseTx = await walletClient.writeContract({
-        address: usdcCreditsAddress,
-        abi: USDCCreditsABI,
-        functionName: "purchaseCreditsFor",
-        args: [amountRaw, targetAccount],
-        chain: walletClient.chain,
-        account: walletClient.account
+      const { txHash } = await billing.topUp({
+        amount: amountRaw,
+        account: targetAccount
       });
-      const receipt = await publicClient.waitForTransactionReceipt({ hash: purchaseTx });
-      this.log(`  ${chalk2.green("\u2713")} Transaction confirmed: ${receipt.transactionHash}`);
+      this.log(`  ${chalk2.green("\u2713")} Transaction confirmed: ${txHash}`);
       this.log(chalk2.gray("\n  Waiting for credits to appear..."));
       const startTime = Date.now();
       while (Date.now() - startTime < POLL_TIMEOUT_MS) {
@@ -464,11 +461,25 @@ ${chalk2.yellow("  No USDC in wallet.")}`);
           const status = await billing.getStatus({
             productId: flags.product
           });
-          if (status.remainingCredits !== void 0 && (currentCredits === void 0 || status.remainingCredits > currentCredits)) {
-            this.log(
-              `
-  ${chalk2.green("\u2713")} Credits received! Balance: ${chalk2.cyan(`$${status.remainingCredits.toFixed(2)}`)}`
-            );
+          const remaining = status.remainingCredits ?? 0;
+          const applied = status.creditsApplied ?? 0;
+          const currentTotal = remaining + applied;
+          this.debug(`Poll: remaining=${remaining}, applied=${applied}, total=${currentTotal}, baseline=${baselineTotal}`);
+          if (baselineTotal === void 0 || currentTotal > baselineTotal) {
+            const creditsAdded = baselineTotal !== void 0 ? currentTotal - baselineTotal : void 0;
+            const isMatched = creditsAdded !== void 0 && Math.abs(creditsAdded - amountFloat * 2) < 0.01;
+            const appliedFromTopUp = creditsAdded !== void 0 ? creditsAdded - remaining : 0;
+            this.log(`
+  ${chalk2.green("\u2713")} Credits received: ${chalk2.cyan(`$${(creditsAdded ?? amountFloat).toFixed(2)}`)}`);
+            if (isMatched) {
+              this.log(`  ${chalk2.green("\u2713")} Includes $${amountFloat.toFixed(2)} match bonus!`);
+            }
+            if (remaining > 0) {
+              this.log(`  Remaining balance: ${chalk2.cyan(`$${remaining.toFixed(2)}`)}`);
+            }
+            if (appliedFromTopUp > 0) {
+              this.log(`  ${chalk2.gray(`$${appliedFromTopUp.toFixed(2)} applied to current bill`)}`);
+            }
             this.log();
             return;
           }