@layr-labs/ecloud-cli 1.0.0-devep7 → 1.0.0

package/dist/commands/billing/__tests__/status.test.js

@@ -297,7 +297,7 @@ var init_flags = __esm({
         required: false,
         description: "Deployment environment to use",
         env: "ECLOUD_ENV",
-        default: async () => getDefaultEnvironment() || (getBuildType2() === "dev" ? "sepolia-dev" : "sepolia")
+        default: async () => getDefaultEnvironment() || (getBuildType2() === "dev" ? "sepolia-dev" : "mainnet-alpha")
       }),
       "private-key": Flags.string({
         required: false,
@@ -327,6 +327,12 @@ var init_flags = __esm({
       nonce: Flags.string({
         required: false,
         description: 'Override transaction nonce (integer or "latest" to replace a stuck transaction)'
+      }),
+      "non-interactive": Flags.boolean({
+        required: false,
+        description: "Assume non-interactive mode: default safe prompts and error all-at-once on missing required inputs",
+        env: "ECLOUD_NON_INTERACTIVE",
+        default: false
       })
     };
   }
@@ -337,6 +343,7 @@ import {
   createComputeModule,
   createBillingModule,
   createBuildModule,
+  createAdminModule,
   getEnvironmentConfig as getEnvironmentConfig3,
   requirePrivateKey
 } from "@layr-labs/ecloud-sdk";
@@ -361,7 +368,8 @@ async function createBillingClient(flags) {
     walletClient,
     publicClient,
     environment,
-    skipTelemetry: true
+    skipTelemetry: true,
+    privateKey
   });
 }
 var init_client = __esm({
@@ -373,6 +381,18 @@ var init_client = __esm({
   }
 });
 
+// src/utils/exitCodes.ts
+import { InsufficientGasError } from "@layr-labs/ecloud-sdk";
+function errorMessage(err) {
+  if (err instanceof Error) return err.message;
+  return String(err);
+}
+var init_exitCodes = __esm({
+  "src/utils/exitCodes.ts"() {
+    "use strict";
+  }
+});
+
 // src/telemetry.ts
 import {
   createTelemetryClient,
@@ -443,6 +463,8 @@ __export(status_exports, {
   default: () => BillingStatus
 });
 import { Command, Flags as Flags2 } from "@oclif/core";
+import { getEnvironmentConfig as getEnvironmentConfig4 } from "@layr-labs/ecloud-sdk";
+import { formatEther as formatEther2 } from "viem";
 import chalk2 from "chalk";
 var BillingStatus;
 var init_status = __esm({
@@ -450,6 +472,8 @@ var init_status = __esm({
     "use strict";
     init_client();
     init_flags();
+    init_viemClients();
+    init_exitCodes();
     init_telemetry();
     BillingStatus = class _BillingStatus extends Command {
       static description = "Show subscription status";
@@ -498,6 +522,21 @@ var init_status = __esm({
           this.log(`
 ${chalk2.bold("Subscription Status:")}`);
           this.log(`  Wallet: ${billing.address}`);
+          try {
+            const privateKey = flags["private-key"];
+            if (privateKey) {
+              const environment = flags.environment;
+              const environmentConfig = getEnvironmentConfig4(environment);
+              const rpcUrl = flags["rpc-url"] || environmentConfig.defaultRPCURL;
+              const { publicClient, address } = createViemClients({ privateKey, rpcUrl, environment });
+              const balanceWei = await publicClient.getBalance({ address });
+              const eth = formatEther2(balanceWei);
+              const note = balanceWei === BigInt(0) ? chalk2.yellow("  (fund with ETH to pay deploy/upgrade gas)") : "";
+              this.log(`  Wallet ETH (${environment}): ${chalk2.cyan(`${eth} ETH`)}${note}`);
+            }
+          } catch (err) {
+            this.warn(`Could not read wallet ETH balance: ${errorMessage(err)}`);
+          }
           this.log(`  Status: ${formatStatus(result.subscriptionStatus)}`);
           this.log(`  Product: ${result.productId}`);
           if (result.currentPeriodStart && result.currentPeriodEnd) {
@@ -555,6 +594,7 @@ ${chalk2.bold("Need more credits?")}`);
 
 // src/commands/billing/__tests__/status.test.ts
 init_client();
+init_viemClients();
 import { describe, it, expect, vi, beforeEach } from "vitest";
 vi.mock("../../../client", () => ({
   createBillingClient: vi.fn()
@@ -562,25 +602,37 @@ vi.mock("../../../client", () => ({
 vi.mock("../../../telemetry", () => ({
   withTelemetry: vi.fn((_cmd, fn) => fn())
 }));
+vi.mock("@layr-labs/ecloud-sdk", () => ({
+  getEnvironmentConfig: vi.fn(() => ({ defaultRPCURL: "https://rpc.example" }))
+}));
+vi.mock("../../../utils/viemClients", () => ({
+  createViemClients: vi.fn()
+}));
 describe("ecloud billing status \u2014 top-up hint", () => {
   let logOutput;
   let mockBilling;
   beforeEach(() => {
     logOutput = [];
+    warnOutput = [];
     mockBilling = {
       address: "0xabcdef1234567890abcdef1234567890abcdef12",
       getStatus: vi.fn()
     };
     createBillingClient.mockResolvedValue(mockBilling);
   });
-  async function runStatusCommand(statusResult) {
+  let warnOutput;
+  async function runStatusCommand(statusResult, flagOverrides = {}) {
     const { default: BillingStatus2 } = await Promise.resolve().then(() => (init_status(), status_exports));
     mockBilling.getStatus.mockResolvedValue(statusResult);
     const cmd = new BillingStatus2([], {});
     cmd.parse = vi.fn().mockResolvedValue({
-      flags: { product: "compute", verbose: false }
+      flags: { product: "compute", verbose: false, ...flagOverrides }
     });
     cmd.log = vi.fn((...args) => logOutput.push(args.join(" ")));
+    cmd.warn = vi.fn((msg) => {
+      warnOutput.push(typeof msg === "string" ? msg : msg.message);
+      return msg;
+    });
     cmd.debug = vi.fn();
     await cmd.run();
     return logOutput;
@@ -621,5 +673,31 @@ describe("ecloud billing status \u2014 top-up hint", () => {
     const fullOutput = output.join("\n");
     expect(fullOutput).not.toContain("Need more credits?");
   });
+  describe("wallet ETH balance line", () => {
+    it("warns (does not silently swallow) when the balance read fails, but still completes", async () => {
+      createViemClients.mockImplementation(() => {
+        throw new Error("invalid private key");
+      });
+      const output = await runStatusCommand(
+        { subscriptionStatus: "active", productId: "compute" },
+        { "private-key": "0xbad", environment: "sepolia" }
+      );
+      expect(output.join("\n")).toContain("Subscription Status:");
+      expect(warnOutput.join("\n")).toMatch(/wallet ETH|balance/i);
+      expect(warnOutput.join("\n")).toContain("invalid private key");
+    });
+    it("prints the ETH line on a successful balance read", async () => {
+      createViemClients.mockReturnValue({
+        publicClient: { getBalance: vi.fn().mockResolvedValue(1000000000000000000n) },
+        address: "0xabcdef1234567890abcdef1234567890abcdef12"
+      });
+      const output = await runStatusCommand(
+        { subscriptionStatus: "active", productId: "compute" },
+        { "private-key": "0xgood", environment: "sepolia" }
+      );
+      expect(output.join("\n")).toMatch(/Wallet ETH.*1 ETH/);
+      expect(warnOutput).toHaveLength(0);
+    });
+  });
 });
 //# sourceMappingURL=status.test.js.map