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

package/dist/commands/compute/build/logs.js

@@ -13,9 +13,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,
@@ -32,12 +32,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";
@@ -124,7 +155,7 @@ var APPS_DIR = path2.join(CONFIG_DIR, "apps");
 
 // 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()}`;
@@ -198,7 +229,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`);
       }
@@ -211,7 +242,7 @@ async function getEnvironmentInteractive(environment) {
   const configDefaultEnv = getDefaultEnvironment();
   if (configDefaultEnv && availableEnvs.includes(configDefaultEnv)) {
     try {
-      getEnvironmentConfig(configDefaultEnv);
+      getEnvironmentConfig2(configDefaultEnv);
       defaultEnv = configDefaultEnv;
     } catch {
     }
@@ -278,16 +309,27 @@ import {
   createComputeModule,
   createBillingModule,
   createBuildModule,
-  getEnvironmentConfig as getEnvironmentConfig2,
+  getEnvironmentConfig as getEnvironmentConfig3,
   requirePrivateKey,
   getPrivateKeyWithSource
 } from "@layr-labs/ecloud-sdk";
 async function createBuildClient(flags) {
   flags = await validateCommonFlags(flags, { requirePrivateKey: false });
+  const environment = flags.environment || "mainnet";
+  const environmentConfig = getEnvironmentConfig3(environment);
+  const rpcUrl = flags["rpc-url"] || environmentConfig.defaultRPCURL;
+  let walletClient;
+  if (flags["private-key"]) {
+    walletClient = createViemClients({
+      privateKey: flags["private-key"],
+      rpcUrl,
+      environment
+    }).walletClient;
+  }
   return createBuildModule({
     verbose: flags.verbose,
-    privateKey: flags["private-key"],
-    environment: flags.environment,
+    walletClient,
+    environment,
     clientId: getClientId(),
     skipTelemetry: true
     // CLI already has telemetry, skip SDK telemetry
@@ -367,8 +409,8 @@ function assertBuildId(buildId) {
 }
 
 // src/commands/compute/build/logs.ts
-import { privateKeyToAccount as privateKeyToAccount3 } from "viem/accounts";
-import { addHexPrefix } from "@layr-labs/ecloud-sdk";
+import { privateKeyToAccount as privateKeyToAccount4 } from "viem/accounts";
+import { addHexPrefix as addHexPrefix2 } from "@layr-labs/ecloud-sdk";
 var BuildLogs = class _BuildLogs extends Command {
   static description = "Get or stream build logs";
   static examples = [
@@ -400,8 +442,8 @@ var BuildLogs = class _BuildLogs extends Command {
       const client = await createBuildClient(validatedFlags);
       let buildId = args.buildId;
       if (!buildId) {
-        const billingAddress = privateKeyToAccount3(
-          addHexPrefix(validatedFlags["private-key"])
+        const billingAddress = privateKeyToAccount4(
+          addHexPrefix2(validatedFlags["private-key"])
         ).address;
         buildId = await promptBuildIdFromRecentBuilds({ client, billingAddress, limit: 20 });
       } else {