@sherwoodagent/cli 0.59.11 → 0.59.13

package/dist/index.js

@@ -933,6 +933,50 @@ function resolveTemplate(key) {
   }
   return { def, address };
 }
+function computeProposalAssetChecks(templateKey, opts) {
+  if (templateKey === "moonwell-supply" || templateKey === "mamo-yield") {
+    if (!opts.amount) return [];
+    const token = opts.token || "USDC";
+    const asset = resolveToken(token);
+    const decimals = token.toUpperCase() === "USDC" ? 6 : 18;
+    return [{ asset, amount: parseUnits(opts.amount, decimals), label: token.toUpperCase() }];
+  }
+  if (templateKey === "venice-inference") {
+    if (!opts.amount) return [];
+    const assetSymbol = opts.asset || "USDC";
+    const asset = resolveToken(assetSymbol);
+    const decimals = assetSymbol.toUpperCase() === "USDC" ? 6 : 18;
+    return [{ asset, amount: parseUnits(opts.amount, decimals), label: assetSymbol.toUpperCase() }];
+  }
+  if (templateKey === "aerodrome-lp") {
+    if (!opts.tokenA || !opts.tokenB || !opts.amountA || !opts.amountB) return [];
+    return [];
+  }
+  if (templateKey === "wsteth-moonwell") {
+    if (!opts.amount) return [];
+    return [{
+      asset: TOKENS().WETH,
+      amount: parseUnits(opts.amount, 18),
+      label: "WETH"
+    }];
+  }
+  if (templateKey === "portfolio") {
+    if (!opts.amount) return [];
+    const defaultAsset = getNetwork() === "robinhood-testnet" ? "WETH" : "USDC";
+    const assetSymbol = opts.asset || defaultAsset;
+    const asset = resolveToken(assetSymbol);
+    const decimals = assetSymbol.toUpperCase() === "USDC" ? 6 : 18;
+    return [{ asset, amount: parseUnits(opts.amount, decimals), label: assetSymbol.toUpperCase() }];
+  }
+  if (templateKey === "hyperliquid-perp" || templateKey === "hyperliquid-grid") {
+    if (!opts.amount) return [];
+    const token = opts.token || "USDC";
+    const asset = resolveToken(token);
+    const decimals = token.toUpperCase() === "USDC" ? 6 : 18;
+    return [{ asset, amount: parseUnits(opts.amount, decimals), label: token.toUpperCase() }];
+  }
+  return [];
+}
 async function buildInitDataForTemplate(templateKey, opts, vault) {
   if (templateKey === "moonwell-supply") {
     if (!opts.amount) {
@@ -1513,6 +1557,37 @@ function registerStrategyTemplateCommands(strategy2) {
         console.error(chalk.red(`  Vault ${vault} is paused. Cannot propose.`));
         process.exit(1);
       }
+      const checks = computeProposalAssetChecks(templateKey, opts);
+      for (const check of checks) {
+        if (check.amount === 0n) continue;
+        const [balance, decimals] = await Promise.all([
+          publicClient.readContract({
+            address: check.asset,
+            abi: erc20Abi,
+            functionName: "balanceOf",
+            args: [vault]
+          }),
+          publicClient.readContract({
+            address: check.asset,
+            abi: erc20Abi,
+            functionName: "decimals"
+          })
+        ]);
+        if (balance < check.amount) {
+          preflightSpinner.fail("Preflight failed");
+          console.error(
+            chalk.red(
+              `  Vault ${vault} holds ${formatUnits(balance, decimals)} ${check.label} but proposal requires ${formatUnits(check.amount, decimals)} ${check.label}.`
+            )
+          );
+          console.error(
+            chalk.yellow(
+              `  Hint: --amount is in human units (e.g. "10" = 10 ${check.label}), not raw decimals.`
+            )
+          );
+          process.exit(1);
+        }
+      }
       preflightSpinner.succeed("Preflight OK");
     } catch (err) {
       preflightSpinner.fail("Preflight failed");
@@ -4216,7 +4291,7 @@ function registerProposalCommands(program2) {
         );
         console.error(
           DIM2(
-            "\n  Other states have their own recovery path:\n    Draft/Pending    \u2192 sherwood proposal cancel --id <id>\n    Approved         \u2192 sherwood proposal veto <id>\n    Expired          \u2192 vault is not locked, nothing to do\n    Settled          \u2192 already settled\n    Cancelled        \u2192 governor upgrade required (issue #177)\n"
+            "\n  Other states have their own recovery path:\n    Draft/Pending/GuardianReview/Approved \u2192 sherwood proposal cancel --id <id> (proposer)\n    Draft/Pending (vault owner)           \u2192 sherwood proposal cancel --id <id> --emergency\n    Pending (vault owner)                 \u2192 sherwood proposal veto --id <id>\n    Expired          \u2192 vault is not locked, nothing to do\n    Settled          \u2192 already settled\n    Cancelled        \u2192 governor upgrade required (issue #177)\n"
           )
         );
         process.exit(1);
@@ -4331,14 +4406,32 @@ function registerProposalCommands(program2) {
         spinner.fail(`Proposal is already ${PROPOSAL_STATES[state]}`);
         process.exit(1);
       }
+      const PROPOSER_CANCELLABLE = /* @__PURE__ */ new Set([
+        PROPOSAL_STATE.Draft,
+        PROPOSAL_STATE.Pending,
+        PROPOSAL_STATE.GuardianReview,
+        PROPOSAL_STATE.Approved
+      ]);
+      const OWNER_EMERGENCY_CANCELLABLE = /* @__PURE__ */ new Set([
+        PROPOSAL_STATE.Draft,
+        PROPOSAL_STATE.Pending
+      ]);
       let hash;
       if (opts.emergency) {
+        if (!OWNER_EMERGENCY_CANCELLABLE.has(state)) {
+          spinner.fail(
+            `Proposal is ${PROPOSAL_STATES[state] || "Unknown"} \u2014 emergencyCancel only works in Draft or Pending. For GuardianReview / Approved, the proposer can run: sherwood proposal cancel --id ${proposalId}`
+          );
+          process.exit(1);
+        }
         spinner.text = W2("Emergency cancelling...");
         hash = await emergencyCancel(proposalId);
         spinner.succeed(G2("Emergency cancelled"));
       } else {
-        if (state !== PROPOSAL_STATE.Draft && state !== PROPOSAL_STATE.Pending) {
-          spinner.fail(`Proposal is ${PROPOSAL_STATES[state] || "Unknown"} \u2014 use --emergency for non-pending/approved`);
+        if (!PROPOSER_CANCELLABLE.has(state)) {
+          spinner.fail(
+            `Proposal is ${PROPOSAL_STATES[state] || "Unknown"} \u2014 not cancellable in this state. cancelProposal accepts Draft / Pending / GuardianReview / Approved (proposer only).`
+          );
           process.exit(1);
         }
         spinner.text = W2("Cancelling proposal...");