@hypurrquant/defi-cli 1.0.11 → 1.0.13

package/dist/mcp-server.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-#!/usr/bin/env node
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __esm = (fn, res) => function __init() {
@@ -111,11 +110,15 @@ function buildTransfer(token, to, amount) {
     gas_estimate: 65e3
   };
 }
-function getProvider(rpcUrl) {
-  const cached = providerCache.get(rpcUrl);
+function getProvider(rpcUrl, chain) {
+  const key = chain ? `${rpcUrl}@${chain.id}` : rpcUrl;
+  const cached = providerCache.get(key);
   if (cached) return cached;
-  const client = createPublicClient({ transport: http(rpcUrl) });
-  providerCache.set(rpcUrl, client);
+  const client = createPublicClient({
+    transport: http(rpcUrl),
+    ...chain ? { chain } : {}
+  });
+  providerCache.set(key, client);
   return client;
 }
 function clearProviderCache() {
@@ -341,6 +344,28 @@ var init_dist = __esm({
         const chainEnv = this.name.toUpperCase().replace(/ /g, "_") + "_RPC_URL";
         return process.env[chainEnv] ?? this.rpc_url;
       }
+      /**
+       * Build a viem Chain object pinned to this config so wallet/public clients
+       * can sign with an explicit chainId rather than auto-fetching it from the
+       * RPC. SSOT 7.4: anchoring chainId at client-construction time defends
+       * against an MITM RPC that returns the wrong eth_chainId, and keeps
+       * offline signing safe against RPC drift.
+       */
+      viemChain() {
+        const rpcUrl = this.effectiveRpcUrl();
+        return {
+          id: this.chain_id,
+          name: this.name,
+          nativeCurrency: {
+            name: this.native_token,
+            symbol: this.native_token,
+            decimals: 18
+          },
+          rpcUrls: { default: { http: [rpcUrl] } },
+          ...this.explorer_url ? { blockExplorers: { default: { name: this.name, url: this.explorer_url } } } : {},
+          ...this.multicall3 ? { contracts: { multicall3: { address: this.multicall3 } } } : {}
+        };
+      }
     };
     ProtocolCategory = /* @__PURE__ */ ((ProtocolCategory2) => {
       ProtocolCategory2["Dex"] = "dex";
@@ -532,13 +557,13 @@ __export(dist_exports2, {
 import { encodeFunctionData as encodeFunctionData3, parseAbi as parseAbi3, createPublicClient as createPublicClient2, http as http2, decodeAbiParameters } from "viem";
 import { encodeFunctionData as encodeFunctionData22, parseAbi as parseAbi22, createPublicClient as createPublicClient22, http as http22, decodeFunctionResult as decodeFunctionResult2, decodeAbiParameters as decodeAbiParameters2 } from "viem";
 import { encodeFunctionData as encodeFunctionData32, parseAbi as parseAbi32, createPublicClient as createPublicClient3, http as http3, decodeAbiParameters as decodeAbiParameters3, concatHex, zeroAddress } from "viem";
-import { encodeFunctionData as encodeFunctionData4, parseAbi as parseAbi4, zeroAddress as zeroAddress2 } from "viem";
+import { encodeFunctionData as encodeFunctionData4, parseAbi as parseAbi4 } from "viem";
 import { encodeFunctionData as encodeFunctionData5, parseAbi as parseAbi5 } from "viem";
 import { encodeFunctionData as encodeFunctionData6, parseAbi as parseAbi6, decodeAbiParameters as decodeAbiParameters4 } from "viem";
-import { encodeFunctionData as encodeFunctionData7, parseAbi as parseAbi7, createPublicClient as createPublicClient4, http as http4, zeroAddress as zeroAddress3 } from "viem";
-import { createPublicClient as createPublicClient5, decodeFunctionResult as decodeFunctionResult22, encodeFunctionData as encodeFunctionData8, http as http5, parseAbi as parseAbi8, zeroAddress as zeroAddress4 } from "viem";
-import { encodeFunctionData as encodeFunctionData9, parseAbi as parseAbi9, zeroAddress as zeroAddress5 } from "viem";
-import { createPublicClient as createPublicClient6, decodeFunctionResult as decodeFunctionResult3, encodeFunctionData as encodeFunctionData10, http as http6, parseAbi as parseAbi10, zeroAddress as zeroAddress6 } from "viem";
+import { encodeFunctionData as encodeFunctionData7, parseAbi as parseAbi7, createPublicClient as createPublicClient4, http as http4, zeroAddress as zeroAddress2 } from "viem";
+import { createPublicClient as createPublicClient5, decodeFunctionResult as decodeFunctionResult22, encodeFunctionData as encodeFunctionData8, http as http5, parseAbi as parseAbi8, zeroAddress as zeroAddress3 } from "viem";
+import { encodeFunctionData as encodeFunctionData9, parseAbi as parseAbi9, zeroAddress as zeroAddress4 } from "viem";
+import { createPublicClient as createPublicClient6, decodeFunctionResult as decodeFunctionResult3, encodeFunctionData as encodeFunctionData10, http as http6, parseAbi as parseAbi10, zeroAddress as zeroAddress5 } from "viem";
 import { encodeFunctionData as encodeFunctionData11, parseAbi as parseAbi11, createPublicClient as createPublicClient7, http as http7 } from "viem";
 import {
   encodeFunctionData as encodeFunctionData12,
@@ -556,24 +581,24 @@ import {
   keccak256,
   parseAbi as parseAbi13,
   decodeFunctionResult as decodeFunctionResult5,
-  zeroAddress as zeroAddress7
+  zeroAddress as zeroAddress6
 } from "viem";
-import { createPublicClient as createPublicClient10, http as http10, parseAbi as parseAbi14, encodeFunctionData as encodeFunctionData14, decodeFunctionResult as decodeFunctionResult6, zeroAddress as zeroAddress8 } from "viem";
-import { createPublicClient as createPublicClient11, http as http11, parseAbi as parseAbi15, encodeFunctionData as encodeFunctionData15, zeroAddress as zeroAddress9 } from "viem";
+import { createPublicClient as createPublicClient10, http as http10, parseAbi as parseAbi14, encodeFunctionData as encodeFunctionData14, decodeFunctionResult as decodeFunctionResult6, zeroAddress as zeroAddress7 } from "viem";
+import { createPublicClient as createPublicClient11, http as http11, parseAbi as parseAbi15, encodeFunctionData as encodeFunctionData15, zeroAddress as zeroAddress8 } from "viem";
 import { createPublicClient as createPublicClient12, http as http12, parseAbi as parseAbi16 } from "viem";
 import { createPublicClient as createPublicClient13, http as http13, parseAbi as parseAbi17, encodeFunctionData as encodeFunctionData16 } from "viem";
 import { createPublicClient as createPublicClient14, http as http14, parseAbi as parseAbi18, encodeFunctionData as encodeFunctionData17 } from "viem";
 import { createPublicClient as createPublicClient15, http as http15, parseAbi as parseAbi19, encodeFunctionData as encodeFunctionData18 } from "viem";
-import { parseAbi as parseAbi20, encodeFunctionData as encodeFunctionData19, decodeFunctionResult as decodeFunctionResult7, zeroAddress as zeroAddress10 } from "viem";
-import { createPublicClient as createPublicClient16, http as http16, parseAbi as parseAbi21, encodeFunctionData as encodeFunctionData20, zeroAddress as zeroAddress11 } from "viem";
-import { createPublicClient as createPublicClient17, http as http17, parseAbi as parseAbi222 } from "viem";
-import { createPublicClient as createPublicClient18, http as http18, parseAbi as parseAbi23, encodeFunctionData as encodeFunctionData21 } from "viem";
+import { parseAbi as parseAbi20, encodeFunctionData as encodeFunctionData19, decodeFunctionResult as decodeFunctionResult7, zeroAddress as zeroAddress9, createPublicClient as createPublicClient16, http as http16 } from "viem";
+import { createPublicClient as createPublicClient17, http as http17, parseAbi as parseAbi21, encodeFunctionData as encodeFunctionData20, zeroAddress as zeroAddress10 } from "viem";
+import { createPublicClient as createPublicClient18, http as http18, parseAbi as parseAbi222 } from "viem";
+import { createPublicClient as createPublicClient19, http as http19, parseAbi as parseAbi23, encodeFunctionData as encodeFunctionData21 } from "viem";
 import { parseAbi as parseAbi24, encodeFunctionData as encodeFunctionData222 } from "viem";
-import { createPublicClient as createPublicClient19, http as http19, parseAbi as parseAbi25, encodeFunctionData as encodeFunctionData23, zeroAddress as zeroAddress12 } from "viem";
-import { createPublicClient as createPublicClient20, http as http20, parseAbi as parseAbi26, encodeFunctionData as encodeFunctionData24, zeroAddress as zeroAddress13 } from "viem";
+import { createPublicClient as createPublicClient20, http as http20, parseAbi as parseAbi25, encodeFunctionData as encodeFunctionData23, zeroAddress as zeroAddress11 } from "viem";
+import { createPublicClient as createPublicClient21, http as http21, parseAbi as parseAbi26, encodeFunctionData as encodeFunctionData24, zeroAddress as zeroAddress12 } from "viem";
 import { parseAbi as parseAbi27, encodeFunctionData as encodeFunctionData25 } from "viem";
 import { parseAbi as parseAbi28, encodeFunctionData as encodeFunctionData26 } from "viem";
-import { createPublicClient as createPublicClient21, http as http21, parseAbi as parseAbi29 } from "viem";
+import { createPublicClient as createPublicClient222, http as http222, parseAbi as parseAbi29 } from "viem";
 function pctToTickDelta(pct) {
   return Math.round(Math.log(1 + pct / 100) / Math.log(1.0001));
 }
@@ -827,15 +852,6 @@ function u256ToF642(v) {
   if (v > MAX_U128) return Infinity;
   return Number(v);
 }
-function defaultMarketParams(loanToken = zeroAddress10) {
-  return {
-    loanToken,
-    collateralToken: zeroAddress10,
-    oracle: zeroAddress10,
-    irm: zeroAddress10,
-    lltv: 0n
-  };
-}
 function decodeMarket(data) {
   if (!data) return null;
   try {
@@ -1068,7 +1084,7 @@ function createKittenSwapFarming(entry, rpcUrl) {
   const bonusRewardToken = entry.contracts?.["bonus_reward_token"];
   return new KittenSwapFarmingAdapter(entry.name, farmingCenter, eternalFarming, positionManager, rpcUrl, factory, rewardToken, bonusRewardToken);
 }
-var DEFAULT_FEE, swapRouterAbi, quoterAbi, ramsesQuoterAbi, positionManagerAbi, slipstreamMintAbi, UniswapV3Adapter, abi, lbQuoterAbi, UniswapV2Adapter, abi2, algebraQuoterAbi, algebraSingleQuoterAbi, algebraIntegralPmAbi, algebraV2PmAbi, algebraSharedPmAbi, AlgebraV3Adapter, abi3, BalancerV3Adapter, poolAbi, CurveStableSwapAdapter, abi4, abiV2, SolidlyAdapter, thenaPmAbi, thenaRouterAbi, thenaPoolAbi, thenaFactoryAbi, ThenaCLAdapter, _addressDecodeAbi, _symbolDecodeAbi, gaugeManagerAbi, gaugeCLAbi, nfpmAbi, veAbi, voterAbi, HybraGaugeAdapter, abi5, WooFiAdapter, gaugeAbi, veAbi2, voterAbi2, _addressDecodeAbi2, _symbolDecodeAbi2, _boolDecodeAbi, HYPEREVM_TOKENS, CL_TICK_SPACINGS, SolidlyGaugeAdapter, masterchefAbi, MasterChefAdapter, lbRouterAbi, lbFactoryAbi, lbPairAbi, lbRewarderAbi, masterChefAbi, veMoeAbi, lbPairBinAbi, lbQuoterAbi2, erc20Abi2, _addressAbi, _uint256Abi, _boolAbi, _rangeAbi, _binAbi, _uint256ArrayAbi, MerchantMoeLBAdapter, KITTEN_TOKEN, WHYPE_TOKEN, MAX_NONCE_SCAN, HYPEREVM_TOKENS2, farmingCenterAbi, positionManagerAbi2, eternalFarmingAbi, algebraFactoryAbi, _addressDecodeAbi3, nonceCache, KittenSwapFarmingAdapter, DEFAULT_BASE_URL, FALLBACK_BASE_URL, NEST_TOKEN, NEST_DECIMALS, NestOffChainAdapter, POOL_ABI, ERC20_ABI, INCENTIVES_ABI, REWARDS_CONTROLLER_ABI, POOL_PROVIDER_ABI, ADDRESSES_PROVIDER_ABI, ORACLE_ABI, ERC20_DECIMALS_ABI, AaveV3Adapter, POOL_ABI2, ERC20_ABI2, AaveV2Adapter, ORACLE_ABI2, AaveOracleAdapter, CTOKEN_ABI, BSC_BLOCKS_PER_YEAR, CompoundV2Adapter, COMET_ABI, SECONDS_PER_YEAR, CompoundV3Adapter, EULER_VAULT_ABI, SECONDS_PER_YEAR2, EulerV2Adapter, MORPHO_ABI, META_MORPHO_ABI, ERC4626_ABI, MAX_UINT256, IRM_ABI, SECONDS_PER_YEAR3, MorphoBlueAdapter, BORROWER_OPS_ABI, TROVE_MANAGER_ABI, HINT_HELPERS_ABI, SORTED_TROVES_ABI, FelixCdpAdapter, PRICE_FEED_ABI, FelixOracleAdapter, ERC4626_ABI2, ERC4626VaultAdapter, GENERIC_LST_ABI, GenericLstAdapter, STHYPE_ABI, ERC20_ABI3, StHypeAdapter, KINETIQ_ABI, ORACLE_ABI3, WHYPE, HYPERLEND_ORACLE, KinetiqAdapter, PendleAdapter, GenericYieldAdapter, HLP_ABI, HlpVaultAdapter, GenericDerivativesAdapter, RYSK_ABI, RyskAdapter, GenericOptionsAdapter, ERC721_ABI, ERC721Adapter, DexSpotPrice;
+var DEFAULT_FEE, swapRouterAbi, quoterAbi, ramsesQuoterAbi, positionManagerAbi, slipstreamMintAbi, ramsesMintAbi, UniswapV3Adapter, abi, lbQuoterAbi, UniswapV2Adapter, abi2, algebraQuoterAbi, algebraSingleQuoterAbi, algebraIntegralPmAbi, algebraV2PmAbi, algebraSharedPmAbi, AlgebraV3Adapter, abi3, BalancerV3Adapter, poolAbi, CurveStableSwapAdapter, abi4, abiV2, SolidlyAdapter, thenaPmAbi, thenaRouterAbi, thenaPoolAbi, thenaFactoryAbi, ThenaCLAdapter, _addressDecodeAbi, _symbolDecodeAbi, gaugeManagerAbi, gaugeCLAbi, nfpmAbi, veAbi, voterAbi, HybraGaugeAdapter, abi5, WooFiAdapter, gaugeAbi, veAbi2, voterAbi2, _addressDecodeAbi2, _symbolDecodeAbi2, _boolDecodeAbi, HYPEREVM_TOKENS, CL_TICK_SPACINGS, SolidlyGaugeAdapter, masterchefAbi, MasterChefAdapter, lbRouterAbi, lbFactoryAbi, lbPairAbi, lbRewarderAbi, masterChefAbi, veMoeAbi, lbPairBinAbi, lbQuoterAbi2, erc20Abi2, _addressAbi, _uint256Abi, _boolAbi, _rangeAbi, _binAbi, _uint256ArrayAbi, MerchantMoeLBAdapter, KITTEN_TOKEN, WHYPE_TOKEN, MAX_NONCE_SCAN, HYPEREVM_TOKENS2, farmingCenterAbi, positionManagerAbi2, eternalFarmingAbi, algebraFactoryAbi, _addressDecodeAbi3, nonceCache, KittenSwapFarmingAdapter, DEFAULT_BASE_URL, FALLBACK_BASE_URL, NEST_TOKEN, NEST_DECIMALS, NestOffChainAdapter, POOL_ABI, ERC20_ABI, INCENTIVES_ABI, REWARDS_CONTROLLER_ABI, POOL_PROVIDER_ABI, ADDRESSES_PROVIDER_ABI, ORACLE_ABI, ERC20_DECIMALS_ABI, AaveV3Adapter, POOL_ABI2, ERC20_ABI2, AaveV2Adapter, ORACLE_ABI2, AaveOracleAdapter, CTOKEN_ABI, NATIVE_CTOKEN_ABI, COMPTROLLER_ABI, NATIVE_SENTINEL, BSC_BLOCKS_PER_YEAR, CompoundV2Adapter, COMET_ABI, SECONDS_PER_YEAR, CompoundV3Adapter, EULER_VAULT_ABI, SECONDS_PER_YEAR2, EulerV2Adapter, MORPHO_ABI, META_MORPHO_ABI, ERC4626_ABI, MAX_UINT256, IRM_ABI, SECONDS_PER_YEAR3, MorphoBlueAdapter, BORROWER_OPS_ABI, TROVE_MANAGER_ABI, HINT_HELPERS_ABI, SORTED_TROVES_ABI, FelixCdpAdapter, PRICE_FEED_ABI, FelixOracleAdapter, ERC4626_ABI2, ERC4626VaultAdapter, GENERIC_LST_ABI, GenericLstAdapter, STHYPE_ABI, ERC20_ABI3, StHypeAdapter, KINETIQ_ABI, ORACLE_ABI3, WHYPE, HYPERLEND_ORACLE, KinetiqAdapter, PendleAdapter, GenericYieldAdapter, HLP_ABI, HlpVaultAdapter, GenericDerivativesAdapter, RYSK_ABI, RyskAdapter, GenericOptionsAdapter, ERC721_ABI, ERC721Adapter, DexSpotPrice;
 var init_dist2 = __esm({
   "../defi-protocols/dist/index.js"() {
     "use strict";
@@ -1136,6 +1152,10 @@ var init_dist2 = __esm({
       "struct SlipstreamMintParams { address token0; address token1; int24 tickSpacing; int24 tickLower; int24 tickUpper; uint256 amount0Desired; uint256 amount1Desired; uint256 amount0Min; uint256 amount1Min; address recipient; uint256 deadline; uint160 sqrtPriceX96; }",
       "function mint(SlipstreamMintParams calldata params) external payable returns (uint256 tokenId, uint128 liquidity, uint256 amount0, uint256 amount1)"
     ]);
+    ramsesMintAbi = parseAbi3([
+      "struct RamsesMintParams { address token0; address token1; int24 tickSpacing; int24 tickLower; int24 tickUpper; uint256 amount0Desired; uint256 amount1Desired; uint256 amount0Min; uint256 amount1Min; address recipient; uint256 deadline; }",
+      "function mint(RamsesMintParams calldata params) external payable returns (uint256 tokenId, uint128 liquidity, uint256 amount0, uint256 amount1)"
+    ]);
     UniswapV3Adapter = class {
       protocolName;
       router;
@@ -1145,6 +1165,7 @@ var init_dist2 = __esm({
       fee;
       rpcUrl;
       useTickSpacingQuoter;
+      clStyle;
       constructor(entry, rpcUrl) {
         this.protocolName = entry.name;
         const router = entry.contracts?.["router"];
@@ -1157,6 +1178,7 @@ var init_dist2 = __esm({
         this.factory = entry.contracts?.["factory"];
         this.fee = DEFAULT_FEE;
         this.rpcUrl = rpcUrl;
+        this.clStyle = entry.cl_style;
         this.useTickSpacingQuoter = entry.cl_style === "slipstream" || entry.cl_style === "ramses" || entry.contracts?.["pool_deployer"] !== void 0 || entry.contracts?.["gauge_factory"] !== void 0;
       }
       name() {
@@ -1164,7 +1186,15 @@ var init_dist2 = __esm({
       }
       async buildSwap(params) {
         const deadline = BigInt(params.deadline ?? 18446744073709551615n);
-        const amountOutMinimum = 0n;
+        const amountOutMinimum = params.amount_out_min ?? applyMinSlippage(
+          params.slippage,
+          (await this.quote({
+            protocol: this.protocolName,
+            token_in: params.token_in,
+            token_out: params.token_out,
+            amount_in: params.amount_in
+          })).amount_out
+        );
         const data = encodeFunctionData3({
           abi: swapRouterAbi,
           functionName: "exactInputSingle",
@@ -1330,31 +1360,37 @@ var init_dist2 = __esm({
         if (!pm) {
           throw new DefiError("CONTRACT_ERROR", "Position manager address not configured");
         }
-        const [token0, token1, rawAmount0, rawAmount1] = params.token_a.toLowerCase() < params.token_b.toLowerCase() ? [params.token_a, params.token_b, params.amount_a, params.amount_b] : [params.token_b, params.token_a, params.amount_b, params.amount_a];
+        const isAFirst = params.token_a.toLowerCase() < params.token_b.toLowerCase();
+        const [token0, token1, rawAmount0, rawAmount1] = isAFirst ? [params.token_a, params.token_b, params.amount_a, params.amount_b] : [params.token_b, params.token_a, params.amount_b, params.amount_a];
         const amount0 = rawAmount0 === 0n && rawAmount1 > 0n ? 1n : rawAmount0;
         const amount1 = rawAmount1 === 0n && rawAmount0 > 0n ? 1n : rawAmount1;
+        const slippage = params.slippage ?? defaultSwapSlippage();
+        const minA = params.amount_a_min ?? applyMinSlippage(slippage, params.amount_a);
+        const minB = params.amount_b_min ?? applyMinSlippage(slippage, params.amount_b);
+        const [amount0Min, amount1Min] = isAFirst ? [minA, minB] : [minB, minA];
         let thirdField = this.fee;
         let tickLower = -887220;
         let tickUpper = 887220;
         if (params.pool && this.rpcUrl) {
           const poolAbi2 = parseAbi3([
             "function fee() view returns (uint24)",
-            "function tickSpacing() view returns (int24)",
-            "function slot0() view returns (uint160 sqrtPriceX96, int24 tick, uint16, uint16, uint16, bool)"
+            "function tickSpacing() view returns (int24)"
           ]);
           const client = createPublicClient2({ transport: http2(this.rpcUrl) });
-          const [poolFee, poolTs, slot0] = await Promise.all([
+          const [poolFee, poolTs, slot0Raw] = await Promise.all([
             client.readContract({ address: params.pool, abi: poolAbi2, functionName: "fee" }).catch(() => null),
             client.readContract({ address: params.pool, abi: poolAbi2, functionName: "tickSpacing" }).catch(() => null),
-            client.readContract({ address: params.pool, abi: poolAbi2, functionName: "slot0" }).catch(() => null)
+            client.call({ to: params.pool, data: "0x3850c7bd" }).then((r) => r.data ?? null).catch(() => null)
           ]);
           if (this.useTickSpacingQuoter && poolTs !== null) {
             thirdField = poolTs;
           } else if (poolFee !== null) {
             thirdField = poolFee;
           }
-          if (params.range_pct !== void 0 && slot0 && poolTs !== null) {
-            const currentTick = slot0[1];
+          if (params.range_pct !== void 0 && slot0Raw && poolTs !== null) {
+            const tickWord = slot0Raw.slice(2 + 64, 2 + 128);
+            const tickU = BigInt("0x" + tickWord);
+            const currentTick = tickU >= 1n << 255n ? Number(tickU - (1n << 256n)) : Number(tickU);
             const rangeTicks = Math.floor(params.range_pct * 100);
             tickLower = Math.floor((currentTick - rangeTicks) / poolTs) * poolTs;
             tickUpper = Math.ceil((currentTick + rangeTicks) / poolTs) * poolTs;
@@ -1362,7 +1398,25 @@ var init_dist2 = __esm({
         }
         if (params.tick_lower !== void 0) tickLower = params.tick_lower;
         if (params.tick_upper !== void 0) tickUpper = params.tick_upper;
-        const data = this.useTickSpacingQuoter ? encodeFunctionData3({
+        const data = this.clStyle === "ramses" ? encodeFunctionData3({
+          abi: ramsesMintAbi,
+          functionName: "mint",
+          args: [
+            {
+              token0,
+              token1,
+              tickSpacing: thirdField,
+              tickLower,
+              tickUpper,
+              amount0Desired: amount0,
+              amount1Desired: amount1,
+              amount0Min,
+              amount1Min,
+              recipient: params.recipient,
+              deadline: BigInt("18446744073709551615")
+            }
+          ]
+        }) : this.useTickSpacingQuoter ? encodeFunctionData3({
           abi: slipstreamMintAbi,
           functionName: "mint",
           args: [
@@ -1374,8 +1428,8 @@ var init_dist2 = __esm({
               tickUpper,
               amount0Desired: amount0,
               amount1Desired: amount1,
-              amount0Min: 0n,
-              amount1Min: 0n,
+              amount0Min,
+              amount1Min,
               recipient: params.recipient,
               deadline: BigInt("18446744073709551615"),
               sqrtPriceX96: 0n
@@ -1393,8 +1447,8 @@ var init_dist2 = __esm({
               tickUpper,
               amount0Desired: amount0,
               amount1Desired: amount1,
-              amount0Min: 0n,
-              amount1Min: 0n,
+              amount0Min,
+              amount1Min,
               recipient: params.recipient,
               deadline: BigInt("18446744073709551615")
             }
@@ -1428,10 +1482,17 @@ var init_dist2 = __esm({
         const liquidity = params.liquidity;
         const MAX_UINT128 = (1n << 128n) - 1n;
         const deadline = BigInt("18446744073709551615");
+        if (params.amount_a_min === void 0 || params.amount_b_min === void 0) {
+          throw DefiError.invalidParam(
+            `[${this.protocolName}] V3 remove_liquidity requires amount_a_min and amount_b_min for slippage protection (SSOT 7.3). Caller must compute expected token outputs from the pool state and apply a slippage tolerance before calling buildRemoveLiquidity.`
+          );
+        }
+        const isAFirst = params.token_a.toLowerCase() < params.token_b.toLowerCase();
+        const [amount0Min, amount1Min] = isAFirst ? [params.amount_a_min, params.amount_b_min] : [params.amount_b_min, params.amount_a_min];
         const decreaseData = encodeFunctionData3({
           abi: positionManagerAbi,
           functionName: "decreaseLiquidity",
-          args: [{ tokenId, liquidity, amount0Min: 0n, amount1Min: 0n, deadline }]
+          args: [{ tokenId, liquidity, amount0Min, amount1Min, deadline }]
         });
         const collectData = encodeFunctionData3({
           abi: positionManagerAbi,
@@ -1729,7 +1790,13 @@ var init_dist2 = __esm({
           to: this.router,
           data,
           value: 0n,
-          gas_estimate: 25e4
+          gas_estimate: 25e4,
+          // Same LP-approval requirement as Solidly forks: the V2 router pulls the
+          // LP pair token via transferFrom and reverts at gas ~42k otherwise.
+          // Caller passes --pool so we can target the pair contract for approval.
+          // Discovered live on Uniswap V2 Monad WMON/AUSD 2026-05-08
+          // (failed tx 0x2268659a…09ae → recovered with this fix).
+          ...params.pool ? { approvals: [{ token: params.pool, spender: this.router, amount: params.liquidity }] } : {}
         };
       }
     };
@@ -1784,7 +1851,15 @@ var init_dist2 = __esm({
       }
       async buildSwap(params) {
         const deadline = BigInt(params.deadline ?? 18446744073709551615n);
-        const amountOutMinimum = 0n;
+        const amountOutMinimum = params.amount_out_min ?? applyMinSlippage(
+          params.slippage,
+          (await this.quote({
+            protocol: this.protocolName,
+            token_in: params.token_in,
+            token_out: params.token_out,
+            amount_in: params.amount_in
+          })).amount_out
+        );
         const data = encodeFunctionData32({
           abi: abi2,
           functionName: "exactInputSingle",
@@ -1898,7 +1973,12 @@ var init_dist2 = __esm({
         if (!pm) {
           throw new DefiError("CONTRACT_ERROR", "Position manager address not configured");
         }
-        const [token0, token1, rawAmount0, rawAmount1] = params.token_a.toLowerCase() < params.token_b.toLowerCase() ? [params.token_a, params.token_b, params.amount_a, params.amount_b] : [params.token_b, params.token_a, params.amount_b, params.amount_a];
+        const isAFirst = params.token_a.toLowerCase() < params.token_b.toLowerCase();
+        const [token0, token1, rawAmount0, rawAmount1] = isAFirst ? [params.token_a, params.token_b, params.amount_a, params.amount_b] : [params.token_b, params.token_a, params.amount_b, params.amount_a];
+        const slippage = params.slippage ?? defaultSwapSlippage();
+        const minA = params.amount_a_min ?? applyMinSlippage(slippage, params.amount_a);
+        const minB = params.amount_b_min ?? applyMinSlippage(slippage, params.amount_b);
+        const [amount0Min, amount1Min] = isAFirst ? [minA, minB] : [minB, minA];
         let tickLower = params.tick_lower ?? -887220;
         let tickUpper = params.tick_upper ?? 887220;
         const isSingleSide = rawAmount0 === 0n || rawAmount1 === 0n;
@@ -1935,11 +2015,11 @@ var init_dist2 = __esm({
         const data = this.useSingleQuoter ? encodeFunctionData32({
           abi: algebraV2PmAbi,
           functionName: "mint",
-          args: [{ token0, token1, tickLower, tickUpper, amount0Desired: amount0, amount1Desired: amount1, amount0Min: 0n, amount1Min: 0n, recipient: params.recipient, deadline: BigInt("18446744073709551615") }]
+          args: [{ token0, token1, tickLower, tickUpper, amount0Desired: amount0, amount1Desired: amount1, amount0Min, amount1Min, recipient: params.recipient, deadline: BigInt("18446744073709551615") }]
         }) : encodeFunctionData32({
           abi: algebraIntegralPmAbi,
           functionName: "mint",
-          args: [{ token0, token1, deployer: zeroAddress, tickLower, tickUpper, amount0Desired: amount0, amount1Desired: amount1, amount0Min: 0n, amount1Min: 0n, recipient: params.recipient, deadline: BigInt("18446744073709551615") }]
+          args: [{ token0, token1, deployer: zeroAddress, tickLower, tickUpper, amount0Desired: amount0, amount1Desired: amount1, amount0Min, amount1Min, recipient: params.recipient, deadline: BigInt("18446744073709551615") }]
         });
         const approvals = [];
         if (amount0 > 0n) approvals.push({ token: token0, spender: pm, amount: amount0 });
@@ -1957,12 +2037,19 @@ var init_dist2 = __esm({
         const pm = this.positionManager;
         if (!pm) throw DefiError.contractError(`[${this.protocolName}] Missing 'position_manager'`);
         if (!params.token_id) throw DefiError.invalidParam(`[${this.protocolName}] V3 remove_liquidity requires --token-id`);
+        if (params.amount_a_min === void 0 || params.amount_b_min === void 0) {
+          throw DefiError.invalidParam(
+            `[${this.protocolName}] remove_liquidity requires amount_a_min and amount_b_min for slippage protection (SSOT 7.3). Compute expected outputs from positions(tokenId) + pool.globalState off-chain and apply tolerance.`
+          );
+        }
+        const isAFirst = params.token_a.toLowerCase() < params.token_b.toLowerCase();
+        const [amount0Min, amount1Min] = isAFirst ? [params.amount_a_min, params.amount_b_min] : [params.amount_b_min, params.amount_a_min];
         const MAX_UINT128 = (1n << 128n) - 1n;
         const deadline = BigInt("18446744073709551615");
         const decreaseData = encodeFunctionData32({
           abi: algebraSharedPmAbi,
           functionName: "decreaseLiquidity",
-          args: [{ tokenId: params.token_id, liquidity: params.liquidity, amount0Min: 0n, amount1Min: 0n, deadline }]
+          args: [{ tokenId: params.token_id, liquidity: params.liquidity, amount0Min, amount1Min, deadline }]
         });
         const collectData = encodeFunctionData32({
           abi: algebraSharedPmAbi,
@@ -1989,6 +2076,7 @@ var init_dist2 = __esm({
     BalancerV3Adapter = class {
       protocolName;
       router;
+      pool;
       constructor(entry, _rpcUrl) {
         this.protocolName = entry.name;
         const router = entry.contracts?.["router"];
@@ -1996,19 +2084,29 @@ var init_dist2 = __esm({
           throw new DefiError("CONTRACT_ERROR", "Missing 'router' contract");
         }
         this.router = router;
+        this.pool = entry.contracts?.["pool"];
       }
       name() {
         return this.protocolName;
       }
       async buildSwap(params) {
-        const minAmountOut = 0n;
+        if (params.amount_out_min === void 0) {
+          throw DefiError.invalidParam(
+            `[${this.protocolName}] buildSwap requires amount_out_min for slippage protection (SSOT 7.3) \u2014 Balancer V3 has no on-chain quoter wired in this adapter. Compute the floor off-chain (e.g. via the Vault's static-call simulation) and pass it explicitly.`
+          );
+        }
+        if (!this.pool) {
+          throw DefiError.invalidParam(
+            `[${this.protocolName}] buildSwap requires a pool address. Register the pool under [protocol.contracts] as \`pool = "0x..."\` in the protocol's TOML config. Multi-pool routing is intentionally not implemented in this adapter \u2014 for that, quote against the Balancer V3 BatchRouter off-chain and route via a different surface.`
+          );
+        }
+        const minAmountOut = params.amount_out_min;
         const deadline = BigInt(params.deadline ?? 18446744073709551615n);
         const data = encodeFunctionData4({
           abi: abi3,
           functionName: "swapSingleTokenExactIn",
           args: [
-            zeroAddress2,
-            // TODO: resolve pool from registry
+            this.pool,
             params.token_in,
             params.token_out,
             params.amount_in,
@@ -2019,7 +2117,7 @@ var init_dist2 = __esm({
           ]
         });
         return {
-          description: `[${this.protocolName}] Swap ${params.amount_in} via Balancer V3`,
+          description: `[${this.protocolName}] Swap ${params.amount_in} via Balancer V3 pool ${this.pool}`,
           to: this.router,
           data,
           value: 0n,
@@ -2039,8 +2137,8 @@ var init_dist2 = __esm({
     poolAbi = parseAbi5([
       "function exchange(int128 i, int128 j, uint256 dx, uint256 min_dy) external returns (uint256)",
       "function get_dy(int128 i, int128 j, uint256 dx) external view returns (uint256)",
-      "function add_liquidity(uint256[2] amounts, uint256 min_mint_amount) external returns (uint256)",
-      "function remove_liquidity(uint256 amount, uint256[2] min_amounts) external returns (uint256[2])"
+      "function add_liquidity(uint256[] amounts, uint256 min_mint_amount) external returns (uint256)",
+      "function remove_liquidity(uint256 amount, uint256[] min_amounts) external returns (uint256[])"
     ]);
     CurveStableSwapAdapter = class {
       protocolName;
@@ -2075,28 +2173,42 @@ var init_dist2 = __esm({
         throw DefiError.unsupported(`[${this.protocolName}] quote requires RPC connection`);
       }
       async buildAddLiquidity(params) {
+        if (!params.pool) {
+          throw DefiError.invalidParam(
+            `[${this.protocolName}] Curve add_liquidity needs --pool <address>. The router does not proxy this call; it lives on the pool itself.`
+          );
+        }
         const data = encodeFunctionData5({
           abi: poolAbi,
           functionName: "add_liquidity",
           args: [[params.amount_a, params.amount_b], 0n]
         });
+        const approvals = [];
+        if (params.amount_a > 0n) approvals.push({ token: params.token_a, spender: params.pool, amount: params.amount_a });
+        if (params.amount_b > 0n) approvals.push({ token: params.token_b, spender: params.pool, amount: params.amount_b });
         return {
-          description: `[${this.protocolName}] Curve add liquidity`,
-          to: this.router,
+          description: `[${this.protocolName}] Curve add liquidity to ${params.pool}`,
+          to: params.pool,
           data,
           value: 0n,
-          gas_estimate: 4e5
+          gas_estimate: 4e5,
+          approvals
         };
       }
       async buildRemoveLiquidity(params) {
+        if (!params.pool) {
+          throw DefiError.invalidParam(
+            `[${this.protocolName}] Curve remove_liquidity needs --pool <address>. The router does not proxy this call.`
+          );
+        }
         const data = encodeFunctionData5({
           abi: poolAbi,
           functionName: "remove_liquidity",
           args: [params.liquidity, [0n, 0n]]
         });
         return {
-          description: `[${this.protocolName}] Curve remove liquidity`,
-          to: this.router,
+          description: `[${this.protocolName}] Curve remove liquidity from ${params.pool}`,
+          to: params.pool,
           data,
           value: 0n,
           gas_estimate: 35e4
@@ -2262,7 +2374,12 @@ var init_dist2 = __esm({
           to: this.router,
           data,
           value: 0n,
-          gas_estimate: 3e5
+          gas_estimate: 3e5,
+          // The router pulls the LP token via transferFrom; without this approval
+          // the tx reverts at gas ~42k. Caller must pass --pool so we know which
+          // LP pair to approve. Discovered live on Aerodrome USDC/USDT 2026-05-08
+          // (failed tx 0x6d052e0a…3298 → recovered with manual approve 0xa126fc3a).
+          ...params.pool ? { approvals: [{ token: params.pool, spender: this.router, amount: params.liquidity }] } : {}
         };
       }
     };
@@ -2309,6 +2426,11 @@ var init_dist2 = __esm({
         return this.protocolName;
       }
       async buildSwap(params) {
+        if (params.amount_out_min === void 0) {
+          throw DefiError.invalidParam(
+            `[${this.protocolName}] buildSwap requires amount_out_min for slippage protection (SSOT 7.3) \u2014 Thena CL has no on-chain quoter. Compute the floor off-chain (e.g. via the router's static-call simulation) and pass it explicitly.`
+          );
+        }
         const data = encodeFunctionData7({
           abi: thenaRouterAbi,
           functionName: "exactInputSingle",
@@ -2319,7 +2441,7 @@ var init_dist2 = __esm({
             recipient: params.recipient,
             deadline: BigInt(params.deadline ?? 18446744073709551615n),
             amountIn: params.amount_in,
-            amountOutMinimum: 0n,
+            amountOutMinimum: params.amount_out_min,
             sqrtPriceLimitX96: 0n
           }]
         });
@@ -2339,7 +2461,12 @@ var init_dist2 = __esm({
         const pm = this.positionManager;
         if (!pm) throw new DefiError("CONTRACT_ERROR", "Position manager not configured");
         if (!this.rpcUrl) throw DefiError.rpcError("RPC URL required");
-        const [token0, token1, rawAmount0, rawAmount1] = params.token_a.toLowerCase() < params.token_b.toLowerCase() ? [params.token_a, params.token_b, params.amount_a, params.amount_b] : [params.token_b, params.token_a, params.amount_b, params.amount_a];
+        const isAFirst = params.token_a.toLowerCase() < params.token_b.toLowerCase();
+        const [token0, token1, rawAmount0, rawAmount1] = isAFirst ? [params.token_a, params.token_b, params.amount_a, params.amount_b] : [params.token_b, params.token_a, params.amount_b, params.amount_a];
+        const slippage = params.slippage ?? defaultSwapSlippage();
+        const minA = params.amount_a_min ?? applyMinSlippage(slippage, params.amount_a);
+        const minB = params.amount_b_min ?? applyMinSlippage(slippage, params.amount_b);
+        const [amount0Min, amount1Min] = isAFirst ? [minA, minB] : [minB, minA];
         const client = createPublicClient4({ transport: http4(this.rpcUrl) });
         const poolAddr = params.pool;
         let tickSpacing = this.defaultTickSpacing;
@@ -2354,7 +2481,7 @@ var init_dist2 = __esm({
               functionName: "getPool",
               args: [token0, token1, tickSpacing]
             });
-            if (pool === zeroAddress3) throw new DefiError("CONTRACT_ERROR", "Pool not found");
+            if (pool === zeroAddress2) throw new DefiError("CONTRACT_ERROR", "Pool not found");
           }
           if (pool) {
             const [slot0, ts] = await Promise.all([
@@ -2397,8 +2524,8 @@ var init_dist2 = __esm({
             tickUpper,
             amount0Desired: rawAmount0,
             amount1Desired: rawAmount1,
-            amount0Min: 0n,
-            amount1Min: 0n,
+            amount0Min,
+            amount1Min,
             recipient: params.recipient,
             deadline: BigInt("18446744073709551615"),
             sqrtPriceX96: 0n
@@ -2420,12 +2547,19 @@ var init_dist2 = __esm({
         const pm = this.positionManager;
         if (!pm) throw DefiError.contractError(`[${this.protocolName}] Missing 'position_manager'`);
         if (!params.token_id) throw DefiError.invalidParam(`[${this.protocolName}] V3 remove_liquidity requires --token-id`);
+        if (params.amount_a_min === void 0 || params.amount_b_min === void 0) {
+          throw DefiError.invalidParam(
+            `[${this.protocolName}] remove_liquidity requires amount_a_min and amount_b_min for slippage protection (SSOT 7.3). Compute expected outputs from positions(tokenId) + pool.slot0 off-chain and apply tolerance.`
+          );
+        }
+        const isAFirst = params.token_a.toLowerCase() < params.token_b.toLowerCase();
+        const [amount0Min, amount1Min] = isAFirst ? [params.amount_a_min, params.amount_b_min] : [params.amount_b_min, params.amount_a_min];
         const MAX_UINT128 = (1n << 128n) - 1n;
         const deadline = BigInt("18446744073709551615");
         const decreaseData = encodeFunctionData7({
           abi: thenaPmAbi,
           functionName: "decreaseLiquidity",
-          args: [{ tokenId: params.token_id, liquidity: params.liquidity, amount0Min: 0n, amount1Min: 0n, deadline }]
+          args: [{ tokenId: params.token_id, liquidity: params.liquidity, amount0Min, amount1Min, deadline }]
         });
         const collectData = encodeFunctionData7({
           abi: thenaPmAbi,
@@ -2492,8 +2626,8 @@ var init_dist2 = __esm({
         const ve = entry.contracts?.["ve_token"];
         if (!ve) throw new DefiError("CONTRACT_ERROR", "Missing 've_token' contract");
         this.veToken = ve;
-        this.voter = entry.contracts?.["voter"] ?? zeroAddress4;
-        this.positionManager = entry.contracts?.["position_manager"] ?? zeroAddress4;
+        this.voter = entry.contracts?.["voter"] ?? zeroAddress3;
+        this.positionManager = entry.contracts?.["position_manager"] ?? zeroAddress3;
         this.poolFactory = entry.contracts?.["pool_factory"];
         this.rpcUrl = rpcUrl;
       }
@@ -2535,7 +2669,7 @@ var init_dist2 = __esm({
           ]);
         }
         const poolAddressResults = await multicallRead(this.rpcUrl, poolAddressCalls);
-        const pools = poolAddressResults.map((r) => decodeAddress(r)).filter((a) => a !== null && a !== zeroAddress4);
+        const pools = poolAddressResults.map((r) => decodeAddress(r)).filter((a) => a !== null && a !== zeroAddress3);
         if (pools.length === 0) return [];
         const gaugeCalls = pools.map((pool) => [
           this.gaugeManager,
@@ -2545,7 +2679,7 @@ var init_dist2 = __esm({
         const gaugedPools = [];
         for (let i = 0; i < pools.length; i++) {
           const gauge = decodeAddress(gaugeResults[i] ?? null);
-          if (gauge && gauge !== zeroAddress4) {
+          if (gauge && gauge !== zeroAddress3) {
             gaugedPools.push({ pool: pools[i], gauge });
           }
         }
@@ -2560,8 +2694,8 @@ var init_dist2 = __esm({
         for (let i = 0; i < gaugedPools.length; i++) {
           const t0 = decodeAddress(tokenResults[i * 2] ?? null);
           const t1 = decodeAddress(tokenResults[i * 2 + 1] ?? null);
-          if (t0 && t0 !== zeroAddress4) tokenAddrs.add(t0);
-          if (t1 && t1 !== zeroAddress4) tokenAddrs.add(t1);
+          if (t0 && t0 !== zeroAddress3) tokenAddrs.add(t0);
+          if (t1 && t1 !== zeroAddress3) tokenAddrs.add(t1);
         }
         const uniqueTokens = Array.from(tokenAddrs);
         const symbolCalls = uniqueTokens.map((t) => [
@@ -2600,7 +2734,7 @@ var init_dist2 = __esm({
           functionName: "gauges",
           args: [pool]
         });
-        if (gauge === zeroAddress4) throw new DefiError("CONTRACT_ERROR", `No gauge for pool ${pool}`);
+        if (gauge === zeroAddress3) throw new DefiError("CONTRACT_ERROR", `No gauge for pool ${pool}`);
         return gauge;
       }
       // ─── CL Gauge: NFT Deposit/Withdraw ──────────────────────────
@@ -2762,7 +2896,7 @@ var init_dist2 = __esm({
             params.amount_in,
             minToAmount,
             params.recipient,
-            zeroAddress5
+            zeroAddress4
           ]
         });
         return {
@@ -2987,7 +3121,7 @@ var init_dist2 = __esm({
             poolCalls.push([this.voter, encodeFunctionData10({ abi: voterPoolsAbi, functionName: "pools", args: [BigInt(i)] })]);
           }
           const poolResults = await multicallRead(this.rpcUrl, poolCalls);
-          pairs = poolResults.map((r) => decodeAddress2(r)).filter((a) => a !== null && a !== zeroAddress6);
+          pairs = poolResults.map((r) => decodeAddress2(r)).filter((a) => a !== null && a !== zeroAddress5);
         } else {
           const v2FactoryAbi = parseAbi10(["function allPairsLength() view returns (uint256)", "function allPairs(uint256) view returns (address)"]);
           const solidlyFactoryAbi = parseAbi10(["function allPoolsLength() view returns (uint256)", "function allPools(uint256) view returns (address)"]);
@@ -3012,17 +3146,17 @@ var init_dist2 = __esm({
           const pairCalls = [];
           for (let i = startIdx; i < count; i++) pairCalls.push([this.v2Factory, encodeFunctionData10({ abi: fetchAbi, functionName: fetchFn, args: [BigInt(i)] })]);
           const pairResults = await multicallRead(this.rpcUrl, pairCalls);
-          pairs = pairResults.map((r) => decodeAddress2(r)).filter((a) => a !== null && a !== zeroAddress6);
+          pairs = pairResults.map((r) => decodeAddress2(r)).filter((a) => a !== null && a !== zeroAddress5);
         }
         if (pairs.length === 0) return;
         const gaugeCalls = pairs.map((p) => [this.voter, encodeFunctionData10({ abi: gaugeForPoolAbi, functionName: "gaugeForPool", args: [p] })]);
         let gaugeResults = await multicallRead(this.rpcUrl, gaugeCalls);
-        const allNull = gaugeResults.every((r) => !r || decodeAddress2(r) === zeroAddress6 || decodeAddress2(r) === null);
+        const allNull = gaugeResults.every((r) => !r || decodeAddress2(r) === zeroAddress5 || decodeAddress2(r) === null);
         if (allNull) {
           const fb1 = pairs.map((p) => [this.voter, encodeFunctionData10({ abi: poolToGaugeAbi, functionName: "poolToGauge", args: [p] })]);
           gaugeResults = await multicallRead(this.rpcUrl, fb1);
         }
-        const allNull2 = gaugeResults.every((r) => !r || decodeAddress2(r) === zeroAddress6 || decodeAddress2(r) === null);
+        const allNull2 = gaugeResults.every((r) => !r || decodeAddress2(r) === zeroAddress5 || decodeAddress2(r) === null);
         if (allNull2) {
           const fb2 = pairs.map((p) => [this.voter, encodeFunctionData10({ abi: gaugesAbi, functionName: "gauges", args: [p] })]);
           gaugeResults = await multicallRead(this.rpcUrl, fb2);
@@ -3030,7 +3164,7 @@ var init_dist2 = __esm({
         const gaugedPairs = [];
         for (let i = 0; i < pairs.length; i++) {
           const gauge = decodeAddress2(gaugeResults[i] ?? null);
-          if (gauge && gauge !== zeroAddress6) {
+          if (gauge && gauge !== zeroAddress5) {
             gaugedPairs.push({ pair: pairs[i], gauge });
           }
         }
@@ -3046,8 +3180,8 @@ var init_dist2 = __esm({
         for (let i = 0; i < gaugedPairs.length; i++) {
           const t0 = decodeAddress2(metaResults[i * 3] ?? null);
           const t1 = decodeAddress2(metaResults[i * 3 + 1] ?? null);
-          if (t0 && t0 !== zeroAddress6) tokenAddrs.add(t0);
-          if (t1 && t1 !== zeroAddress6) tokenAddrs.add(t1);
+          if (t0 && t0 !== zeroAddress5) tokenAddrs.add(t0);
+          if (t1 && t1 !== zeroAddress5) tokenAddrs.add(t1);
         }
         const uniqueTokens = Array.from(tokenAddrs);
         const symbolCalls = uniqueTokens.map((t) => [
@@ -3137,7 +3271,7 @@ var init_dist2 = __esm({
         const candidatePools = [];
         for (let i = 0; i < getPoolCalls.length; i++) {
           const pool = decodeAddress2(getPoolResults[i] ?? null);
-          if (pool && pool !== zeroAddress6) {
+          if (pool && pool !== zeroAddress5) {
             const { pairIdx, tickSpacing } = callMeta[i];
             const [tokenA, tokenB] = pairs[pairIdx];
             candidatePools.push({ pool, tokenA, tokenB, tickSpacing });
@@ -3149,7 +3283,7 @@ var init_dist2 = __esm({
           encodeFunctionData10({ abi: gaugeForPoolAbi, functionName: "gaugeForPool", args: [pool] })
         ]);
         let gaugeResults = await multicallRead(this.rpcUrl, gaugeCalls);
-        const allNull = gaugeResults.every((r) => !r || decodeAddress2(r) === zeroAddress6 || decodeAddress2(r) === null);
+        const allNull = gaugeResults.every((r) => !r || decodeAddress2(r) === zeroAddress5 || decodeAddress2(r) === null);
         if (allNull) {
           const fallbackCalls = candidatePools.map(({ pool }) => [
             this.voter,
@@ -3160,7 +3294,7 @@ var init_dist2 = __esm({
         const gaugedCL = [];
         for (let i = 0; i < candidatePools.length; i++) {
           const gauge = decodeAddress2(gaugeResults[i] ?? null);
-          if (gauge && gauge !== zeroAddress6) {
+          if (gauge && gauge !== zeroAddress5) {
             gaugedCL.push({ ...candidatePools[i], gauge });
           }
         }
@@ -3190,8 +3324,8 @@ var init_dist2 = __esm({
           const { pool, gauge, tokenA, tokenB, tickSpacing } = gaugedCL[i];
           const rawT0 = decodeAddress2(poolTokenResults[i * 2] ?? null);
           const rawT1 = decodeAddress2(poolTokenResults[i * 2 + 1] ?? null);
-          const t0 = rawT0 && rawT0 !== zeroAddress6 ? rawT0 : tokenA;
-          const t1 = rawT1 && rawT1 !== zeroAddress6 ? rawT1 : tokenB;
+          const t0 = rawT0 && rawT0 !== zeroAddress5 ? rawT0 : tokenA;
+          const t1 = rawT1 && rawT1 !== zeroAddress5 ? rawT1 : tokenB;
           out.push({
             pool,
             gauge,
@@ -3293,7 +3427,7 @@ var init_dist2 = __esm({
               functionName: fn,
               args: [pool]
             });
-            if (gauge !== zeroAddress6) return gauge;
+            if (gauge !== zeroAddress5) return gauge;
           } catch {
           }
         }
@@ -3347,7 +3481,7 @@ var init_dist2 = __esm({
             abi: gaugeAbi,
             functionName: "rewardToken"
           });
-          if (rt !== zeroAddress6) return { tokens: [rt], multiToken: false };
+          if (rt !== zeroAddress5) return { tokens: [rt], multiToken: false };
         } catch {
         }
         return { tokens: [], multiToken: false };
@@ -3357,7 +3491,7 @@ var init_dist2 = __esm({
           const data = encodeFunctionData10({
             abi: gaugeAbi,
             functionName: "getReward",
-            args: [account ?? zeroAddress6]
+            args: [account ?? zeroAddress5]
           });
           return { description: `[${this.protocolName}] Claim gauge rewards`, to: gauge, data, value: 0n, gas_estimate: 2e5 };
         }
@@ -3581,7 +3715,7 @@ var init_dist2 = __esm({
               functionName: "earned",
               args: [user]
             });
-            results.push({ token: zeroAddress6, symbol: "unknown", amount: earned });
+            results.push({ token: zeroAddress5, symbol: "unknown", amount: earned });
           } catch {
           }
         }
@@ -3943,20 +4077,47 @@ var init_dist2 = __esm({
       /**
        * Build an addLiquidity transaction for a Liquidity Book pair.
        * Distributes tokenX/tokenY uniformly across active bin ± numBins.
+       *
+       * The LB pair stores tokenX/tokenY in the order set at factory creation,
+       * which is **not** address-sorted. Callers may pass tokens in either order;
+       * we always re-align with the pool's `getTokenX/getTokenY` (and swap amounts
+       * accordingly) so the router's `if (tokenX != pair.tokenX) revert` path is
+       * never hit.
        */
       async buildAddLiquidity(params) {
         const numBins = params.numBins ?? 5;
         const deadline = params.deadline ?? BigInt("18446744073709551615");
-        let activeIdDesired = params.activeIdDesired;
-        if (activeIdDesired === void 0) {
-          const rpcUrl = this.requireRpc();
-          const client = createPublicClient8({ transport: http8(rpcUrl) });
-          const activeId = await client.readContract({
-            address: params.pool,
-            abi: lbPairAbi,
-            functionName: "getActiveId"
-          });
-          activeIdDesired = activeId;
+        const rpcUrl = this.requireRpc();
+        const client = createPublicClient8({ transport: http8(rpcUrl) });
+        const [poolTokenX, poolTokenY, onChainActiveId] = await Promise.all([
+          client.readContract({ address: params.pool, abi: lbPairAbi, functionName: "getTokenX" }),
+          client.readContract({ address: params.pool, abi: lbPairAbi, functionName: "getTokenY" }),
+          params.activeIdDesired === void 0 ? client.readContract({ address: params.pool, abi: lbPairAbi, functionName: "getActiveId" }) : Promise.resolve(params.activeIdDesired)
+        ]);
+        const activeIdDesired = onChainActiveId;
+        const inX = params.tokenX.toLowerCase();
+        const inY = params.tokenY.toLowerCase();
+        const poolX = poolTokenX.toLowerCase();
+        const poolY = poolTokenY.toLowerCase();
+        let tokenX;
+        let tokenY;
+        let amountX;
+        let amountY;
+        if (inX === poolX && inY === poolY) {
+          tokenX = params.tokenX;
+          tokenY = params.tokenY;
+          amountX = params.amountX;
+          amountY = params.amountY;
+        } else if (inX === poolY && inY === poolX) {
+          tokenX = poolTokenX;
+          tokenY = poolTokenY;
+          amountX = params.amountY;
+          amountY = params.amountX;
+        } else {
+          throw new DefiError(
+            "CONTRACT_ERROR",
+            `[${this.protocolName}] tokenX/tokenY ${params.tokenX}/${params.tokenY} do not match pool ${params.pool} (${poolTokenX}/${poolTokenY})`
+          );
         }
         const deltaIds = [];
         for (let d = -numBins; d <= numBins; d++) {
@@ -3968,11 +4129,11 @@ var init_dist2 = __esm({
           functionName: "addLiquidity",
           args: [
             {
-              tokenX: params.tokenX,
-              tokenY: params.tokenY,
+              tokenX,
+              tokenY,
               binStep: BigInt(params.binStep),
-              amountX: params.amountX,
-              amountY: params.amountY,
+              amountX,
+              amountY,
               amountXMin: 0n,
               amountYMin: 0n,
               activeIdDesired: BigInt(activeIdDesired),
@@ -3987,31 +4148,63 @@ var init_dist2 = __esm({
           ]
         });
         return {
-          description: `[${this.protocolName}] LB addLiquidity ${params.amountX} tokenX + ${params.amountY} tokenY across ${deltaIds.length} bins`,
+          description: `[${this.protocolName}] LB addLiquidity ${amountX} tokenX + ${amountY} tokenY across ${deltaIds.length} bins`,
           to: this.lbRouter,
           data,
           value: 0n,
           gas_estimate: 8e5,
           approvals: [
-            { token: params.tokenX, spender: this.lbRouter, amount: params.amountX },
-            { token: params.tokenY, spender: this.lbRouter, amount: params.amountY }
+            { token: tokenX, spender: this.lbRouter, amount: amountX },
+            { token: tokenY, spender: this.lbRouter, amount: amountY }
           ]
         };
       }
       /**
        * Build a removeLiquidity transaction for specific LB bins.
+       *
+       * When `pool` is supplied, the adapter realigns tokenX/tokenY (and
+       * amountXMin/amountYMin) to the pool's actual ordering. Otherwise it trusts
+       * the caller — the router will revert if the order is wrong.
        */
       async buildRemoveLiquidity(params) {
         const deadline = params.deadline ?? BigInt("18446744073709551615");
+        let tokenX = params.tokenX;
+        let tokenY = params.tokenY;
+        let amountXMin = params.amountXMin ?? 0n;
+        let amountYMin = params.amountYMin ?? 0n;
+        if (params.pool) {
+          const rpcUrl = this.requireRpc();
+          const client = createPublicClient8({ transport: http8(rpcUrl) });
+          const [poolTokenX, poolTokenY] = await Promise.all([
+            client.readContract({ address: params.pool, abi: lbPairAbi, functionName: "getTokenX" }),
+            client.readContract({ address: params.pool, abi: lbPairAbi, functionName: "getTokenY" })
+          ]);
+          const inX = params.tokenX.toLowerCase();
+          const inY = params.tokenY.toLowerCase();
+          const poolX = poolTokenX.toLowerCase();
+          const poolY = poolTokenY.toLowerCase();
+          if (inX === poolY && inY === poolX) {
+            tokenX = poolTokenX;
+            tokenY = poolTokenY;
+            const x = amountXMin;
+            amountXMin = amountYMin;
+            amountYMin = x;
+          } else if (!(inX === poolX && inY === poolY)) {
+            throw new DefiError(
+              "CONTRACT_ERROR",
+              `[${this.protocolName}] tokenX/tokenY ${params.tokenX}/${params.tokenY} do not match pool ${params.pool} (${poolTokenX}/${poolTokenY})`
+            );
+          }
+        }
         const data = encodeFunctionData12({
           abi: lbRouterAbi,
           functionName: "removeLiquidity",
           args: [
-            params.tokenX,
-            params.tokenY,
+            tokenX,
+            tokenY,
             params.binStep,
-            params.amountXMin ?? 0n,
-            params.amountYMin ?? 0n,
+            amountXMin,
+            amountYMin,
             params.binIds.map(BigInt),
             params.amounts,
             params.recipient,
@@ -4921,7 +5114,7 @@ var init_dist2 = __esm({
         const poolSet = /* @__PURE__ */ new Set();
         for (const data of poolResults) {
           const addr = decodeAddress3(data);
-          if (addr && addr !== zeroAddress7) {
+          if (addr && addr !== zeroAddress6) {
             poolSet.add(addr.toLowerCase());
           }
         }
@@ -5086,6 +5279,34 @@ var init_dist2 = __esm({
         }
         return apr;
       }
+      /**
+       * Snapshot of all NEST gauged pools from the off-chain blaze API. The
+       * on-chain ve(3,3) gauges return `rewardRate=0` (emissions are credited
+       * off-chain via signed claim tickets), so the on-chain Solidly gauge
+       * reader cannot surface real emission APR. This API is the canonical
+       * read source — used by `lp discover` to expose non-zero NEST yields.
+       */
+      async getLiquidityPools() {
+        const raw = await this.fetchJson("/liquidity-pools");
+        const out = [];
+        for (const p of raw) {
+          const t0 = p.token0?.basetoken;
+          const t1 = p.token1?.basetoken;
+          if (!t0?.address || !t1?.address) continue;
+          out.push({
+            pool: p.id,
+            gauge: p.gauge ?? null,
+            token0: { address: t0.address, symbol: t0.symbol ?? "?" },
+            token1: { address: t1.address, symbol: t1.symbol ?? "?" },
+            tvlUSD: Number(p.tvlUSD ?? 0),
+            aprPercent: Number(p.apr ?? 0),
+            curEpochEmissionRewardsUSD: Number(p.curEpochEmissionRewardsUSD ?? 0),
+            poolType: p.poolType,
+            isStable: p.isStable
+          });
+        }
+        return out;
+      }
       /** Pending NEST emissions as IGauge-compatible RewardInfo[] */
       async getPendingRewards(user) {
         const status = await this.getClaimStatus(user);
@@ -5241,6 +5462,16 @@ var init_dist2 = __esm({
       "function borrow(address asset, uint256 amount, uint256 interestRateMode, uint16 referralCode, address onBehalfOf) external",
       "function repay(address asset, uint256 amount, uint256 interestRateMode, address onBehalfOf) external returns (uint256)",
       "function withdraw(address asset, uint256 amount, address to) external returns (uint256)",
+      // Toggles required to actually borrow against an isolation-mode reserve
+      // (https://aave.com/docs/aave-v3/smart-contracts/pool):
+      //   - setUserUseReserveAsCollateral: an isolation reserve can be enabled
+      //     only if no other asset is enabled; LTV=0 reserves can never be
+      //     enabled; disable reverts if the resulting HF would drop below the
+      //     liquidation threshold.
+      //   - setUserEMode: reverts if the user is borrowing a non-eMode-
+      //     compatible asset, or if the change would push HF below threshold.
+      "function setUserUseReserveAsCollateral(address asset, bool useAsCollateral) external",
+      "function setUserEMode(uint8 categoryId) external",
       "function getUserAccountData(address user) external view returns (uint256 totalCollateralBase, uint256 totalDebtBase, uint256 availableBorrowsBase, uint256 currentLiquidationThreshold, uint256 ltv, uint256 healthFactor)",
       "function getReservesList() external view returns (address[])",
       "function getReserveData(address asset) external view returns (uint256 configuration, uint128 liquidityIndex, uint128 currentLiquidityRate, uint128 variableBorrowIndex, uint128 currentVariableBorrowRate, uint128 currentStableBorrowRate, uint40 lastUpdateTimestamp, uint16 id, address aTokenAddress, address stableDebtTokenAddress, address variableDebtTokenAddress, address interestRateStrategyAddress, uint128 accruedToTreasury, uint128 unbacked, uint128 isolationModeTotalDebt)"
@@ -5366,6 +5597,34 @@ var init_dist2 = __esm({
           gas_estimate: 25e4
         };
       }
+      async buildSetUseReserveAsCollateral(asset, useAsCollateral) {
+        const data = encodeFunctionData14({
+          abi: POOL_ABI,
+          functionName: "setUserUseReserveAsCollateral",
+          args: [asset, useAsCollateral]
+        });
+        return {
+          description: `[${this.protocolName}] ${useAsCollateral ? "Enable" : "Disable"} ${asset} as collateral`,
+          to: this.pool,
+          data,
+          value: 0n,
+          gas_estimate: 1e5
+        };
+      }
+      async buildSetEMode(categoryId) {
+        const data = encodeFunctionData14({
+          abi: POOL_ABI,
+          functionName: "setUserEMode",
+          args: [categoryId]
+        });
+        return {
+          description: `[${this.protocolName}] Set eMode category to ${categoryId}${categoryId === 0 ? " (opt out)" : ""}`,
+          to: this.pool,
+          data,
+          value: 0n,
+          gas_estimate: 15e4
+        };
+      }
       async getRates(asset) {
         if (!this.rpcUrl) throw DefiError.rpcError("No RPC URL configured");
         const reserveCallData = encodeFunctionData14({
@@ -5410,7 +5669,7 @@ var init_dist2 = __esm({
             [aTokenAddress, encodeFunctionData14({ abi: INCENTIVES_ABI, functionName: "getIncentivesController" })]
           ]);
           const controllerAddr = decodeAddress4(controllerRaw ?? null);
-          if (controllerAddr && controllerAddr !== zeroAddress8) {
+          if (controllerAddr && controllerAddr !== zeroAddress7) {
             const [supplyRewardsRaw, borrowRewardsRaw] = await multicallRead(this.rpcUrl, [
               [controllerAddr, encodeFunctionData14({ abi: REWARDS_CONTROLLER_ABI, functionName: "getRewardsByAsset", args: [aTokenAddress] })],
               [controllerAddr, encodeFunctionData14({ abi: REWARDS_CONTROLLER_ABI, functionName: "getRewardsByAsset", args: [variableDebtTokenAddress] })]
@@ -5606,8 +5865,8 @@ var init_dist2 = __esm({
             if (p.value.borrow > 0n) borrows.push({ asset: p.value.asset, symbol: p.value.symbol, amount: p.value.borrow });
           }
         } catch {
-          if (collateralUsd > 0) supplies.push({ asset: zeroAddress8, symbol: "Total Collateral (per-asset breakdown unavailable)", amount: totalCollateralBase });
-          if (debtUsd > 0) borrows.push({ asset: zeroAddress8, symbol: "Total Debt (per-asset breakdown unavailable)", amount: totalDebtBase });
+          if (collateralUsd > 0) supplies.push({ asset: zeroAddress7, symbol: "Total Collateral (per-asset breakdown unavailable)", amount: totalCollateralBase });
+          if (debtUsd > 0) borrows.push({ asset: zeroAddress7, symbol: "Total Debt (per-asset breakdown unavailable)", amount: totalDebtBase });
         }
         return {
           protocol: this.protocolName,
@@ -5774,8 +6033,8 @@ var init_dist2 = __esm({
         const collateralUsd = u256ToF642(totalCollateralBase) / 1e18;
         const debtUsd = u256ToF642(totalDebtBase) / 1e18;
         const ltvBps = u256ToF642(ltv);
-        const supplies = collateralUsd > 0 ? [{ asset: zeroAddress9, symbol: "Total Collateral", amount: totalCollateralBase, value_usd: collateralUsd }] : [];
-        const borrows = debtUsd > 0 ? [{ asset: zeroAddress9, symbol: "Total Debt", amount: totalDebtBase, value_usd: debtUsd }] : [];
+        const supplies = collateralUsd > 0 ? [{ asset: zeroAddress8, symbol: "Total Collateral", amount: totalCollateralBase, value_usd: collateralUsd }] : [];
+        const borrows = debtUsd > 0 ? [{ asset: zeroAddress8, symbol: "Total Debt", amount: totalDebtBase, value_usd: debtUsd }] : [];
         return {
           protocol: this.protocolName,
           user,
@@ -5878,14 +6137,31 @@ var init_dist2 = __esm({
       "function borrow(uint256 borrowAmount) external returns (uint256)",
       "function repayBorrow(uint256 repayAmount) external returns (uint256)"
     ]);
+    NATIVE_CTOKEN_ABI = parseAbi17([
+      "function mint() external payable",
+      "function repayBorrow() external payable"
+    ]);
+    COMPTROLLER_ABI = parseAbi17([
+      "function enterMarkets(address[] cTokens) external returns (uint256[])",
+      "function exitMarket(address cToken) external returns (uint256)"
+    ]);
+    NATIVE_SENTINEL = "0x0000000000000000000000000000000000000000";
     BSC_BLOCKS_PER_YEAR = 10512e3;
     CompoundV2Adapter = class {
       protocolName;
       defaultVtoken;
       vTokenCandidates;
+      comptroller;
       rpcUrl;
-      // Lazy cache: underlying asset address (lowercased) → vToken address
+      // Lazy cache: underlying asset address (lowercased) → vToken address.
+      // The native sentinel (0x0…) is mapped to the cETH/vBNB-style vToken
+      // when one is detected during resolveVtoken().
       vTokenByAsset = null;
+      // The cETH/vBNB-style vToken whose underlying() reverts (it has no
+      // ERC20 underlying — the underlying is the chain's native gas token).
+      // Set lazily by resolveVtoken() and consulted by buildSupply/buildRepay
+      // to switch to the payable mint() / repayBorrow() variants.
+      nativeVtoken = null;
       constructor(entry, rpcUrl) {
         this.protocolName = entry.name;
         this.rpcUrl = rpcUrl;
@@ -5893,6 +6169,7 @@ var init_dist2 = __esm({
         const vtoken = contracts["vusdt"] ?? contracts["vusdc"] ?? contracts["vbnb"] ?? contracts["comptroller"];
         if (!vtoken) throw DefiError.contractError("Missing vToken or comptroller address");
         this.defaultVtoken = vtoken;
+        this.comptroller = contracts["comptroller"];
         this.vTokenCandidates = Object.entries(contracts).filter(([k]) => /^v[a-z][a-z0-9]*$/i.test(k)).map(([, v]) => v);
         if (this.vTokenCandidates.length === 0) this.vTokenCandidates = [vtoken];
       }
@@ -5901,19 +6178,38 @@ var init_dist2 = __esm({
         if (!this.vTokenByAsset) {
           const client = createPublicClient13({ transport: http13(this.rpcUrl) });
           const map = /* @__PURE__ */ new Map();
+          let nativeVtoken = null;
           const lookups = await Promise.allSettled(
             this.vTokenCandidates.map(async (v) => {
-              const u = await client.readContract({ address: v, abi: CTOKEN_ABI, functionName: "underlying" });
-              return [u.toLowerCase(), v];
+              try {
+                const u = await client.readContract({ address: v, abi: CTOKEN_ABI, functionName: "underlying" });
+                return { vtoken: v, underlying: u };
+              } catch {
+                return { vtoken: v, underlying: null };
+              }
             })
           );
           for (const r of lookups) {
-            if (r.status === "fulfilled") map.set(r.value[0], r.value[1]);
+            if (r.status !== "fulfilled") continue;
+            const { vtoken, underlying } = r.value;
+            if (underlying) {
+              map.set(underlying.toLowerCase(), vtoken);
+            } else if (!nativeVtoken) {
+              nativeVtoken = vtoken;
+            }
+          }
+          if (nativeVtoken) {
+            map.set(NATIVE_SENTINEL, nativeVtoken);
           }
           this.vTokenByAsset = map;
+          this.nativeVtoken = nativeVtoken;
         }
         return this.vTokenByAsset.get(asset.toLowerCase()) ?? null;
       }
+      /** True iff `vtoken` is the cETH/vBNB-style native cToken for this protocol. */
+      isNativeVtoken(vtoken) {
+        return this.nativeVtoken !== null && vtoken.toLowerCase() === this.nativeVtoken.toLowerCase();
+      }
       name() {
         return this.protocolName;
       }
@@ -5927,6 +6223,16 @@ var init_dist2 = __esm({
       }
       async buildSupply(params) {
         const vtoken = await this.vtokenFor(params.asset);
+        if (this.isNativeVtoken(vtoken)) {
+          const data2 = encodeFunctionData16({ abi: NATIVE_CTOKEN_ABI, functionName: "mint" });
+          return {
+            description: `[${this.protocolName}] Supply ${params.amount} (native) to Venus`,
+            to: vtoken,
+            data: data2,
+            value: params.amount,
+            gas_estimate: 3e5
+          };
+        }
         const data = encodeFunctionData16({ abi: CTOKEN_ABI, functionName: "mint", args: [params.amount] });
         return {
           description: `[${this.protocolName}] Supply ${params.amount} of ${params.asset} to Venus`,
@@ -5950,6 +6256,16 @@ var init_dist2 = __esm({
       }
       async buildRepay(params) {
         const vtoken = await this.vtokenFor(params.asset);
+        if (this.isNativeVtoken(vtoken)) {
+          const data2 = encodeFunctionData16({ abi: NATIVE_CTOKEN_ABI, functionName: "repayBorrow" });
+          return {
+            description: `[${this.protocolName}] Repay ${params.amount} (native) to Venus`,
+            to: vtoken,
+            data: data2,
+            value: params.amount,
+            gas_estimate: 3e5
+          };
+        }
         const data = encodeFunctionData16({ abi: CTOKEN_ABI, functionName: "repayBorrow", args: [params.amount] });
         return {
           description: `[${this.protocolName}] Repay ${params.amount} of ${params.asset} to Venus`,
@@ -5962,6 +6278,37 @@ var init_dist2 = __esm({
       }
       async buildWithdraw(params) {
         const vtoken = await this.vtokenFor(params.asset);
+        const MAX_UINT2562 = (1n << 256n) - 1n;
+        if (params.amount === MAX_UINT2562 && this.rpcUrl) {
+          const client = createPublicClient13({ transport: http13(this.rpcUrl) });
+          const [vtokenBalance, borrowBalance] = await Promise.all([
+            client.readContract({
+              address: vtoken,
+              abi: CTOKEN_ABI,
+              functionName: "balanceOf",
+              args: [params.to]
+            }),
+            client.readContract({
+              address: vtoken,
+              abi: CTOKEN_ABI,
+              functionName: "borrowBalanceStored",
+              args: [params.to]
+            }).catch(() => 0n)
+          ]);
+          if (borrowBalance > 0n) {
+            throw DefiError.contractError(
+              `[${this.protocolName}] Cannot withdraw all (uint256.max) \u2014 wallet has an outstanding borrow of ${borrowBalance} on this market. Repay the borrow first, or pass an explicit --amount that leaves enough collateral.`
+            );
+          }
+          const redeemData = encodeFunctionData16({ abi: CTOKEN_ABI, functionName: "redeem", args: [vtokenBalance] });
+          return {
+            description: `[${this.protocolName}] Withdraw all (auto-max, ${vtokenBalance} vTokens) of ${params.asset} from Venus`,
+            to: vtoken,
+            data: redeemData,
+            value: 0n,
+            gas_estimate: 35e4
+          };
+        }
         const data = encodeFunctionData16({ abi: CTOKEN_ABI, functionName: "redeemUnderlying", args: [params.amount] });
         return {
           description: `[${this.protocolName}] Withdraw ${params.amount} of ${params.asset} from Venus`,
@@ -5971,6 +6318,37 @@ var init_dist2 = __esm({
           gas_estimate: 25e4
         };
       }
+      /**
+       * Compound V2 family: enter cTokens as collateral via Comptroller.
+       * Without this call, supplied assets sit dormant in the Comptroller's
+       * accountAssets[] and `getAccountLiquidity` reports zero collateral —
+       * any borrow then reverts. Mirrors the role of Aave V3's
+       * setUserUseReserveAsCollateral, but the API is batch-by-cToken.
+       */
+      async buildEnterMarkets(cTokens) {
+        if (!this.comptroller) {
+          throw DefiError.contractError(
+            `[${this.protocolName}] enterMarkets requires the Comptroller address to be registered under [protocol.contracts] as 'comptroller'.`
+          );
+        }
+        if (cTokens.length === 0) {
+          throw DefiError.invalidParam(
+            `[${this.protocolName}] enterMarkets requires at least one cToken address.`
+          );
+        }
+        const data = encodeFunctionData16({
+          abi: COMPTROLLER_ABI,
+          functionName: "enterMarkets",
+          args: [cTokens]
+        });
+        return {
+          description: `[${this.protocolName}] Enter ${cTokens.length} market(s) as collateral`,
+          to: this.comptroller,
+          data,
+          value: 0n,
+          gas_estimate: 2e5
+        };
+      }
       async getRates(asset) {
         if (!this.rpcUrl) throw DefiError.rpcError("No RPC URL configured");
         const client = createPublicClient13({ transport: http13(this.rpcUrl) });
@@ -6338,9 +6716,11 @@ var init_dist2 = __esm({
       "function market(bytes32 id) external view returns (uint128 totalSupplyAssets, uint128 totalSupplyShares, uint128 totalBorrowAssets, uint128 totalBorrowShares, uint128 lastUpdate, uint128 fee)",
       "function idToMarketParams(bytes32 id) external view returns (address loanToken, address collateralToken, address oracle, address irm, uint256 lltv)",
       "function supply((address loanToken, address collateralToken, address oracle, address irm, uint256 lltv) marketParams, uint256 assets, uint256 shares, address onBehalf, bytes data) external returns (uint256 assetsSupplied, uint256 sharesSupplied)",
+      "function supplyCollateral((address loanToken, address collateralToken, address oracle, address irm, uint256 lltv) marketParams, uint256 assets, address onBehalf, bytes data) external",
       "function borrow((address loanToken, address collateralToken, address oracle, address irm, uint256 lltv) marketParams, uint256 assets, uint256 shares, address onBehalf, address receiver) external returns (uint256 assetsBorrowed, uint256 sharesBorrowed)",
       "function repay((address loanToken, address collateralToken, address oracle, address irm, uint256 lltv) marketParams, uint256 assets, uint256 shares, address onBehalf, bytes data) external returns (uint256 assetsRepaid, uint256 sharesRepaid)",
-      "function withdraw((address loanToken, address collateralToken, address oracle, address irm, uint256 lltv) marketParams, uint256 assets, uint256 shares, address onBehalf, address receiver) external returns (uint256 assetsWithdrawn, uint256 sharesWithdrawn)"
+      "function withdraw((address loanToken, address collateralToken, address oracle, address irm, uint256 lltv) marketParams, uint256 assets, uint256 shares, address onBehalf, address receiver) external returns (uint256 assetsWithdrawn, uint256 sharesWithdrawn)",
+      "function withdrawCollateral((address loanToken, address collateralToken, address oracle, address irm, uint256 lltv) marketParams, uint256 assets, address onBehalf, address receiver) external"
     ]);
     META_MORPHO_ABI = parseAbi20([
       "function supplyQueueLength() external view returns (uint256)",
@@ -6367,6 +6747,8 @@ var init_dist2 = __esm({
       rpcUrl;
       metaMorphoVaults;
       metaMorphoVaultEntries;
+      namedMarkets;
+      namedMarketByName;
       vaultAssetMap = null;
       constructor(entry, rpcUrl) {
         this.protocolName = entry.name;
@@ -6378,6 +6760,26 @@ var init_dist2 = __esm({
         this.defaultVault = contracts["fehype"] ?? contracts["vault"] ?? contracts["feusdc"];
         this.metaMorphoVaultEntries = Object.entries(contracts).filter(([key]) => /^fe[a-z0-9_]+$/i.test(key) || key === "vault").map(([key, addr]) => ({ key, addr }));
         this.metaMorphoVaults = this.metaMorphoVaultEntries.map((e) => e.addr);
+        this.namedMarkets = entry.markets ?? [];
+        const byName = /* @__PURE__ */ new Map();
+        for (const m of this.namedMarkets) byName.set(m.name.toLowerCase(), m.id);
+        this.namedMarketByName = byName;
+      }
+      /**
+       * Resolve a friendly market name (e.g. `WMON-AUSD`) to its 32-byte
+       * marketId via the per-protocol TOML registry. Returns null when the
+       * adapter has no markets[] block or the name doesn't match any entry —
+       * callers fall back to treating the input as a raw hex marketId.
+       */
+      resolveMarketIdByName(name) {
+        return this.namedMarketByName.get(name.toLowerCase()) ?? null;
+      }
+      /**
+       * Returns the registered named markets for diagnostics (e.g. CLI error
+       * messages listing valid choices when the user passes an unknown name).
+       */
+      listNamedMarkets() {
+        return this.namedMarkets;
       }
       async resolveVault(asset, preferKey) {
         if (this.metaMorphoVaultEntries.length === 0 || !this.rpcUrl) return null;
@@ -6411,10 +6813,61 @@ var init_dist2 = __esm({
       name() {
         return this.protocolName;
       }
+      /**
+       * Resolve a Morpho Blue marketId into the full MarketParams tuple by
+       * calling Morpho.idToMarketParams(id). Used by every direct-market
+       * method (supply / borrow / repay / withdraw / supplyCollateral /
+       * withdrawCollateral) so the caller only has to pass the 32-byte
+       * marketId — same shape as the Morpho UI / API.
+       */
+      async resolveMarketParams(marketId) {
+        if (!this.rpcUrl) {
+          throw DefiError.rpcError(
+            `[${this.protocolName}] No RPC URL configured \u2014 cannot resolve marketId ${marketId}`
+          );
+        }
+        const client = createPublicClient16({ transport: http16(this.rpcUrl) });
+        let result;
+        try {
+          result = await client.readContract({
+            address: this.morpho,
+            abi: MORPHO_ABI,
+            functionName: "idToMarketParams",
+            args: [marketId]
+          });
+        } catch (e) {
+          throw DefiError.rpcError(
+            `[${this.protocolName}] idToMarketParams(${marketId}) failed: ${e}`
+          );
+        }
+        const [loanToken, collateralToken, oracle, irm, lltv] = result;
+        if (loanToken === zeroAddress9 || collateralToken === zeroAddress9 || lltv === 0n) {
+          throw DefiError.invalidParam(
+            `[${this.protocolName}] marketId ${marketId} resolves to an empty MarketParams (loan=${loanToken}, collateral=${collateralToken}, lltv=${lltv}). Verify the id matches a registered market on this chain.`
+          );
+        }
+        return { loanToken, collateralToken, oracle, irm, lltv };
+      }
       async buildSupply(params) {
+        if (params.market_id) {
+          const market = await this.resolveMarketParams(params.market_id);
+          const data = encodeFunctionData19({
+            abi: MORPHO_ABI,
+            functionName: "supply",
+            args: [market, params.amount, 0n, params.on_behalf_of, "0x"]
+          });
+          return {
+            description: `[${this.protocolName}] Supply ${params.amount} of ${params.asset} to market ${params.market_id.slice(0, 10)}\u2026`,
+            to: this.morpho,
+            data,
+            value: 0n,
+            gas_estimate: 35e4,
+            approvals: [{ token: params.asset, spender: this.morpho, amount: params.amount }]
+          };
+        }
         const vault = await this.resolveVault(params.asset);
         if (vault) {
-          const data2 = encodeFunctionData19({
+          const data = encodeFunctionData19({
             abi: ERC4626_ABI,
             functionName: "deposit",
             args: [params.amount, params.on_behalf_of]
@@ -6422,50 +6875,118 @@ var init_dist2 = __esm({
           return {
             description: `[${this.protocolName}] Deposit ${params.amount} into MetaMorpho vault`,
             to: vault,
-            data: data2,
+            data,
             value: 0n,
             gas_estimate: 4e5,
             approvals: [{ token: params.asset, spender: vault, amount: params.amount }]
           };
         }
-        const market = defaultMarketParams(params.asset);
+        throw DefiError.invalidParam(
+          `[${this.protocolName}] supply requires either a registered MetaMorpho vault for ${params.asset} or an explicit --market <marketId>. The legacy zero-MarketParams stub was removed (it always reverted on-chain).`
+        );
+      }
+      async buildBorrow(params) {
+        if (!params.market_id) {
+          throw DefiError.invalidParam(
+            `[${this.protocolName}] Morpho Blue borrow requires --market <marketId>. Find one via the Morpho API (https://blue-api.morpho.org/graphql).`
+          );
+        }
+        const market = await this.resolveMarketParams(params.market_id);
+        const data = encodeFunctionData19({
+          abi: MORPHO_ABI,
+          functionName: "borrow",
+          args: [market, params.amount, 0n, params.on_behalf_of, params.on_behalf_of]
+        });
+        return {
+          description: `[${this.protocolName}] Borrow ${params.amount} of ${params.asset} from market ${params.market_id.slice(0, 10)}\u2026`,
+          to: this.morpho,
+          data,
+          value: 0n,
+          gas_estimate: 4e5
+        };
+      }
+      async buildRepay(params) {
+        if (!params.market_id) {
+          throw DefiError.invalidParam(
+            `[${this.protocolName}] Morpho Blue repay requires --market <marketId>.`
+          );
+        }
+        const market = await this.resolveMarketParams(params.market_id);
+        if (params.amount === MAX_UINT256) {
+          if (!this.rpcUrl) {
+            throw DefiError.rpcError(
+              `[${this.protocolName}] max-repay requires an RPC URL to read borrowShares.`
+            );
+          }
+          const client = createPublicClient16({ transport: http16(this.rpcUrl) });
+          const positionAbi = parseAbi20([
+            "function position(bytes32 id, address user) external view returns (uint256 supplyShares, uint128 borrowShares, uint128 collateral)"
+          ]);
+          const pos = await client.readContract({
+            address: this.morpho,
+            abi: positionAbi,
+            functionName: "position",
+            args: [params.market_id, params.on_behalf_of]
+          });
+          const [, borrowShares] = pos;
+          if (borrowShares === 0n) {
+            throw DefiError.invalidParam(
+              `[${this.protocolName}] cannot repay max \u2014 user has no borrow position in market ${params.market_id}.`
+            );
+          }
+          const data2 = encodeFunctionData19({
+            abi: MORPHO_ABI,
+            functionName: "repay",
+            args: [market, 0n, borrowShares, params.on_behalf_of, "0x"]
+          });
+          return {
+            description: `[${this.protocolName}] Repay max (${borrowShares} shares) to market ${params.market_id.slice(0, 10)}\u2026`,
+            to: this.morpho,
+            data: data2,
+            value: 0n,
+            gas_estimate: 35e4,
+            approvals: [{ token: params.asset, spender: this.morpho, amount: MAX_UINT256 }]
+          };
+        }
         const data = encodeFunctionData19({
           abi: MORPHO_ABI,
-          functionName: "supply",
+          functionName: "repay",
           args: [market, params.amount, 0n, params.on_behalf_of, "0x"]
         });
         return {
-          description: `[${this.protocolName}] Supply ${params.amount} to Morpho market`,
+          description: `[${this.protocolName}] Repay ${params.amount} of ${params.asset} to market ${params.market_id.slice(0, 10)}\u2026`,
           to: this.morpho,
           data,
           value: 0n,
-          gas_estimate: 3e5
+          gas_estimate: 35e4,
+          approvals: [{ token: params.asset, spender: this.morpho, amount: params.amount }]
         };
       }
-      async buildBorrow(params) {
-        const market = defaultMarketParams(params.asset);
+      async buildSupplyCollateral(params) {
+        const market = await this.resolveMarketParams(params.market_id);
         const data = encodeFunctionData19({
           abi: MORPHO_ABI,
-          functionName: "borrow",
-          args: [market, params.amount, 0n, params.on_behalf_of, params.on_behalf_of]
+          functionName: "supplyCollateral",
+          args: [market, params.amount, params.on_behalf_of, "0x"]
         });
         return {
-          description: `[${this.protocolName}] Borrow ${params.amount} from Morpho market`,
+          description: `[${this.protocolName}] Supply collateral ${params.amount} of ${params.asset} to market ${params.market_id.slice(0, 10)}\u2026`,
           to: this.morpho,
           data,
           value: 0n,
-          gas_estimate: 35e4
+          gas_estimate: 35e4,
+          approvals: [{ token: params.asset, spender: this.morpho, amount: params.amount }]
         };
       }
-      async buildRepay(params) {
-        const market = defaultMarketParams(params.asset);
+      async buildWithdrawCollateral(params) {
+        const market = await this.resolveMarketParams(params.market_id);
         const data = encodeFunctionData19({
           abi: MORPHO_ABI,
-          functionName: "repay",
-          args: [market, params.amount, 0n, params.on_behalf_of, "0x"]
+          functionName: "withdrawCollateral",
+          args: [market, params.amount, params.to, params.to]
         });
         return {
-          description: `[${this.protocolName}] Repay ${params.amount} to Morpho market`,
+          description: `[${this.protocolName}] Withdraw collateral ${params.amount} of ${params.asset} from market ${params.market_id.slice(0, 10)}\u2026`,
           to: this.morpho,
           data,
           value: 0n,
@@ -6473,6 +6994,21 @@ var init_dist2 = __esm({
         };
       }
       async buildWithdraw(params) {
+        if (params.market_id) {
+          const market = await this.resolveMarketParams(params.market_id);
+          const data = encodeFunctionData19({
+            abi: MORPHO_ABI,
+            functionName: "withdraw",
+            args: [market, params.amount, 0n, params.to, params.to]
+          });
+          return {
+            description: `[${this.protocolName}] Withdraw ${params.amount} of ${params.asset} from market ${params.market_id.slice(0, 10)}\u2026`,
+            to: this.morpho,
+            data,
+            value: 0n,
+            gas_estimate: 3e5
+          };
+        }
         const vault = await this.resolveVault(params.asset);
         if (vault) {
           if (params.amount === MAX_UINT256) {
@@ -6481,7 +7017,7 @@ var init_dist2 = __esm({
               [vault, encodeFunctionData19({ abi: ERC4626_ABI, functionName: "balanceOf", args: [params.to] })]
             ]);
             const shares = decodeU256(balRaw ?? null);
-            const data3 = encodeFunctionData19({
+            const data2 = encodeFunctionData19({
               abi: ERC4626_ABI,
               functionName: "redeem",
               args: [shares, params.to, params.to]
@@ -6489,12 +7025,12 @@ var init_dist2 = __esm({
             return {
               description: `[${this.protocolName}] Redeem all shares (${shares}) from MetaMorpho vault`,
               to: vault,
-              data: data3,
+              data: data2,
               value: 0n,
               gas_estimate: 4e5
             };
           }
-          const data2 = encodeFunctionData19({
+          const data = encodeFunctionData19({
             abi: ERC4626_ABI,
             functionName: "withdraw",
             args: [params.amount, params.to, params.to]
@@ -6502,24 +7038,14 @@ var init_dist2 = __esm({
           return {
             description: `[${this.protocolName}] Withdraw ${params.amount} assets from MetaMorpho vault`,
             to: vault,
-            data: data2,
+            data,
             value: 0n,
             gas_estimate: 4e5
           };
         }
-        const market = defaultMarketParams(params.asset);
-        const data = encodeFunctionData19({
-          abi: MORPHO_ABI,
-          functionName: "withdraw",
-          args: [market, params.amount, 0n, params.to, params.to]
-        });
-        return {
-          description: `[${this.protocolName}] Withdraw ${params.amount} from Morpho market`,
-          to: this.morpho,
-          data,
-          value: 0n,
-          gas_estimate: 25e4
-        };
+        throw DefiError.invalidParam(
+          `[${this.protocolName}] withdraw requires either a registered MetaMorpho vault for ${params.asset} or an explicit --market <marketId>. The legacy zero-MarketParams stub was removed (it always reverted on-chain).`
+        );
       }
       async getRates(asset) {
         if (!this.rpcUrl) throw DefiError.rpcError("No RPC URL configured");
@@ -6636,7 +7162,7 @@ var init_dist2 = __esm({
         if (!this.hintHelpers || !this.sortedTroves || !this.rpcUrl) {
           return [0n, 0n];
         }
-        const client = createPublicClient16({ transport: http16(this.rpcUrl) });
+        const client = createPublicClient17({ transport: http17(this.rpcUrl) });
         const approxResult = await client.readContract({
           address: this.hintHelpers,
           abi: HINT_HELPERS_ABI,
@@ -6727,7 +7253,7 @@ var init_dist2 = __esm({
       async getCdpInfo(cdpId) {
         if (!this.rpcUrl) throw DefiError.rpcError(`[${this.protocolName}] getCdpInfo requires RPC \u2014 set HYPEREVM_RPC_URL`);
         if (!this.troveManager) throw DefiError.contractError(`[${this.protocolName}] trove_manager contract not configured`);
-        const client = createPublicClient16({ transport: http16(this.rpcUrl) });
+        const client = createPublicClient17({ transport: http17(this.rpcUrl) });
         const data = await client.readContract({
           address: this.troveManager,
           abi: TROVE_MANAGER_ABI,
@@ -6745,13 +7271,13 @@ var init_dist2 = __esm({
           protocol: this.protocolName,
           cdp_id: cdpId,
           collateral: {
-            token: zeroAddress11,
+            token: zeroAddress10,
             symbol: "WHYPE",
             amount: entireColl,
             decimals: 18
           },
           debt: {
-            token: zeroAddress11,
+            token: zeroAddress10,
             symbol: "feUSD",
             amount: entireDebt,
             decimals: 18
@@ -6786,7 +7312,7 @@ var init_dist2 = __esm({
         if (asset !== this.asset && this.asset !== "0x0000000000000000000000000000000000000000") {
           throw DefiError.unsupported(`[${this.protocolName}] Felix PriceFeed only supports asset ${this.asset}`);
         }
-        const client = createPublicClient17({ transport: http17(this.rpcUrl) });
+        const client = createPublicClient18({ transport: http18(this.rpcUrl) });
         let priceVal;
         try {
           const result = await client.readContract({
@@ -6878,7 +7404,7 @@ var init_dist2 = __esm({
       }
       async totalAssets() {
         if (!this.rpcUrl) throw DefiError.rpcError("No RPC URL configured");
-        const client = createPublicClient18({ transport: http18(this.rpcUrl) });
+        const client = createPublicClient19({ transport: http19(this.rpcUrl) });
         return client.readContract({
           address: this.vaultAddress,
           abi: ERC4626_ABI2,
@@ -6889,7 +7415,7 @@ var init_dist2 = __esm({
       }
       async convertToShares(assets) {
         if (!this.rpcUrl) throw DefiError.rpcError("No RPC URL configured");
-        const client = createPublicClient18({ transport: http18(this.rpcUrl) });
+        const client = createPublicClient19({ transport: http19(this.rpcUrl) });
         return client.readContract({
           address: this.vaultAddress,
           abi: ERC4626_ABI2,
@@ -6901,7 +7427,7 @@ var init_dist2 = __esm({
       }
       async convertToAssets(shares) {
         if (!this.rpcUrl) throw DefiError.rpcError("No RPC URL configured");
-        const client = createPublicClient18({ transport: http18(this.rpcUrl) });
+        const client = createPublicClient19({ transport: http19(this.rpcUrl) });
         return client.readContract({
           address: this.vaultAddress,
           abi: ERC4626_ABI2,
@@ -6913,7 +7439,7 @@ var init_dist2 = __esm({
       }
       async getVaultInfo() {
         if (!this.rpcUrl) throw DefiError.rpcError("No RPC URL configured");
-        const client = createPublicClient18({ transport: http18(this.rpcUrl) });
+        const client = createPublicClient19({ transport: http19(this.rpcUrl) });
         const [totalAssets, totalSupply, asset] = await Promise.all([
           client.readContract({ address: this.vaultAddress, abi: ERC4626_ABI2, functionName: "totalAssets" }).catch((e) => {
             throw DefiError.rpcError(`[${this.protocolName}] totalAssets failed: ${e}`);
@@ -7005,7 +7531,7 @@ var init_dist2 = __esm({
         const data = encodeFunctionData23({
           abi: STHYPE_ABI,
           functionName: "submit",
-          args: [zeroAddress12]
+          args: [zeroAddress11]
         });
         return {
           description: `[${this.protocolName}] Stake ${params.amount} HYPE for stHYPE`,
@@ -7031,7 +7557,7 @@ var init_dist2 = __esm({
       }
       async getInfo() {
         if (!this.rpcUrl) throw DefiError.rpcError("No RPC URL configured");
-        const client = createPublicClient19({ transport: http19(this.rpcUrl) });
+        const client = createPublicClient20({ transport: http20(this.rpcUrl) });
         const tokenAddr = this.sthypeToken ?? this.staking;
         const totalSupply = await client.readContract({
           address: tokenAddr,
@@ -7042,7 +7568,7 @@ var init_dist2 = __esm({
         });
         return {
           protocol: this.protocolName,
-          staked_token: zeroAddress12,
+          staked_token: zeroAddress11,
           liquid_token: tokenAddr,
           exchange_rate: 1,
           total_staked: totalSupply
@@ -7101,7 +7627,7 @@ var init_dist2 = __esm({
       }
       async getInfo() {
         if (!this.rpcUrl) throw DefiError.rpcError("No RPC URL configured");
-        const client = createPublicClient20({ transport: http20(this.rpcUrl) });
+        const client = createPublicClient21({ transport: http21(this.rpcUrl) });
         const totalStaked = await client.readContract({
           address: this.staking,
           abi: KINETIQ_ABI,
@@ -7116,7 +7642,7 @@ var init_dist2 = __esm({
         const rateF64 = hypePrice > 0n && khypePrice > 0n ? Number(khypePrice * 10n ** 18n / hypePrice) / 1e18 : 1;
         return {
           protocol: this.protocolName,
-          staked_token: zeroAddress13,
+          staked_token: zeroAddress12,
           liquid_token: this.liquidToken,
           exchange_rate: rateF64,
           total_staked: totalStaked
@@ -7336,7 +7862,7 @@ var init_dist2 = __esm({
       }
       async getCollectionInfo(collection) {
         if (!this.rpcUrl) throw DefiError.rpcError("No RPC URL configured");
-        const client = createPublicClient21({ transport: http21(this.rpcUrl) });
+        const client = createPublicClient222({ transport: http222(this.rpcUrl) });
         const [collectionName, symbol, totalSupply] = await Promise.all([
           client.readContract({ address: collection, abi: ERC721_ABI, functionName: "name" }).catch((e) => {
             throw DefiError.rpcError(`[${this.protocolName}] name failed: ${e}`);
@@ -7355,7 +7881,7 @@ var init_dist2 = __esm({
       }
       async getTokenInfo(collection, tokenId) {
         if (!this.rpcUrl) throw DefiError.rpcError("No RPC URL configured");
-        const client = createPublicClient21({ transport: http21(this.rpcUrl) });
+        const client = createPublicClient222({ transport: http222(this.rpcUrl) });
         const [owner, tokenUri] = await Promise.all([
           client.readContract({ address: collection, abi: ERC721_ABI, functionName: "ownerOf", args: [tokenId] }).catch((e) => {
             throw DefiError.rpcError(`[${this.protocolName}] ownerOf failed: ${e}`);
@@ -7371,7 +7897,7 @@ var init_dist2 = __esm({
       }
       async getBalance(owner, collection) {
         if (!this.rpcUrl) throw DefiError.rpcError("No RPC URL configured");
-        const client = createPublicClient21({ transport: http21(this.rpcUrl) });
+        const client = createPublicClient222({ transport: http222(this.rpcUrl) });
         return client.readContract({ address: collection, abi: ERC721_ABI, functionName: "balanceOf", args: [owner] }).catch((e) => {
           throw DefiError.rpcError(`[${this.protocolName}] balanceOf failed: ${e}`);
         });
@@ -7441,15 +7967,34 @@ var Executor = class _Executor {
   dryRun;
   rpcUrl;
   explorerUrl;
-  constructor(broadcast, rpcUrl, explorerUrl) {
+  /**
+   * Optional viem Chain object. When set, all wallet/public clients built
+   * inside this executor anchor to the explicit chainId at construction
+   * time, defending against MITM RPCs that lie about eth_chainId and
+   * keeping offline-signing safe under RPC drift (SSOT 7.4).
+   */
+  chain;
+  constructor(broadcast, rpcUrl, explorerUrl, chain) {
     this.dryRun = !broadcast;
     this.rpcUrl = rpcUrl;
     this.explorerUrl = explorerUrl;
+    this.chain = chain;
+  }
+  /** Returns the optional `{ chain }` spread for viem client constructors. */
+  chainOpt() {
+    return this.chain ? { chain: this.chain } : {};
   }
   /** Apply 20% buffer to a gas estimate */
   static applyGasBuffer(gas) {
     return gas * GAS_BUFFER_BPS / 10000n;
   }
+  /**
+   * EIP-1559 max-fee formula: `baseFee * 1.25 + priorityFee`.
+   * Extracted as a static so the math is unit-testable without mocking viem.
+   */
+  static computeMaxFee(baseFeePerGas, priorityFee) {
+    return baseFeePerGas * 125n / 100n + priorityFee;
+  }
   /**
    * Check allowance for a single token/spender pair and send an approve tx if needed.
    * Only called in broadcast mode (not dry-run).
@@ -7561,7 +8106,7 @@ var Executor = class _Executor {
    */
   async fetchEip1559Fees(rpcUrl) {
     try {
-      const client = createPublicClient23({ transport: http23(rpcUrl) });
+      const client = createPublicClient23({ transport: http23(rpcUrl), ...this.chainOpt() });
       let priorityFee = DEFAULT_PRIORITY_FEE_WEI;
       try {
         priorityFee = await client.estimateMaxPriorityFeePerGas();
@@ -7570,8 +8115,7 @@ var Executor = class _Executor {
       try {
         const block = await client.getBlock({ blockTag: "latest" });
         if (block.baseFeePerGas !== null && block.baseFeePerGas !== void 0) {
-          const maxFee = block.baseFeePerGas * 125n / 100n + priorityFee;
-          return [maxFee, priorityFee];
+          return [_Executor.computeMaxFee(block.baseFeePerGas, priorityFee), priorityFee];
         }
       } catch {
       }
@@ -7584,7 +8128,7 @@ var Executor = class _Executor {
   /** Estimate gas dynamically with buffer, falling back to a hardcoded estimate */
   async estimateGasWithBuffer(rpcUrl, tx, from) {
     try {
-      const client = createPublicClient23({ transport: http23(rpcUrl) });
+      const client = createPublicClient23({ transport: http23(rpcUrl), ...this.chainOpt() });
       const estimated = await client.estimateGas({
         to: tx.to,
         data: tx.data,
@@ -7608,7 +8152,7 @@ var Executor = class _Executor {
     if (!rpcUrl) {
       throw DefiError.rpcError("No RPC URL \u2014 cannot simulate. Set HYPEREVM_RPC_URL.");
     }
-    const client = createPublicClient23({ transport: http23(rpcUrl) });
+    const client = createPublicClient23({ transport: http23(rpcUrl), ...this.chainOpt() });
     const privateKey = process.env["DEFI_PRIVATE_KEY"];
     const from = privateKey ? privateKeyToAccount(privateKey).address : "0x0000000000000000000000000000000000000001";
     if (tx.approvals && tx.approvals.length > 0) {
@@ -7722,8 +8266,8 @@ var Executor = class _Executor {
     if (!rpcUrl) {
       throw DefiError.rpcError("No RPC URL configured for broadcasting");
     }
-    const publicClient = createPublicClient23({ transport: http23(rpcUrl) });
-    const walletClient = createWalletClient({ account, transport: http23(rpcUrl) });
+    const publicClient = createPublicClient23({ transport: http23(rpcUrl), ...this.chainOpt() });
+    const walletClient = createWalletClient({ account, transport: http23(rpcUrl), ...this.chainOpt() });
     if (tx.pre_txs && tx.pre_txs.length > 0) {
       for (const preTx of tx.pre_txs) {
         process.stderr.write(`  Pre-tx: ${preTx.description}...
@@ -8110,19 +8654,20 @@ server.tool(
 );
 server.tool(
   "defi_bridge",
-  "Get a cross-chain bridge quote via LI.FI, deBridge DLN, or Circle CCTP. Returns estimated output amount and fees",
+  "Get a cross-chain bridge quote via LI.FI (default) or Relay. Returns estimated output and fees. For deBridge / CCTP quotes plus broadcast use the `defi bridge --provider <name>` CLI directly.",
   {
     from_chain: z.string().describe("Source chain name (supported source chains: hyperevm, mantle, base, bnb, monad)"),
-    to_chain: z.string().describe("Destination chain name. CCTP V2 destinations include ethereum, arbitrum, optimism, polygon, avalanche; LI.FI/deBridge accept any chain"),
-    token: z.string().optional().describe("Token symbol to bridge (default: USDC). Use native for native token"),
+    to_chain: z.string().describe("Destination chain name. CCTP V2 destinations include ethereum, arbitrum, optimism, polygon, avalanche; LI.FI/Relay/deBridge accept any chain they route to"),
+    token: z.string().optional().describe("Token symbol or address to bridge (default: USDC). Use 0x0\u20260 for native gas token. Relay rejects some ERC20s (e.g. BNB USDC/USDT) with INVALID_INPUT_CURRENCY \u2014 fall back to native or LI.FI"),
     amount: z.string().describe("Amount in human-readable units, e.g. '100' for 100 USDC"),
-    recipient: z.string().optional().describe("Recipient address on destination chain")
+    recipient: z.string().optional().describe("Recipient address on destination chain"),
+    provider: z.enum(["lifi", "relay"]).optional().describe("Bridge provider for the quote (default: lifi). For debridge/cctp use the CLI.")
   },
-  async ({ from_chain, to_chain, token, amount, recipient }) => {
+  async ({ from_chain, to_chain, token, amount, recipient, provider }) => {
     try {
       const tokenSymbol = token ?? "USDC";
       const recipientAddr = recipient ?? process.env["DEFI_WALLET_ADDRESS"] ?? "0x0000000000000000000000000000000000000001";
-      const LIFI_API = "https://li.quest/v1";
+      const selectedProvider = provider ?? "lifi";
       const registry = getRegistry();
       let fromChainId;
       let toChainId;
@@ -8134,14 +8679,81 @@ server.tool(
         toChainId = registry.getChain(to_chain).chain_id;
       } catch {
       }
+      const isAddr = tokenSymbol.startsWith("0x");
+      const NATIVE = "0x0000000000000000000000000000000000000000";
+      let srcTokenAddr;
+      let dstTokenAddr;
+      let tokenDecimals = 18;
+      let dstTokenDecimals = 18;
+      if (isAddr) {
+        srcTokenAddr = tokenSymbol;
+        dstTokenAddr = tokenSymbol;
+      } else {
+        try {
+          const srcResolved = registry.resolveToken(from_chain, tokenSymbol);
+          srcTokenAddr = srcResolved.address;
+          tokenDecimals = srcResolved.decimals ?? 18;
+        } catch {
+          srcTokenAddr = NATIVE;
+          tokenDecimals = 18;
+        }
+        try {
+          const dstResolved = registry.resolveToken(to_chain, tokenSymbol);
+          dstTokenAddr = dstResolved.address;
+          dstTokenDecimals = dstResolved.decimals ?? tokenDecimals;
+        } catch {
+          dstTokenAddr = srcTokenAddr;
+          dstTokenDecimals = tokenDecimals;
+        }
+      }
+      if (selectedProvider === "relay") {
+        const RELAY_API = "https://api.relay.link";
+        if (!fromChainId || !toChainId) {
+          throw new Error("Relay requires resolvable numeric chain IDs for both source and destination");
+        }
+        const amountRaw = String(BigInt(Math.round(parseFloat(amount) * Math.pow(10, tokenDecimals))));
+        const res2 = await fetch(`${RELAY_API}/quote`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json", Accept: "application/json" },
+          body: JSON.stringify({
+            user: recipientAddr,
+            recipient: recipientAddr,
+            originChainId: fromChainId,
+            destinationChainId: toChainId,
+            originCurrency: srcTokenAddr,
+            destinationCurrency: dstTokenAddr,
+            tradeType: "EXACT_INPUT",
+            amount: amountRaw
+          })
+        });
+        if (!res2.ok) {
+          const text = await res2.text();
+          throw new Error(`Relay quote failed (${res2.status}): ${text.slice(0, 200)}`);
+        }
+        const data2 = await res2.json();
+        const details = data2.details;
+        const fees = data2.fees;
+        const quote2 = {
+          from_chain,
+          to_chain,
+          token: tokenSymbol,
+          amount_in: amount,
+          amount_out: details?.currencyOut?.amountFormatted ?? "unknown",
+          fees,
+          execution_duration_seconds: details?.timeEstimate ?? "unknown",
+          tool: "relay",
+          raw: data2
+        };
+        return { content: [{ type: "text", text: ok(quote2, { from_chain, to_chain, token: tokenSymbol, provider: "relay" }) }] };
+      }
+      const LIFI_API = "https://li.quest/v1";
       const params = new URLSearchParams({
         fromChain: fromChainId ? String(fromChainId) : from_chain,
         toChain: toChainId ? String(toChainId) : to_chain,
-        fromToken: tokenSymbol,
-        toToken: tokenSymbol,
-        fromAmount: String(Math.round(parseFloat(amount) * 1e6)),
-        // USDC decimals
-        toAddress: recipientAddr
+        fromToken: srcTokenAddr,
+        toToken: dstTokenAddr,
+        fromAmount: String(BigInt(Math.round(parseFloat(amount) * Math.pow(10, tokenDecimals)))),
+        fromAddress: recipientAddr
       });
       const res = await fetch(`${LIFI_API}/quote?${params}`, {
         headers: { Accept: "application/json" }
@@ -8152,19 +8764,21 @@ server.tool(
       }
       const data = await res.json();
       const estimate = data.estimate;
+      const lifiDstDecimals = estimate?.toToken?.decimals;
+      const amountOutDivisor = Math.pow(10, lifiDstDecimals ?? dstTokenDecimals);
       const quote = {
         from_chain,
         to_chain,
         token: tokenSymbol,
         amount_in: amount,
-        amount_out: estimate?.toAmount ? String(Number(estimate.toAmount) / 1e6) : "unknown",
+        amount_out: estimate?.toAmount ? String(Number(estimate.toAmount) / amountOutDivisor) : "unknown",
         fee_costs: estimate?.feeCosts ?? [],
         gas_costs: estimate?.gasCosts ?? [],
         execution_duration_seconds: estimate?.executionDuration ?? "unknown",
         tool: data.tool ?? "unknown",
         raw: data
       };
-      return { content: [{ type: "text", text: ok(quote, { from_chain, to_chain, token: tokenSymbol }) }] };
+      return { content: [{ type: "text", text: ok(quote, { from_chain, to_chain, token: tokenSymbol, provider: "lifi" }) }] };
     } catch (e) {
       return { content: [{ type: "text", text: err(e instanceof Error ? e.message : String(e), { from_chain, to_chain }) }], isError: true };
     }