@sherwoodagent/cli 0.88.1 → 0.88.2

package/dist/index.js

@@ -1638,7 +1638,7 @@ function registerStrategyTemplateCommands(strategy2) {
       ]);
       const stateNames = ["Pending", "Executed", "Settled"];
       const stateStr = stateNames[Number(stateRaw)] || `Unknown(${stateRaw})`;
-      const [assetDecimals, assetSymbol] = await Promise.all([
+      const [assetDecimals2, assetSymbol] = await Promise.all([
         publicClient.readContract({ address: assetAddr, abi: erc20Abi3, functionName: "decimals" }),
         publicClient.readContract({ address: assetAddr, abi: erc20Abi3, functionName: "symbol" })
       ]);
@@ -1673,19 +1673,19 @@ function registerStrategyTemplateCommands(strategy2) {
             feeTier: feeTiers[i]
           })),
           asset: assetAddr,
-          assetDecimals
+          assetDecimals: assetDecimals2
         });
         priceSource = prices.find((p) => p !== null)?.source ?? null;
       } catch {
       }
       const pricesAvailable = prices.some((p) => p !== null);
-      const assetBalanceNum = Number(formatUnits5(assetBalance, assetDecimals));
+      const assetBalanceNum = Number(formatUnits5(assetBalance, assetDecimals2));
       let totalPortfolioValue = assetBalanceNum;
       let totalInvested = 0n;
       const allocStatuses = allocations.map((alloc, i) => {
         const [balance, symbol, decimals] = tokenData[i];
         const balanceNum = Number(formatUnits5(balance, decimals));
-        const investedNum = Number(formatUnits5(alloc.investedAmount, assetDecimals));
+        const investedNum = Number(formatUnits5(alloc.investedAmount, assetDecimals2));
         totalInvested += alloc.investedAmount;
         const price = prices[i];
         let currentValue = null;
@@ -1700,7 +1700,7 @@ function registerStrategyTemplateCommands(strategy2) {
           targetWeightBps: Number(alloc.targetWeightBps),
           balance: formatUnits5(balance, decimals),
           balanceRaw: balance.toString(),
-          investedAmount: formatUnits5(alloc.investedAmount, assetDecimals),
+          investedAmount: formatUnits5(alloc.investedAmount, assetDecimals2),
           currentPrice: price?.price ?? null,
           currentValue,
           actualWeightBps: null,
@@ -1724,7 +1724,7 @@ function registerStrategyTemplateCommands(strategy2) {
           }
         }
       }
-      const totalInvestedNum = Number(formatUnits5(totalInvested, assetDecimals));
+      const totalInvestedNum = Number(formatUnits5(totalInvested, assetDecimals2));
       const totalPnl = pricesAvailable ? totalPortfolioValue - totalInvestedNum : null;
       const totalPnlPct = totalPnl !== null && totalInvestedNum > 0 ? totalPnl / totalInvestedNum * 100 : null;
       spinner?.succeed("Strategy state loaded");
@@ -1735,10 +1735,10 @@ function registerStrategyTemplateCommands(strategy2) {
           proposer,
           state: stateStr,
           network,
-          asset: { address: assetAddr, symbol: assetSymbol, decimals: assetDecimals },
-          totalDeployed: formatUnits5(totalAmount, assetDecimals),
+          asset: { address: assetAddr, symbol: assetSymbol, decimals: assetDecimals2 },
+          totalDeployed: formatUnits5(totalAmount, assetDecimals2),
           maxSlippageBps: Number(maxSlippage),
-          assetBalance: formatUnits5(assetBalance, assetDecimals),
+          assetBalance: formatUnits5(assetBalance, assetDecimals2),
           pricesAvailable,
           priceSource,
           portfolio: {
@@ -1763,9 +1763,9 @@ function registerStrategyTemplateCommands(strategy2) {
       console.log(`  Proposer:    ${chalk4.cyan(proposer)}`);
       console.log(`  State:       ${stateColor(stateStr)}`);
       console.log(`  Asset:       ${assetSymbol} (${assetAddr})`);
-      console.log(`  Deployed:    ${formatUnits5(totalAmount, assetDecimals)} ${assetSymbol}`);
+      console.log(`  Deployed:    ${formatUnits5(totalAmount, assetDecimals2)} ${assetSymbol}`);
       console.log(`  Max Slip:    ${Number(maxSlippage) / 100}%`);
-      console.log(`  Asset held:  ${formatUnits5(assetBalance, assetDecimals)} ${assetSymbol}`);
+      console.log(`  Asset held:  ${formatUnits5(assetBalance, assetDecimals2)} ${assetSymbol}`);
       if (pricesAvailable) {
         const pvStr = totalPortfolioValue.toFixed(6);
         const pnlStr = totalPnl !== null ? (totalPnl >= 0 ? "+" : "") + totalPnl.toFixed(6) : "n/a";
@@ -1807,7 +1807,7 @@ function registerStrategyTemplateCommands(strategy2) {
         }
       }
       console.log(chalk4.dim("\u2500".repeat(70)));
-      console.log(`  Total invested: ${formatUnits5(totalInvested, assetDecimals)} ${assetSymbol}`);
+      console.log(`  Total invested: ${formatUnits5(totalInvested, assetDecimals2)} ${assetSymbol}`);
       if (pricesAvailable && maxDriftToken) {
         const absMaxDrift = Math.abs(maxDriftBps);
         const driftColor = absMaxDrift > 500 ? chalk4.red : absMaxDrift > 200 ? chalk4.yellow : chalk4.green;
@@ -1851,7 +1851,7 @@ function registerStrategyTemplateCommands(strategy2) {
         verifySpinner.fail(`Only the proposer (${proposer}) can rebalance. Your wallet: ${account.address}`);
         process.exit(1);
       }
-      const [assetDecimals, assetSymbol] = await Promise.all([
+      const [assetDecimals2, assetSymbol] = await Promise.all([
         publicClient.readContract({ address: assetAddr, abi: erc20Abi3, functionName: "decimals" }),
         publicClient.readContract({ address: assetAddr, abi: erc20Abi3, functionName: "symbol" })
       ]);
@@ -1953,7 +1953,7 @@ function registerStrategyTemplateCommands(strategy2) {
         const alloc = postAllocations[i];
         const [balance, symbol, decimals] = postData[i];
         const weightPct = (Number(alloc.targetWeightBps) / 100).toFixed(1) + "%";
-        const investedStr = formatUnits5(alloc.investedAmount, assetDecimals);
+        const investedStr = formatUnits5(alloc.investedAmount, assetDecimals2);
         console.log(
           `  ${chalk4.bold(symbol.padEnd(8))} ${weightPct.padEnd(8)} invested: ${investedStr.padEnd(14)} bal: ${formatUnits5(balance, decimals)}`
         );
@@ -2299,7 +2299,7 @@ function registerVeniceCommands(program2) {
         getNetDeposited(vaultAddress),
         getAgentAddresses(vaultAddress)
       ]);
-      const [assetDecimals, assetSymbol, assetBalance] = await Promise.all([
+      const [assetDecimals2, assetSymbol, assetBalance] = await Promise.all([
         client.readContract({ address: assetAddress, abi: ERC20_ABI, functionName: "decimals" }),
         client.readContract({ address: assetAddress, abi: ERC20_ABI, functionName: "symbol" }),
         client.readContract({ address: assetAddress, abi: ERC20_ABI, functionName: "balanceOf", args: [vaultAddress] })
@@ -2349,7 +2349,7 @@ function registerVeniceCommands(program2) {
       console.log(chalk5.bold("Venice Inference Status"));
       console.log(chalk5.dim("\u2500".repeat(50)));
       console.log(chalk5.bold("\n  Vault"));
-      console.log(`    Profit available:  ${formatUnits6(profit, assetDecimals)} ${assetSymbol}`);
+      console.log(`    Profit available:  ${formatUnits6(profit, assetDecimals2)} ${assetSymbol}`);
       console.log(`    VVV (unstaked):    ${formatUnits6(vaultVvvBalance, 18)}`);
       console.log(chalk5.bold("\n  Agent sVVV Balances"));
       for (const { agent, balance } of agentBalances) {
@@ -2463,8 +2463,8 @@ import ora5 from "ora";
 
 // src/strategies/allowance-disburse.ts
 import { encodeFunctionData, parseUnits as parseUnits6 } from "viem";
-function buildDisburseBatch(config, vaultAddress, agents, assetAddress, assetDecimals, minUsdc, swapPath) {
-  const assetAmount = parseUnits6(config.amount, assetDecimals);
+function buildDisburseBatch(config, vaultAddress, agents, assetAddress, assetDecimals2, minUsdc, swapPath) {
+  const assetAmount = parseUnits6(config.amount, assetDecimals2);
   const isUsdc = assetAddress.toLowerCase() === TOKENS().USDC.toLowerCase();
   const isWeth = assetAddress.toLowerCase() === TOKENS().WETH.toLowerCase();
   const calls = [];
@@ -2564,7 +2564,7 @@ function registerAllowanceCommands(program2) {
     const client = getPublicClient();
     const spinner = ora5("Reading vault state...").start();
     let assetAddress;
-    let assetDecimals;
+    let assetDecimals2;
     let assetSymbol;
     let totalDeposited;
     let assetBalance;
@@ -2575,7 +2575,7 @@ function registerAllowanceCommands(program2) {
         getNetDeposited(vaultAddress),
         getAgentAddresses(vaultAddress)
       ]);
-      [assetDecimals, assetSymbol, assetBalance] = await Promise.all([
+      [assetDecimals2, assetSymbol, assetBalance] = await Promise.all([
         client.readContract({ address: assetAddress, abi: ERC20_ABI, functionName: "decimals" }),
         client.readContract({ address: assetAddress, abi: ERC20_ABI, functionName: "symbol" }),
         client.readContract({ address: assetAddress, abi: ERC20_ABI, functionName: "balanceOf", args: [vaultAddress] })
@@ -2590,18 +2590,18 @@ function registerAllowanceCommands(program2) {
       console.error(chalk6.red("No agents registered in vault. Register agents first."));
       process.exit(1);
     }
-    const requestedAmount = parseUnits7(opts.amount, assetDecimals);
+    const requestedAmount = parseUnits7(opts.amount, assetDecimals2);
     const profit = assetBalance > totalDeposited ? assetBalance - totalDeposited : 0n;
     const isUsdc = assetAddress.toLowerCase() === TOKENS().USDC.toLowerCase();
     const isWeth = assetAddress.toLowerCase() === TOKENS().WETH.toLowerCase();
     console.log();
     console.log(chalk6.bold("Allowance Disburse"));
     console.log(chalk6.dim("\u2500".repeat(40)));
-    console.log(`  Asset:         ${assetSymbol} (${assetDecimals} decimals)`);
+    console.log(`  Asset:         ${assetSymbol} (${assetDecimals2} decimals)`);
     console.log(`  Amount:        ${opts.amount} ${assetSymbol}`);
-    console.log(`  Vault balance: ${formatUnits7(assetBalance, assetDecimals)} ${assetSymbol}`);
-    console.log(`  Net deposited (est.): ${formatUnits7(totalDeposited, assetDecimals)} ${assetSymbol}`);
-    console.log(`  Profit:        ${formatUnits7(profit, assetDecimals)} ${assetSymbol}`);
+    console.log(`  Vault balance: ${formatUnits7(assetBalance, assetDecimals2)} ${assetSymbol}`);
+    console.log(`  Net deposited (est.): ${formatUnits7(totalDeposited, assetDecimals2)} ${assetSymbol}`);
+    console.log(`  Profit:        ${formatUnits7(profit, assetDecimals2)} ${assetSymbol}`);
     console.log(`  Agents:        ${agents.length} (USDC will be split equally)`);
     if (!isUsdc) {
       console.log(`  Routing:       ${isWeth ? `WETH \u2192 USDC (fee ${fee})` : `${assetSymbol} \u2192 WETH \u2192 USDC (fee ${fee})`}`);
@@ -2610,7 +2610,7 @@ function registerAllowanceCommands(program2) {
     console.log(`  Vault:         ${vaultAddress}`);
     console.log();
     if (requestedAmount > profit) {
-      console.warn(chalk6.yellow(`  Warning: amount (${opts.amount}) exceeds available profit (${formatUnits7(profit, assetDecimals)})`));
+      console.warn(chalk6.yellow(`  Warning: amount (${opts.amount}) exceeds available profit (${formatUnits7(profit, assetDecimals2)})`));
       console.warn(chalk6.yellow("  This will use deposited capital, not just profits."));
       console.log();
     }
@@ -2662,7 +2662,7 @@ function registerAllowanceCommands(program2) {
       fee,
       slippageBps
     };
-    const calls = buildDisburseBatch(config, vaultAddress, agents, assetAddress, assetDecimals, minUsdc, swapPath);
+    const calls = buildDisburseBatch(config, vaultAddress, agents, assetAddress, assetDecimals2, minUsdc, swapPath);
     console.log();
     console.log(chalk6.bold(`Batch calls (${calls.length}):`));
     console.log(formatBatch(calls));
@@ -2688,7 +2688,7 @@ function registerAllowanceCommands(program2) {
         getNetDeposited(vaultAddress),
         getAgentAddresses(vaultAddress)
       ]);
-      const [assetDecimals, assetSymbol, assetBalance] = await Promise.all([
+      const [assetDecimals2, assetSymbol, assetBalance] = await Promise.all([
         client.readContract({ address: assetAddress, abi: ERC20_ABI, functionName: "decimals" }),
         client.readContract({ address: assetAddress, abi: ERC20_ABI, functionName: "symbol" }),
         client.readContract({ address: assetAddress, abi: ERC20_ABI, functionName: "balanceOf", args: [vaultAddress] })
@@ -2712,9 +2712,9 @@ function registerAllowanceCommands(program2) {
       console.log(chalk6.dim("\u2500".repeat(50)));
       console.log(chalk6.bold("\n  Vault"));
       console.log(`    Asset:           ${assetSymbol}`);
-      console.log(`    Balance:         ${formatUnits7(assetBalance, assetDecimals)} ${assetSymbol}`);
-      console.log(`    Net deposited (est.): ${formatUnits7(totalDeposited, assetDecimals)} ${assetSymbol}`);
-      console.log(`    Profit:          ${formatUnits7(profit, assetDecimals)} ${assetSymbol}`);
+      console.log(`    Balance:         ${formatUnits7(assetBalance, assetDecimals2)} ${assetSymbol}`);
+      console.log(`    Net deposited (est.): ${formatUnits7(totalDeposited, assetDecimals2)} ${assetSymbol}`);
+      console.log(`    Profit:          ${formatUnits7(profit, assetDecimals2)} ${assetSymbol}`);
       console.log(chalk6.bold("\n  Agent USDC Balances"));
       for (const { agent, balance } of agentBalances) {
         const isMe = agent.toLowerCase() === account.address.toLowerCase();
@@ -3637,7 +3637,7 @@ async function resolveRiskEnvelope(opts, vault) {
   }
   return { maxCapital, maxDrawdownBps };
 }
-function resolveCaps(list, callCount, fallbackTotal, flag) {
+function resolveCaps(list, callCount, fallbackTotal, flag, decimals) {
   if (list === void 0) {
     if (callCount === 0) return [];
     return Array.from({ length: callCount }, (_, i) => i === callCount - 1 ? fallbackTotal : 0n);
@@ -3649,7 +3649,20 @@ function resolveCaps(list, callCount, fallbackTotal, flag) {
     );
     process.exit(1);
   }
-  return parts.map((x) => BigInt(x));
+  return parts.map((x) => {
+    if (!/^\d+(\.\d+)?$/.test(x)) {
+      console.error(chalk8.red(`  ${flag} entries must be non-negative decimal amounts in asset units (got "${x}").`));
+      process.exit(1);
+    }
+    return parseUnits8(x, decimals);
+  });
+}
+async function assetDecimals(vault) {
+  return await getPublicClient().readContract({
+    address: await getAssetAddress(vault),
+    abi: ERC20_ABI,
+    functionName: "decimals"
+  });
 }
 function registerProposalCommands(program2) {
   const proposal = program2.command("proposal").description("Governance proposals \u2014 create, vote, execute, settle");
@@ -3694,6 +3707,7 @@ function registerProposalCommands(program2) {
           process.exit(1);
         }
         const calldataEnvelope = await resolveRiskEnvelope(opts, vault);
+        const capDecimals2 = await assetDecimals(vault);
         try {
           emitCalldata(
             encodePropose(
@@ -3709,14 +3723,16 @@ function registerProposalCommands(program2) {
                   opts.executeCaps,
                   executeCalls.length,
                   calldataEnvelope.maxCapital,
-                  "--execute-caps"
+                  "--execute-caps",
+                  capDecimals2
                 ),
                 settlementCalls: settleCalls,
                 settlementCallCaps: resolveCaps(
                   opts.settleCaps,
                   settleCalls.length,
                   0n,
-                  "--settle-caps"
+                  "--settle-caps",
+                  capDecimals2
                 )
               },
               getChain().id
@@ -3806,17 +3822,20 @@ function registerProposalCommands(program2) {
       }
       const spinner = ora6({ text: W3("Submitting proposal..."), color: "green" }).start();
       const envelope = await resolveRiskEnvelope(opts, vault);
+      const capDecimals = await assetDecimals(vault);
       const executeCallCaps = resolveCaps(
         opts.executeCaps,
         executeCalls.length,
         envelope.maxCapital,
-        "--execute-caps"
+        "--execute-caps",
+        capDecimals
       );
       const settleCallCaps = resolveCaps(
         opts.settleCaps,
         settleCalls.length,
         0n,
-        "--settle-caps"
+        "--settle-caps",
+        capDecimals
       );
       try {
         await ensureProposerBondAllowance(vault, envelope.maxCapital, await getAssetAddress(vault));
@@ -8057,7 +8076,7 @@ try {
 } catch {
 }
 var require2 = createRequire(import.meta.url);
-var CLI_VERSION = "0.88.1";
+var CLI_VERSION = "0.88.2";
 async function loadXmtp() {
   return import("./xmtp-72IRK7JL.js");
 }
@@ -9349,8 +9368,8 @@ vaultCmd.command("balance").description("Show LP share balance and asset value")
 });
 vaultCmd.command("redeem").description("Redeem vault shares for the underlying asset (ERC-4626)").option("--vault <address>", "Vault address (default: from config)").option("--shares <amount>", "Shares to redeem in whole-share units (default: all)").option("--receiver <address>", "Receiver of the underlying asset (default: your wallet)").option("--owner <address>", "Share owner whose shares burn (required with --calldata-only)").action(async (opts) => {
   resolveVault(opts);
-  const assetDecimals = await getAssetDecimals();
-  const shareDecimals = assetDecimals * 2;
+  const assetDecimals2 = await getAssetDecimals();
+  const shareDecimals = assetDecimals2 * 2;
   if (isCalldataOnly()) {
     if (!opts.shares) {
       console.error(
@@ -9423,7 +9442,7 @@ vaultCmd.command("redeem").description("Redeem vault shares for the underlying a
     );
     spinner.succeed(`Redeemed: ${hash}`);
     console.log(chalk17.dim(`  ${getExplorerUrl(hash)}`));
-    console.log(`  Assets received: ${formatUnits10(assetsOut, assetDecimals)}`);
+    console.log(`  Assets received: ${formatUnits10(assetsOut, assetDecimals2)}`);
   } catch (err) {
     spinner.fail("Redeem failed");
     console.error(chalk17.red(formatContractError(err)));