@owney/sdk 0.7.25-beta.13 → 0.7.25-beta.14

package/dist/index.cjs

@@ -34,6 +34,7 @@ module.exports = __toCommonJS(index_exports);
 
 // src/lib/funding-evidence.ts
 var import_viem = require("viem");
+var import_account_abstraction = require("viem/account-abstraction");
 function notifyFunding(callback, evidence) {
   try {
     void Promise.resolve(callback?.({ ...evidence })).catch(() => {
@@ -43,11 +44,53 @@ function notifyFunding(callback, evidence) {
 }
 var fullWithdrawalAbi = (0, import_viem.parseAbi)(["function withdrawAllAssetToUser(address recipient, address asset)"]);
 var withdrawalEventAbi = (0, import_viem.parseAbi)(["event WithdrewTokenToUser(address indexed owner, address indexed recipient, address indexed token, uint256 amount)"]);
-function isFullYieldseekerWithdrawal(transaction, evidence, tokenAddress) {
-  if (evidence.agentId !== "yieldseeker" || transaction.chainId !== evidence.chainId || transaction.hash.toLowerCase() !== evidence.txHash?.toLowerCase() || transaction.to?.toLowerCase() !== evidence.agentWallet?.toLowerCase() || transaction.from.toLowerCase() !== evidence.walletAddress.toLowerCase()) return false;
+var accountExecutionAbi = (0, import_viem.parseAbi)([
+  "function execute(address target,uint256 value,bytes data)",
+  "function executeBatch((address target,uint256 value,bytes data)[] calls)"
+]);
+var entryPoint06 = "0x5ff137d4b0fdcd49dca30c7cf57e578a026d2789";
+var entryPoint07 = "0x0000000071727de22e5e9d8baf0edac6f37da032";
+function isFullYieldseekerWithdrawal(transaction, evidence, tokenAddress, receipt) {
+  if (evidence.agentId !== "yieldseeker" || transaction.chainId !== evidence.chainId || transaction.hash.toLowerCase() !== evidence.txHash?.toLowerCase() || !evidence.agentWallet) return false;
+  const matchesFullCall = (data) => {
+    try {
+      const decoded = (0, import_viem.decodeFunctionData)({ abi: fullWithdrawalAbi, data });
+      return decoded.args[0].toLowerCase() === evidence.walletAddress.toLowerCase() && decoded.args[1].toLowerCase() === tokenAddress.toLowerCase();
+    } catch {
+      return false;
+    }
+  };
+  if (transaction.to?.toLowerCase() === evidence.agentWallet.toLowerCase() && transaction.from.toLowerCase() === evidence.walletAddress.toLowerCase()) return matchesFullCall(transaction.input);
   try {
-    const decoded = (0, import_viem.decodeFunctionData)({ abi: fullWithdrawalAbi, data: transaction.input });
-    return decoded.args[0].toLowerCase() === evidence.walletAddress.toLowerCase() && decoded.args[1].toLowerCase() === tokenAddress.toLowerCase();
+    const address = transaction.to?.toLowerCase();
+    if (address !== entryPoint06 && address !== entryPoint07) return false;
+    const version = address === entryPoint06 ? "0.6" : "0.7";
+    const decoded = (0, import_viem.decodeFunctionData)({ abi: version === "0.6" ? import_account_abstraction.entryPoint06Abi : import_account_abstraction.entryPoint07Abi, data: transaction.input });
+    if (decoded.functionName !== "handleOps") return false;
+    const operations = decoded.args[0].filter((operation2) => [evidence.agentWallet.toLowerCase(), evidence.walletAddress.toLowerCase()].includes(operation2.sender.toLowerCase()));
+    if (operations.length !== 1) return false;
+    const operation = operations[0];
+    const userOperation = (0, import_account_abstraction.toUserOperation)(operation);
+    const hash = (0, import_account_abstraction.getUserOperationHash)({
+      chainId: evidence.chainId,
+      entryPointAddress: transaction.to,
+      entryPointVersion: version,
+      userOperation
+    });
+    if (evidence.userOpHash && hash.toLowerCase() !== evidence.userOpHash.toLowerCase()) return false;
+    if (!receipt?.logs.some((log) => {
+      if (log.address.toLowerCase() !== address) return false;
+      try {
+        const event = (0, import_viem.decodeEventLog)({ abi: import_account_abstraction.entryPoint06Abi, data: log.data, topics: log.topics });
+        return event.eventName === "UserOperationEvent" && event.args.userOpHash.toLowerCase() === hash.toLowerCase() && event.args.sender.toLowerCase() === operation.sender.toLowerCase() && event.args.success;
+      } catch {
+        return false;
+      }
+    })) return false;
+    if (operation.sender.toLowerCase() === evidence.agentWallet.toLowerCase()) return matchesFullCall(operation.callData);
+    const execution = (0, import_viem.decodeFunctionData)({ abi: accountExecutionAbi, data: operation.callData });
+    const calls = execution.functionName === "execute" ? [{ target: execution.args[0], value: execution.args[1], data: execution.args[2] }] : execution.args[0];
+    return calls.length === 1 && calls[0].value === 0n && calls[0].target.toLowerCase() === evidence.agentWallet.toLowerCase() && matchesFullCall(calls[0].data);
   } catch {
     return false;
   }
@@ -3550,6 +3593,49 @@ function actionEntry(action) {
     rebalanceLog: []
   };
 }
+function allocationEntry(action, context) {
+  if (action.actionType.toLowerCase() !== "autoseek") return void 0;
+  const hash = action.details?.depositTransactionHash;
+  const deposits = action.details?.deposits;
+  if (typeof hash !== "string" || !/^0x[a-fA-F0-9]{64}$/.test(hash) || !Array.isArray(deposits) || deposits.length === 0) return void 0;
+  const positions = [];
+  let amountRaw = 0n;
+  for (const deposit of deposits) {
+    if (!deposit || typeof deposit !== "object") return void 0;
+    const leg = deposit;
+    const symbol = typeof leg.assetSymbol === "string" ? leg.assetSymbol.toUpperCase() : "";
+    if (symbol !== context.asset && !(context.asset === "WETH" && symbol === "ETH")) return void 0;
+    if (typeof leg.vaultAddress !== "string" || !(0, import_viem7.isAddress)(leg.vaultAddress)) return void 0;
+    const rawAmount = typeof leg.rawAmount === "string" && /^\d+$/.test(leg.rawAmount) ? BigInt(leg.rawAmount) : typeof leg.rawAmount === "number" && Number.isSafeInteger(leg.rawAmount) ? BigInt(leg.rawAmount) : void 0;
+    if (rawAmount === void 0 || rawAmount <= 0n) return void 0;
+    const option = context.positions.find((position2) => position2.yieldOption.address.toLowerCase() === leg.vaultAddress.toLowerCase())?.yieldOption;
+    positions.push({
+      protocol: typeof leg.vaultProvider === "string" && leg.vaultProvider ? leg.vaultProvider : option?.provider || "Vault",
+      pool: typeof leg.vaultName === "string" && leg.vaultName ? leg.vaultName : option?.name,
+      tokenSymbol: context.asset,
+      amount: (0, import_viem7.formatUnits)(rawAmount, YIELDSEEKER_ASSET_METADATA[context.asset].decimals)
+    });
+    amountRaw += rawAmount;
+  }
+  return {
+    agent: "yieldseeker",
+    action: "Deposit",
+    date: action.createdDate,
+    oldApy: null,
+    newApy: null,
+    positions,
+    rebalanceLog: [],
+    transactions: [{
+      txHashes: [hash],
+      chainId: context.agent.chainId,
+      tokenAddress: context.agent.assetAddress,
+      tokenSymbol: context.asset,
+      agentWallet: context.wallet.walletAddress,
+      amountRaw: String(amountRaw),
+      amount: (0, import_viem7.formatUnits)(amountRaw, YIELDSEEKER_ASSET_METADATA[context.asset].decimals)
+    }]
+  };
+}
 function depositDestination(context, movement) {
   const to = movement.toAddress.toLowerCase();
   const option = context.positions.find(({ yieldOption }) => yieldOption.chainId === movement.chainId && yieldOption.assetAddress.toLowerCase() === context.agent.assetAddress.toLowerCase() && yieldOption.address.toLowerCase() === to)?.yieldOption;
@@ -3617,20 +3703,30 @@ function mapYieldseekerHistory(contexts, options) {
       seenMovements.add(key2);
       return true;
     });
-    return [
-      ...movements.map(
-        (movement) => movementEntry(
-          movement,
-          context.wallet,
-          context.agent,
-          context.asset,
-          options.ownerAddress,
-          options.vaultAddresses,
-          depositDestination(context, movement)
-        )
-      ),
-      ...(context.actions ?? []).map(actionEntry)
-    ].filter((entry) => entry !== void 0);
+    const movementEntries = movements.map(
+      (movement) => movementEntry(
+        movement,
+        context.wallet,
+        context.agent,
+        context.asset,
+        options.ownerAddress,
+        options.vaultAddresses,
+        depositDestination(context, movement)
+      )
+    ).filter((entry) => entry !== void 0);
+    const deposits = new Set(movementEntries.filter((entry) => entry.action === "Deposit").map((entry) => entry.transactions[0]?.txHashes[0]?.toLowerCase()));
+    const actions = (context.actions ?? []).flatMap((action) => {
+      const allocation = allocationEntry(action, context);
+      if (allocation) {
+        const hash = allocation.transactions[0].txHashes[0].toLowerCase();
+        if (deposits.has(hash)) return [];
+        deposits.add(hash);
+        return [allocation];
+      }
+      const entry = actionEntry(action);
+      return entry ? [entry] : [];
+    });
+    return [...movementEntries, ...actions];
   });
   const grouped = /* @__PURE__ */ new Map();
   const ungrouped = [];
@@ -3801,7 +3897,7 @@ var YIELDSEEKER_UPGRADE_ABI = walletAbi;
 
 // src/agents/yieldseeker/yieldseeker.sponsored-withdraw.ts
 var import_viem9 = require("viem");
-var import_account_abstraction = require("viem/account-abstraction");
+var import_account_abstraction2 = require("viem/account-abstraction");
 var import_accounts = require("viem/accounts");
 var import_chains3 = require("viem/chains");
 var ENTRY_POINT_V06 = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789";
@@ -3815,7 +3911,7 @@ var ENTRY_POINT_NONCE_ABI = [
 var DEFAULT_ROUTING_API = "https://owney-routing-api-243946518160.europe-west4.run.app";
 var SIMULATION_ACCOUNT = (0, import_accounts.privateKeyToAccount)((0, import_accounts.generatePrivateKey)());
 function operationHash(operation) {
-  return (0, import_account_abstraction.getUserOperationHash)({
+  return (0, import_account_abstraction2.getUserOperationHash)({
     chainId: 8453,
     entryPointAddress: ENTRY_POINT_V06,
     entryPointVersion: "0.6",
@@ -4143,6 +4239,7 @@ var YIELDSEEKER_SETTLEMENT_ACTIVITY_CACHE_MS = 15e3;
 var YIELDSEEKER_READ_FAILURE_COOLDOWN_MS = 6e4;
 var YIELDSEEKER_SETTLEMENT_WINDOW_MS = 5 * 6e4;
 var YIELDSEEKER_ACTIVITY_CACHE_MS = 6e4;
+var YIELDSEEKER_MAX_WITHDRAW_SWEEPS = 3;
 function generateYieldseekerUsername() {
   const suffix = globalThis.crypto.randomUUID().replaceAll("-", "").slice(0, YIELDSEEKER_USERNAME_RANDOM_LENGTH).toLowerCase();
   return `${YIELDSEEKER_USERNAME_PREFIX}${suffix}`;
@@ -4583,6 +4680,7 @@ var YieldseekerAgent = class {
     let confirmedMovement = false;
     let settlement = null;
     try {
+      if (amount === void 0) this.advancePortfolioVersion(this.contextKey(state, chainId, asset));
       const portfolio = await this.loadPortfolioContext(
         state,
         chainId,
@@ -4600,7 +4698,35 @@ var YieldseekerAgent = class {
         return balance;
       };
       const idle = await readIdle();
-      const deployed = portfolio.positions.reduce(
+      let positions = portfolio.positions;
+      let positionsStatus = "empty";
+      const validatePositions = (values) => {
+        const seen = /* @__PURE__ */ new Set();
+        for (const value of values) {
+          const address = value?.yieldOption?.address;
+          if (typeof address !== "string" || !(0, import_viem10.isAddress)(address) || seen.has(address.toLowerCase()) || typeof value.assetsRaw !== "string" || !/^\d+$/.test(value.assetsRaw) || typeof value.withdrawableAssetsRaw !== "string" || !/^\d+$/.test(value.withdrawableAssetsRaw))
+            throw this.invalidResponse("yield positions");
+          seen.add(address.toLowerCase());
+        }
+        return values;
+      };
+      const hasPositions = (values) => values.some((position2) => BigInt(position2.assetsRaw) > 0n || BigInt(position2.withdrawableAssetsRaw) > 0n);
+      const refreshPositions = async () => {
+        this.assertSession(generation, chainId, asset);
+        const response = await this.walletRequest(
+          state,
+          chainId,
+          this.agentPath(context, "yield-positions")
+        );
+        this.assertSession(generation, chainId, asset);
+        if (!Array.isArray(response?.yieldPositions)) throw this.invalidResponse("yield positions");
+        return validatePositions(response.yieldPositions);
+      };
+      if (amount === void 0) {
+        validatePositions(positions);
+        positionsStatus = hasPositions(positions) ? "remaining" : "empty";
+      }
+      const deployed = positions.reduce(
         (total, position2) => total + BigInt(position2.withdrawableAssetsRaw),
         0n
       );
@@ -4608,6 +4734,13 @@ var YieldseekerAgent = class {
       const requested = amount === void 0 ? totalAvailable : BigInt(amount);
       if (requested === 0n) {
         this.invalidateFundingRead(state, chainId, asset);
+        if (amount === void 0 && positionsStatus === "remaining")
+          throw new OwneyError(
+            "WITHDRAW_FAILED",
+            "Yieldseeker vault funds are not currently withdrawable.",
+            { asset, remainingPositions: positions.map((position2) => position2.yieldOption.address) },
+            this.id
+          );
         throw new OwneyError(
           "WITHDRAW_INSUFFICIENT_BALANCE",
           "No Yieldseeker funds are available to withdraw.",
@@ -4629,33 +4762,55 @@ var YieldseekerAgent = class {
       }
       let remaining = requested > idle ? requested - idle : 0n;
       let grossUnwound = 0n;
-      for (const position2 of portfolio.positions) {
-        if (remaining === 0n) break;
-        const available = BigInt(position2.withdrawableAssetsRaw);
-        if (available <= 0n) continue;
-        const assetsRaw = available < remaining ? available : remaining;
+      const unwind = async (position2, assetsRaw) => {
+        this.assertSession(generation, chainId, asset);
         const response = await this.walletRequest(
           state,
           chainId,
           this.agentPath(context, "withdraw-from-position"),
           {
             method: "POST",
-            body: {
-              chainId,
-              vaultAddress: position2.yieldOption.address,
-              assetsRaw: assetsRaw.toString()
-            }
+            body: { chainId, vaultAddress: position2.yieldOption.address, assetsRaw: assetsRaw.toString() }
           }
         );
-        if (!this.isTransactionHash(response?.transactionHash)) {
-          throw this.invalidResponse("position withdrawal");
-        }
+        if (!this.isTransactionHash(response?.transactionHash)) throw this.invalidResponse("position withdrawal");
         await this.waitForReceipt(state, chainId, response.transactionHash);
         confirmedMovement = true;
+        this.assertSession(generation, chainId, asset);
         grossUnwound += assetsRaw;
-        remaining -= assetsRaw;
+      };
+      if (amount === void 0) {
+        for (let sweep = 0; sweep < YIELDSEEKER_MAX_WITHDRAW_SWEEPS && hasPositions(positions); sweep++) {
+          const before = new Map(positions.map((position2) => [position2.yieldOption.address.toLowerCase(), BigInt(position2.assetsRaw)]));
+          let unwound = false;
+          for (const position2 of positions) {
+            const available = BigInt(position2.withdrawableAssetsRaw);
+            if (available <= 0n) continue;
+            await unwind(position2, available);
+            unwound = true;
+          }
+          if (!unwound) break;
+          try {
+            positions = await refreshPositions();
+            positionsStatus = hasPositions(positions) ? "remaining" : "empty";
+          } catch {
+            this.assertSession(generation, chainId, asset);
+            positionsStatus = "unavailable";
+            break;
+          }
+          if (positions.some((position2) => BigInt(position2.assetsRaw) > 0n && before.has(position2.yieldOption.address.toLowerCase()) && BigInt(position2.assetsRaw) >= before.get(position2.yieldOption.address.toLowerCase()))) break;
+        }
+      } else {
+        for (const position2 of positions) {
+          if (remaining === 0n) break;
+          const available = BigInt(position2.withdrawableAssetsRaw);
+          if (available <= 0n) continue;
+          const assetsRaw = available < remaining ? available : remaining;
+          await unwind(position2, assetsRaw);
+          remaining -= assetsRaw;
+        }
       }
-      if (remaining > 0n) {
+      if (amount !== void 0 && remaining > 0n) {
         throw this.invalidResponse("yield positions", {
           reason: "Withdrawable positions could not cover the request.",
           remaining: remaining.toString()
@@ -4667,6 +4822,13 @@ var YieldseekerAgent = class {
       const shortfall = availableForOwner < requested ? requested - availableForOwner : 0n;
       if (availableForOwner === 0n || amount !== void 0 && shortfall > maxFee) {
         this.invalidateFundingRead(state, chainId, asset);
+        if (amount === void 0 && positionsStatus !== "empty")
+          throw new OwneyError(
+            "WITHDRAW_FAILED",
+            "Yieldseeker vault funds could not be cleared for the owner transfer.",
+            { asset, positionsStatus },
+            this.id
+          );
         throw new OwneyError(
           "WITHDRAW_INSUFFICIENT_BALANCE",
           "Yieldseeker funds are not available for the owner transfer.",
@@ -4721,6 +4883,33 @@ var YieldseekerAgent = class {
       settlement = plannedMovement;
       const evidence = receipt ? inspectFundingReceipt(receipt, { ...base6, txHash }, metadata.address, "withdraw") : { ...base6, txHash, confirmedAmount: payout.toString(), transfer: "confirmed", delivery: "confirmed" };
       notifyFunding(onProgress, evidence);
+      if (amount === void 0) {
+        try {
+          positions = await refreshPositions();
+          positionsStatus = hasPositions(positions) ? "remaining" : "empty";
+        } catch {
+          positionsStatus = "unavailable";
+        }
+        if (positionsStatus !== "empty") {
+          const result = { txHash, type: "partial", amount: evidence.confirmedAmount ?? payout.toString(), evidence };
+          throw new OwneyError(
+            "WITHDRAW_PARTIAL_FAILURE",
+            "Yieldseeker MAX could not confirm that all vault positions were cleared.",
+            {
+              reason: "YIELDSEEKER_MAX_INCOMPLETE",
+              asset,
+              positionsStatus,
+              remainingPositions: positionsStatus === "remaining" ? positions.map((position2) => ({
+                vaultAddress: position2.yieldOption.address,
+                sharesRaw: position2.assetsRaw,
+                withdrawableAmountRaw: position2.withdrawableAssetsRaw
+              })) : void 0,
+              partialResults: { [this.id]: result }
+            },
+            this.id
+          );
+        }
+      }
       if (evidence.transfer === "failed" && evidence.confirmedAmount === "0")
         throw new OwneyError(
           "WITHDRAW_INSUFFICIENT_BALANCE",
@@ -7391,7 +7580,7 @@ var OwneySDK = class {
     if (direction === "withdraw" && evidence.agentId === "yieldseeker" && verified.transfer === "unknown" && verified.confirmedAmount && BigInt(verified.confirmedAmount) > 0n) {
       const transaction = await rpc2.getTransaction({ hash: evidence.txHash });
       assertCurrent();
-      if (isFullYieldseekerWithdrawal(transaction, { ...evidence, agentWallet }, token.address))
+      if (isFullYieldseekerWithdrawal(transaction, { ...evidence, agentWallet }, token.address, receipt))
         verified = inspectFundingReceipt(receipt, { ...evidence, agentWallet, intendedAmount: "MAX" }, token.address, direction);
     }
     const key2 = `${state.walletAddress.toLowerCase()}:${chainId}:${evidence.agentId}:${evidence.token}:${evidence.txHash}`;
@@ -7595,6 +7784,7 @@ var OwneySDK = class {
     if (!amount) {
       const results2 = {};
       const agentErrors2 = {};
+      const incompleteWithdrawals = {};
       for (const agent of withdrawalAgents) {
         try {
           results2[agent.id] = await submit(agent);
@@ -7603,6 +7793,14 @@ var OwneySDK = class {
           if (err instanceof OwneyError && err.code === "SPONSOR_REQUEST_FAILED" && err.details?.safeToFallback === true) throw err;
           if (this.isUserRejectedWithdrawal(err)) throw err;
           if (err instanceof OwneyError && err.code === "WITHDRAW_INSUFFICIENT_BALANCE" && err.details?.available === "0" && submissionEvidence.get(agent.id)?.transfer === "failed") continue;
+          if (agent.id === "yieldseeker" && err instanceof OwneyError && err.code === "WITHDRAW_PARTIAL_FAILURE" && err.details?.reason === "YIELDSEEKER_MAX_INCOMPLETE") {
+            incompleteWithdrawals[agent.id] = { positionsStatus: err.details.positionsStatus };
+            const evidence = submissionEvidence.get(agent.id);
+            if (evidence?.agentId === agent.id && evidence.chainId === chainId && evidence.token === token && evidence.walletAddress.toLowerCase() === state.walletAddress.toLowerCase() && evidence.intendedAmount === "MAX" && evidence.transfer === "confirmed" && evidence.delivery === "confirmed" && evidence.txHash && /^0x[\da-f]{64}$/i.test(evidence.txHash) && evidence.confirmedAmount && /^\d+$/.test(evidence.confirmedAmount) && BigInt(evidence.confirmedAmount) > 0n) {
+              results2[agent.id] = { txHash: evidence.txHash, type: "partial", amount: evidence.confirmedAmount, evidence };
+              notifyAgentResult(agent.id, results2[agent.id]);
+            }
+          }
           console.error(`withdraw failed for agent "${agent.id}":`, err);
           agentErrors2[agent.id] = err instanceof Error ? err.message : String(err);
           const code = err instanceof OwneyError ? err.code : "SDK_AGENT_FAILURE";
@@ -7625,7 +7823,7 @@ var OwneySDK = class {
         throw new OwneyError(
           "WITHDRAW_PARTIAL_FAILURE",
           "Some agents could not complete the withdrawal.",
-          { asset, partialResults: results2, agentErrors: agentErrors2 }
+          { asset, partialResults: results2, agentErrors: agentErrors2, ...Object.keys(incompleteWithdrawals).length ? { incompleteWithdrawals } : {} }
         );
       }
       const amountsKnown = Object.values(results2).every(

package/dist/index.js

@@ -1,5 +1,6 @@
 // src/lib/funding-evidence.ts
 import { decodeEventLog, decodeFunctionData, erc20Abi, parseAbi } from "viem";
+import { entryPoint06Abi, entryPoint07Abi, getUserOperationHash, toUserOperation } from "viem/account-abstraction";
 function notifyFunding(callback, evidence) {
   try {
     void Promise.resolve(callback?.({ ...evidence })).catch(() => {
@@ -9,11 +10,53 @@ function notifyFunding(callback, evidence) {
 }
 var fullWithdrawalAbi = parseAbi(["function withdrawAllAssetToUser(address recipient, address asset)"]);
 var withdrawalEventAbi = parseAbi(["event WithdrewTokenToUser(address indexed owner, address indexed recipient, address indexed token, uint256 amount)"]);
-function isFullYieldseekerWithdrawal(transaction, evidence, tokenAddress) {
-  if (evidence.agentId !== "yieldseeker" || transaction.chainId !== evidence.chainId || transaction.hash.toLowerCase() !== evidence.txHash?.toLowerCase() || transaction.to?.toLowerCase() !== evidence.agentWallet?.toLowerCase() || transaction.from.toLowerCase() !== evidence.walletAddress.toLowerCase()) return false;
+var accountExecutionAbi = parseAbi([
+  "function execute(address target,uint256 value,bytes data)",
+  "function executeBatch((address target,uint256 value,bytes data)[] calls)"
+]);
+var entryPoint06 = "0x5ff137d4b0fdcd49dca30c7cf57e578a026d2789";
+var entryPoint07 = "0x0000000071727de22e5e9d8baf0edac6f37da032";
+function isFullYieldseekerWithdrawal(transaction, evidence, tokenAddress, receipt) {
+  if (evidence.agentId !== "yieldseeker" || transaction.chainId !== evidence.chainId || transaction.hash.toLowerCase() !== evidence.txHash?.toLowerCase() || !evidence.agentWallet) return false;
+  const matchesFullCall = (data) => {
+    try {
+      const decoded = decodeFunctionData({ abi: fullWithdrawalAbi, data });
+      return decoded.args[0].toLowerCase() === evidence.walletAddress.toLowerCase() && decoded.args[1].toLowerCase() === tokenAddress.toLowerCase();
+    } catch {
+      return false;
+    }
+  };
+  if (transaction.to?.toLowerCase() === evidence.agentWallet.toLowerCase() && transaction.from.toLowerCase() === evidence.walletAddress.toLowerCase()) return matchesFullCall(transaction.input);
   try {
-    const decoded = decodeFunctionData({ abi: fullWithdrawalAbi, data: transaction.input });
-    return decoded.args[0].toLowerCase() === evidence.walletAddress.toLowerCase() && decoded.args[1].toLowerCase() === tokenAddress.toLowerCase();
+    const address = transaction.to?.toLowerCase();
+    if (address !== entryPoint06 && address !== entryPoint07) return false;
+    const version = address === entryPoint06 ? "0.6" : "0.7";
+    const decoded = decodeFunctionData({ abi: version === "0.6" ? entryPoint06Abi : entryPoint07Abi, data: transaction.input });
+    if (decoded.functionName !== "handleOps") return false;
+    const operations = decoded.args[0].filter((operation2) => [evidence.agentWallet.toLowerCase(), evidence.walletAddress.toLowerCase()].includes(operation2.sender.toLowerCase()));
+    if (operations.length !== 1) return false;
+    const operation = operations[0];
+    const userOperation = toUserOperation(operation);
+    const hash = getUserOperationHash({
+      chainId: evidence.chainId,
+      entryPointAddress: transaction.to,
+      entryPointVersion: version,
+      userOperation
+    });
+    if (evidence.userOpHash && hash.toLowerCase() !== evidence.userOpHash.toLowerCase()) return false;
+    if (!receipt?.logs.some((log) => {
+      if (log.address.toLowerCase() !== address) return false;
+      try {
+        const event = decodeEventLog({ abi: entryPoint06Abi, data: log.data, topics: log.topics });
+        return event.eventName === "UserOperationEvent" && event.args.userOpHash.toLowerCase() === hash.toLowerCase() && event.args.sender.toLowerCase() === operation.sender.toLowerCase() && event.args.success;
+      } catch {
+        return false;
+      }
+    })) return false;
+    if (operation.sender.toLowerCase() === evidence.agentWallet.toLowerCase()) return matchesFullCall(operation.callData);
+    const execution = decodeFunctionData({ abi: accountExecutionAbi, data: operation.callData });
+    const calls = execution.functionName === "execute" ? [{ target: execution.args[0], value: execution.args[1], data: execution.args[2] }] : execution.args[0];
+    return calls.length === 1 && calls[0].value === 0n && calls[0].target.toLowerCase() === evidence.agentWallet.toLowerCase() && matchesFullCall(calls[0].data);
   } catch {
     return false;
   }
@@ -3532,6 +3575,49 @@ function actionEntry(action) {
     rebalanceLog: []
   };
 }
+function allocationEntry(action, context) {
+  if (action.actionType.toLowerCase() !== "autoseek") return void 0;
+  const hash = action.details?.depositTransactionHash;
+  const deposits = action.details?.deposits;
+  if (typeof hash !== "string" || !/^0x[a-fA-F0-9]{64}$/.test(hash) || !Array.isArray(deposits) || deposits.length === 0) return void 0;
+  const positions = [];
+  let amountRaw = 0n;
+  for (const deposit of deposits) {
+    if (!deposit || typeof deposit !== "object") return void 0;
+    const leg = deposit;
+    const symbol = typeof leg.assetSymbol === "string" ? leg.assetSymbol.toUpperCase() : "";
+    if (symbol !== context.asset && !(context.asset === "WETH" && symbol === "ETH")) return void 0;
+    if (typeof leg.vaultAddress !== "string" || !isAddress(leg.vaultAddress)) return void 0;
+    const rawAmount = typeof leg.rawAmount === "string" && /^\d+$/.test(leg.rawAmount) ? BigInt(leg.rawAmount) : typeof leg.rawAmount === "number" && Number.isSafeInteger(leg.rawAmount) ? BigInt(leg.rawAmount) : void 0;
+    if (rawAmount === void 0 || rawAmount <= 0n) return void 0;
+    const option = context.positions.find((position2) => position2.yieldOption.address.toLowerCase() === leg.vaultAddress.toLowerCase())?.yieldOption;
+    positions.push({
+      protocol: typeof leg.vaultProvider === "string" && leg.vaultProvider ? leg.vaultProvider : option?.provider || "Vault",
+      pool: typeof leg.vaultName === "string" && leg.vaultName ? leg.vaultName : option?.name,
+      tokenSymbol: context.asset,
+      amount: formatUnits2(rawAmount, YIELDSEEKER_ASSET_METADATA[context.asset].decimals)
+    });
+    amountRaw += rawAmount;
+  }
+  return {
+    agent: "yieldseeker",
+    action: "Deposit",
+    date: action.createdDate,
+    oldApy: null,
+    newApy: null,
+    positions,
+    rebalanceLog: [],
+    transactions: [{
+      txHashes: [hash],
+      chainId: context.agent.chainId,
+      tokenAddress: context.agent.assetAddress,
+      tokenSymbol: context.asset,
+      agentWallet: context.wallet.walletAddress,
+      amountRaw: String(amountRaw),
+      amount: formatUnits2(amountRaw, YIELDSEEKER_ASSET_METADATA[context.asset].decimals)
+    }]
+  };
+}
 function depositDestination(context, movement) {
   const to = movement.toAddress.toLowerCase();
   const option = context.positions.find(({ yieldOption }) => yieldOption.chainId === movement.chainId && yieldOption.assetAddress.toLowerCase() === context.agent.assetAddress.toLowerCase() && yieldOption.address.toLowerCase() === to)?.yieldOption;
@@ -3599,20 +3685,30 @@ function mapYieldseekerHistory(contexts, options) {
       seenMovements.add(key2);
       return true;
     });
-    return [
-      ...movements.map(
-        (movement) => movementEntry(
-          movement,
-          context.wallet,
-          context.agent,
-          context.asset,
-          options.ownerAddress,
-          options.vaultAddresses,
-          depositDestination(context, movement)
-        )
-      ),
-      ...(context.actions ?? []).map(actionEntry)
-    ].filter((entry) => entry !== void 0);
+    const movementEntries = movements.map(
+      (movement) => movementEntry(
+        movement,
+        context.wallet,
+        context.agent,
+        context.asset,
+        options.ownerAddress,
+        options.vaultAddresses,
+        depositDestination(context, movement)
+      )
+    ).filter((entry) => entry !== void 0);
+    const deposits = new Set(movementEntries.filter((entry) => entry.action === "Deposit").map((entry) => entry.transactions[0]?.txHashes[0]?.toLowerCase()));
+    const actions = (context.actions ?? []).flatMap((action) => {
+      const allocation = allocationEntry(action, context);
+      if (allocation) {
+        const hash = allocation.transactions[0].txHashes[0].toLowerCase();
+        if (deposits.has(hash)) return [];
+        deposits.add(hash);
+        return [allocation];
+      }
+      const entry = actionEntry(action);
+      return entry ? [entry] : [];
+    });
+    return [...movementEntries, ...actions];
   });
   const grouped = /* @__PURE__ */ new Map();
   const ungrouped = [];
@@ -3792,7 +3888,7 @@ import {
   getAddress as getAddress3,
   toHex
 } from "viem";
-import { getUserOperationHash } from "viem/account-abstraction";
+import { getUserOperationHash as getUserOperationHash2 } from "viem/account-abstraction";
 import { generatePrivateKey, privateKeyToAccount } from "viem/accounts";
 import { base as base3 } from "viem/chains";
 var ENTRY_POINT_V06 = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789";
@@ -3806,7 +3902,7 @@ var ENTRY_POINT_NONCE_ABI = [
 var DEFAULT_ROUTING_API = "https://owney-routing-api-243946518160.europe-west4.run.app";
 var SIMULATION_ACCOUNT = privateKeyToAccount(generatePrivateKey());
 function operationHash(operation) {
-  return getUserOperationHash({
+  return getUserOperationHash2({
     chainId: 8453,
     entryPointAddress: ENTRY_POINT_V06,
     entryPointVersion: "0.6",
@@ -4134,6 +4230,7 @@ var YIELDSEEKER_SETTLEMENT_ACTIVITY_CACHE_MS = 15e3;
 var YIELDSEEKER_READ_FAILURE_COOLDOWN_MS = 6e4;
 var YIELDSEEKER_SETTLEMENT_WINDOW_MS = 5 * 6e4;
 var YIELDSEEKER_ACTIVITY_CACHE_MS = 6e4;
+var YIELDSEEKER_MAX_WITHDRAW_SWEEPS = 3;
 function generateYieldseekerUsername() {
   const suffix = globalThis.crypto.randomUUID().replaceAll("-", "").slice(0, YIELDSEEKER_USERNAME_RANDOM_LENGTH).toLowerCase();
   return `${YIELDSEEKER_USERNAME_PREFIX}${suffix}`;
@@ -4574,6 +4671,7 @@ var YieldseekerAgent = class {
     let confirmedMovement = false;
     let settlement = null;
     try {
+      if (amount === void 0) this.advancePortfolioVersion(this.contextKey(state, chainId, asset));
       const portfolio = await this.loadPortfolioContext(
         state,
         chainId,
@@ -4591,7 +4689,35 @@ var YieldseekerAgent = class {
         return balance;
       };
       const idle = await readIdle();
-      const deployed = portfolio.positions.reduce(
+      let positions = portfolio.positions;
+      let positionsStatus = "empty";
+      const validatePositions = (values) => {
+        const seen = /* @__PURE__ */ new Set();
+        for (const value of values) {
+          const address = value?.yieldOption?.address;
+          if (typeof address !== "string" || !isAddress2(address) || seen.has(address.toLowerCase()) || typeof value.assetsRaw !== "string" || !/^\d+$/.test(value.assetsRaw) || typeof value.withdrawableAssetsRaw !== "string" || !/^\d+$/.test(value.withdrawableAssetsRaw))
+            throw this.invalidResponse("yield positions");
+          seen.add(address.toLowerCase());
+        }
+        return values;
+      };
+      const hasPositions = (values) => values.some((position2) => BigInt(position2.assetsRaw) > 0n || BigInt(position2.withdrawableAssetsRaw) > 0n);
+      const refreshPositions = async () => {
+        this.assertSession(generation, chainId, asset);
+        const response = await this.walletRequest(
+          state,
+          chainId,
+          this.agentPath(context, "yield-positions")
+        );
+        this.assertSession(generation, chainId, asset);
+        if (!Array.isArray(response?.yieldPositions)) throw this.invalidResponse("yield positions");
+        return validatePositions(response.yieldPositions);
+      };
+      if (amount === void 0) {
+        validatePositions(positions);
+        positionsStatus = hasPositions(positions) ? "remaining" : "empty";
+      }
+      const deployed = positions.reduce(
         (total, position2) => total + BigInt(position2.withdrawableAssetsRaw),
         0n
       );
@@ -4599,6 +4725,13 @@ var YieldseekerAgent = class {
       const requested = amount === void 0 ? totalAvailable : BigInt(amount);
       if (requested === 0n) {
         this.invalidateFundingRead(state, chainId, asset);
+        if (amount === void 0 && positionsStatus === "remaining")
+          throw new OwneyError(
+            "WITHDRAW_FAILED",
+            "Yieldseeker vault funds are not currently withdrawable.",
+            { asset, remainingPositions: positions.map((position2) => position2.yieldOption.address) },
+            this.id
+          );
         throw new OwneyError(
           "WITHDRAW_INSUFFICIENT_BALANCE",
           "No Yieldseeker funds are available to withdraw.",
@@ -4620,33 +4753,55 @@ var YieldseekerAgent = class {
       }
       let remaining = requested > idle ? requested - idle : 0n;
       let grossUnwound = 0n;
-      for (const position2 of portfolio.positions) {
-        if (remaining === 0n) break;
-        const available = BigInt(position2.withdrawableAssetsRaw);
-        if (available <= 0n) continue;
-        const assetsRaw = available < remaining ? available : remaining;
+      const unwind = async (position2, assetsRaw) => {
+        this.assertSession(generation, chainId, asset);
         const response = await this.walletRequest(
           state,
           chainId,
           this.agentPath(context, "withdraw-from-position"),
           {
             method: "POST",
-            body: {
-              chainId,
-              vaultAddress: position2.yieldOption.address,
-              assetsRaw: assetsRaw.toString()
-            }
+            body: { chainId, vaultAddress: position2.yieldOption.address, assetsRaw: assetsRaw.toString() }
           }
         );
-        if (!this.isTransactionHash(response?.transactionHash)) {
-          throw this.invalidResponse("position withdrawal");
-        }
+        if (!this.isTransactionHash(response?.transactionHash)) throw this.invalidResponse("position withdrawal");
         await this.waitForReceipt(state, chainId, response.transactionHash);
         confirmedMovement = true;
+        this.assertSession(generation, chainId, asset);
         grossUnwound += assetsRaw;
-        remaining -= assetsRaw;
+      };
+      if (amount === void 0) {
+        for (let sweep = 0; sweep < YIELDSEEKER_MAX_WITHDRAW_SWEEPS && hasPositions(positions); sweep++) {
+          const before = new Map(positions.map((position2) => [position2.yieldOption.address.toLowerCase(), BigInt(position2.assetsRaw)]));
+          let unwound = false;
+          for (const position2 of positions) {
+            const available = BigInt(position2.withdrawableAssetsRaw);
+            if (available <= 0n) continue;
+            await unwind(position2, available);
+            unwound = true;
+          }
+          if (!unwound) break;
+          try {
+            positions = await refreshPositions();
+            positionsStatus = hasPositions(positions) ? "remaining" : "empty";
+          } catch {
+            this.assertSession(generation, chainId, asset);
+            positionsStatus = "unavailable";
+            break;
+          }
+          if (positions.some((position2) => BigInt(position2.assetsRaw) > 0n && before.has(position2.yieldOption.address.toLowerCase()) && BigInt(position2.assetsRaw) >= before.get(position2.yieldOption.address.toLowerCase()))) break;
+        }
+      } else {
+        for (const position2 of positions) {
+          if (remaining === 0n) break;
+          const available = BigInt(position2.withdrawableAssetsRaw);
+          if (available <= 0n) continue;
+          const assetsRaw = available < remaining ? available : remaining;
+          await unwind(position2, assetsRaw);
+          remaining -= assetsRaw;
+        }
       }
-      if (remaining > 0n) {
+      if (amount !== void 0 && remaining > 0n) {
         throw this.invalidResponse("yield positions", {
           reason: "Withdrawable positions could not cover the request.",
           remaining: remaining.toString()
@@ -4658,6 +4813,13 @@ var YieldseekerAgent = class {
       const shortfall = availableForOwner < requested ? requested - availableForOwner : 0n;
       if (availableForOwner === 0n || amount !== void 0 && shortfall > maxFee) {
         this.invalidateFundingRead(state, chainId, asset);
+        if (amount === void 0 && positionsStatus !== "empty")
+          throw new OwneyError(
+            "WITHDRAW_FAILED",
+            "Yieldseeker vault funds could not be cleared for the owner transfer.",
+            { asset, positionsStatus },
+            this.id
+          );
         throw new OwneyError(
           "WITHDRAW_INSUFFICIENT_BALANCE",
           "Yieldseeker funds are not available for the owner transfer.",
@@ -4712,6 +4874,33 @@ var YieldseekerAgent = class {
       settlement = plannedMovement;
       const evidence = receipt ? inspectFundingReceipt(receipt, { ...base6, txHash }, metadata.address, "withdraw") : { ...base6, txHash, confirmedAmount: payout.toString(), transfer: "confirmed", delivery: "confirmed" };
       notifyFunding(onProgress, evidence);
+      if (amount === void 0) {
+        try {
+          positions = await refreshPositions();
+          positionsStatus = hasPositions(positions) ? "remaining" : "empty";
+        } catch {
+          positionsStatus = "unavailable";
+        }
+        if (positionsStatus !== "empty") {
+          const result = { txHash, type: "partial", amount: evidence.confirmedAmount ?? payout.toString(), evidence };
+          throw new OwneyError(
+            "WITHDRAW_PARTIAL_FAILURE",
+            "Yieldseeker MAX could not confirm that all vault positions were cleared.",
+            {
+              reason: "YIELDSEEKER_MAX_INCOMPLETE",
+              asset,
+              positionsStatus,
+              remainingPositions: positionsStatus === "remaining" ? positions.map((position2) => ({
+                vaultAddress: position2.yieldOption.address,
+                sharesRaw: position2.assetsRaw,
+                withdrawableAmountRaw: position2.withdrawableAssetsRaw
+              })) : void 0,
+              partialResults: { [this.id]: result }
+            },
+            this.id
+          );
+        }
+      }
       if (evidence.transfer === "failed" && evidence.confirmedAmount === "0")
         throw new OwneyError(
           "WITHDRAW_INSUFFICIENT_BALANCE",
@@ -7390,7 +7579,7 @@ var OwneySDK = class {
     if (direction === "withdraw" && evidence.agentId === "yieldseeker" && verified.transfer === "unknown" && verified.confirmedAmount && BigInt(verified.confirmedAmount) > 0n) {
       const transaction = await rpc2.getTransaction({ hash: evidence.txHash });
       assertCurrent();
-      if (isFullYieldseekerWithdrawal(transaction, { ...evidence, agentWallet }, token.address))
+      if (isFullYieldseekerWithdrawal(transaction, { ...evidence, agentWallet }, token.address, receipt))
         verified = inspectFundingReceipt(receipt, { ...evidence, agentWallet, intendedAmount: "MAX" }, token.address, direction);
     }
     const key2 = `${state.walletAddress.toLowerCase()}:${chainId}:${evidence.agentId}:${evidence.token}:${evidence.txHash}`;
@@ -7594,6 +7783,7 @@ var OwneySDK = class {
     if (!amount) {
       const results2 = {};
       const agentErrors2 = {};
+      const incompleteWithdrawals = {};
       for (const agent of withdrawalAgents) {
         try {
           results2[agent.id] = await submit(agent);
@@ -7602,6 +7792,14 @@ var OwneySDK = class {
           if (err instanceof OwneyError && err.code === "SPONSOR_REQUEST_FAILED" && err.details?.safeToFallback === true) throw err;
           if (this.isUserRejectedWithdrawal(err)) throw err;
           if (err instanceof OwneyError && err.code === "WITHDRAW_INSUFFICIENT_BALANCE" && err.details?.available === "0" && submissionEvidence.get(agent.id)?.transfer === "failed") continue;
+          if (agent.id === "yieldseeker" && err instanceof OwneyError && err.code === "WITHDRAW_PARTIAL_FAILURE" && err.details?.reason === "YIELDSEEKER_MAX_INCOMPLETE") {
+            incompleteWithdrawals[agent.id] = { positionsStatus: err.details.positionsStatus };
+            const evidence = submissionEvidence.get(agent.id);
+            if (evidence?.agentId === agent.id && evidence.chainId === chainId && evidence.token === token && evidence.walletAddress.toLowerCase() === state.walletAddress.toLowerCase() && evidence.intendedAmount === "MAX" && evidence.transfer === "confirmed" && evidence.delivery === "confirmed" && evidence.txHash && /^0x[\da-f]{64}$/i.test(evidence.txHash) && evidence.confirmedAmount && /^\d+$/.test(evidence.confirmedAmount) && BigInt(evidence.confirmedAmount) > 0n) {
+              results2[agent.id] = { txHash: evidence.txHash, type: "partial", amount: evidence.confirmedAmount, evidence };
+              notifyAgentResult(agent.id, results2[agent.id]);
+            }
+          }
           console.error(`withdraw failed for agent "${agent.id}":`, err);
           agentErrors2[agent.id] = err instanceof Error ? err.message : String(err);
           const code = err instanceof OwneyError ? err.code : "SDK_AGENT_FAILURE";
@@ -7624,7 +7822,7 @@ var OwneySDK = class {
         throw new OwneyError(
           "WITHDRAW_PARTIAL_FAILURE",
           "Some agents could not complete the withdrawal.",
-          { asset, partialResults: results2, agentErrors: agentErrors2 }
+          { asset, partialResults: results2, agentErrors: agentErrors2, ...Object.keys(incompleteWithdrawals).length ? { incompleteWithdrawals } : {} }
         );
       }
       const amountsKnown = Object.values(results2).every(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owney/sdk",
-  "version": "0.7.25-beta.13",
+  "version": "0.7.25-beta.14",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",