@agether/sdk 2.12.2 → 2.13.0

package/dist/index.mjs

@@ -419,25 +419,21 @@ var AgetherClient = class _AgetherClient {
     const acctAddr = await this.agether4337Factory.getAccount(agentId);
     this.accountAddress = acctAddr;
     if (!acctExists) {
-      try {
-        const updatedMeta = JSON.stringify({
-          type: "https://eips.ethereum.org/EIPS/eip-8004#registration-v1",
-          name: options?.name || "Unnamed Agent",
-          description: options?.description || "AI agent registered via @agether/sdk",
-          active: true,
-          wallet: `eip155:${this.config.chainId}:${acctAddr}`,
-          registrations: [{
-            agentId: Number(agentId),
-            agentRegistry: `eip155:${this.config.chainId}:${this.config.contracts.identityRegistry}`
-          }]
-        });
-        const finalURI = `data:application/json;base64,${Buffer.from(updatedMeta).toString("base64")}`;
-        const uriTx = await this.identityRegistry.setAgentURI(agentId, finalURI);
-        await uriTx.wait();
-        this._refreshSigner();
-      } catch (e) {
-        console.warn("[agether] setAgentURI failed (non-fatal):", e instanceof Error ? e.message : e);
-      }
+      const updatedMeta = JSON.stringify({
+        type: "https://eips.ethereum.org/EIPS/eip-8004#registration-v1",
+        name: options?.name || "Unnamed Agent",
+        description: options?.description || "AI agent registered via @agether/sdk",
+        active: true,
+        wallet: `eip155:${this.config.chainId}:${acctAddr}`,
+        registrations: [{
+          agentId: Number(agentId),
+          agentRegistry: `eip155:${this.config.chainId}:${this.config.contracts.identityRegistry}`
+        }]
+      });
+      const finalURI = `data:application/json;base64,${Buffer.from(updatedMeta).toString("base64")}`;
+      const uriTx = await this.identityRegistry.setAgentURI(agentId, finalURI);
+      await uriTx.wait();
+      this._refreshSigner();
     }
     const kyaRequired = await this.isKyaRequired();
     return {
@@ -455,7 +451,7 @@ var AgetherClient = class _AgetherClient {
   async _mintNewIdentity(name, description) {
     const registrationFile = JSON.stringify({
       type: "https://eips.ethereum.org/EIPS/eip-8004#registration-v1",
-      name: name || "Unnamed Agent",
+      name: name || "Agether Agent",
       description: description || "AI agent registered via @agether/sdk",
       active: true,
       registrations: [{
@@ -966,8 +962,9 @@ var morphoIface = new ethers2.Interface(MORPHO_BLUE_ABI);
 var erc20Iface2 = new ethers2.Interface(ERC20_ABI);
 var MorphoClient = class {
   constructor(config) {
+    /** Market params cache: keyed by market uniqueKey (bytes32 hash) */
     this._marketCache = /* @__PURE__ */ new Map();
-    /** Dynamic token registry: symbol (uppercase) → { address, symbol, decimals } */
+    /** Dynamic token registry: symbol (uppercase) or address (lowercase) → { address, symbol, decimals } */
     this._tokenCache = /* @__PURE__ */ new Map();
     this._discoveredAt = 0;
     if (!config.agentId) {
@@ -1070,21 +1067,23 @@ var MorphoClient = class {
   //  Market Discovery (Morpho GraphQL API)
   // ════════════════════════════════════════════════════════
   /**
-   * Fetch USDC borrow markets on Base from Morpho API.
-   * Caches results for 5 minutes.
+   * Fetch available markets on the current chain from Morpho API.
+   * Caches results for 5 minutes. Supports all loan tokens (not just USDC).
+   *
+   * @param forceRefresh - bypass cache TTL
+   * @param filter - optional filter by loan token and/or collateral token
    */
-  async getMarkets(forceRefresh = false) {
+  async getMarkets(forceRefresh = false, filter) {
     if (!forceRefresh && this._discoveredMarkets && Date.now() - this._discoveredAt < 3e5) {
-      return this._discoveredMarkets;
+      return filter ? this._applyMarketFilter(this._discoveredMarkets, filter) : this._discoveredMarkets;
     }
     const chainId = this.config.chainId;
-    const usdcAddr = this.config.contracts.usdc.toLowerCase();
     const query = `{
       markets(
         first: 50
         orderBy: SupplyAssetsUsd
         orderDirection: Desc
-        where: { chainId_in: [${chainId}], loanAssetAddress_in: ["${usdcAddr}"] }
+        where: { chainId_in: [${chainId}] }
       ) {
         items {
           uniqueKey
@@ -1117,14 +1116,14 @@ var MorphoClient = class {
       }));
       this._discoveredAt = Date.now();
       for (const mi of this._discoveredMarkets) {
+        this._marketCache.set(mi.uniqueKey.toLowerCase(), {
+          loanToken: mi.loanAsset.address,
+          collateralToken: mi.collateralAsset.address,
+          oracle: mi.oracle,
+          irm: mi.irm,
+          lltv: mi.lltv
+        });
         if (mi.collateralAsset.address !== ethers2.ZeroAddress) {
-          this._marketCache.set(mi.collateralAsset.address.toLowerCase(), {
-            loanToken: mi.loanAsset.address,
-            collateralToken: mi.collateralAsset.address,
-            oracle: mi.oracle,
-            irm: mi.irm,
-            lltv: mi.lltv
-          });
           this._tokenCache.set(mi.collateralAsset.symbol.toUpperCase(), {
             address: mi.collateralAsset.address,
             symbol: mi.collateralAsset.symbol,
@@ -1149,17 +1148,24 @@ var MorphoClient = class {
           });
         }
       }
-      return this._discoveredMarkets;
+      return filter ? this._applyMarketFilter(this._discoveredMarkets, filter) : this._discoveredMarkets;
     } catch (e) {
       console.warn("[agether] getMarkets failed, using cache:", e instanceof Error ? e.message : e);
-      return this._discoveredMarkets ?? [];
+      const cached = this._discoveredMarkets ?? [];
+      return filter ? this._applyMarketFilter(cached, filter) : cached;
     }
   }
   /**
-   * Get MarketParams for a collateral token.
-   * Tries cache → API → onchain idToMarketParams.
+   * Get MarketParams for a collateral token (and optionally a specific loan token).
+   * Tries cache → API discovery.
+   *
+   * When `loanTokenSymbolOrAddress` is omitted, returns the most liquid market
+   * for that collateral (sorted by supply, typically the USDC market).
+   *
+   * @param collateralSymbolOrAddress - e.g. 'WETH', 'wstETH', or '0x4200...'
+   * @param loanTokenSymbolOrAddress - e.g. 'USDC', 'WETH', or '0x833589...' (optional)
    */
-  async findMarketForCollateral(collateralSymbolOrAddress) {
+  async findMarketForCollateral(collateralSymbolOrAddress, loanTokenSymbolOrAddress) {
     let colAddr;
     if (collateralSymbolOrAddress.startsWith("0x")) {
       colAddr = collateralSymbolOrAddress.toLowerCase();
@@ -1171,13 +1177,33 @@ var MorphoClient = class {
         colAddr = collateralSymbolOrAddress.toLowerCase();
       }
     }
-    const cached = this._marketCache.get(colAddr);
-    if (cached) return cached;
-    await this.getMarkets();
-    const fromApi = this._marketCache.get(colAddr);
-    if (fromApi) return fromApi;
+    let loanAddr;
+    if (loanTokenSymbolOrAddress) {
+      if (loanTokenSymbolOrAddress.startsWith("0x")) {
+        loanAddr = loanTokenSymbolOrAddress.toLowerCase();
+      } else {
+        try {
+          const resolved = await this._resolveToken(loanTokenSymbolOrAddress);
+          loanAddr = resolved.address.toLowerCase();
+        } catch {
+          loanAddr = loanTokenSymbolOrAddress.toLowerCase();
+        }
+      }
+    }
+    if (!this._discoveredMarkets) await this.getMarkets();
+    for (const m of this._discoveredMarkets ?? []) {
+      if (m.collateralAsset.address.toLowerCase() !== colAddr) continue;
+      if (loanAddr && m.loanAsset.address.toLowerCase() !== loanAddr) continue;
+      return {
+        loanToken: m.loanAsset.address,
+        collateralToken: m.collateralAsset.address,
+        oracle: m.oracle,
+        irm: m.irm,
+        lltv: m.lltv
+      };
+    }
     throw new AgetherError(
-      `No Morpho market found for collateral ${collateralSymbolOrAddress}`,
+      `No Morpho market found for collateral ${collateralSymbolOrAddress}` + (loanTokenSymbolOrAddress ? ` with loan token ${loanTokenSymbolOrAddress}` : ""),
       "MARKET_NOT_FOUND"
     );
   }
@@ -1212,12 +1238,13 @@ var MorphoClient = class {
     const acctAddr = await this.getAccountAddress();
     const markets = await this.getMarkets();
     const positions = [];
-    let totalDebt = 0n;
+    let totalDebtFloat = 0;
     for (const m of markets) {
       if (!m.collateralAsset || m.collateralAsset.address === ethers2.ZeroAddress) continue;
       try {
         const pos = await this.morphoBlue.position(m.uniqueKey, acctAddr);
         if (pos.collateral === 0n && pos.borrowShares === 0n && pos.supplyShares === 0n) continue;
+        const loanDecimals = m.loanAsset.decimals;
         let debt = 0n;
         if (pos.borrowShares > 0n) {
           try {
@@ -1225,7 +1252,7 @@ var MorphoClient = class {
             const totalBorrowShares = BigInt(mkt.totalBorrowShares);
             const totalBorrowAssets = BigInt(mkt.totalBorrowAssets);
             debt = totalBorrowShares > 0n ? (BigInt(pos.borrowShares) * totalBorrowAssets + totalBorrowShares - 1n) / totalBorrowShares : 0n;
-            totalDebt += debt;
+            totalDebtFloat += parseFloat(ethers2.formatUnits(debt, loanDecimals));
           } catch (e) {
             console.warn(`[agether] debt calc failed for market ${m.uniqueKey}:`, e instanceof Error ? e.message : e);
           }
@@ -1233,10 +1260,11 @@ var MorphoClient = class {
         positions.push({
           marketId: m.uniqueKey,
           collateralToken: m.collateralAsset.symbol,
+          loanToken: m.loanAsset.symbol,
           collateral: ethers2.formatUnits(pos.collateral, m.collateralAsset.decimals),
           borrowShares: pos.borrowShares.toString(),
           supplyShares: pos.supplyShares.toString(),
-          debt: ethers2.formatUnits(debt, 6)
+          debt: ethers2.formatUnits(debt, loanDecimals)
         });
       } catch (e) {
         console.warn(`[agether] position read failed for market:`, e instanceof Error ? e.message : e);
@@ -1246,16 +1274,28 @@ var MorphoClient = class {
     return {
       agentId: this.agentId,
       agentAccount: acctAddr,
-      totalDebt: ethers2.formatUnits(totalDebt, 6),
+      totalDebt: totalDebtFloat.toFixed(6),
       positions
     };
   }
   // ════════════════════════════════════════════════════════
   //  Balance & Borrowing Capacity
   // ════════════════════════════════════════════════════════
+  /**
+   * Get the balance of any ERC-20 token in the AgentAccount.
+   * @param symbolOrAddress - token symbol (e.g. 'USDC', 'WETH') or address
+   * @returns balance in raw units
+   */
+  async getTokenBalance(symbolOrAddress) {
+    const acctAddr = await this.getAccountAddress();
+    const tokenInfo = await this._resolveToken(symbolOrAddress);
+    const token = new Contract2(tokenInfo.address, ERC20_ABI, this.provider);
+    return token.balanceOf(acctAddr);
+  }
   /**
    * Get the USDC balance of the AgentAccount.
    * @returns USDC balance in raw units (6 decimals)
+   * @deprecated Use `getTokenBalance('USDC')` instead.
    */
   async getUsdcBalance() {
     const acctAddr = await this.getAccountAddress();
@@ -1263,7 +1303,7 @@ var MorphoClient = class {
     return usdc.balanceOf(acctAddr);
   }
   /**
-   * Calculate the maximum additional USDC that can be borrowed
+   * Calculate the maximum additional loan token that can be borrowed
    * given the agent's current collateral and debt across all markets.
    *
    * For each market with collateral deposited:
@@ -1271,7 +1311,7 @@ var MorphoClient = class {
    *
    * Uses the Morpho oracle to price collateral → loan token.
    *
-   * @returns Maximum additional USDC borrowable (6 decimals)
+   * @returns Maximum additional borrowable per market (raw units in each market's loan token)
    */
   async getMaxBorrowable() {
     const acctAddr = await this.getAccountAddress();
@@ -1304,6 +1344,8 @@ var MorphoClient = class {
         totalAdditional += maxAdditional;
         byMarket.push({
           collateralToken: m.collateralAsset.symbol,
+          loanToken: m.loanAsset.symbol,
+          loanDecimals: m.loanAsset.decimals,
           maxAdditional,
           currentDebt,
           collateralValue: collateralValueInLoan
@@ -1319,14 +1361,16 @@ var MorphoClient = class {
   //  Market Rates & Yield Estimation
   // ════════════════════════════════════════════════════════
   /**
-   * Fetch current supply/borrow APY for a collateral market from Morpho GraphQL API.
+   * Fetch current supply/borrow APY for markets from Morpho GraphQL API.
    *
    * Note: On Morpho Blue, collateral does NOT earn yield directly. Supply APY
    * is what lenders earn; borrow APY is what borrowers pay.
+   *
+   * @param collateralSymbolOrAddress - filter by collateral token (optional)
+   * @param loanTokenSymbolOrAddress - filter by loan token (optional). Omit for all loan tokens.
    */
-  async getMarketRates(collateralSymbolOrAddress) {
+  async getMarketRates(collateralSymbolOrAddress, loanTokenSymbolOrAddress) {
     const chainId = this.config.chainId;
-    const usdcAddr = this.config.contracts.usdc.toLowerCase();
     let collateralFilter = "";
     if (collateralSymbolOrAddress) {
       let colAddr;
@@ -1342,12 +1386,27 @@ var MorphoClient = class {
       }
       collateralFilter = `, collateralAssetAddress_in: ["${colAddr}"]`;
     }
+    let loanFilter = "";
+    if (loanTokenSymbolOrAddress) {
+      let loanAddr;
+      if (loanTokenSymbolOrAddress.startsWith("0x")) {
+        loanAddr = loanTokenSymbolOrAddress.toLowerCase();
+      } else {
+        try {
+          const resolved = await this._resolveToken(loanTokenSymbolOrAddress);
+          loanAddr = resolved.address.toLowerCase();
+        } catch {
+          loanAddr = loanTokenSymbolOrAddress.toLowerCase();
+        }
+      }
+      loanFilter = `, loanAssetAddress_in: ["${loanAddr}"]`;
+    }
     const query = `{
       markets(
         first: 50
         orderBy: SupplyAssetsUsd
         orderDirection: Desc
-        where: { chainId_in: [${chainId}], loanAssetAddress_in: ["${usdcAddr}"]${collateralFilter} }
+        where: { chainId_in: [${chainId}]${loanFilter}${collateralFilter} }
       ) {
         items {
           uniqueKey
@@ -1367,17 +1426,21 @@ var MorphoClient = class {
     try {
       const resp = await axios.post(MORPHO_API_URL, { query }, { timeout: 1e4 });
       const items = resp.data?.data?.markets?.items ?? [];
-      return items.filter((m) => m.collateralAsset?.address && m.collateralAsset.address !== ethers2.ZeroAddress).map((m) => ({
-        collateralToken: m.collateralAsset.symbol,
-        loanToken: m.loanAsset.symbol,
-        supplyApy: m.state?.supplyApy ? Number(m.state.supplyApy) : 0,
-        borrowApy: m.state?.borrowApy ? Number(m.state.borrowApy) : 0,
-        utilization: m.state?.utilization ? Number(m.state.utilization) : 0,
-        totalSupplyUsd: m.state?.supplyAssets ? Number(m.state.supplyAssets) / 1e6 : 0,
-        totalBorrowUsd: m.state?.borrowAssets ? Number(m.state.borrowAssets) / 1e6 : 0,
-        lltv: `${(Number(m.lltv) / 1e16).toFixed(0)}%`,
-        marketId: m.uniqueKey
-      }));
+      return items.filter((m) => m.collateralAsset?.address && m.collateralAsset.address !== ethers2.ZeroAddress).map((m) => {
+        const loanDecimals = m.loanAsset?.decimals ?? 18;
+        return {
+          collateralToken: m.collateralAsset.symbol,
+          loanToken: m.loanAsset.symbol,
+          loanDecimals,
+          supplyApy: m.state?.supplyApy ? Number(m.state.supplyApy) : 0,
+          borrowApy: m.state?.borrowApy ? Number(m.state.borrowApy) : 0,
+          utilization: m.state?.utilization ? Number(m.state.utilization) : 0,
+          totalSupplyUsd: m.state?.supplyAssets ? Number(m.state.supplyAssets) / 10 ** loanDecimals : 0,
+          totalBorrowUsd: m.state?.borrowAssets ? Number(m.state.borrowAssets) / 10 ** loanDecimals : 0,
+          lltv: `${(Number(m.lltv) / 1e16).toFixed(0)}%`,
+          marketId: m.uniqueKey
+        };
+      });
     } catch (e) {
       console.warn("[agether] getMarketRates failed:", e instanceof Error ? e.message : e);
       return [];
@@ -1411,14 +1474,15 @@ var MorphoClient = class {
     } else {
       try {
         const params = await this.findMarketForCollateral(collateralSymbol);
+        const loanDecimals = await this._getLoanTokenDecimals(params);
         const oracleContract = new Contract2(params.oracle, [
           "function price() view returns (uint256)"
         ], this.provider);
         const oraclePrice = await oracleContract.price();
         const ORACLE_PRICE_SCALE = 10n ** 36n;
         const amountWei = ethers2.parseUnits(amount, colInfo.decimals);
-        const valueInUsdc = amountWei * oraclePrice / ORACLE_PRICE_SCALE;
-        collateralValueUsd = Number(valueInUsdc) / 1e6;
+        const valueInLoan = amountWei * oraclePrice / ORACLE_PRICE_SCALE;
+        collateralValueUsd = Number(valueInLoan) / 10 ** loanDecimals;
       } catch (e) {
         console.warn("[agether] oracle price fetch for yield estimation failed:", e instanceof Error ? e.message : e);
         throw new AgetherError("Cannot determine collateral value. Provide ethPriceUsd.", "PRICE_UNAVAILABLE");
@@ -1439,61 +1503,65 @@ var MorphoClient = class {
   //  Supply-Side (Lending) — earn yield by supplying USDC
   // ════════════════════════════════════════════════════════
   /**
-   * Supply USDC to a Morpho Blue market as a lender (earn yield).
+   * Supply loan token to a Morpho Blue market as a lender (earn yield).
    *
    * Unlike `supplyCollateral` (borrower-side), this is the **lender-side**:
-   * you deposit the loanToken (USDC) into the market's supply pool and earn
+   * you deposit the loanToken into the market's supply pool and earn
    * interest paid by borrowers.
    *
-   * @param usdcAmount - Amount of USDC to supply (e.g. '500')
+   * @param amount - Amount of loan token to supply (e.g. '500' for 500 USDC, '0.5' for 0.5 WETH)
    * @param collateralSymbol - Market collateral token to identify which market (e.g. 'WETH')
    *                           Optional — defaults to highest-APY market
+   * @param loanTokenSymbol - Loan token to filter market (e.g. 'USDC', 'WETH'). Optional.
    */
-  async supplyAsset(usdcAmount, collateralSymbol) {
+  async supplyAsset(amount, collateralSymbol, loanTokenSymbol) {
     const acctAddr = await this.getAccountAddress();
-    const amount = ethers2.parseUnits(usdcAmount, 6);
     const morphoAddr = this.config.contracts.morphoBlue;
-    const usdcAddr = this.config.contracts.usdc;
     let params;
     let usedCollateral;
     if (collateralSymbol) {
-      params = await this.findMarketForCollateral(collateralSymbol);
+      params = await this.findMarketForCollateral(collateralSymbol, loanTokenSymbol);
       usedCollateral = collateralSymbol;
     } else {
-      const rates = await this.getMarketRates();
+      const rates = await this.getMarketRates(void 0, loanTokenSymbol);
       if (rates.length === 0) throw new AgetherError("No markets available", "NO_MARKETS");
       const best = rates.reduce((a, b) => a.supplyApy > b.supplyApy ? a : b);
-      params = await this.findMarketForCollateral(best.collateralToken);
+      params = await this.findMarketForCollateral(best.collateralToken, loanTokenSymbol);
       usedCollateral = best.collateralToken;
     }
+    const loanDecimals = await this._getLoanTokenDecimals(params);
+    const loanTokenAddr = params.loanToken;
+    const parsedAmount = ethers2.parseUnits(amount, loanDecimals);
     const marketId = ethers2.keccak256(
       ethers2.AbiCoder.defaultAbiCoder().encode(
         ["address", "address", "address", "address", "uint256"],
         [params.loanToken, params.collateralToken, params.oracle, params.irm, params.lltv]
       )
     );
-    const usdcContract = new Contract2(usdcAddr, ERC20_ABI, this._signer);
-    const acctBalance = await usdcContract.balanceOf(acctAddr);
-    if (acctBalance < amount) {
-      const shortfall = amount - acctBalance;
-      const eoaBalance = await usdcContract.balanceOf(await this.getSignerAddress());
+    const loanContract = new Contract2(loanTokenAddr, ERC20_ABI, this._signer);
+    const acctBalance = await loanContract.balanceOf(acctAddr);
+    if (acctBalance < parsedAmount) {
+      const shortfall = parsedAmount - acctBalance;
+      const eoaBalance = await loanContract.balanceOf(await this.getSignerAddress());
       if (eoaBalance < shortfall) {
+        const loanInfo = this._tokenCache.get(loanTokenAddr.toLowerCase());
+        const loanSymbol = loanInfo?.symbol ?? "loan token";
         throw new AgetherError(
-          `Insufficient USDC. Need ${usdcAmount}, AgentAccount has ${ethers2.formatUnits(acctBalance, 6)}, EOA has ${ethers2.formatUnits(eoaBalance, 6)}.`,
+          `Insufficient ${loanSymbol}. Need ${amount}, AgentAccount has ${ethers2.formatUnits(acctBalance, loanDecimals)}, EOA has ${ethers2.formatUnits(eoaBalance, loanDecimals)}.`,
           "INSUFFICIENT_BALANCE"
         );
       }
-      const transferTx = await usdcContract.transfer(acctAddr, shortfall);
+      const transferTx = await loanContract.transfer(acctAddr, shortfall);
       await transferTx.wait();
       this._refreshSigner();
     }
-    const targets = [usdcAddr, morphoAddr];
+    const targets = [loanTokenAddr, morphoAddr];
     const values = [0n, 0n];
     const datas = [
-      erc20Iface2.encodeFunctionData("approve", [morphoAddr, amount]),
+      erc20Iface2.encodeFunctionData("approve", [morphoAddr, parsedAmount]),
       morphoIface.encodeFunctionData("supply", [
         this._toTuple(params),
-        amount,
+        parsedAmount,
         0n,
         acctAddr,
         "0x"
@@ -1502,7 +1570,7 @@ var MorphoClient = class {
     const receipt = await this.batch(targets, values, datas);
     return {
       tx: receipt.hash,
-      amount: usdcAmount,
+      amount,
       marketId,
       collateralToken: usedCollateral,
       agentAccount: acctAddr
@@ -1515,17 +1583,26 @@ var MorphoClient = class {
    * @param collateralSymbol - Market collateral to identify which market
    * @param receiver - Destination address (defaults to EOA)
    */
-  async withdrawSupply(usdcAmount, collateralSymbol, receiver) {
+  /**
+   * Withdraw supplied loan token (+ earned interest) from a Morpho Blue market.
+   *
+   * @param amount - Amount to withdraw (e.g. '100' or 'all' for full position)
+   * @param collateralSymbol - Market collateral to identify which market
+   * @param receiver - Destination address (defaults to EOA)
+   * @param loanTokenSymbol - Loan token to filter market (optional)
+   */
+  async withdrawSupply(amount, collateralSymbol, receiver, loanTokenSymbol) {
     const acctAddr = await this.getAccountAddress();
     const morphoAddr = this.config.contracts.morphoBlue;
     const dest = receiver || await this.getSignerAddress();
     let params;
     if (collateralSymbol) {
-      params = await this.findMarketForCollateral(collateralSymbol);
+      params = await this.findMarketForCollateral(collateralSymbol, loanTokenSymbol);
     } else {
       const { params: p } = await this._findActiveSupplyMarket();
       params = p;
     }
+    const loanDecimals = await this._getLoanTokenDecimals(params);
     const marketId = ethers2.keccak256(
       ethers2.AbiCoder.defaultAbiCoder().encode(
         ["address", "address", "address", "address", "uint256"],
@@ -1534,13 +1611,13 @@ var MorphoClient = class {
     );
     let withdrawAssets;
     let withdrawShares;
-    if (usdcAmount === "all") {
+    if (amount === "all") {
       const pos = await this.morphoBlue.position(marketId, acctAddr);
       withdrawShares = BigInt(pos.supplyShares);
       withdrawAssets = 0n;
       if (withdrawShares === 0n) throw new AgetherError("No supply position to withdraw", "NO_SUPPLY");
     } else {
-      withdrawAssets = ethers2.parseUnits(usdcAmount, 6);
+      withdrawAssets = ethers2.parseUnits(amount, loanDecimals);
       withdrawShares = 0n;
     }
     const data = morphoIface.encodeFunctionData("withdraw", [
@@ -1558,13 +1635,13 @@ var MorphoClient = class {
       const totalSupplyAssets = BigInt(mkt.totalSupplyAssets);
       const totalSupplyShares = BigInt(mkt.totalSupplyShares);
       const currentAssets = totalSupplyShares > 0n ? BigInt(pos.supplyShares) * totalSupplyAssets / totalSupplyShares : 0n;
-      remainingSupply = ethers2.formatUnits(currentAssets, 6);
+      remainingSupply = ethers2.formatUnits(currentAssets, loanDecimals);
     } catch (e) {
       console.warn("[agether] failed to read remaining supply:", e instanceof Error ? e.message : e);
     }
     return {
       tx: receipt.hash,
-      amount: usdcAmount,
+      amount,
       remainingSupply,
       destination: dest
     };
@@ -1637,14 +1714,13 @@ var MorphoClient = class {
    * Computes available yield, verifies the requested amount doesn't exceed it,
    * then withdraws from the supply position and sends directly to the recipient.
    *
-   * @param recipient - Address to receive the USDC
-   * @param usdcAmount - Amount to pay from yield (e.g. '5.50')
+   * @param recipient - Address to receive the loan token
+   * @param amount - Amount to pay from yield (e.g. '5.50')
    * @param collateralSymbol - Market collateral to identify which supply position
    */
-  async payFromYield(recipient, usdcAmount, collateralSymbol) {
+  async payFromYield(recipient, amount, collateralSymbol) {
     const acctAddr = await this.getAccountAddress();
     const morphoAddr = this.config.contracts.morphoBlue;
-    const amount = ethers2.parseUnits(usdcAmount, 6);
     const positions = await this.getSupplyPositions(collateralSymbol);
     if (positions.length === 0) {
       throw new AgetherError("No supply position found", "NO_SUPPLY");
@@ -1652,17 +1728,20 @@ var MorphoClient = class {
     const pos = positions.reduce(
       (a, b) => parseFloat(a.earnedYield) > parseFloat(b.earnedYield) ? a : b
     );
-    const availableYield = ethers2.parseUnits(pos.earnedYield, 6);
-    if (amount > availableYield) {
+    const params = await this.findMarketForCollateral(pos.collateralToken, pos.loanToken);
+    const loanDecimals = await this._getLoanTokenDecimals(params);
+    const parsedAmount = ethers2.parseUnits(amount, loanDecimals);
+    const availableYield = ethers2.parseUnits(pos.earnedYield, loanDecimals);
+    if (parsedAmount > availableYield) {
+      const loanSymbol = pos.loanToken;
       throw new AgetherError(
-        `Requested ${usdcAmount} USDC exceeds available yield of ${pos.earnedYield} USDC. Use withdrawSupply to withdraw principal.`,
+        `Requested ${amount} ${loanSymbol} exceeds available yield of ${pos.earnedYield} ${loanSymbol}. Use withdrawSupply to withdraw principal.`,
         "EXCEEDS_YIELD"
       );
     }
-    const params = await this.findMarketForCollateral(pos.collateralToken);
     const data = morphoIface.encodeFunctionData("withdraw", [
       this._toTuple(params),
-      amount,
+      parsedAmount,
       0n,
       acctAddr,
       recipient
@@ -1681,7 +1760,7 @@ var MorphoClient = class {
     }
     return {
       tx: receipt.hash,
-      yieldWithdrawn: usdcAmount,
+      yieldWithdrawn: amount,
       recipient,
       remainingYield,
       remainingSupply
@@ -1739,28 +1818,31 @@ var MorphoClient = class {
     };
   }
   /**
-   * Borrow USDC against existing collateral.
+   * Borrow loan token against existing collateral.
    *
    * AgentAccount.execute: Morpho.borrow(params, amount, 0, account, account)
    *
-   * @param usdcAmount - USDC amount (e.g. '100')
+   * @param amount - Loan token amount (e.g. '100' for 100 USDC, '0.5' for 0.5 WETH)
    * @param tokenSymbol - collateral symbol to identify which market (default: first with collateral)
+   * @param marketParams - explicit market params (optional)
+   * @param loanTokenSymbol - loan token to filter market (optional, e.g. 'USDC', 'WETH')
    */
-  async borrow(usdcAmount, tokenSymbol, marketParams) {
+  async borrow(amount, tokenSymbol, marketParams, loanTokenSymbol) {
     const acctAddr = await this.getAccountAddress();
-    const amount = ethers2.parseUnits(usdcAmount, 6);
     const morphoAddr = this.config.contracts.morphoBlue;
     let params;
     let usedToken = tokenSymbol || "WETH";
     if (marketParams) {
       params = marketParams;
     } else if (tokenSymbol) {
-      params = await this.findMarketForCollateral(tokenSymbol);
+      params = await this.findMarketForCollateral(tokenSymbol, loanTokenSymbol);
     } else {
       const { params: p, symbol } = await this._findActiveMarket();
       params = p;
       usedToken = symbol;
     }
+    const loanDecimals = await this._getLoanTokenDecimals(params);
+    const parsedAmount = ethers2.parseUnits(amount, loanDecimals);
     try {
       const marketId = ethers2.keccak256(
         ethers2.AbiCoder.defaultAbiCoder().encode(
@@ -1784,11 +1866,14 @@ var MorphoClient = class {
       const totalBorrowAssets = BigInt(mktState.totalBorrowAssets);
       const currentDebt = totalBorrowShares > 0n ? (BigInt(pos.borrowShares) * totalBorrowAssets + totalBorrowShares - 1n) / totalBorrowShares : 0n;
       const maxAdditional = maxBorrowTotal > currentDebt ? maxBorrowTotal - currentDebt : 0n;
-      if (amount > maxAdditional) {
-        const maxUsd = ethers2.formatUnits(maxAdditional, 6);
-        const colFormatted = ethers2.formatUnits(pos.collateral, 18);
+      if (parsedAmount > maxAdditional) {
+        const loanInfo = this._tokenCache.get(params.loanToken.toLowerCase());
+        const loanSymbol = loanInfo?.symbol ?? "loan token";
+        const colInfo = await this._resolveToken(usedToken);
+        const maxFormatted = ethers2.formatUnits(maxAdditional, loanDecimals);
+        const colFormatted = ethers2.formatUnits(pos.collateral, colInfo.decimals);
         throw new AgetherError(
-          `Borrow of $${usdcAmount} USDC exceeds max borrowable $${maxUsd} USDC (collateral: ${colFormatted} ${usedToken}, LLTV: ${Number(params.lltv) / 1e18 * 100}%). Deposit more collateral or reduce borrow amount.`,
+          `Borrow of ${amount} ${loanSymbol} exceeds max borrowable ${maxFormatted} ${loanSymbol} (collateral: ${colFormatted} ${usedToken}, LLTV: ${Number(params.lltv) / 1e18 * 100}%). Deposit more collateral or reduce borrow amount.`,
           "EXCEEDS_MAX_LTV"
         );
       }
@@ -1798,7 +1883,7 @@ var MorphoClient = class {
     }
     const data = morphoIface.encodeFunctionData("borrow", [
       this._toTuple(params),
-      amount,
+      parsedAmount,
       0n,
       acctAddr,
       acctAddr
@@ -1806,7 +1891,7 @@ var MorphoClient = class {
     const receipt = await this.exec(morphoAddr, data);
     return {
       tx: receipt.hash,
-      amount: usdcAmount,
+      amount,
       collateralToken: usedToken,
       agentAccount: acctAddr
     };
@@ -1814,17 +1899,27 @@ var MorphoClient = class {
   /**
    * Deposit collateral AND borrow USDC in one batched transaction.
    *
+  /**
+   * Deposit collateral AND borrow loan token in one batched transaction.
+   *
    * AgentAccount.executeBatch:
    *   [collateral.approve, Morpho.supplyCollateral, Morpho.borrow]
    *
    * The collateral must be transferred to AgentAccount first.
+   *
+   * @param tokenSymbol - collateral token symbol (e.g. 'WETH')
+   * @param collateralAmount - amount of collateral (e.g. '0.05')
+   * @param borrowAmount - amount of loan token to borrow (e.g. '100')
+   * @param marketParams - explicit market params (optional)
+   * @param loanTokenSymbol - loan token to filter market (optional)
    */
-  async depositAndBorrow(tokenSymbol, collateralAmount, borrowUsdcAmount, marketParams) {
+  async depositAndBorrow(tokenSymbol, collateralAmount, borrowAmount, marketParams, loanTokenSymbol) {
     const acctAddr = await this.getAccountAddress();
     const colInfo = await this._resolveToken(tokenSymbol);
-    const params = marketParams ?? await this.findMarketForCollateral(tokenSymbol);
+    const params = marketParams ?? await this.findMarketForCollateral(tokenSymbol, loanTokenSymbol);
+    const loanDecimals = await this._getLoanTokenDecimals(params);
     const colWei = ethers2.parseUnits(collateralAmount, colInfo.decimals);
-    const borrowWei = ethers2.parseUnits(borrowUsdcAmount, 6);
+    const borrowWei = ethers2.parseUnits(borrowAmount, loanDecimals);
     const morphoAddr = this.config.contracts.morphoBlue;
     try {
       const marketId = ethers2.keccak256(
@@ -1845,9 +1940,11 @@ var MorphoClient = class {
       const currentDebt = totalBorrowShares > 0n ? (BigInt(pos.borrowShares) * totalBorrowAssets + totalBorrowShares - 1n) / totalBorrowShares : 0n;
       const maxAdditional = maxBorrowTotal > currentDebt ? maxBorrowTotal - currentDebt : 0n;
       if (borrowWei > maxAdditional) {
-        const maxUsd = ethers2.formatUnits(maxAdditional, 6);
+        const loanInfo = this._tokenCache.get(params.loanToken.toLowerCase());
+        const loanSymbol = loanInfo?.symbol ?? "loan token";
+        const maxFormatted = ethers2.formatUnits(maxAdditional, loanDecimals);
         throw new AgetherError(
-          `Borrow of $${borrowUsdcAmount} USDC exceeds max borrowable $${maxUsd} USDC (total collateral: ${ethers2.formatUnits(totalCollateral, colInfo.decimals)} ${tokenSymbol}, LLTV: ${Number(params.lltv) / 1e18 * 100}%). Reduce borrow or increase collateral.`,
+          `Borrow of ${borrowAmount} ${loanSymbol} exceeds max borrowable ${maxFormatted} ${loanSymbol} (total collateral: ${ethers2.formatUnits(totalCollateral, colInfo.decimals)} ${tokenSymbol}, LLTV: ${Number(params.lltv) / 1e18 * 100}%). Reduce borrow or increase collateral.`,
           "EXCEEDS_MAX_LTV"
         );
       }
@@ -1893,36 +1990,42 @@ var MorphoClient = class {
       tx: receipt.hash,
       collateralToken: tokenSymbol,
       collateralAmount,
-      borrowAmount: borrowUsdcAmount,
+      borrowAmount,
       agentAccount: acctAddr
     };
   }
   /**
-   * Repay borrowed USDC from AgentAccount.
+   * Repay borrowed loan token from AgentAccount.
    *
    * AgentAccount.executeBatch:
-   *   [USDC.approve(MorphoBlue), Morpho.repay(params)]
+   *   [loanToken.approve(MorphoBlue), Morpho.repay(params)]
+   *
+   * @param amount - loan token amount to repay (e.g. '50' or 'all' for full repayment)
+   * @param tokenSymbol - collateral symbol to identify which market (optional)
+   * @param marketParams - explicit market params (optional)
+   * @param loanTokenSymbol - loan token to filter market (optional)
    */
-  async repay(usdcAmount, tokenSymbol, marketParams) {
+  async repay(amount, tokenSymbol, marketParams, loanTokenSymbol) {
     const acctAddr = await this.getAccountAddress();
     const morphoAddr = this.config.contracts.morphoBlue;
-    const usdcAddr = this.config.contracts.usdc;
     let params;
     if (marketParams) {
       params = marketParams;
     } else if (tokenSymbol) {
-      params = await this.findMarketForCollateral(tokenSymbol);
+      params = await this.findMarketForCollateral(tokenSymbol, loanTokenSymbol);
     } else {
       const { params: p } = await this._findActiveMarket();
       params = p;
     }
+    const loanTokenAddr = params.loanToken;
+    const loanDecimals = await this._getLoanTokenDecimals(params);
     let repayAssets;
     let repayShares;
     let approveAmount;
-    if (usdcAmount === "all") {
+    if (amount === "all") {
       const markets = await this.getMarkets();
       const mkt = markets.find(
-        (m) => m.collateralAsset?.address.toLowerCase() === params.collateralToken.toLowerCase()
+        (m) => m.collateralAsset?.address.toLowerCase() === params.collateralToken.toLowerCase() && m.loanAsset?.address.toLowerCase() === params.loanToken.toLowerCase()
       );
       if (mkt) {
         const pos = await this.morphoBlue.position(mkt.uniqueKey, acctAddr);
@@ -1932,33 +2035,35 @@ var MorphoClient = class {
         const totalBorrowAssets = BigInt(onChainMkt.totalBorrowAssets);
         const totalBorrowShares = BigInt(onChainMkt.totalBorrowShares);
         const estimated = totalBorrowShares > 0n ? repayShares * totalBorrowAssets / totalBorrowShares + 10n : 0n;
-        approveAmount = estimated > 0n ? estimated : ethers2.parseUnits("1", 6);
+        approveAmount = estimated > 0n ? estimated : ethers2.parseUnits("1", loanDecimals);
       } else {
-        repayAssets = ethers2.parseUnits("999999", 6);
+        repayAssets = ethers2.parseUnits("999999", loanDecimals);
         repayShares = 0n;
         approveAmount = repayAssets;
       }
     } else {
-      repayAssets = ethers2.parseUnits(usdcAmount, 6);
+      repayAssets = ethers2.parseUnits(amount, loanDecimals);
       repayShares = 0n;
       approveAmount = repayAssets;
     }
-    const usdcContract = new Contract2(usdcAddr, ERC20_ABI, this._signer);
-    const acctBalance = await usdcContract.balanceOf(acctAddr);
+    const loanContract = new Contract2(loanTokenAddr, ERC20_ABI, this._signer);
+    const acctBalance = await loanContract.balanceOf(acctAddr);
     if (acctBalance < approveAmount) {
       const shortfall = approveAmount - acctBalance;
-      const eoaBalance = await usdcContract.balanceOf(await this.getSignerAddress());
+      const eoaBalance = await loanContract.balanceOf(await this.getSignerAddress());
       if (eoaBalance < shortfall) {
+        const loanInfo = this._tokenCache.get(loanTokenAddr.toLowerCase());
+        const loanSymbol = loanInfo?.symbol ?? "loan token";
         throw new AgetherError(
-          `Insufficient USDC for repay. Need ${ethers2.formatUnits(approveAmount, 6)} USDC, AgentAccount has ${ethers2.formatUnits(acctBalance, 6)}, EOA has ${ethers2.formatUnits(eoaBalance, 6)}.`,
+          `Insufficient ${loanSymbol} for repay. Need ${ethers2.formatUnits(approveAmount, loanDecimals)}, AgentAccount has ${ethers2.formatUnits(acctBalance, loanDecimals)}, EOA has ${ethers2.formatUnits(eoaBalance, loanDecimals)}.`,
           "INSUFFICIENT_BALANCE"
         );
       }
-      const transferTx = await usdcContract.transfer(acctAddr, shortfall);
+      const transferTx = await loanContract.transfer(acctAddr, shortfall);
       await transferTx.wait();
       this._refreshSigner();
     }
-    const targets = [usdcAddr, morphoAddr];
+    const targets = [loanTokenAddr, morphoAddr];
     const values = [0n, 0n];
     const datas = [
       erc20Iface2.encodeFunctionData("approve", [morphoAddr, approveAmount]),
@@ -1978,7 +2083,7 @@ var MorphoClient = class {
     } catch (e) {
       console.warn("[agether] failed to read remaining debt after repay:", e instanceof Error ? e.message : e);
     }
-    return { tx: receipt.hash, amount: usdcAmount, remainingDebt };
+    return { tx: receipt.hash, amount, remainingDebt };
   }
   /**
    * Withdraw collateral from Morpho Blue.
@@ -1992,12 +2097,13 @@ var MorphoClient = class {
     const colInfo = await this._resolveToken(tokenSymbol);
     const params = marketParams ?? await this.findMarketForCollateral(tokenSymbol);
     const morphoAddr = this.config.contracts.morphoBlue;
-    const usdcAddr = this.config.contracts.usdc;
+    const loanTokenAddr = params.loanToken;
+    const loanDecimals = await this._getLoanTokenDecimals(params);
     const dest = receiver || await this.getSignerAddress();
     let weiAmount;
     const markets = await this.getMarkets();
     const market = markets.find(
-      (m) => m.collateralAsset?.address.toLowerCase() === colInfo.address.toLowerCase()
+      (m) => m.collateralAsset?.address.toLowerCase() === colInfo.address.toLowerCase() && m.loanAsset?.address.toLowerCase() === loanTokenAddr.toLowerCase()
     );
     if (amount === "all") {
       if (!market) throw new AgetherError("Market not found", "MARKET_NOT_FOUND");
@@ -2020,8 +2126,10 @@ var MorphoClient = class {
           const totalBorrowAssets = BigInt(onChainMkt.totalBorrowAssets);
           const totalBorrowShares = BigInt(onChainMkt.totalBorrowShares);
           const estimated = totalBorrowShares > 0n ? dustBorrowShares * totalBorrowAssets / totalBorrowShares + 10n : 0n;
-          dustApproveAmount = estimated > 0n ? estimated : ethers2.parseUnits("1", 6);
-          console.log(`[agether] dust borrow shares detected: ${dustBorrowShares} shares \u2248 ${ethers2.formatUnits(dustApproveAmount, 6)} USDC \u2014 auto-repaying before withdraw`);
+          dustApproveAmount = estimated > 0n ? estimated : ethers2.parseUnits("1", loanDecimals);
+          const loanInfo = this._tokenCache.get(loanTokenAddr.toLowerCase());
+          const loanSymbol = loanInfo?.symbol ?? "loan token";
+          console.log(`[agether] dust borrow shares detected: ${dustBorrowShares} shares \u2248 ${ethers2.formatUnits(dustApproveAmount, loanDecimals)} ${loanSymbol} \u2014 auto-repaying before withdraw`);
         }
       } catch (e) {
         console.warn("[agether] failed to check borrow shares before withdraw:", e instanceof Error ? e.message : e);
@@ -2035,19 +2143,21 @@ var MorphoClient = class {
     ]);
     let receipt;
     if (hasDustDebt) {
-      const usdcContract = new Contract2(usdcAddr, ERC20_ABI, this._signer);
-      const acctBalance = await usdcContract.balanceOf(acctAddr);
+      const loanContract = new Contract2(loanTokenAddr, ERC20_ABI, this._signer);
+      const acctBalance = await loanContract.balanceOf(acctAddr);
       if (acctBalance < dustApproveAmount) {
         const shortfall = dustApproveAmount - acctBalance;
-        const eoaBalance = await usdcContract.balanceOf(await this.getSignerAddress());
+        const eoaBalance = await loanContract.balanceOf(await this.getSignerAddress());
         if (eoaBalance >= shortfall) {
-          console.log(`[agether] transferring ${ethers2.formatUnits(shortfall, 6)} USDC from EOA \u2192 AgentAccount for dust repay`);
-          const transferTx = await usdcContract.transfer(acctAddr, shortfall);
+          const loanInfo = this._tokenCache.get(loanTokenAddr.toLowerCase());
+          const loanSymbol = loanInfo?.symbol ?? "loan token";
+          console.log(`[agether] transferring ${ethers2.formatUnits(shortfall, loanDecimals)} ${loanSymbol} from EOA \u2192 AgentAccount for dust repay`);
+          const transferTx = await loanContract.transfer(acctAddr, shortfall);
           await transferTx.wait();
           this._refreshSigner();
         }
       }
-      const targets = [usdcAddr, morphoAddr, morphoAddr];
+      const targets = [loanTokenAddr, morphoAddr, morphoAddr];
       const values = [0n, 0n, 0n];
       const datas = [
         erc20Iface2.encodeFunctionData("approve", [morphoAddr, dustApproveAmount]),
@@ -2292,6 +2402,37 @@ var MorphoClient = class {
     }
     throw new AgetherError("No active supply position found", "NO_SUPPLY");
   }
+  /**
+   * Resolve loan token decimals from market params.
+   * Uses the `_tokenCache` populated by `getMarkets()`.
+   */
+  async _getLoanTokenDecimals(params) {
+    const tokenInfo = this._tokenCache.get(params.loanToken.toLowerCase());
+    if (tokenInfo) return tokenInfo.decimals;
+    await this.getMarkets();
+    const fromApi = this._tokenCache.get(params.loanToken.toLowerCase());
+    return fromApi?.decimals ?? 18;
+  }
+  /**
+   * Apply client-side filter to discovered markets.
+   */
+  _applyMarketFilter(markets, filter) {
+    return markets.filter((m) => {
+      if (filter.loanToken) {
+        const loanAddr = filter.loanToken.toLowerCase();
+        if (m.loanAsset.address.toLowerCase() !== loanAddr && m.loanAsset.symbol.toUpperCase() !== filter.loanToken.toUpperCase()) {
+          return false;
+        }
+      }
+      if (filter.collateralToken) {
+        const colAddr = filter.collateralToken.toLowerCase();
+        if (m.collateralAsset.address.toLowerCase() !== colAddr && m.collateralAsset.symbol.toUpperCase() !== filter.collateralToken.toUpperCase()) {
+          return false;
+        }
+      }
+      return true;
+    });
+  }
   /**
    * Resolve a token symbol or address to { address, symbol, decimals }.
    *
@@ -2308,8 +2449,8 @@ var MorphoClient = class {
     const fromApi = this._tokenCache.get(key);
     if (fromApi) return fromApi;
     throw new AgetherError(
-      `Unknown token: ${symbolOrAddress}. No Morpho market found with this collateral.`,
-      "UNKNOWN_COLLATERAL"
+      `Unknown token: ${symbolOrAddress}. No Morpho market found with this token.`,
+      "UNKNOWN_TOKEN"
     );
   }
   /**