@agether/sdk 2.17.3 → 2.18.0

package/dist/index.mjs

@@ -3,13 +3,13 @@ import { ethers, Contract } from "ethers";
 import axios from "axios";
 
 // src/types/index.ts
-var ChainId = /* @__PURE__ */ ((ChainId3) => {
-  ChainId3[ChainId3["Ethereum"] = 1] = "Ethereum";
-  ChainId3[ChainId3["Base"] = 8453] = "Base";
-  ChainId3[ChainId3["BaseSepolia"] = 84532] = "BaseSepolia";
-  ChainId3[ChainId3["Sepolia"] = 11155111] = "Sepolia";
-  ChainId3[ChainId3["Hardhat"] = 31337] = "Hardhat";
-  return ChainId3;
+var ChainId = /* @__PURE__ */ ((ChainId4) => {
+  ChainId4[ChainId4["Ethereum"] = 1] = "Ethereum";
+  ChainId4[ChainId4["Base"] = 8453] = "Base";
+  ChainId4[ChainId4["BaseSepolia"] = 84532] = "BaseSepolia";
+  ChainId4[ChainId4["Sepolia"] = 11155111] = "Sepolia";
+  ChainId4[ChainId4["Hardhat"] = 31337] = "Hardhat";
+  return ChainId4;
 })(ChainId || {});
 var AgetherError = class extends Error {
   constructor(message, code, details) {
@@ -1185,67 +1185,14 @@ var AgetherClient = class _AgetherClient {
 };
 
 // src/clients/MorphoClient.ts
-import { ethers as ethers2, Contract as Contract2 } from "ethers";
-import axios2 from "axios";
+import { ethers as ethers3, Contract as Contract3 } from "ethers";
 
-// src/utils/retry.ts
-var RETRIABLE_PATTERNS = [
-  "ECONNRESET",
-  "ECONNREFUSED",
-  "ENOTFOUND",
-  "ETIMEDOUT",
-  "fetch failed",
-  "network error",
-  "socket hang up",
-  "rate limit",
-  "429",
-  "502",
-  "503",
-  "504",
-  "timeout"
-];
-function isRetriable(error) {
-  const msg = error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();
-  return RETRIABLE_PATTERNS.some((p) => msg.includes(p.toLowerCase()));
-}
-async function withRetry(fn, options = {}) {
-  const {
-    maxRetries = 3,
-    baseDelay = 1e3,
-    maxDelay = 15e3,
-    onRetry
-  } = options;
-  let lastError;
-  for (let attempt = 1; attempt <= maxRetries; attempt++) {
-    try {
-      return await fn();
-    } catch (error) {
-      lastError = error instanceof Error ? error : new Error(String(error));
-      if (attempt >= maxRetries || !isRetriable(error)) {
-        throw lastError;
-      }
-      const delay = Math.min(baseDelay * Math.pow(2, attempt - 1), maxDelay);
-      const jitter = delay * (0.5 + Math.random() * 0.5);
-      onRetry?.(attempt, lastError);
-      await new Promise((resolve) => setTimeout(resolve, jitter));
-    }
-  }
-  throw lastError;
-}
-
-// src/clients/MorphoClient.ts
-var MORPHO_API_URL2 = "https://api.morpho.org/graphql";
+// src/clients/AgentAccountClient.ts
+import { ethers as ethers2, Contract as Contract2 } from "ethers";
 var MODE_SINGLE2 = "0x0000000000000000000000000000000000000000000000000000000000000000";
 var MODE_BATCH = "0x0100000000000000000000000000000000000000000000000000000000000000";
-var morphoIface = new ethers2.Interface(MORPHO_BLUE_ABI);
-var erc20Iface2 = new ethers2.Interface(ERC20_ABI);
-var _MorphoClient = class _MorphoClient {
+var AgentAccountClient = class {
   constructor(config) {
-    /** Market params cache: keyed by market uniqueKey (bytes32 hash) */
-    this._marketCache = /* @__PURE__ */ new Map();
-    /** Dynamic token registry: symbol (uppercase) or address (lowercase) → { address, symbol, decimals } */
-    this._tokenCache = /* @__PURE__ */ new Map();
-    this._discoveredAt = 0;
     if (!config.agentId) {
       throw new AgetherError(
         "agentId is required. Use AgetherClient.register() first to get an agentId.",
@@ -1280,13 +1227,10 @@ var _MorphoClient = class _MorphoClient {
     }
     const addrs = { ...defaultCfg.contracts, ...config.contracts };
     this.agether4337Factory = new Contract2(addrs.agether4337Factory, ACCOUNT_FACTORY_ABI, this._signer);
-    this.morphoBlue = new Contract2(addrs.morphoBlue, MORPHO_BLUE_ABI, this.provider);
     this.entryPoint = new Contract2(addrs.entryPoint, ENTRYPOINT_V07_ABI, this._signer);
   }
-  // ════════════════════════════════════════════════════════
-  //  Account Management
-  // ════════════════════════════════════════════════════════
-  /** Resolve the AgentAccount address (cached, with retry for flaky RPCs). */
+  // ─── Account Management ───────────────────────────────────────────────
+  /** Resolve the AgentAccount (Safe) address. Cached after first call. */
   async getAccountAddress() {
     if (this._accountAddress) return this._accountAddress;
     const MAX_RETRIES = 3;
@@ -1312,26 +1256,260 @@ var _MorphoClient = class _MorphoClient {
   getAgentId() {
     return this.agentId;
   }
-  /**
-   * Get the EOA wallet address (synchronous, best-effort).
-   *
-   * For the `privateKey` path this always works. For the `signer` path
-   * it works if the signer exposes `.address` synchronously (e.g. ethers.Wallet).
-   * If the address has not been resolved yet, throws — call `getSignerAddress()` first.
-   */
+  /** Get the EOA wallet address (synchronous). */
   getWalletAddress() {
     if (this._eoaAddress) return this._eoaAddress;
     const signer = this._signer;
     if (signer.address && typeof signer.address === "string") {
-      const addr = signer.address;
-      this._eoaAddress = addr;
-      return addr;
+      this._eoaAddress = signer.address;
+      return signer.address;
     }
     throw new AgetherError(
-      "EOA address not yet resolved. Call getSignerAddress() (async) first, or use a signer that exposes .address synchronously.",
-      "ADDRESS_NOT_RESOLVED"
+      "EOA address not available synchronously. Call getSignerAddress() first.",
+      "NO_EOA_ADDRESS"
+    );
+  }
+  /** Get EOA wallet address (async, works for all signer types). */
+  async getSignerAddress() {
+    if (this._eoaAddress) return this._eoaAddress;
+    const addr = await this._signer.getAddress();
+    this._eoaAddress = addr;
+    return addr;
+  }
+  // ─── Safe7579 Execution ───────────────────────────────────────────────
+  /** Pack two uint128 values into a single bytes32. */
+  _packUint128(hi, lo) {
+    return ethers2.zeroPadValue(ethers2.toBeHex(hi << 128n | lo), 32);
+  }
+  /**
+   * Build, sign and submit a PackedUserOperation through EntryPoint.handleOps.
+   */
+  async _submitUserOp(callData) {
+    const sender = await this.getAccountAddress();
+    const validatorAddr = this.config.contracts.erc8004ValidationModule;
+    const nonceKey = BigInt(validatorAddr) << 32n;
+    const nonce = await this.entryPoint.getNonce(sender, nonceKey);
+    const feeData = await this.provider.getFeeData();
+    const maxFeePerGas = feeData.maxFeePerGas ?? ethers2.parseUnits("0.5", "gwei");
+    const maxPriorityFeePerGas = feeData.maxPriorityFeePerGas ?? ethers2.parseUnits("0.1", "gwei");
+    const verificationGasLimit = 500000n;
+    const callGasLimit = 800000n;
+    const preVerificationGas = 100000n;
+    const accountGasLimits = this._packUint128(verificationGasLimit, callGasLimit);
+    const gasFees = this._packUint128(maxPriorityFeePerGas, maxFeePerGas);
+    const requiredPrefund = (verificationGasLimit + callGasLimit + preVerificationGas) * maxFeePerGas;
+    const accountBalance = await this.provider.getBalance(sender);
+    if (accountBalance < requiredPrefund) {
+      const topUp = requiredPrefund - accountBalance;
+      const topUpWithBuffer = topUp * 120n / 100n;
+      const eoaBalance = await this.provider.getBalance(
+        this._eoaAddress ?? await this._signer.getAddress()
+      );
+      if (eoaBalance < topUpWithBuffer) {
+        const needed = ethers2.formatEther(topUpWithBuffer);
+        throw new AgetherError(
+          `Insufficient ETH for gas. Need ~${needed} ETH in EOA.`,
+          "INSUFFICIENT_GAS"
+        );
+      }
+      const tx = await this._signer.sendTransaction({ to: sender, value: topUpWithBuffer });
+      await tx.wait();
+    }
+    const packedUserOp = {
+      sender,
+      nonce,
+      initCode: "0x",
+      callData,
+      accountGasLimits,
+      preVerificationGas,
+      gasFees,
+      paymasterAndData: "0x",
+      signature: "0x"
+    };
+    const entryPointAddr = await this.entryPoint.getAddress();
+    const chainId = (await this.provider.getNetwork()).chainId;
+    const userOpHash = ethers2.keccak256(
+      ethers2.AbiCoder.defaultAbiCoder().encode(
+        ["bytes32", "address", "uint256"],
+        [
+          ethers2.keccak256(
+            ethers2.AbiCoder.defaultAbiCoder().encode(
+              [
+                "address",
+                "uint256",
+                "bytes32",
+                "bytes32",
+                "bytes32",
+                "uint256",
+                "bytes32",
+                "bytes32"
+              ],
+              [
+                packedUserOp.sender,
+                packedUserOp.nonce,
+                ethers2.keccak256(packedUserOp.initCode),
+                ethers2.keccak256(packedUserOp.callData),
+                packedUserOp.accountGasLimits,
+                packedUserOp.preVerificationGas,
+                packedUserOp.gasFees,
+                ethers2.keccak256(packedUserOp.paymasterAndData)
+              ]
+            )
+          ),
+          entryPointAddr,
+          chainId
+        ]
+      )
     );
+    const signature = await this._signer.signMessage(ethers2.getBytes(userOpHash));
+    packedUserOp.signature = signature;
+    const handleOpsTx = await this.entryPoint.handleOps(
+      [
+        [
+          packedUserOp.sender,
+          packedUserOp.nonce,
+          packedUserOp.initCode,
+          packedUserOp.callData,
+          packedUserOp.accountGasLimits,
+          packedUserOp.preVerificationGas,
+          packedUserOp.gasFees,
+          packedUserOp.paymasterAndData,
+          packedUserOp.signature
+        ]
+      ],
+      this._eoaAddress ?? await this._signer.getAddress()
+    );
+    const receipt = await handleOpsTx.wait();
+    const epIface = new ethers2.Interface(ENTRYPOINT_V07_ABI);
+    for (const log of receipt.logs) {
+      try {
+        const parsed = epIface.parseLog({ topics: log.topics, data: log.data });
+        if (parsed?.name === "UserOperationEvent") {
+          if (!parsed.args.success) {
+            let revertMsg = "UserOp inner execution reverted";
+            for (const rLog of receipt.logs) {
+              try {
+                const rParsed = epIface.parseLog({ topics: rLog.topics, data: rLog.data });
+                if (rParsed?.name === "UserOperationRevertReason") {
+                  const reason = rParsed.args.revertReason;
+                  try {
+                    if (reason.length >= 10 && reason.slice(0, 10) === "0x08c379a0") {
+                      const decoded = ethers2.AbiCoder.defaultAbiCoder().decode(["string"], "0x" + reason.slice(10));
+                      revertMsg = `UserOp reverted: ${decoded[0]}`;
+                    } else {
+                      revertMsg = `UserOp reverted with data: ${reason}`;
+                    }
+                  } catch {
+                    revertMsg = `UserOp reverted with data: ${reason}`;
+                  }
+                  break;
+                }
+              } catch {
+                continue;
+              }
+            }
+            throw new AgetherError(revertMsg, "USEROP_EXECUTION_FAILED");
+          }
+        }
+      } catch (e) {
+        if (e instanceof AgetherError) throw e;
+        continue;
+      }
+    }
+    return receipt;
   }
+  /**
+   * Execute a single call via Safe7579 account through ERC-4337 UserOp.
+   */
+  async executeSingle(target, data, value = 0n) {
+    const valueHex = ethers2.zeroPadValue(ethers2.toBeHex(value), 32);
+    const executionCalldata = ethers2.concat([target, valueHex, data]);
+    const safe7579Iface = new ethers2.Interface(SAFE7579_ACCOUNT_ABI);
+    const callData = safe7579Iface.encodeFunctionData("execute", [MODE_SINGLE2, executionCalldata]);
+    return this._submitUserOp(callData);
+  }
+  /**
+   * Execute multiple calls via Safe7579 account in one atomic batch.
+   */
+  async executeBatch(targets, values, datas) {
+    const executions = targets.map((t, i) => [t, values[i], datas[i]]);
+    const executionCalldata = ethers2.AbiCoder.defaultAbiCoder().encode(
+      ["(address,uint256,bytes)[]"],
+      [executions]
+    );
+    const safe7579Iface = new ethers2.Interface(SAFE7579_ACCOUNT_ABI);
+    const callData = safe7579Iface.encodeFunctionData("execute", [MODE_BATCH, executionCalldata]);
+    return this._submitUserOp(callData);
+  }
+};
+
+// src/clients/MorphoClient.ts
+import axios2 from "axios";
+
+// src/utils/retry.ts
+var RETRIABLE_PATTERNS = [
+  "ECONNRESET",
+  "ECONNREFUSED",
+  "ENOTFOUND",
+  "ETIMEDOUT",
+  "fetch failed",
+  "network error",
+  "socket hang up",
+  "rate limit",
+  "429",
+  "502",
+  "503",
+  "504",
+  "timeout"
+];
+function isRetriable(error) {
+  const msg = error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();
+  return RETRIABLE_PATTERNS.some((p) => msg.includes(p.toLowerCase()));
+}
+async function withRetry(fn, options = {}) {
+  const {
+    maxRetries = 3,
+    baseDelay = 1e3,
+    maxDelay = 15e3,
+    onRetry
+  } = options;
+  let lastError;
+  for (let attempt = 1; attempt <= maxRetries; attempt++) {
+    try {
+      return await fn();
+    } catch (error) {
+      lastError = error instanceof Error ? error : new Error(String(error));
+      if (attempt >= maxRetries || !isRetriable(error)) {
+        throw lastError;
+      }
+      const delay = Math.min(baseDelay * Math.pow(2, attempt - 1), maxDelay);
+      const jitter = delay * (0.5 + Math.random() * 0.5);
+      onRetry?.(attempt, lastError);
+      await new Promise((resolve) => setTimeout(resolve, jitter));
+    }
+  }
+  throw lastError;
+}
+
+// src/clients/MorphoClient.ts
+var MORPHO_API_URL2 = "https://api.morpho.org/graphql";
+var morphoIface = new ethers3.Interface(MORPHO_BLUE_ABI);
+var erc20Iface2 = new ethers3.Interface(ERC20_ABI);
+var _MorphoClient = class _MorphoClient extends AgentAccountClient {
+  constructor(config) {
+    super(config);
+    // Cached state
+    /** Market params cache: keyed by market uniqueKey (bytes32 hash) */
+    this._marketCache = /* @__PURE__ */ new Map();
+    /** Dynamic token registry: symbol (uppercase) or address (lowercase) → { address, symbol, decimals } */
+    this._tokenCache = /* @__PURE__ */ new Map();
+    this._discoveredAt = 0;
+    const addrs = { ...this.config.contracts, ...config.contracts };
+    this.morphoBlue = new Contract3(addrs.morphoBlue, MORPHO_BLUE_ABI, this.provider);
+  }
+  // ════════════════════════════════════════════════════════
+  //  Account Management
+  // ════════════════════════════════════════════════════════
   /**
    * Resolve the EOA signer address (async, works with all signer types).
    * Result is cached after the first call.
@@ -1388,7 +1566,7 @@ var _MorphoClient = class _MorphoClient {
       this._discoveredMarkets = items.map((m) => ({
         uniqueKey: m.uniqueKey,
         loanAsset: m.loanAsset,
-        collateralAsset: m.collateralAsset ?? { address: ethers2.ZeroAddress, symbol: "N/A", decimals: 0 },
+        collateralAsset: m.collateralAsset ?? { address: ethers3.ZeroAddress, symbol: "N/A", decimals: 0 },
         oracle: m.oracleAddress,
         irm: m.irmAddress,
         lltv: BigInt(m.lltv),
@@ -1405,7 +1583,7 @@ var _MorphoClient = class _MorphoClient {
           irm: mi.irm,
           lltv: mi.lltv
         });
-        if (mi.collateralAsset.address !== ethers2.ZeroAddress) {
+        if (mi.collateralAsset.address !== ethers3.ZeroAddress) {
           this._tokenCache.set(mi.collateralAsset.symbol.toUpperCase(), {
             address: mi.collateralAsset.address,
             symbol: mi.collateralAsset.symbol,
@@ -1417,7 +1595,7 @@ var _MorphoClient = class _MorphoClient {
             decimals: mi.collateralAsset.decimals
           });
         }
-        if (mi.loanAsset.address !== ethers2.ZeroAddress) {
+        if (mi.loanAsset.address !== ethers3.ZeroAddress) {
           this._tokenCache.set(mi.loanAsset.symbol.toUpperCase(), {
             address: mi.loanAsset.address,
             symbol: mi.loanAsset.symbol,
@@ -1587,7 +1765,7 @@ var _MorphoClient = class _MorphoClient {
             const totalBorrowShares = BigInt(mkt.totalBorrowShares);
             const totalBorrowAssets = BigInt(mkt.totalBorrowAssets);
             debt = totalBorrowShares > 0n ? (borrowShares * totalBorrowAssets + totalBorrowShares - 1n) / totalBorrowShares : 0n;
-            totalDebtFloat += parseFloat(ethers2.formatUnits(debt, loanDecimals));
+            totalDebtFloat += parseFloat(ethers3.formatUnits(debt, loanDecimals));
           } catch (e) {
             console.warn(`[agether] debt calc failed for market ${m.uniqueKey}:`, e instanceof Error ? e.message : e);
           }
@@ -1596,17 +1774,17 @@ var _MorphoClient = class _MorphoClient {
           marketId: m.uniqueKey,
           collateralToken: m.collateralAsset.symbol,
           loanToken: m.loanAsset.symbol,
-          collateral: ethers2.formatUnits(collateral, m.collateralAsset.decimals),
+          collateral: ethers3.formatUnits(collateral, m.collateralAsset.decimals),
           borrowShares: borrowShares.toString(),
           supplyShares: supplyShares.toString(),
-          debt: ethers2.formatUnits(debt, loanDecimals)
+          debt: ethers3.formatUnits(debt, loanDecimals)
         });
       }
     } catch (e) {
       console.warn("[agether] marketPositions API failed, falling back to market scan:", e instanceof Error ? e.message : e);
       const markets = await this.getMarkets();
       for (const m of markets) {
-        if (!m.collateralAsset || m.collateralAsset.address === ethers2.ZeroAddress) continue;
+        if (!m.collateralAsset || m.collateralAsset.address === ethers3.ZeroAddress) continue;
         try {
           const pos = await this.morphoBlue.position(m.uniqueKey, acctAddr);
           if (pos.collateral === 0n && pos.borrowShares === 0n && pos.supplyShares === 0n) continue;
@@ -1618,7 +1796,7 @@ var _MorphoClient = class _MorphoClient {
               const totalBorrowShares = BigInt(mkt.totalBorrowShares);
               const totalBorrowAssets = BigInt(mkt.totalBorrowAssets);
               debt = totalBorrowShares > 0n ? (BigInt(pos.borrowShares) * totalBorrowAssets + totalBorrowShares - 1n) / totalBorrowShares : 0n;
-              totalDebtFloat += parseFloat(ethers2.formatUnits(debt, loanDecimals));
+              totalDebtFloat += parseFloat(ethers3.formatUnits(debt, loanDecimals));
             } catch (e2) {
               console.warn(`[agether] debt calc failed:`, e2 instanceof Error ? e2.message : e2);
             }
@@ -1627,10 +1805,10 @@ var _MorphoClient = class _MorphoClient {
             marketId: m.uniqueKey,
             collateralToken: m.collateralAsset.symbol,
             loanToken: m.loanAsset.symbol,
-            collateral: ethers2.formatUnits(pos.collateral, m.collateralAsset.decimals),
+            collateral: ethers3.formatUnits(pos.collateral, m.collateralAsset.decimals),
             borrowShares: pos.borrowShares.toString(),
             supplyShares: pos.supplyShares.toString(),
-            debt: ethers2.formatUnits(debt, loanDecimals)
+            debt: ethers3.formatUnits(debt, loanDecimals)
           });
         } catch (e2) {
           console.warn(`[agether] position read failed:`, e2 instanceof Error ? e2.message : e2);
@@ -1656,7 +1834,7 @@ var _MorphoClient = class _MorphoClient {
   async getTokenBalance(symbolOrAddress) {
     const acctAddr = await this.getAccountAddress();
     const tokenInfo = await this._resolveToken(symbolOrAddress);
-    const token = new Contract2(tokenInfo.address, ERC20_ABI, this.provider);
+    const token = new Contract3(tokenInfo.address, ERC20_ABI, this.provider);
     return token.balanceOf(acctAddr);
   }
   /**
@@ -1666,7 +1844,7 @@ var _MorphoClient = class _MorphoClient {
    */
   async getUsdcBalance() {
     const acctAddr = await this.getAccountAddress();
-    const usdc = new Contract2(this.config.contracts.usdc, ERC20_ABI, this.provider);
+    const usdc = new Contract3(this.config.contracts.usdc, ERC20_ABI, this.provider);
     return usdc.balanceOf(acctAddr);
   }
   /**
@@ -1686,7 +1864,7 @@ var _MorphoClient = class _MorphoClient {
     let totalAdditional = 0n;
     const byMarket = [];
     for (const m of markets) {
-      if (!m.collateralAsset || m.collateralAsset.address === ethers2.ZeroAddress) continue;
+      if (!m.collateralAsset || m.collateralAsset.address === ethers3.ZeroAddress) continue;
       try {
         const pos = await this.morphoBlue.position(m.uniqueKey, acctAddr);
         if (pos.collateral === 0n) continue;
@@ -1696,7 +1874,7 @@ var _MorphoClient = class _MorphoClient {
         const currentDebt = totalBorrowShares > 0n ? (BigInt(pos.borrowShares) * totalBorrowAssets + totalBorrowShares - 1n) / totalBorrowShares : 0n;
         let collateralValueInLoan;
         try {
-          const oracleContract = new Contract2(m.oracle, [
+          const oracleContract = new Contract3(m.oracle, [
             "function price() view returns (uint256)"
           ], this.provider);
           const oraclePrice = await oracleContract.price();
@@ -1802,7 +1980,7 @@ var _MorphoClient = class _MorphoClient {
         const sym = loanTokenSymbolOrAddress.toUpperCase();
         items = items.filter((m) => m.loanAsset?.symbol?.toUpperCase() === sym);
       }
-      return items.filter((m) => m.collateralAsset?.address && m.collateralAsset.address !== ethers2.ZeroAddress).map((m) => {
+      return items.filter((m) => m.collateralAsset?.address && m.collateralAsset.address !== ethers3.ZeroAddress).map((m) => {
         const loanDecimals = m.loanAsset?.decimals ?? 18;
         return {
           collateralToken: m.collateralAsset.symbol,
@@ -1863,7 +2041,7 @@ var _MorphoClient = class _MorphoClient {
         { maxRetries: 3, onRetry: (n, e) => console.warn(`[agether] Morpho API retry ${n}:`, e.message) }
       );
       let items = resp.data?.data?.markets?.items ?? [];
-      items = items.filter((m) => m.collateralAsset?.address && m.collateralAsset.address !== ethers2.ZeroAddress);
+      items = items.filter((m) => m.collateralAsset?.address && m.collateralAsset.address !== ethers3.ZeroAddress);
       const searchUpper = search.toUpperCase();
       if (options?.asCollateral) {
         items = items.filter((m) => m.collateralAsset?.symbol?.toUpperCase() === searchUpper);
@@ -1919,10 +2097,10 @@ var _MorphoClient = class _MorphoClient {
       if (ethBalance > 0n) {
         results.push({
           symbol: "ETH",
-          address: ethers2.ZeroAddress,
+          address: ethers3.ZeroAddress,
           decimals: 18,
           balance: ethBalance,
-          balanceFormatted: ethers2.formatEther(ethBalance)
+          balanceFormatted: ethers3.formatEther(ethBalance)
         });
       }
     } catch {
@@ -1933,7 +2111,7 @@ var _MorphoClient = class _MorphoClient {
       const batch = tokenEntries.slice(i, i + batchSize);
       const checks = batch.map(async (info) => {
         try {
-          const token = new Contract2(info.address, ERC20_ABI, this.provider);
+          const token = new Contract3(info.address, ERC20_ABI, this.provider);
           const balance = await token.balanceOf(acctAddr);
           if (balance > 0n) {
             return {
@@ -1941,7 +2119,7 @@ var _MorphoClient = class _MorphoClient {
               address: info.address,
               decimals: info.decimals,
               balance,
-              balanceFormatted: ethers2.formatUnits(balance, info.decimals)
+              balanceFormatted: ethers3.formatUnits(balance, info.decimals)
             };
           }
         } catch {
@@ -1973,7 +2151,7 @@ var _MorphoClient = class _MorphoClient {
       try {
         const balance = await this.getTokenBalance(collateralSymbol);
         const info = await this._resolveToken(collateralSymbol);
-        tokensToCheck = [{ symbol: collateralSymbol, balanceFormatted: ethers2.formatUnits(balance, info.decimals) }];
+        tokensToCheck = [{ symbol: collateralSymbol, balanceFormatted: ethers3.formatUnits(balance, info.decimals) }];
       } catch {
       }
     } else {
@@ -2053,12 +2231,12 @@ var _MorphoClient = class _MorphoClient {
       try {
         const params = await this.findMarketForCollateral(collateralSymbol);
         const loanDecimals = await this._getLoanTokenDecimals(params);
-        const oracleContract = new Contract2(params.oracle, [
+        const oracleContract = new Contract3(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 amountWei = ethers3.parseUnits(amount, colInfo.decimals);
         const valueInLoan = amountWei * oraclePrice / ORACLE_PRICE_SCALE;
         collateralValueUsd = Number(valueInLoan) / 10 ** loanDecimals;
       } catch (e) {
@@ -2109,14 +2287,14 @@ var _MorphoClient = class _MorphoClient {
     }
     const loanDecimals = await this._getLoanTokenDecimals(params);
     const loanTokenAddr = params.loanToken;
-    const parsedAmount = ethers2.parseUnits(amount, loanDecimals);
-    const marketId = ethers2.keccak256(
-      ethers2.AbiCoder.defaultAbiCoder().encode(
+    const parsedAmount = ethers3.parseUnits(amount, loanDecimals);
+    const marketId = ethers3.keccak256(
+      ethers3.AbiCoder.defaultAbiCoder().encode(
         ["address", "address", "address", "address", "uint256"],
         [params.loanToken, params.collateralToken, params.oracle, params.irm, params.lltv]
       )
     );
-    const loanContract = new Contract2(loanTokenAddr, ERC20_ABI, this._signer);
+    const loanContract = new Contract3(loanTokenAddr, ERC20_ABI, this._signer);
     const acctBalance = await loanContract.balanceOf(acctAddr);
     if (acctBalance < parsedAmount) {
       const shortfall = parsedAmount - acctBalance;
@@ -2125,7 +2303,7 @@ var _MorphoClient = class _MorphoClient {
         const loanInfo = this._tokenCache.get(loanTokenAddr.toLowerCase());
         const loanSymbol = loanInfo?.symbol ?? "loan token";
         throw new AgetherError(
-          `Insufficient ${loanSymbol}. Need ${amount}, AgentAccount has ${ethers2.formatUnits(acctBalance, loanDecimals)}, EOA has ${ethers2.formatUnits(eoaBalance, loanDecimals)}.`,
+          `Insufficient ${loanSymbol}. Need ${amount}, AgentAccount has ${ethers3.formatUnits(acctBalance, loanDecimals)}, EOA has ${ethers3.formatUnits(eoaBalance, loanDecimals)}.`,
           "INSUFFICIENT_BALANCE"
         );
       }
@@ -2145,7 +2323,7 @@ var _MorphoClient = class _MorphoClient {
         "0x"
       ])
     ];
-    const receipt = await this.batch(targets, values, datas);
+    const receipt = await this.executeBatch(targets, values, datas);
     return {
       tx: receipt.hash,
       amount,
@@ -2181,8 +2359,8 @@ var _MorphoClient = class _MorphoClient {
       params = p;
     }
     const loanDecimals = await this._getLoanTokenDecimals(params);
-    const marketId = ethers2.keccak256(
-      ethers2.AbiCoder.defaultAbiCoder().encode(
+    const marketId = ethers3.keccak256(
+      ethers3.AbiCoder.defaultAbiCoder().encode(
         ["address", "address", "address", "address", "uint256"],
         [params.loanToken, params.collateralToken, params.oracle, params.irm, params.lltv]
       )
@@ -2195,7 +2373,7 @@ var _MorphoClient = class _MorphoClient {
       withdrawAssets = 0n;
       if (withdrawShares === 0n) throw new AgetherError("No supply position to withdraw", "NO_SUPPLY");
     } else {
-      withdrawAssets = ethers2.parseUnits(amount, loanDecimals);
+      withdrawAssets = ethers3.parseUnits(amount, loanDecimals);
       withdrawShares = 0n;
     }
     const data = morphoIface.encodeFunctionData("withdraw", [
@@ -2205,7 +2383,7 @@ var _MorphoClient = class _MorphoClient {
       acctAddr,
       dest
     ]);
-    const receipt = await this.exec(morphoAddr, data);
+    const receipt = await this.executeSingle(morphoAddr, data);
     let remainingSupply = "0";
     try {
       const pos = await this.morphoBlue.position(marketId, acctAddr);
@@ -2213,7 +2391,7 @@ var _MorphoClient = class _MorphoClient {
       const totalSupplyAssets = BigInt(mkt.totalSupplyAssets);
       const totalSupplyShares = BigInt(mkt.totalSupplyShares);
       const currentAssets = totalSupplyShares > 0n ? BigInt(pos.supplyShares) * totalSupplyAssets / totalSupplyShares : 0n;
-      remainingSupply = ethers2.formatUnits(currentAssets, loanDecimals);
+      remainingSupply = ethers3.formatUnits(currentAssets, loanDecimals);
     } catch (e) {
       console.warn("[agether] failed to read remaining supply:", e instanceof Error ? e.message : e);
     }
@@ -2278,9 +2456,9 @@ var _MorphoClient = class _MorphoClient {
         loanToken: p.market.loanAsset.symbol,
         collateralToken: p.market.collateralAsset?.symbol ?? "none",
         supplyShares: p.state.supplyShares,
-        suppliedAssets: ethers2.formatUnits(currentAssets, p.market.loanAsset.decimals),
-        netDeposited: ethers2.formatUnits(netDeposited, p.market.loanAsset.decimals),
-        earnedYield: ethers2.formatUnits(earnedYield, p.market.loanAsset.decimals),
+        suppliedAssets: ethers3.formatUnits(currentAssets, p.market.loanAsset.decimals),
+        netDeposited: ethers3.formatUnits(netDeposited, p.market.loanAsset.decimals),
+        earnedYield: ethers3.formatUnits(earnedYield, p.market.loanAsset.decimals),
         supplyApy: p.market.state?.supplyApy ?? 0
       });
     }
@@ -2308,8 +2486,8 @@ var _MorphoClient = class _MorphoClient {
     );
     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);
+    const parsedAmount = ethers3.parseUnits(amount, loanDecimals);
+    const availableYield = ethers3.parseUnits(pos.earnedYield, loanDecimals);
     if (parsedAmount > availableYield) {
       const loanSymbol = pos.loanToken;
       throw new AgetherError(
@@ -2324,7 +2502,7 @@ var _MorphoClient = class _MorphoClient {
       acctAddr,
       recipient
     ]);
-    const receipt = await this.exec(morphoAddr, data);
+    const receipt = await this.executeSingle(morphoAddr, data);
     let remainingYield = "0";
     let remainingSupply = "0";
     try {
@@ -2359,16 +2537,16 @@ var _MorphoClient = class _MorphoClient {
     const acctAddr = await this.getAccountAddress();
     const colInfo = await this._resolveToken(tokenSymbol);
     const params = marketParams ?? await this.findMarketForCollateral(tokenSymbol);
-    const weiAmount = ethers2.parseUnits(amount, colInfo.decimals);
+    const weiAmount = ethers3.parseUnits(amount, colInfo.decimals);
     const morphoAddr = this.config.contracts.morphoBlue;
-    const colToken = new Contract2(colInfo.address, ERC20_ABI, this._signer);
+    const colToken = new Contract3(colInfo.address, ERC20_ABI, this._signer);
     const acctBalance = await colToken.balanceOf(acctAddr);
     if (acctBalance < weiAmount) {
       const shortfall = weiAmount - acctBalance;
       const eoaBalance = await colToken.balanceOf(await this.getSignerAddress());
       if (eoaBalance < shortfall) {
         throw new AgetherError(
-          `Insufficient ${tokenSymbol}. Need ${amount}, AgentAccount has ${ethers2.formatUnits(acctBalance, colInfo.decimals)}, EOA has ${ethers2.formatUnits(eoaBalance, colInfo.decimals)}.`,
+          `Insufficient ${tokenSymbol}. Need ${amount}, AgentAccount has ${ethers3.formatUnits(acctBalance, colInfo.decimals)}, EOA has ${ethers3.formatUnits(eoaBalance, colInfo.decimals)}.`,
           "INSUFFICIENT_BALANCE"
         );
       }
@@ -2387,7 +2565,7 @@ var _MorphoClient = class _MorphoClient {
         "0x"
       ])
     ];
-    const receipt = await this.batch(targets, values, datas);
+    const receipt = await this.executeBatch(targets, values, datas);
     return {
       tx: receipt.hash,
       collateralToken: tokenSymbol,
@@ -2420,10 +2598,10 @@ var _MorphoClient = class _MorphoClient {
       usedToken = symbol;
     }
     const loanDecimals = await this._getLoanTokenDecimals(params);
-    const parsedAmount = ethers2.parseUnits(amount, loanDecimals);
+    const parsedAmount = ethers3.parseUnits(amount, loanDecimals);
     try {
-      const marketId = ethers2.keccak256(
-        ethers2.AbiCoder.defaultAbiCoder().encode(
+      const marketId = ethers3.keccak256(
+        ethers3.AbiCoder.defaultAbiCoder().encode(
           ["address", "address", "address", "address", "uint256"],
           [params.loanToken, params.collateralToken, params.oracle, params.irm, params.lltv]
         )
@@ -2435,7 +2613,7 @@ var _MorphoClient = class _MorphoClient {
           "NO_COLLATERAL"
         );
       }
-      const oracleContract = new Contract2(params.oracle, ["function price() view returns (uint256)"], this.provider);
+      const oracleContract = new Contract3(params.oracle, ["function price() view returns (uint256)"], this.provider);
       const oraclePrice = await oracleContract.price();
       const collateralValueInLoan = BigInt(pos.collateral) * oraclePrice / 10n ** 36n;
       const maxBorrowTotal = collateralValueInLoan * params.lltv / 10n ** 18n;
@@ -2448,8 +2626,8 @@ var _MorphoClient = class _MorphoClient {
         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);
+        const maxFormatted = ethers3.formatUnits(maxAdditional, loanDecimals);
+        const colFormatted = ethers3.formatUnits(pos.collateral, colInfo.decimals);
         throw new AgetherError(
           `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"
@@ -2466,7 +2644,7 @@ var _MorphoClient = class _MorphoClient {
       acctAddr,
       acctAddr
     ]);
-    const receipt = await this.exec(morphoAddr, data);
+    const receipt = await this.executeSingle(morphoAddr, data);
     return {
       tx: receipt.hash,
       amount,
@@ -2496,19 +2674,19 @@ var _MorphoClient = class _MorphoClient {
     const colInfo = await this._resolveToken(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(borrowAmount, loanDecimals);
+    const colWei = ethers3.parseUnits(collateralAmount, colInfo.decimals);
+    const borrowWei = ethers3.parseUnits(borrowAmount, loanDecimals);
     const morphoAddr = this.config.contracts.morphoBlue;
     try {
-      const marketId = ethers2.keccak256(
-        ethers2.AbiCoder.defaultAbiCoder().encode(
+      const marketId = ethers3.keccak256(
+        ethers3.AbiCoder.defaultAbiCoder().encode(
           ["address", "address", "address", "address", "uint256"],
           [params.loanToken, params.collateralToken, params.oracle, params.irm, params.lltv]
         )
       );
       const pos = await this.morphoBlue.position(marketId, acctAddr);
       const totalCollateral = BigInt(pos.collateral) + colWei;
-      const oracleContract = new Contract2(params.oracle, ["function price() view returns (uint256)"], this.provider);
+      const oracleContract = new Contract3(params.oracle, ["function price() view returns (uint256)"], this.provider);
       const oraclePrice = await oracleContract.price();
       const collateralValueInLoan = totalCollateral * oraclePrice / 10n ** 36n;
       const maxBorrowTotal = collateralValueInLoan * params.lltv / 10n ** 18n;
@@ -2520,9 +2698,9 @@ var _MorphoClient = class _MorphoClient {
       if (borrowWei > maxAdditional) {
         const loanInfo = this._tokenCache.get(params.loanToken.toLowerCase());
         const loanSymbol = loanInfo?.symbol ?? "loan token";
-        const maxFormatted = ethers2.formatUnits(maxAdditional, loanDecimals);
+        const maxFormatted = ethers3.formatUnits(maxAdditional, loanDecimals);
         throw new AgetherError(
-          `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.`,
+          `Borrow of ${borrowAmount} ${loanSymbol} exceeds max borrowable ${maxFormatted} ${loanSymbol} (total collateral: ${ethers3.formatUnits(totalCollateral, colInfo.decimals)} ${tokenSymbol}, LLTV: ${Number(params.lltv) / 1e18 * 100}%). Reduce borrow or increase collateral.`,
           "EXCEEDS_MAX_LTV"
         );
       }
@@ -2530,14 +2708,14 @@ var _MorphoClient = class _MorphoClient {
       if (e instanceof AgetherError) throw e;
       console.warn("[agether] depositAndBorrow pre-check failed (proceeding anyway):", e instanceof Error ? e.message : e);
     }
-    const colToken = new Contract2(colInfo.address, ERC20_ABI, this._signer);
+    const colToken = new Contract3(colInfo.address, ERC20_ABI, this._signer);
     const acctBalance = await colToken.balanceOf(acctAddr);
     if (acctBalance < colWei) {
       const shortfall = colWei - acctBalance;
       const eoaBalance = await colToken.balanceOf(await this.getSignerAddress());
       if (eoaBalance < shortfall) {
         throw new AgetherError(
-          `Insufficient ${tokenSymbol}. Need ${collateralAmount}, AgentAccount has ${ethers2.formatUnits(acctBalance, colInfo.decimals)}, EOA has ${ethers2.formatUnits(eoaBalance, colInfo.decimals)}.`,
+          `Insufficient ${tokenSymbol}. Need ${collateralAmount}, AgentAccount has ${ethers3.formatUnits(acctBalance, colInfo.decimals)}, EOA has ${ethers3.formatUnits(eoaBalance, colInfo.decimals)}.`,
           "INSUFFICIENT_BALANCE"
         );
       }
@@ -2563,7 +2741,7 @@ var _MorphoClient = class _MorphoClient {
         acctAddr
       ])
     ];
-    const receipt = await this.batch(targets, values, datas);
+    const receipt = await this.executeBatch(targets, values, datas);
     return {
       tx: receipt.hash,
       collateralToken: tokenSymbol,
@@ -2613,9 +2791,9 @@ var _MorphoClient = class _MorphoClient {
         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", loanDecimals);
+        approveAmount = estimated > 0n ? estimated : ethers3.parseUnits("1", loanDecimals);
       } else {
-        const marketId = ethers2.keccak256(ethers2.AbiCoder.defaultAbiCoder().encode(
+        const marketId = ethers3.keccak256(ethers3.AbiCoder.defaultAbiCoder().encode(
           ["address", "address", "address", "address", "uint256"],
           [params.loanToken, params.collateralToken, params.oracle, params.irm, params.lltv]
         ));
@@ -2625,14 +2803,14 @@ var _MorphoClient = class _MorphoClient {
         const onChainMkt = await this.morphoBlue.market(marketId);
         const totalBorrowAssets = BigInt(onChainMkt.totalBorrowAssets);
         const totalBorrowShares = BigInt(onChainMkt.totalBorrowShares);
-        approveAmount = totalBorrowShares > 0n ? repayShares * totalBorrowAssets / totalBorrowShares + 10n : ethers2.parseUnits("1", loanDecimals);
+        approveAmount = totalBorrowShares > 0n ? repayShares * totalBorrowAssets / totalBorrowShares + 10n : ethers3.parseUnits("1", loanDecimals);
       }
     } else {
-      repayAssets = ethers2.parseUnits(amount, loanDecimals);
+      repayAssets = ethers3.parseUnits(amount, loanDecimals);
       repayShares = 0n;
       approveAmount = repayAssets;
     }
-    const loanContract = new Contract2(loanTokenAddr, ERC20_ABI, this._signer);
+    const loanContract = new Contract3(loanTokenAddr, ERC20_ABI, this._signer);
     const acctBalance = await loanContract.balanceOf(acctAddr);
     const checkAmount = repayShares > 0n && repayAssets === 0n ? approveAmount * 1005n / 1000n : approveAmount;
     if (acctBalance < checkAmount) {
@@ -2651,7 +2829,7 @@ var _MorphoClient = class _MorphoClient {
           const loanInfo = this._tokenCache.get(loanTokenAddr.toLowerCase());
           const loanSymbol = loanInfo?.symbol ?? "loan token";
           throw new AgetherError(
-            `Insufficient ${loanSymbol} for repay. Need ~${ethers2.formatUnits(checkAmount, loanDecimals)}, AgentAccount has ${ethers2.formatUnits(acctBalance, loanDecimals)}, EOA has ${ethers2.formatUnits(eoaBalance, loanDecimals)}.`,
+            `Insufficient ${loanSymbol} for repay. Need ~${ethers3.formatUnits(checkAmount, loanDecimals)}, AgentAccount has ${ethers3.formatUnits(acctBalance, loanDecimals)}, EOA has ${ethers3.formatUnits(eoaBalance, loanDecimals)}.`,
             "INSUFFICIENT_BALANCE"
           );
         }
@@ -2673,7 +2851,7 @@ var _MorphoClient = class _MorphoClient {
         "0x"
       ])
     ];
-    const receipt = await this.batch(targets, values, datas);
+    const receipt = await this.executeBatch(targets, values, datas);
     let remainingDebt = "0";
     try {
       const markets = await this.getMarkets(true);
@@ -2688,7 +2866,7 @@ var _MorphoClient = class _MorphoClient {
           const totalAssets = BigInt(onChainMkt.totalBorrowAssets);
           const totalShares = BigInt(onChainMkt.totalBorrowShares);
           const debtWei = totalShares > 0n ? shares * totalAssets / totalShares : 0n;
-          remainingDebt = ethers2.formatUnits(debtWei, loanDecimals);
+          remainingDebt = ethers3.formatUnits(debtWei, loanDecimals);
         }
       }
     } catch (e) {
@@ -2830,7 +3008,7 @@ var _MorphoClient = class _MorphoClient {
       weiAmount = pos.collateral;
       if (weiAmount === 0n) throw new AgetherError("No collateral to withdraw", "NO_COLLATERAL");
     } else {
-      weiAmount = ethers2.parseUnits(amount, colInfo.decimals);
+      weiAmount = ethers3.parseUnits(amount, colInfo.decimals);
     }
     let hasDustDebt = false;
     let dustBorrowShares = 0n;
@@ -2845,10 +3023,10 @@ var _MorphoClient = class _MorphoClient {
           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", loanDecimals);
+          dustApproveAmount = estimated > 0n ? estimated : ethers3.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`);
+          console.log(`[agether] dust borrow shares detected: ${dustBorrowShares} shares \u2248 ${ethers3.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);
@@ -2862,7 +3040,7 @@ var _MorphoClient = class _MorphoClient {
     ]);
     let receipt;
     if (hasDustDebt) {
-      const loanContract = new Contract2(loanTokenAddr, ERC20_ABI, this._signer);
+      const loanContract = new Contract3(loanTokenAddr, ERC20_ABI, this._signer);
       const acctBalance = await loanContract.balanceOf(acctAddr);
       if (acctBalance < dustApproveAmount) {
         const shortfall = dustApproveAmount - acctBalance;
@@ -2870,7 +3048,7 @@ var _MorphoClient = class _MorphoClient {
         if (eoaBalance >= 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`);
+          console.log(`[agether] transferring ${ethers3.formatUnits(shortfall, loanDecimals)} ${loanSymbol} from EOA \u2192 AgentAccount for dust repay`);
           const transferTx = await loanContract.transfer(acctAddr, shortfall);
           await transferTx.wait();
           this._refreshSigner();
@@ -2889,15 +3067,15 @@ var _MorphoClient = class _MorphoClient {
         ]),
         withdrawData
       ];
-      receipt = await this.batch(targets, values, datas);
+      receipt = await this.executeBatch(targets, values, datas);
     } else {
-      receipt = await this.exec(morphoAddr, withdrawData);
+      receipt = await this.executeSingle(morphoAddr, withdrawData);
     }
     let remainingCollateral = "0";
     try {
       if (market) {
         const pos = await this.morphoBlue.position(market.uniqueKey, acctAddr);
-        remainingCollateral = ethers2.formatUnits(pos.collateral, colInfo.decimals);
+        remainingCollateral = ethers3.formatUnits(pos.collateral, colInfo.decimals);
       }
     } catch (e) {
       console.warn("[agether] failed to read remaining collateral after withdraw:", e instanceof Error ? e.message : e);
@@ -2905,7 +3083,7 @@ var _MorphoClient = class _MorphoClient {
     return {
       tx: receipt.hash,
       token: tokenSymbol,
-      amount: amount === "all" ? ethers2.formatUnits(weiAmount, colInfo.decimals) : amount,
+      amount: amount === "all" ? ethers3.formatUnits(weiAmount, colInfo.decimals) : amount,
       remainingCollateral,
       destination: dest
     };
@@ -2929,139 +3107,21 @@ var _MorphoClient = class _MorphoClient {
   _refreshSigner() {
     if (this._useExternalSigner) {
       const addrs = this.config.contracts;
-      this.agether4337Factory = new Contract2(addrs.agether4337Factory, ACCOUNT_FACTORY_ABI, this._signer);
-      this.entryPoint = new Contract2(addrs.entryPoint, ENTRYPOINT_V07_ABI, this._signer);
+      this.agether4337Factory = new Contract3(addrs.agether4337Factory, ACCOUNT_FACTORY_ABI, this._signer);
+      this.entryPoint = new Contract3(addrs.entryPoint, ENTRYPOINT_V07_ABI, this._signer);
     } else {
-      this.provider = new ethers2.JsonRpcProvider(this._rpcUrl);
-      const wallet = new ethers2.Wallet(this._privateKey, this.provider);
+      this.provider = new ethers3.JsonRpcProvider(this._rpcUrl);
+      const wallet = new ethers3.Wallet(this._privateKey, this.provider);
       this._signer = wallet;
       this._eoaAddress = wallet.address;
       const addrs = this.config.contracts;
-      this.agether4337Factory = new Contract2(addrs.agether4337Factory, ACCOUNT_FACTORY_ABI, this._signer);
-      this.entryPoint = new Contract2(addrs.entryPoint, ENTRYPOINT_V07_ABI, this._signer);
+      this.agether4337Factory = new Contract3(addrs.agether4337Factory, ACCOUNT_FACTORY_ABI, this._signer);
+      this.entryPoint = new Contract3(addrs.entryPoint, ENTRYPOINT_V07_ABI, this._signer);
     }
   }
   // ────────────────────────────────────────────────────────────
   //  ERC-4337 UserOp helpers (Safe + Safe7579 + EntryPoint v0.7)
   // ────────────────────────────────────────────────────────────
-  /**
-   * Pack two uint128 values into a single bytes32:
-   *   bytes32 = (hi << 128) | lo
-   */
-  _packUint128(hi, lo) {
-    return ethers2.zeroPadValue(ethers2.toBeHex(hi << 128n | lo), 32);
-  }
-  /**
-   * Build, sign and submit a PackedUserOperation through EntryPoint.handleOps.
-   *
-   * @param callData – the ABI-encoded calldata for the Safe7579 account
-   *   (e.g. `execute(mode, executionCalldata)`)
-   * @returns the transaction receipt of the handleOps call
-   */
-  async _submitUserOp(callData) {
-    const sender = await this.getAccountAddress();
-    const validatorAddr = this.config.contracts.erc8004ValidationModule;
-    const nonceKey = BigInt(validatorAddr) << 32n;
-    const nonce = await this.entryPoint.getNonce(sender, nonceKey);
-    const feeData = await this.provider.getFeeData();
-    const maxFeePerGas = feeData.maxFeePerGas ?? ethers2.parseUnits("0.5", "gwei");
-    const maxPriorityFeePerGas = feeData.maxPriorityFeePerGas ?? ethers2.parseUnits("0.1", "gwei");
-    const verificationGasLimit = 500000n;
-    const callGasLimit = 800000n;
-    const preVerificationGas = 100000n;
-    const accountGasLimits = this._packUint128(verificationGasLimit, callGasLimit);
-    const gasFees = this._packUint128(maxPriorityFeePerGas, maxFeePerGas);
-    const requiredPrefund = (verificationGasLimit + callGasLimit + preVerificationGas) * maxFeePerGas;
-    const accountBalance = await this.provider.getBalance(sender);
-    if (accountBalance < requiredPrefund) {
-      const topUp = requiredPrefund - accountBalance;
-      const topUpWithBuffer = topUp * 120n / 100n;
-      const fundTx = await this._signer.sendTransaction({
-        to: sender,
-        value: topUpWithBuffer
-      });
-      await fundTx.wait();
-      this._refreshSigner();
-    }
-    const userOp = {
-      sender,
-      nonce,
-      initCode: "0x",
-      callData,
-      accountGasLimits,
-      preVerificationGas,
-      gasFees,
-      paymasterAndData: "0x",
-      signature: "0x"
-      // placeholder — replaced after signing
-    };
-    const userOpHash = await this.entryPoint.getUserOpHash(userOp);
-    const signature = await this._signer.signMessage(ethers2.getBytes(userOpHash));
-    userOp.signature = signature;
-    const tx = await this.entryPoint.handleOps([userOp], await this.getSignerAddress());
-    const receipt = await tx.wait();
-    this._refreshSigner();
-    const epIface = new ethers2.Interface(ENTRYPOINT_V07_ABI);
-    for (const log of receipt.logs) {
-      try {
-        const parsed = epIface.parseLog({ topics: log.topics, data: log.data });
-        if (parsed?.name === "UserOperationEvent" && !parsed.args.success) {
-          let revertMsg = "UserOp inner execution reverted";
-          for (const rLog of receipt.logs) {
-            try {
-              const rParsed = epIface.parseLog({ topics: rLog.topics, data: rLog.data });
-              if (rParsed?.name === "UserOperationRevertReason") {
-                const reason = rParsed.args.revertReason;
-                try {
-                  if (reason.length >= 10 && reason.slice(0, 10) === "0x08c379a0") {
-                    const decoded = ethers2.AbiCoder.defaultAbiCoder().decode(["string"], "0x" + reason.slice(10));
-                    revertMsg = `UserOp reverted: ${decoded[0]}`;
-                  } else {
-                    revertMsg = `UserOp reverted with data: ${reason}`;
-                  }
-                } catch {
-                  revertMsg = `UserOp reverted with data: ${reason}`;
-                }
-                break;
-              }
-            } catch {
-              continue;
-            }
-          }
-          throw new AgetherError(revertMsg, "USEROP_EXECUTION_FAILED");
-        }
-      } catch (e) {
-        if (e instanceof AgetherError) throw e;
-        continue;
-      }
-    }
-    return receipt;
-  }
-  /**
-   * Execute a single call via Safe7579 account (ERC-7579 single mode)
-   * through an ERC-4337 UserOperation.
-   */
-  async exec(target, data, value = 0n) {
-    const valueHex = ethers2.zeroPadValue(ethers2.toBeHex(value), 32);
-    const executionCalldata = ethers2.concat([target, valueHex, data]);
-    const safe7579Iface = new ethers2.Interface(SAFE7579_ACCOUNT_ABI);
-    const callData = safe7579Iface.encodeFunctionData("execute", [MODE_SINGLE2, executionCalldata]);
-    return this._submitUserOp(callData);
-  }
-  /**
-   * Execute multiple calls via Safe7579 account (ERC-7579 batch mode)
-   * through an ERC-4337 UserOperation.
-   */
-  async batch(targets, values, datas) {
-    const executions = targets.map((t, i) => [t, values[i], datas[i]]);
-    const executionCalldata = ethers2.AbiCoder.defaultAbiCoder().encode(
-      ["(address,uint256,bytes)[]"],
-      [executions]
-    );
-    const safe7579Iface = new ethers2.Interface(SAFE7579_ACCOUNT_ABI);
-    const callData = safe7579Iface.encodeFunctionData("execute", [MODE_BATCH, executionCalldata]);
-    return this._submitUserOp(callData);
-  }
   /** Convert MorphoMarketParams to Solidity tuple. */
   _toTuple(p) {
     return [p.loanToken, p.collateralToken, p.oracle, p.irm, p.lltv];
@@ -3111,7 +3171,7 @@ var _MorphoClient = class _MorphoClient {
     }
     const markets = await this.getMarkets();
     for (const m of markets) {
-      if (!m.collateralAsset || m.collateralAsset.address === ethers2.ZeroAddress) continue;
+      if (!m.collateralAsset || m.collateralAsset.address === ethers3.ZeroAddress) continue;
       try {
         const pos = await this.morphoBlue.position(m.uniqueKey, acctAddr);
         if (pos.collateral > 0n) {
@@ -3179,7 +3239,7 @@ var _MorphoClient = class _MorphoClient {
     }
     const markets = await this.getMarkets();
     for (const m of markets) {
-      if (!m.collateralAsset || m.collateralAsset.address === ethers2.ZeroAddress) continue;
+      if (!m.collateralAsset || m.collateralAsset.address === ethers3.ZeroAddress) continue;
       try {
         const pos = await this.morphoBlue.position(m.uniqueKey, acctAddr);
         if (BigInt(pos.supplyShares) > 0n) {
@@ -3358,6 +3418,316 @@ _MorphoClient._lstYieldCache = null;
 _MorphoClient.LST_CACHE_TTL = 30 * 60 * 1e3;
 var MorphoClient = _MorphoClient;
 
+// src/clients/AaveClient.ts
+import { ethers as ethers4, Contract as Contract4 } from "ethers";
+var POOL_ABI = [
+  "function getUserAccountData(address user) view returns (uint256 totalCollateralBase, uint256 totalDebtBase, uint256 availableBorrowsBase, uint256 currentLiquidationThreshold, uint256 currentLtv, uint256 healthFactor)",
+  "function getReserveData(address asset) view returns (tuple(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))",
+  "function getReservesList() view returns (address[])",
+  "function supply(address asset, uint256 amount, address onBehalfOf, uint16 referralCode)",
+  "function withdraw(address asset, uint256 amount, address to) returns (uint256)",
+  "function borrow(address asset, uint256 amount, uint256 interestRateMode, uint16 referralCode, address onBehalfOf)",
+  "function repay(address asset, uint256 amount, uint256 interestRateMode, address onBehalfOf) returns (uint256)",
+  "function setUserUseReserveAsCollateral(address asset, bool useAsCollateral)"
+];
+var ERC20_ABI2 = [
+  "function approve(address spender, uint256 amount) returns (bool)",
+  "function allowance(address owner, address spender) view returns (uint256)",
+  "function balanceOf(address account) view returns (uint256)",
+  "function decimals() view returns (uint8)",
+  "function symbol() view returns (string)"
+];
+var ORACLE_ABI = [
+  "function getAssetsPrices(address[] assets) view returns (uint256[])",
+  "function BASE_CURRENCY_UNIT() view returns (uint256)"
+];
+var POOL_DATA_PROVIDER_ABI = [
+  "function getReserveConfigurationData(address asset) view returns (uint256 decimals, uint256 ltv, uint256 liquidationThreshold, uint256 liquidationBonus, uint256 reserveFactor, bool usageAsCollateralEnabled, bool borrowingEnabled, bool stableBorrowRateEnabled, bool isActive, bool isFrozen)",
+  "function getUserReserveData(address asset, address user) view returns (uint256 currentATokenBalance, uint256 currentStableDebt, uint256 currentVariableDebt, uint256 principalStableDebt, uint256 scaledVariableDebt, uint256 stableBorrowRate, uint256 liquidityRate, uint40 stableRateLastUpdated, bool usageAsCollateralEnabled)",
+  "function getReserveTokensAddresses(address asset) view returns (address aTokenAddress, address stableDebtTokenAddress, address variableDebtTokenAddress)",
+  "function getAllReservesTokens() view returns (tuple(string symbol, address tokenAddress)[])"
+];
+var AAVE_ADDRESSES = {
+  [1 /* Ethereum */]: {
+    pool: "0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2",
+    oracle: "0x54586bE62E3c3580375aE3723C145253060Ca0C2",
+    dataProvider: "0x0a16f2FCC0D44FaE41cc54e079281D84A363bECD"
+  },
+  [8453 /* Base */]: {
+    pool: "0xA238Dd80C259a72e81d7e4664a9801593F98d1c5",
+    oracle: "0x2Cc0Fc26eD4563A5ce5e8bdcfe1A2878676Ae156",
+    dataProvider: "0x0F43731EB8d45A581f4a36DD74F5f358bc90C73A"
+  }
+};
+var KNOWN_RESERVES = {
+  [1 /* Ethereum */]: [
+    { symbol: "WETH", address: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2", decimals: 18 },
+    { symbol: "wstETH", address: "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0", decimals: 18 },
+    { symbol: "USDC", address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", decimals: 6 },
+    { symbol: "USDT", address: "0xdAC17F958D2ee523a2206206994597C13D831ec7", decimals: 6 },
+    { symbol: "DAI", address: "0x6B175474E89094C44Da98b954EedeAC495271d0F", decimals: 18 },
+    { symbol: "cbETH", address: "0xBe9895146f7AF43049ca1c1AE358B0541Ea49704", decimals: 18 },
+    { symbol: "rETH", address: "0xae78736Cd615f374D3085123A210448E74Fc6393", decimals: 18 },
+    { symbol: "weETH", address: "0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee", decimals: 18 }
+  ],
+  [8453 /* Base */]: [
+    { symbol: "WETH", address: "0x4200000000000000000000000000000000000006", decimals: 18 },
+    { symbol: "wstETH", address: "0xc1CBa3fCea344f92D9239c08C0568f6F2F0ee452", decimals: 18 },
+    { symbol: "cbETH", address: "0x2Ae3F1Ec7F1F5012CFEab0185bfc7aa3cf0DEc22", decimals: 18 },
+    { symbol: "USDC", address: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913", decimals: 6 },
+    { symbol: "USDbC", address: "0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA", decimals: 6 }
+  ]
+};
+var _AaveClient = class _AaveClient extends AgentAccountClient {
+  /**
+   * Create an AaveClient. Takes the same config as MorphoClient — the agent's
+   * Safe account is used for all Aave operations.
+   */
+  constructor(config) {
+    super(config);
+    // Cache
+    this._reserveCache = /* @__PURE__ */ new Map();
+    this._reserveCacheTs = 0;
+    const chainId = config.chainId ?? 1 /* Ethereum */;
+    const addrs = AAVE_ADDRESSES[chainId];
+    if (!addrs) {
+      throw new AgetherError(`Aave V3 not supported on chain ${chainId}`, "UNSUPPORTED_CHAIN");
+    }
+    this._aaveChainId = chainId;
+    this._pool = new Contract4(addrs.pool, POOL_ABI, this.provider);
+    this._oracle = new Contract4(addrs.oracle, ORACLE_ABI, this.provider);
+    this._dataProvider = new Contract4(addrs.dataProvider, POOL_DATA_PROVIDER_ABI, this.provider);
+    this._poolIface = new ethers4.Interface(POOL_ABI);
+    this._erc20Iface = new ethers4.Interface(ERC20_ABI2);
+  }
+  /** Get the Agent's Safe account address. */
+  async getAccountAddress() {
+    return super.getAccountAddress();
+  }
+  /** Get chainId. */
+  get aaveChainId() {
+    return this._aaveChainId;
+  }
+  // ─── Market Data (read-only, no Safe needed) ─────────────────────────
+  async getReserves(forceRefresh = false) {
+    if (!forceRefresh && this._reserveCache.size > 0 && Date.now() - this._reserveCacheTs < _AaveClient.CACHE_TTL) {
+      return Array.from(this._reserveCache.values());
+    }
+    const reserves = KNOWN_RESERVES[this._aaveChainId] ?? [];
+    if (reserves.length === 0) return [];
+    const addresses = reserves.map((r) => r.address);
+    const prices = await this._oracle.getAssetsPrices(addresses);
+    let baseCurrencyUnit;
+    try {
+      baseCurrencyUnit = await this._oracle.BASE_CURRENCY_UNIT();
+    } catch {
+      baseCurrencyUnit = 100000000n;
+    }
+    const results = [];
+    const reserveDataPromises = reserves.map(async (reserve, i) => {
+      try {
+        const [reserveData, configData] = await Promise.all([
+          this._pool.getReserveData(reserve.address),
+          this._dataProvider.getReserveConfigurationData(reserve.address)
+        ]);
+        const RAY = 10n ** 27n;
+        const liquidityRate = reserveData[2];
+        const borrowRate = reserveData[4];
+        const supplyApy = Number(liquidityRate) / Number(RAY) * 100;
+        const borrowApy = Number(borrowRate) / Number(RAY) * 100;
+        const priceUsd = Number(prices[i]) / Number(baseCurrencyUnit);
+        const ltv = Number(configData[1]) / 100;
+        const liqThreshold = Number(configData[2]) / 100;
+        const borrowingEnabled = configData[6];
+        const isActive = configData[8];
+        const info = {
+          symbol: reserve.symbol,
+          address: reserve.address,
+          decimals: reserve.decimals,
+          supplyApy,
+          borrowApy,
+          totalSupply: 0,
+          totalBorrow: 0,
+          ltv,
+          liquidationThreshold: liqThreshold,
+          borrowingEnabled,
+          isActive,
+          priceUsd
+        };
+        this._reserveCache.set(reserve.symbol, info);
+        return info;
+      } catch (err) {
+        console.warn(`[aave] Failed to fetch reserve ${reserve.symbol}:`, err instanceof Error ? err.message : err);
+        return null;
+      }
+    });
+    const settled = await Promise.all(reserveDataPromises);
+    for (const r of settled) {
+      if (r) results.push(r);
+    }
+    this._reserveCacheTs = Date.now();
+    return results;
+  }
+  // ─── Account Data (reads from Safe account) ──────────────────────────
+  async getAccountData() {
+    const safeAddr = await this.getAccountAddress();
+    const [totalCollateralBase, totalDebtBase, availableBorrowsBase, currentLtv, liqThreshold, healthFactor] = await this._pool.getUserAccountData(safeAddr);
+    let baseCurrencyUnit;
+    try {
+      baseCurrencyUnit = await this._oracle.BASE_CURRENCY_UNIT();
+    } catch {
+      baseCurrencyUnit = 100000000n;
+    }
+    const totalCollateralUsd = Number(totalCollateralBase) / Number(baseCurrencyUnit);
+    const totalDebtUsd = Number(totalDebtBase) / Number(baseCurrencyUnit);
+    const availableBorrowUsd = Number(availableBorrowsBase) / Number(baseCurrencyUnit);
+    const hf = Number(healthFactor) / 1e18;
+    const reserves = KNOWN_RESERVES[this._aaveChainId] ?? [];
+    const reserveInfos = await this.getReserves();
+    const positions = [];
+    const posPromises = reserves.map(async (reserve) => {
+      try {
+        const userData = await this._dataProvider.getUserReserveData(reserve.address, safeAddr);
+        const aTokenBal = userData[0];
+        const stableDebt = userData[1];
+        const variableDebt = userData[2];
+        const usedAsCollateral = userData[8];
+        const totalDebt = stableDebt + variableDebt;
+        if (aTokenBal === 0n && totalDebt === 0n) return null;
+        const reserveInfo = reserveInfos.find((r) => r.symbol === reserve.symbol);
+        const priceUsd = reserveInfo?.priceUsd ?? 0;
+        const divisor = 10 ** reserve.decimals;
+        return {
+          asset: reserve.symbol,
+          address: reserve.address,
+          supplied: Number(aTokenBal) / divisor,
+          suppliedUsd: Number(aTokenBal) / divisor * priceUsd,
+          borrowed: Number(totalDebt) / divisor,
+          borrowedUsd: Number(totalDebt) / divisor * priceUsd,
+          usedAsCollateral,
+          supplyApy: reserveInfo?.supplyApy ?? 0,
+          borrowApy: reserveInfo?.borrowApy ?? 0
+        };
+      } catch {
+        return null;
+      }
+    });
+    const settled = await Promise.all(posPromises);
+    for (const p of settled) {
+      if (p) positions.push(p);
+    }
+    return {
+      totalCollateralUsd,
+      totalDebtUsd,
+      availableBorrowUsd,
+      currentLtv: Number(currentLtv) / 100,
+      liquidationThreshold: Number(liqThreshold) / 100,
+      healthFactor: hf > 1e10 ? Infinity : hf,
+      positions
+    };
+  }
+  // ─── Write Operations (through Safe account) ─────────────────────────
+  /**
+   * Supply an asset to Aave V3 from the Agent's Safe account.
+   * Batch: approve + supply in one UserOp.
+   */
+  async supply(asset, amount) {
+    const reserve = this._resolveReserve(asset);
+    const amountWei = ethers4.parseUnits(amount, reserve.decimals);
+    const safeAddr = await this.getAccountAddress();
+    const poolAddr = await this._pool.getAddress();
+    const approveData = this._erc20Iface.encodeFunctionData("approve", [poolAddr, amountWei]);
+    const supplyData = this._poolIface.encodeFunctionData("supply", [reserve.address, amountWei, safeAddr, 0]);
+    return this.executeBatch(
+      [reserve.address, poolAddr],
+      [0n, 0n],
+      [approveData, supplyData]
+    );
+  }
+  /**
+   * Withdraw a supplied asset from Aave V3 to the Safe account.
+   */
+  async withdraw(asset, amount, to) {
+    const reserve = this._resolveReserve(asset);
+    const amountWei = amount === "all" ? ethers4.MaxUint256 : ethers4.parseUnits(amount, reserve.decimals);
+    const recipient = to ?? await this.getAccountAddress();
+    const poolAddr = await this._pool.getAddress();
+    const data = this._poolIface.encodeFunctionData("withdraw", [reserve.address, amountWei, recipient]);
+    return this.executeSingle(poolAddr, data);
+  }
+  /**
+   * Borrow an asset from Aave V3 (variable rate) to the Safe account.
+   */
+  async borrow(asset, amount) {
+    const reserve = this._resolveReserve(asset);
+    const amountWei = ethers4.parseUnits(amount, reserve.decimals);
+    const safeAddr = await this.getAccountAddress();
+    const poolAddr = await this._pool.getAddress();
+    const data = this._poolIface.encodeFunctionData("borrow", [reserve.address, amountWei, 2, 0, safeAddr]);
+    return this.executeSingle(poolAddr, data);
+  }
+  /**
+   * Repay borrowed asset on Aave V3 from the Safe account.
+   * Batch: approve + repay in one UserOp.
+   */
+  async repay(asset, amount) {
+    const reserve = this._resolveReserve(asset);
+    const amountWei = amount === "all" ? ethers4.MaxUint256 : ethers4.parseUnits(amount, reserve.decimals);
+    const safeAddr = await this.getAccountAddress();
+    const poolAddr = await this._pool.getAddress();
+    const approveAmount = amount === "all" ? ethers4.MaxUint256 : amountWei;
+    const approveData = this._erc20Iface.encodeFunctionData("approve", [poolAddr, approveAmount]);
+    const repayData = this._poolIface.encodeFunctionData("repay", [reserve.address, amountWei, 2, safeAddr]);
+    return this.executeBatch(
+      [reserve.address, poolAddr],
+      [0n, 0n],
+      [approveData, repayData]
+    );
+  }
+  /**
+   * Enable or disable a supplied asset as collateral.
+   */
+  async setCollateral(asset, useAsCollateral) {
+    const reserve = this._resolveReserve(asset);
+    const poolAddr = await this._pool.getAddress();
+    const data = this._poolIface.encodeFunctionData("setUserUseReserveAsCollateral", [reserve.address, useAsCollateral]);
+    return this.executeSingle(poolAddr, data);
+  }
+  /**
+   * Supply an asset and borrow in one atomic batch operation.
+   */
+  async supplyAndBorrow(supplyAsset, supplyAmount, borrowAsset, borrowAmount) {
+    const supplyReserve = this._resolveReserve(supplyAsset);
+    const borrowReserve = this._resolveReserve(borrowAsset);
+    const supplyWei = ethers4.parseUnits(supplyAmount, supplyReserve.decimals);
+    const borrowWei = ethers4.parseUnits(borrowAmount, borrowReserve.decimals);
+    const safeAddr = await this.getAccountAddress();
+    const poolAddr = await this._pool.getAddress();
+    const approveData = this._erc20Iface.encodeFunctionData("approve", [poolAddr, supplyWei]);
+    const supplyData = this._poolIface.encodeFunctionData("supply", [supplyReserve.address, supplyWei, safeAddr, 0]);
+    const borrowData = this._poolIface.encodeFunctionData("borrow", [borrowReserve.address, borrowWei, 2, 0, safeAddr]);
+    return this.executeBatch(
+      [supplyReserve.address, poolAddr, poolAddr],
+      [0n, 0n, 0n],
+      [approveData, supplyData, borrowData]
+    );
+  }
+  // ─── Helpers ──────────────────────────────────────────────────────────
+  _resolveReserve(symbolOrAddress) {
+    const reserves = KNOWN_RESERVES[this._aaveChainId] ?? [];
+    const bySymbol = reserves.find((r) => r.symbol.toLowerCase() === symbolOrAddress.toLowerCase());
+    if (bySymbol) return bySymbol;
+    const byAddr = reserves.find((r) => r.address.toLowerCase() === symbolOrAddress.toLowerCase());
+    if (byAddr) return byAddr;
+    throw new AgetherError(
+      `Unknown Aave reserve: ${symbolOrAddress}. Known: ${reserves.map((r) => r.symbol).join(", ")}`,
+      "UNKNOWN_RESERVE"
+    );
+  }
+};
+_AaveClient.CACHE_TTL = 6e4;
+var AaveClient = _AaveClient;
+
 // src/clients/ScoringClient.ts
 import axios3 from "axios";
 
@@ -3823,7 +4193,7 @@ var ScoringClient = class {
 };
 
 // src/clients/AgentIdentityClient.ts
-import { ethers as ethers3 } from "ethers";
+import { ethers as ethers5 } from "ethers";
 var ERC8004_IDENTITY_ABI = [
   // Registration
   "function register() returns (uint256)",
@@ -3865,8 +4235,8 @@ var AgentIdentityClient = class {
     this.signer = options.signer;
     const identityAddr = options.config.contracts?.identityRegistry || ERC8004_SEPOLIA.identityRegistry;
     const reputationAddr = options.config.contracts?.reputationRegistry || ERC8004_SEPOLIA.reputationRegistry;
-    this.identityRegistry = new ethers3.Contract(identityAddr, ERC8004_IDENTITY_ABI, this.signer);
-    this.reputationRegistry = new ethers3.Contract(reputationAddr, ERC8004_REPUTATION_ABI, this.signer);
+    this.identityRegistry = new ethers5.Contract(identityAddr, ERC8004_IDENTITY_ABI, this.signer);
+    this.reputationRegistry = new ethers5.Contract(reputationAddr, ERC8004_REPUTATION_ABI, this.signer);
   }
   // ============ Identity Functions ============
   /**
@@ -3934,7 +4304,7 @@ var AgentIdentityClient = class {
   async registerWithMetadata(agentURI, metadata) {
     const metadataEntries = metadata.map((m) => ({
       key: m.key,
-      value: ethers3.toUtf8Bytes(m.value)
+      value: ethers5.toUtf8Bytes(m.value)
     }));
     const tx = await this.identityRegistry["register(string,tuple(string,bytes)[])"](
       agentURI,
@@ -3971,7 +4341,7 @@ var AgentIdentityClient = class {
     const tx = await this.identityRegistry.setMetadata(
       agentId,
       key,
-      ethers3.toUtf8Bytes(value)
+      ethers5.toUtf8Bytes(value)
     );
     const receipt = await tx.wait();
     return receipt.hash;
@@ -3981,7 +4351,7 @@ var AgentIdentityClient = class {
    */
   async getMetadata(agentId, key) {
     const value = await this.identityRegistry.getMetadata(agentId, key);
-    return ethers3.toUtf8String(value);
+    return ethers5.toUtf8String(value);
   }
   /**
    * Transfer agent to new owner
@@ -4016,8 +4386,8 @@ var AgentIdentityClient = class {
    * Give feedback to an agent
    */
   async giveFeedback(input) {
-    const feedbackHash = ethers3.keccak256(
-      ethers3.AbiCoder.defaultAbiCoder().encode(
+    const feedbackHash = ethers5.keccak256(
+      ethers5.AbiCoder.defaultAbiCoder().encode(
         ["uint256", "int128", "uint256"],
         [input.agentId, input.value, Date.now()]
       )
@@ -4210,6 +4580,8 @@ export {
   AGETHER_8004_SCORER_ABI,
   AGETHER_8004_VALIDATION_MODULE_ABI,
   AGETHER_HOOK_MULTIPLEXER_ABI,
+  AaveClient,
+  AgentAccountClient,
   AgentIdentityClient,
   AgentNotApprovedError,
   AgetherClient,