@sherwoodagent/cli 0.24.0 → 0.25.2

package/dist/index.js

@@ -6,17 +6,20 @@ import {
   executeBatch,
   getAssetDecimals,
   getBalance,
+  getShareBalance,
   getVaultAddress,
   getVaultInfo,
   isAgent,
   preflightDeposit,
+  preflightRedeem,
+  redeem,
   registerAgent,
   removeDepositor,
   resolveSyndicate,
   resolveVaultSyndicate,
   setTextRecord,
   setVaultAddress
-} from "./chunk-ZIH3SCFJ.js";
+} from "./chunk-G6LOQCM3.js";
 import {
   UniswapProvider,
   applySlippage,
@@ -27,7 +30,7 @@ import {
   getQuote,
   listModels,
   provisionApiKey
-} from "./chunk-PEJPTKLK.js";
+} from "./chunk-L5RWZSET.js";
 import {
   PROPOSAL_STATE,
   PROPOSAL_STATES,
@@ -58,7 +61,7 @@ import {
   setVotingPeriod,
   settleProposal,
   vote
-} from "./chunk-LMDHM36X.js";
+} from "./chunk-2UP63CYI.js";
 import {
   fetchMetadata,
   uploadMetadata
@@ -72,7 +75,7 @@ import {
   queryJoinRequests,
   revokeAttestation,
   stripReferrerPrefix
-} from "./chunk-5NN424VN.js";
+} from "./chunk-2SNPCWB4.js";
 import {
   AERODROME,
   AGENT_REGISTRY,
@@ -93,7 +96,7 @@ import {
   UNISWAP,
   VENICE,
   VENICE_STAKING_ABI
-} from "./chunk-R75DM3VL.js";
+} from "./chunk-O7QIRMJO.js";
 import {
   formatContractError,
   getAccount,
@@ -101,8 +104,9 @@ import {
   sendTxWithRetry,
   waitForReceipt,
   writeContractWithRetry
-} from "./chunk-R7Q2L6VV.js";
+} from "./chunk-SBVHGUQJ.js";
 import {
+  CHAIN_REGISTRY,
   VALID_NETWORKS,
   getChain,
   getExplorerUrl,
@@ -110,11 +114,13 @@ import {
   getRpcUrl,
   isTestnet,
   setNetwork
-} from "./chunk-35536GNW.js";
+} from "./chunk-GWIW6DDG.js";
 import {
   addSyndicate,
   cacheGroupId,
+  cacheSwapRoute,
   getAgentId,
+  getCachedSwapRoute,
   getChainContracts,
   getNotifyTo,
   getPrimarySyndicate,
@@ -130,13 +136,13 @@ import {
   setPrivateKey,
   setUniswapApiKey,
   setVeniceApiKey
-} from "./chunk-5S2TBADL.js";
+} from "./chunk-RGOTBJIN.js";
 
 // src/index.ts
 import { config as loadDotenv } from "dotenv";
 import { createRequire } from "module";
 import { Command, Option } from "commander";
-import { parseUnits as parseUnits5, isAddress as isAddress5 } from "viem";
+import { parseUnits as parseUnits5, formatUnits as formatUnits5, isAddress as isAddress5 } from "viem";
 import chalk8 from "chalk";
 import ora7 from "ora";
 import { input, confirm, select } from "@inquirer/prompts";
@@ -550,7 +556,125 @@ function buildSettleCalls6(clone) {
 }
 
 // src/commands/strategy-template.ts
+import { concat as concat2, numberToHex } from "viem";
 var ZERO = "0x0000000000000000000000000000000000000000";
+function encodeV3Path(tokens, fees) {
+  if (tokens.length !== fees.length + 1) throw new Error("tokens.length must be fees.length + 1");
+  const parts = [];
+  for (let i = 0; i < tokens.length; i++) {
+    parts.push(tokens[i].toLowerCase());
+    if (i < fees.length) {
+      parts.push(numberToHex(fees[i], { size: 3 }));
+    }
+  }
+  return concat2(parts);
+}
+function buildSwapExtraData(network, tokenIn, tokenOut, feeTier, hop) {
+  if (network === "robinhood-testnet") {
+    return encodeAbiParameters7([{ type: "uint24" }], [feeTier]);
+  }
+  if (hop) {
+    const path = encodeV3Path([tokenIn, hop.via, tokenOut], [hop.feeIn, hop.feeOut]);
+    const encoded2 = encodeAbiParameters7([{ type: "bytes" }], [path]);
+    return `0x01${encoded2.slice(2)}`;
+  }
+  const encoded = encodeAbiParameters7([{ type: "uint24" }], [feeTier]);
+  return `0x00${encoded.slice(2)}`;
+}
+async function detectSwapRoute(asset, token, preferredFeeTier) {
+  const network = getNetwork();
+  if (network === "robinhood-testnet") {
+    return {
+      extraData: buildSwapExtraData(network, asset, token, preferredFeeTier),
+      routeDesc: `direct (fee ${preferredFeeTier})`
+    };
+  }
+  const chainId = CHAIN_REGISTRY[network].chain.id;
+  const cached = getCachedSwapRoute(chainId, asset, token);
+  if (cached) {
+    const extraData = cached.hop ? buildSwapExtraData(network, asset, token, 0, {
+      via: cached.hop.via,
+      feeIn: cached.hop.feeIn,
+      feeOut: cached.hop.feeOut
+    }) : buildSwapExtraData(network, asset, token, cached.feeTier);
+    const desc = cached.hop ? `cached multi-hop: ${cached.hop.feeIn}\u2192WETH\u2192${cached.hop.feeOut}` : `cached direct (fee ${cached.feeTier})`;
+    return { extraData, routeDesc: desc };
+  }
+  const publicClient = getPublicClient();
+  const quoterAddr = UNISWAP().QUOTER_V2;
+  const quoterAbi = [{
+    type: "function",
+    name: "quoteExactInputSingle",
+    inputs: [{ type: "tuple", components: [
+      { type: "address", name: "tokenIn" },
+      { type: "address", name: "tokenOut" },
+      { type: "uint256", name: "amountIn" },
+      { type: "uint24", name: "fee" },
+      { type: "uint160", name: "sqrtPriceLimitX96" }
+    ] }],
+    outputs: [
+      { type: "uint256" },
+      { type: "uint160" },
+      { type: "uint32" },
+      { type: "uint256" }
+    ],
+    stateMutability: "nonpayable"
+  }];
+  const testAmount = asset.toLowerCase() === TOKENS().USDC.toLowerCase() ? 1000000n : 1000000000000000n;
+  const feeTiers = [preferredFeeTier, 1e4, 3e3, 500].filter((v, i, a) => a.indexOf(v) === i);
+  for (const fee of feeTiers) {
+    try {
+      await publicClient.simulateContract({
+        address: quoterAddr,
+        abi: quoterAbi,
+        functionName: "quoteExactInputSingle",
+        args: [{ tokenIn: asset, tokenOut: token, amountIn: testAmount, fee, sqrtPriceLimitX96: 0n }]
+      });
+      cacheSwapRoute(chainId, asset, token, { mode: "direct", feeTier: fee, detectedAt: Math.floor(Date.now() / 1e3) });
+      return {
+        extraData: buildSwapExtraData(network, asset, token, fee),
+        routeDesc: `direct (fee ${fee})`
+      };
+    } catch {
+    }
+  }
+  const weth = TOKENS().WETH;
+  if (asset.toLowerCase() === weth.toLowerCase()) return null;
+  let bestAssetToWethFee = null;
+  for (const fee of [500, 3e3, 1e4]) {
+    try {
+      await publicClient.simulateContract({
+        address: quoterAddr,
+        abi: quoterAbi,
+        functionName: "quoteExactInputSingle",
+        args: [{ tokenIn: asset, tokenOut: weth, amountIn: testAmount, fee, sqrtPriceLimitX96: 0n }]
+      });
+      bestAssetToWethFee = fee;
+      break;
+    } catch {
+    }
+  }
+  if (!bestAssetToWethFee) return null;
+  const wethTestAmount = 1000000000000000n;
+  for (const fee of feeTiers) {
+    try {
+      await publicClient.simulateContract({
+        address: quoterAddr,
+        abi: quoterAbi,
+        functionName: "quoteExactInputSingle",
+        args: [{ tokenIn: weth, tokenOut: token, amountIn: wethTestAmount, fee, sqrtPriceLimitX96: 0n }]
+      });
+      const hop = { via: weth, feeIn: bestAssetToWethFee, feeOut: fee };
+      cacheSwapRoute(chainId, asset, token, { mode: "multi-hop", feeTier: 0, hop, detectedAt: Math.floor(Date.now() / 1e3) });
+      return {
+        extraData: buildSwapExtraData(network, asset, token, 0, hop),
+        routeDesc: `multi-hop: ${bestAssetToWethFee}\u2192WETH\u2192${fee}`
+      };
+    } catch {
+    }
+  }
+  return null;
+}
 var TEMPLATES = [
   {
     name: "Moonwell Supply",
@@ -793,8 +917,10 @@ async function buildInitDataForTemplate(templateKey, opts, vault) {
       process.exit(1);
     }
     const tokens = TOKENS();
-    const asset = resolveToken(opts.asset || "WETH");
-    const decimals = opts.asset?.toUpperCase() === "USDC" ? 6 : 18;
+    const defaultAsset = getNetwork() === "robinhood-testnet" ? "WETH" : "USDC";
+    const assetSymbol = opts.asset || defaultAsset;
+    const asset = resolveToken(assetSymbol);
+    const decimals = assetSymbol.toUpperCase() === "USDC" ? 6 : 18;
     const totalAmount = parseUnits(opts.amount, decimals);
     const maxSlippageBps = Number(opts.maxSlippage || "500");
     const feeTier = opts.feeTier || "3000";
@@ -818,11 +944,22 @@ async function buildInitDataForTemplate(templateKey, opts, vault) {
     }
     const swapAdapter = opts.swapAdapter || resolveSwapAdapter();
     const chainlinkVerifier = CHAINLINK().VERIFIER_PROXY;
-    const allocations = tokenAddrs.map((token, i) => ({
-      token,
-      weightBps: weightsBps[i],
-      swapExtraData: encodeAbiParameters7([{ type: "uint24" }], [Number(feeTier)])
-    }));
+    console.log(chalk.dim("  Detecting swap routes..."));
+    const allocations = [];
+    for (let i = 0; i < tokenAddrs.length; i++) {
+      const token = tokenAddrs[i];
+      const route = await detectSwapRoute(asset, token, Number(feeTier));
+      if (!route) {
+        console.error(chalk.red(`No swap route found for ${token}. No Uniswap V3 pool (direct or via WETH).`));
+        process.exit(1);
+      }
+      console.log(chalk.dim(`    ${token.slice(0, 10)}... \u2192 ${route.routeDesc}`));
+      allocations.push({
+        token,
+        weightBps: weightsBps[i],
+        swapExtraData: route.extraData
+      });
+    }
     return {
       initData: buildInitData6(asset, swapAdapter, chainlinkVerifier, allocations, totalAmount, maxSlippageBps),
       asset,
@@ -881,10 +1018,8 @@ function resolveSwapAdapter() {
     }
     return "0xdae81cDCfcB14c56fCeB788A147Fcd6CbEdfEeca";
   }
-  if (UNISWAP().SWAP_ROUTER === ZERO) {
-    console.error(chalk.red("No swap adapter available"));
-    process.exit(1);
-  }
+  const adapterAddr = UNISWAP().SWAP_ADAPTER;
+  if (adapterAddr !== ZERO) return adapterAddr;
   console.error(chalk.red("UniswapSwapAdapter not deployed yet. Use --swap-adapter to specify manually."));
   process.exit(1);
 }
@@ -1161,9 +1296,9 @@ function registerStrategyTemplateCommands(strategy2) {
       console.error(chalk.red("Missing --name, --performance-fee, or --duration. Use --write-calls to skip proposal submission."));
       process.exit(1);
     }
-    const { propose: propose2 } = await import("./governor-JIXAG6WU.js");
+    const { propose: propose2 } = await import("./governor-3PINJ2X2.js");
     const { pinJSON } = await import("./ipfs-22YLNQ2C.js");
-    const { parseDuration: parseDuration2 } = await import("./governor-JIXAG6WU.js");
+    const { parseDuration: parseDuration2 } = await import("./governor-3PINJ2X2.js");
     const performanceFeeBps = BigInt(opts.performanceFee);
     if (performanceFeeBps < 0n || performanceFeeBps > 10000n) {
       console.error(chalk.red("--performance-fee must be 0-10000 (basis points)"));
@@ -1271,7 +1406,7 @@ function registerStrategyTemplateCommands(strategy2) {
       let prices = [];
       let priceSource = null;
       try {
-        const { getTokenPricesInAsset } = await import("./price-AGCWXLZ6.js");
+        const { getTokenPricesInAsset } = await import("./price-76BEXJDI.js");
         prices = await getTokenPricesInAsset({
           tokens: allocations.map((a, i) => ({
             token: a.token,
@@ -1818,7 +1953,7 @@ function registerVeniceCommands(program2) {
       console.log(chalk2.dim(`  Key: ${apiKey.slice(0, 8)}...${apiKey.slice(-4)}`));
       console.log(chalk2.dim("  Saved to ~/.sherwood/config.json"));
       try {
-        const { createVeniceProvisionAttestation, getEasScanUrl: getEasScanUrl2 } = await import("./eas-ZMTIOZH6.js");
+        const { createVeniceProvisionAttestation, getEasScanUrl: getEasScanUrl2 } = await import("./eas-DGLNPNWX.js");
         const { uid } = await createVeniceProvisionAttestation(account.address);
         if (uid !== "0x0000000000000000000000000000000000000000000000000000000000000000") {
           console.log(chalk2.dim(`  Attested: ${getEasScanUrl2(uid)}`));
@@ -1969,10 +2104,10 @@ ${opts.prompt}`;
         console.log(chalk2.dim(`Model: ${result.model} | Tokens: ${result.usage.promptTokens} in, ${result.usage.completionTokens} out, ${result.usage.totalTokens} total`));
       }
       try {
-        const { createVeniceInferenceAttestation, getEasScanUrl: getEasScanUrl2 } = await import("./eas-ZMTIOZH6.js");
+        const { createVeniceInferenceAttestation, getEasScanUrl: getEasScanUrl2 } = await import("./eas-DGLNPNWX.js");
         const { keccak256, toHex, isAddress: isAddr } = await import("viem");
-        const { getChainContracts: getChainContracts2 } = await import("./config-EHCEKT2B.js");
-        const { getChain: getActiveChain } = await import("./network-UVMYTKQX.js");
+        const { getChainContracts: getChainContracts2 } = await import("./config-YXZKPSZB.js");
+        const { getChain: getActiveChain } = await import("./network-QEMP3DSP.js");
         const vaultRecipient = opts.vault && isAddr(opts.vault) ? opts.vault : getChainContracts2(getActiveChain().id).vault;
         const promptHash = keccak256(toHex(userContent)).slice(0, 18);
         const { uid } = await createVeniceInferenceAttestation(
@@ -3101,8 +3236,8 @@ function printSimulationResult(result, callType) {
 }
 async function sendSimulationAlert(subdomain, proposalId, vault, execResult, settleResult) {
   try {
-    const xmtp = await import("./xmtp-B2XFVPIV.js");
-    const { getAccount: getAccount2 } = await import("./client-XG6LL6TS.js");
+    const xmtp = await import("./xmtp-64CYLVLO.js");
+    const { getAccount: getAccount2 } = await import("./client-CWQFYZ5Z.js");
     const group = await xmtp.getGroup("", subdomain);
     const allRisks = [...execResult.risks, ...settleResult?.risks ?? []];
     const criticals = allRisks.filter((r) => r.level === "critical");
@@ -3794,7 +3929,7 @@ try {
 var require2 = createRequire(import.meta.url);
 var { version: CLI_VERSION } = require2("../package.json");
 async function loadXmtp() {
-  return import("./xmtp-B2XFVPIV.js");
+  return import("./xmtp-64CYLVLO.js");
 }
 async function loadCron() {
   return import("./cron-EOULYO3R.js");
@@ -4754,10 +4889,61 @@ vaultCmd.command("balance").description("Show LP share balance and asset value")
     process.exit(1);
   }
 });
+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)").action(async (opts) => {
+  resolveVault(opts);
+  const assetDecimals = await getAssetDecimals();
+  const shareDecimals = assetDecimals * 2;
+  let shares;
+  try {
+    if (opts.shares) {
+      shares = parseUnits5(opts.shares, shareDecimals);
+    } else {
+      shares = await getShareBalance();
+      if (shares === 0n) {
+        console.error(chalk8.red("\n  \u2716 No shares to redeem.\n"));
+        process.exit(1);
+      }
+    }
+  } catch (err) {
+    console.error(chalk8.red(`
+  \u2716 ${err instanceof Error ? err.message : String(err)}
+`));
+    process.exit(1);
+  }
+  if (opts.receiver && !isAddress5(opts.receiver)) {
+    console.error(chalk8.red(`
+  \u2716 Invalid receiver address: ${opts.receiver}
+`));
+    process.exit(1);
+  }
+  try {
+    await preflightRedeem(shares);
+  } catch (err) {
+    console.error(chalk8.red(`
+  \u2716 ${err instanceof Error ? err.message : String(err)}
+`));
+    process.exit(1);
+  }
+  const sharesDisplay = formatUnits5(shares, shareDecimals);
+  const spinner = ora7(`Redeeming ${sharesDisplay} shares...`).start();
+  try {
+    const { hash, assetsOut } = await redeem(
+      shares,
+      opts.receiver
+    );
+    spinner.succeed(`Redeemed: ${hash}`);
+    console.log(chalk8.dim(`  ${getExplorerUrl(hash)}`));
+    console.log(`  Assets received: ${formatUnits5(assetsOut, assetDecimals)}`);
+  } catch (err) {
+    spinner.fail("Redeem failed");
+    console.error(chalk8.red(formatContractError(err)));
+    process.exit(1);
+  }
+});
 var strategy = program.command("strategy").description("Strategy templates \u2014 list, clone, propose");
 registerStrategyTemplateCommands(strategy);
 program.command("providers").description("List available DeFi providers").action(async () => {
-  const { MessariProvider, NansenProvider } = await import("./research-2I6AA3BI.js");
+  const { MessariProvider, NansenProvider } = await import("./research-ZX7T2ZIJ.js");
   const providers = [new MoonwellProvider(), new UniswapProvider(), new MessariProvider(), new NansenProvider()];
   for (const p of providers) {
     const info = p.info();
@@ -4768,7 +4954,7 @@ ${info.name} (${info.type})`);
   }
 });
 try {
-  const { registerChatCommands } = await import("./chat-3SAX4VRO.js");
+  const { registerChatCommands } = await import("./chat-MYRUIM54.js");
   registerChatCommands(program);
 } catch {
   program.command("chat <name> [action] [actionArgs...]").description("Syndicate chat (XMTP) \u2014 requires @xmtp/cli").action(() => {
@@ -4778,16 +4964,16 @@ try {
     process.exit(1);
   });
 }
-var { registerSessionCommands } = await import("./session-2FIR4LJP.js");
+var { registerSessionCommands } = await import("./session-6DJ4A2Q3.js");
 registerSessionCommands(program);
 registerVeniceCommands(program);
 registerAllowanceCommands(program);
 registerIdentityCommands(program);
 registerProposalCommands(program);
 registerGovernorCommands(program);
-var { registerResearchCommands } = await import("./research-KUIZM6AK.js");
+var { registerResearchCommands } = await import("./research-FIX3U4LG.js");
 registerResearchCommands(program);
-var { registerTradeCommands } = await import("./trade-UTM3DSO3.js");
+var { registerTradeCommands } = await import("./trade-MDVM4XFF.js");
 registerTradeCommands(program);
 var configCmd = program.command("config");
 configCmd.command("set").description("Save settings to ~/.sherwood/config.json (persists across sessions)").option("--private-key <key>", "Wallet private key (0x-prefixed)").option("--vault <address>", "Default SyndicateVault address").option("--rpc <url>", "Custom RPC URL for the active --chain network").option("--notify-to <id>", "Destination for cron summaries (Telegram chat ID, phone, etc.)").option("--uniswap-api-key <key>", "Uniswap Trading API key (from developers.uniswap.org)").option("--venice-api-key <key>", "Venice AI inference API key").action((opts) => {