@elisym/cli 0.9.0 → 0.9.1

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env -S node --no-deprecation
 import { readFileSync, readdirSync, statSync, renameSync, mkdirSync, writeFileSync } from 'node:fs';
 import { dirname, join, resolve, basename, relative, sep } from 'node:path';
-import { SolanaPaymentStrategy, validateAgentName, RELAYS, ElisymIdentity, formatSol, formatAssetAmount, ElisymClient, MediaService, jobRequestKind, DEFAULT_KIND_OFFSET, toDTag, DEFAULTS, USDC_SOLANA_DEVNET, makeCensor, DEFAULT_REDACT_PATHS, createSlidingWindowLimiter, getProtocolProgramId, getProtocolConfig, LIMITS, calculateProtocolFee, BoundedSet, KIND_JOB_FEEDBACK, NATIVE_SOL } from '@elisym/sdk';
+import { SolanaPaymentStrategy, validateAgentName, RELAYS, ElisymIdentity, formatSol, formatAssetAmount, USDC_SOLANA_DEVNET, ElisymClient, MediaService, jobRequestKind, DEFAULT_KIND_OFFSET, toDTag, DEFAULTS, makeCensor, DEFAULT_REDACT_PATHS, createSlidingWindowLimiter, getProtocolProgramId, getProtocolConfig, LIMITS, calculateProtocolFee, BoundedSet, KIND_JOB_FEEDBACK, NATIVE_SOL } from '@elisym/sdk';
 import { ElisymYamlSchema, resolveInHome, resolveInProject, createAgentDir, writeYaml, writeSecrets, listAgents, loadAgent, agentPaths, readMediaCache, lookupCachedUrl, newCacheEntry, writeMediaCache } from '@elisym/sdk/agent-store';
 import { isAddress, createSolanaRpc, address } from '@solana/kit';
 import { generateSecretKey, getPublicKey, nip19, verifyEvent } from 'nostr-tools';
@@ -712,6 +712,30 @@ function getRpcUrl(_network) {
   }
   return "https://api.devnet.solana.com";
 }
+async function fetchUsdcBalance(rpc, owner) {
+  const mint = USDC_SOLANA_DEVNET.mint;
+  if (!mint) {
+    return 0n;
+  }
+  try {
+    const response = await rpc.getTokenAccountsByOwner(
+      owner,
+      { mint: address(mint) },
+      { encoding: "jsonParsed", commitment: "confirmed" }
+    ).send();
+    let total = 0n;
+    for (const entry of response.value) {
+      const parsed = entry.account.data;
+      const raw = parsed?.parsed?.info?.tokenAmount?.amount;
+      if (typeof raw === "string") {
+        total += BigInt(raw);
+      }
+    }
+    return total;
+  } catch {
+    return 0n;
+  }
+}
 var VALID_TRANSITIONS = {
   paid: ["executed", "failed"],
   executed: ["delivered", "failed"],
@@ -2505,7 +2529,10 @@ async function cmdStart(nameArg, options = {}) {
       const rpcUrl = getRpcUrl(walletNetwork);
       const rpc = createSolanaRpc(rpcUrl);
       const walletAddress = address(solanaAddress);
-      const { value: balanceLamports } = await rpc.getBalance(walletAddress).send();
+      const [{ value: balanceLamports }, usdcBalance] = await Promise.all([
+        rpc.getBalance(walletAddress).send(),
+        fetchUsdcBalance(rpc, walletAddress)
+      ]);
       const balance = Number(balanceLamports);
       console.log("  Wallet");
       console.log(`     Network  ${walletNetwork}`);
@@ -2513,7 +2540,8 @@ async function cmdStart(nameArg, options = {}) {
       if (process.env.SOLANA_RPC_URL) {
         console.log(`     RPC      ${process.env.SOLANA_RPC_URL} (custom)`);
       }
-      console.log(`     Balance  ${formatSol(balance)} (${balance} lamports)`);
+      console.log(`     SOL      ${formatSol(balance)} (${balance} lamports)`);
+      console.log(`     USDC     ${formatAssetAmount(USDC_SOLANA_DEVNET, usdcBalance)}`);
       if (balance === 0) {
         console.log("  ! Wallet is empty. Get devnet SOL: https://faucet.solana.com");
       }
@@ -3000,30 +3028,6 @@ async function loadAgentWithPrompt(name, cwd) {
   }
   throw new Error("Unreachable");
 }
-async function fetchUsdcBalance(rpc, owner) {
-  const mint = USDC_SOLANA_DEVNET.mint;
-  if (!mint) {
-    return 0n;
-  }
-  try {
-    const response = await rpc.getTokenAccountsByOwner(
-      owner,
-      { mint: address(mint) },
-      { encoding: "jsonParsed", commitment: "confirmed" }
-    ).send();
-    let total = 0n;
-    for (const entry of response.value) {
-      const parsed = entry.account.data;
-      const raw = parsed?.parsed?.info?.tokenAmount?.amount;
-      if (typeof raw === "string") {
-        total += BigInt(raw);
-      }
-    }
-    return total;
-  } catch {
-    return 0n;
-  }
-}
 async function cmdWallet(name) {
   const cwd = process.cwd();
   if (!name) {