@owney/sdk 0.7.27-beta.0 → 0.7.27-beta.1

package/dist/index.cjs

@@ -5689,7 +5689,7 @@ var YieldseekerAgent = class {
       const initialFunds = funds;
       const idle = initialFunds.idle;
       const maxLiquidity = amount === void 0 ? funds : void 0;
-      let positions = [...funds.positions, ...funds.indexedPositions.filter((position2) => !funds.verifiedVaults.includes(position2.yieldOption.address.toLowerCase()))];
+      let positions = [...funds.positions, ...funds.indexedPositions.filter((position2) => !funds.resolvedVaults.includes(position2.yieldOption.address.toLowerCase()))];
       let positionsStatus = "empty";
       const validatePositions = (values) => this.validateWithdrawalPositions(values, chainId, asset);
       validatePositions(positions);
@@ -5703,17 +5703,17 @@ var YieldseekerAgent = class {
         const verifiedPositions = [];
         if (timeoutMs <= 0) return { verified: false, positions: verifiedPositions };
         let active = true;
-        const checks = this.readVaultLiquidity(values.map((position2) => position2.yieldOption), agentWallet, blockNumber).catch(() => []);
+        const checks = this.readVaultShares(values.map((position2) => position2.yieldOption), agentWallet, blockNumber).catch(() => []);
         const reads = values.map(async (position2, index) => {
           const address = (0, import_viem13.getAddress)(position2.yieldOption.address);
           try {
-            const group = (await checks).slice(index * 3, index * 3 + 3);
-            if (!active || group.length !== 3 || group.some((value) => value.status !== "success")) return null;
+            const group = (await checks).slice(index * 2, index * 2 + 2);
+            if (!active || group.length !== 2 || group.some((value) => value.status !== "success")) return null;
             this.assertSession(generation, chainId, asset);
-            const [underlying, shares, withdrawable] = group.map((value) => value.result);
-            if (typeof underlying !== "string" || !(0, import_viem13.isAddress)(underlying) || underlying.toLowerCase() !== metadata.address.toLowerCase() || typeof shares !== "bigint" || shares < 0n || typeof withdrawable !== "bigint" || withdrawable < 0n) return null;
-            const verified = { ...position2, assetsRaw: shares.toString(), withdrawableAssetsRaw: withdrawable.toString() };
-            if (shares > 0n && withdrawable === 0n) {
+            const [underlying, shares] = group.map((value) => value.result);
+            if (typeof underlying !== "string" || !(0, import_viem13.isAddress)(underlying) || underlying.toLowerCase() !== metadata.address.toLowerCase() || typeof shares !== "bigint" || shares < 0n) return null;
+            const verified = { ...position2, assetsRaw: shares.toString(), withdrawableAssetsRaw: "0" };
+            if (shares > 0n) {
               let positiveValue = false;
               const valuations = await Promise.all(["convertToAssets", "previewRedeem"].map(async (functionName) => {
                 try {
@@ -5724,9 +5724,11 @@ var YieldseekerAgent = class {
                     args: [shares],
                     blockNumber
                   });
-                  if (typeof value !== "bigint" || value < 0n) return null;
+                  if (!active || typeof value !== "bigint" || value < 0n) return null;
+                  this.assertSession(generation, chainId, asset);
                   if (value > 0n && !positiveValue) {
                     positiveValue = true;
+                    verified.withdrawableAssetsRaw = value.toString();
                     verifiedPositions.push(verified);
                   }
                   return value;
@@ -5734,7 +5736,12 @@ var YieldseekerAgent = class {
                   return null;
                 }
               }));
-              if (positiveValue) return verified;
+              if (positiveValue) {
+                const redemptionValue = valuations[1];
+                if (redemptionValue !== null && redemptionValue > 0n)
+                  verified.withdrawableAssetsRaw = redemptionValue.toString();
+                return verified;
+              }
               if (blockNumber === void 0 || valuations.some((value) => value !== 0n)) return null;
               zeroValuePositions.add(verified);
             }
@@ -5897,8 +5904,10 @@ var YieldseekerAgent = class {
           this.assertSession(generation, chainId, asset);
           if (proof.verified) {
             positions = [...proof.positions, ...(catalog ?? []).filter((position2) => !knownBeforeRefresh.has(position2.yieldOption.address.toLowerCase()))];
-          } else if (catalog) positions = catalog;
-          else {
+          } else if (catalog) {
+            const checked = new Set(proof.positions.map((position2) => position2.yieldOption.address.toLowerCase()));
+            positions = [...proof.positions, ...catalog.filter((position2) => !checked.has(position2.yieldOption.address.toLowerCase()))];
+          } else {
             positionsStatus = "unavailable";
             break;
           }
@@ -6082,7 +6091,7 @@ var YieldseekerAgent = class {
       }
     }
   }
-  /** A withdrawal-only liquidity floor; display snapshots never authorize it. */
+  /** Fresh position amounts for withdrawal planning, net of reserved fees. */
   async getWithdrawableBalance(state, chainId, asset, minimumAmount) {
     this.assertChain(chainId);
     this.assertAsset(asset);
@@ -6107,7 +6116,7 @@ var YieldseekerAgent = class {
     );
     return proof.available;
   }
-  async readVaultLiquidity(options, wallet, blockNumber) {
+  async readVaultShares(options, wallet, blockNumber) {
     const owner = (0, import_viem13.getAddress)(wallet);
     const batches = Array.from({ length: Math.ceil(options.length / YIELDSEEKER_VAULTS_PER_RPC_BATCH) }, (_, index) => options.slice(index * YIELDSEEKER_VAULTS_PER_RPC_BATCH, (index + 1) * YIELDSEEKER_VAULTS_PER_RPC_BATCH));
     const results = await Promise.all(batches.map((batch) => this.getReceiptClient().multicall({
@@ -6117,8 +6126,7 @@ var YieldseekerAgent = class {
         const address = (0, import_viem13.getAddress)(option.address);
         return [
           { address, abi: import_viem13.erc4626Abi, functionName: "asset" },
-          { address, abi: import_viem13.erc20Abi, functionName: "balanceOf", args: [owner] },
-          { address, abi: import_viem13.erc4626Abi, functionName: "maxWithdraw", args: [owner] }
+          { address, abi: import_viem13.erc20Abi, functionName: "balanceOf", args: [owner] }
         ];
       })
     })));
@@ -6188,7 +6196,7 @@ var YieldseekerAgent = class {
     );
     let active = true;
     let knownProof;
-    const hasUnverifiedIndexedFunds = (proof) => proof.indexedPositions.some((position2) => !proof.verifiedVaults.includes(position2.yieldOption.address.toLowerCase()) && BigInt(position2.withdrawableAssetsRaw) > 0n);
+    const hasUnverifiedIndexedFunds = (proof) => proof.indexedPositions.some((position2) => !proof.resolvedVaults.includes(position2.yieldOption.address.toLowerCase()) && BigInt(position2.withdrawableAssetsRaw) > 0n);
     const assertReadCurrent = () => {
       this.assertSession(generation, chainId, context.asset);
       if (!active || this.portfolioVersion(contextKey) !== version) throw unavailable();
@@ -6206,7 +6214,6 @@ var YieldseekerAgent = class {
       for (const position2 of indexedPositions) candidates.set(position2.yieldOption.address.toLowerCase(), position2.yieldOption);
       const options = [...candidates.values()];
       if (options.length > YIELDSEEKER_WITHDRAWAL_CANDIDATE_LIMIT) throw unavailable();
-      const checksRead = this.readVaultLiquidity(options, wallet, blockNumber).then((value) => ({ value }), (error) => ({ error }));
       const [idle, feeTracker] = await Promise.all([
         client.readContract({
           address: metadata.address,
@@ -6233,7 +6240,7 @@ var YieldseekerAgent = class {
       });
       if (typeof fees !== "bigint" || fees < 0n) throw unavailable();
       const verified = [];
-      const verifiedVaults = [];
+      const resolvedVaults = [];
       let deployed = 0n;
       const proof = (complete) => ({
         blockNumber,
@@ -6241,51 +6248,100 @@ var YieldseekerAgent = class {
         fees,
         available: idle + deployed > fees ? idle + deployed - fees : 0n,
         positions: [...verified],
-        verifiedVaults: [...verifiedVaults],
+        resolvedVaults: [...resolvedVaults],
         indexedPositions,
         complete
       });
       assertReadCurrent();
       knownProof = proof(false);
       if (requested !== void 0 && knownProof.available >= requested) return knownProof;
-      const collect = (options2, results) => {
+      const indexed = new Map(indexedPositions.map((position2) => [position2.yieldOption.address.toLowerCase(), position2]));
+      const indexedValue = indexedPositions.reduce((sum, position2) => sum + BigInt(position2.withdrawableAssetsRaw), 0n);
+      const missingKnownPosition = previousPositions.some((position2) => !indexed.has(position2.yieldOption.address.toLowerCase()));
+      const unvaluedPosition = indexedPositions.some((position2) => BigInt(position2.assetsRaw) > 0n && BigInt(position2.withdrawableAssetsRaw) === 0n);
+      const indexedAvailable = idle + indexedValue > fees ? idle + indexedValue - fees : 0n;
+      if (indexedValue > 0n && !missingKnownPosition && !unvaluedPosition && (requested === void 0 || indexedAvailable >= requested)) {
+        const known = this.balanceVaults.get(contextKey) ?? /* @__PURE__ */ new Set();
+        for (const position2 of indexedPositions) if (BigInt(position2.withdrawableAssetsRaw) > 0n)
+          known.add(position2.yieldOption.address.toLowerCase());
+        this.balanceVaults.set(contextKey, known);
+        return {
+          blockNumber,
+          idle,
+          fees,
+          available: indexedAvailable,
+          positions: indexedPositions,
+          resolvedVaults: [...indexed.keys()],
+          indexedPositions,
+          complete: true
+        };
+      }
+      const collect = async (options2, results) => {
         assertReadCurrent();
         const known = this.balanceVaults.get(contextKey) ?? /* @__PURE__ */ new Set();
         this.balanceVaults.set(contextKey, known);
-        let valid2 = true;
-        options2.forEach((option, index) => {
-          const group = results.slice(index * 3, index * 3 + 3);
-          const shareProbe = group[1];
-          if (shareProbe?.status === "success" && typeof shareProbe.result === "bigint" && shareProbe.result > 0n)
-            known.add(option.address.toLowerCase());
-          if (group.length !== 3 || group.some((value) => value.status !== "success")) {
-            valid2 = false;
-            return;
-          }
-          const [underlying, shares, withdrawable] = group.map((value) => value.result);
-          if (typeof underlying !== "string" || !(0, import_viem13.isAddress)(underlying) || underlying.toLowerCase() !== metadata.address.toLowerCase() || typeof shares !== "bigint" || shares < 0n || typeof withdrawable !== "bigint" || withdrawable < 0n || shares === 0n && withdrawable > 0n) {
-            valid2 = false;
-            return;
-          }
-          verifiedVaults.push(option.address.toLowerCase());
-          deployed += withdrawable;
-          verified.push({
+        const valid2 = await Promise.all(options2.map(async (option, index) => {
+          const group = results.slice(index * 2, index * 2 + 2);
+          if (group.length !== 2 || group.some((value2) => value2.status !== "success")) return false;
+          const [underlying, shares] = group.map((value2) => value2.result);
+          if (typeof underlying !== "string" || !(0, import_viem13.isAddress)(underlying) || underlying.toLowerCase() !== metadata.address.toLowerCase() || typeof shares !== "bigint" || shares < 0n) return false;
+          if (shares > 0n) known.add(option.address.toLowerCase());
+          const position2 = {
             yieldOption: option,
             assetsRaw: shares.toString(),
             assetsBase: "0",
             assetsUsd: 0,
-            withdrawableAssetsRaw: withdrawable.toString(),
-            withdrawableAssetsBase: withdrawable.toString()
-          });
-        });
-        return valid2;
+            withdrawableAssetsRaw: "0",
+            withdrawableAssetsBase: "0"
+          };
+          resolvedVaults.push(option.address.toLowerCase());
+          verified.push(position2);
+          knownProof = proof(false);
+          if (shares === 0n) return true;
+          let preview;
+          try {
+            const value2 = await client.readContract({
+              address: (0, import_viem13.getAddress)(option.address),
+              abi: import_viem13.erc4626Abi,
+              functionName: "previewRedeem",
+              args: [shares],
+              blockNumber
+            });
+            if (typeof value2 === "bigint" && value2 >= 0n) preview = value2;
+          } catch {
+          }
+          assertReadCurrent();
+          let value = preview;
+          if (value === void 0 || value === 0n) {
+            try {
+              const converted = await client.readContract({
+                address: (0, import_viem13.getAddress)(option.address),
+                abi: import_viem13.erc4626Abi,
+                functionName: "convertToAssets",
+                args: [shares],
+                blockNumber
+              });
+              if (typeof converted === "bigint" && converted >= 0n && (converted > 0n || preview === 0n)) value = converted;
+              else value = void 0;
+            } catch {
+              value = void 0;
+            }
+          }
+          assertReadCurrent();
+          if (value === void 0) return false;
+          position2.withdrawableAssetsRaw = value.toString();
+          position2.withdrawableAssetsBase = value.toString();
+          deployed += value;
+          knownProof = proof(false);
+          return true;
+        }));
+        return valid2.every(Boolean);
       };
-      const checks = await checksRead;
+      const checks = await this.readVaultShares(options, wallet, blockNumber);
       assertReadCurrent();
-      if ("error" in checks) throw checks.error;
-      const allKnownVerified = collect(options, checks.value);
+      const allKnownVerified = await collect(options, checks);
       knownProof = proof(false);
-      const indexed = new Map(indexedPositions.map((position2) => [position2.yieldOption.address.toLowerCase(), position2]));
+      if (requested !== void 0 && knownProof.available >= requested) return knownProof;
       const discrepancy = verified.some((position2) => {
         const row = indexed.get(position2.yieldOption.address.toLowerCase());
         return row ? BigInt(position2.withdrawableAssetsRaw) < BigInt(row.withdrawableAssetsRaw) : BigInt(position2.assetsRaw) > 0n;
@@ -6305,7 +6361,7 @@ var YieldseekerAgent = class {
       }
       const extra = [...eligible].filter(([address]) => !candidates.has(address)).map(([, option]) => option);
       if (options.length + extra.length > YIELDSEEKER_WITHDRAWAL_CANDIDATE_LIMIT) throw unavailable();
-      const allExtraVerified = collect(extra, await this.readVaultLiquidity(extra, wallet, blockNumber));
+      const allExtraVerified = await collect(extra, await this.readVaultShares(extra, wallet, blockNumber));
       assertReadCurrent();
       const result = proof(eligible.size > 0 && allKnownVerified && allExtraVerified);
       if (result.available === 0n && !result.complete && !hasUnverifiedIndexedFunds(result)) throw unavailable();

package/dist/index.d.cts

@@ -1913,9 +1913,9 @@ declare class YieldseekerAgent implements IAgent {
     deposit(state: ConnectionState, chainId: number, amount: string, asset: OwneySupportedTokens, depositCallback?: DepositCallback, onProgress?: FundingProgress, onBeforeSubmission?: (evidence: FundingEvidence) => void | Promise<void>): Promise<OwneyDepositResult>;
     withdraw(state: ConnectionState, chainId: number, asset: OwneySupportedTokens, amount?: string, onProgress?: FundingProgress, gasMode?: "auto" | "sponsored" | "paid", onBeforeSubmission?: FundingProgress): Promise<AgentWithdrawResult>;
     private withdrawInternal;
-    /** A withdrawal-only liquidity floor; display snapshots never authorize it. */
+    /** Fresh position amounts for withdrawal planning, net of reserved fees. */
     getWithdrawableBalance(state: ConnectionState, chainId: number, asset: OwneySupportedTokens, minimumAmount?: bigint): Promise<bigint>;
-    private readVaultLiquidity;
+    private readVaultShares;
     private validateWithdrawalPositions;
     private withdrawalVaultHints;
     private readWithdrawalPositions;

package/dist/index.d.ts

@@ -1913,9 +1913,9 @@ declare class YieldseekerAgent implements IAgent {
     deposit(state: ConnectionState, chainId: number, amount: string, asset: OwneySupportedTokens, depositCallback?: DepositCallback, onProgress?: FundingProgress, onBeforeSubmission?: (evidence: FundingEvidence) => void | Promise<void>): Promise<OwneyDepositResult>;
     withdraw(state: ConnectionState, chainId: number, asset: OwneySupportedTokens, amount?: string, onProgress?: FundingProgress, gasMode?: "auto" | "sponsored" | "paid", onBeforeSubmission?: FundingProgress): Promise<AgentWithdrawResult>;
     private withdrawInternal;
-    /** A withdrawal-only liquidity floor; display snapshots never authorize it. */
+    /** Fresh position amounts for withdrawal planning, net of reserved fees. */
     getWithdrawableBalance(state: ConnectionState, chainId: number, asset: OwneySupportedTokens, minimumAmount?: bigint): Promise<bigint>;
-    private readVaultLiquidity;
+    private readVaultShares;
     private validateWithdrawalPositions;
     private withdrawalVaultHints;
     private readWithdrawalPositions;

package/dist/index.js

@@ -5677,7 +5677,7 @@ var YieldseekerAgent = class {
       const initialFunds = funds;
       const idle = initialFunds.idle;
       const maxLiquidity = amount === void 0 ? funds : void 0;
-      let positions = [...funds.positions, ...funds.indexedPositions.filter((position2) => !funds.verifiedVaults.includes(position2.yieldOption.address.toLowerCase()))];
+      let positions = [...funds.positions, ...funds.indexedPositions.filter((position2) => !funds.resolvedVaults.includes(position2.yieldOption.address.toLowerCase()))];
       let positionsStatus = "empty";
       const validatePositions = (values) => this.validateWithdrawalPositions(values, chainId, asset);
       validatePositions(positions);
@@ -5691,17 +5691,17 @@ var YieldseekerAgent = class {
         const verifiedPositions = [];
         if (timeoutMs <= 0) return { verified: false, positions: verifiedPositions };
         let active = true;
-        const checks = this.readVaultLiquidity(values.map((position2) => position2.yieldOption), agentWallet, blockNumber).catch(() => []);
+        const checks = this.readVaultShares(values.map((position2) => position2.yieldOption), agentWallet, blockNumber).catch(() => []);
         const reads = values.map(async (position2, index) => {
           const address = getAddress5(position2.yieldOption.address);
           try {
-            const group = (await checks).slice(index * 3, index * 3 + 3);
-            if (!active || group.length !== 3 || group.some((value) => value.status !== "success")) return null;
+            const group = (await checks).slice(index * 2, index * 2 + 2);
+            if (!active || group.length !== 2 || group.some((value) => value.status !== "success")) return null;
             this.assertSession(generation, chainId, asset);
-            const [underlying, shares, withdrawable] = group.map((value) => value.result);
-            if (typeof underlying !== "string" || !isAddress4(underlying) || underlying.toLowerCase() !== metadata.address.toLowerCase() || typeof shares !== "bigint" || shares < 0n || typeof withdrawable !== "bigint" || withdrawable < 0n) return null;
-            const verified = { ...position2, assetsRaw: shares.toString(), withdrawableAssetsRaw: withdrawable.toString() };
-            if (shares > 0n && withdrawable === 0n) {
+            const [underlying, shares] = group.map((value) => value.result);
+            if (typeof underlying !== "string" || !isAddress4(underlying) || underlying.toLowerCase() !== metadata.address.toLowerCase() || typeof shares !== "bigint" || shares < 0n) return null;
+            const verified = { ...position2, assetsRaw: shares.toString(), withdrawableAssetsRaw: "0" };
+            if (shares > 0n) {
               let positiveValue = false;
               const valuations = await Promise.all(["convertToAssets", "previewRedeem"].map(async (functionName) => {
                 try {
@@ -5712,9 +5712,11 @@ var YieldseekerAgent = class {
                     args: [shares],
                     blockNumber
                   });
-                  if (typeof value !== "bigint" || value < 0n) return null;
+                  if (!active || typeof value !== "bigint" || value < 0n) return null;
+                  this.assertSession(generation, chainId, asset);
                   if (value > 0n && !positiveValue) {
                     positiveValue = true;
+                    verified.withdrawableAssetsRaw = value.toString();
                     verifiedPositions.push(verified);
                   }
                   return value;
@@ -5722,7 +5724,12 @@ var YieldseekerAgent = class {
                   return null;
                 }
               }));
-              if (positiveValue) return verified;
+              if (positiveValue) {
+                const redemptionValue = valuations[1];
+                if (redemptionValue !== null && redemptionValue > 0n)
+                  verified.withdrawableAssetsRaw = redemptionValue.toString();
+                return verified;
+              }
               if (blockNumber === void 0 || valuations.some((value) => value !== 0n)) return null;
               zeroValuePositions.add(verified);
             }
@@ -5885,8 +5892,10 @@ var YieldseekerAgent = class {
           this.assertSession(generation, chainId, asset);
           if (proof.verified) {
             positions = [...proof.positions, ...(catalog ?? []).filter((position2) => !knownBeforeRefresh.has(position2.yieldOption.address.toLowerCase()))];
-          } else if (catalog) positions = catalog;
-          else {
+          } else if (catalog) {
+            const checked = new Set(proof.positions.map((position2) => position2.yieldOption.address.toLowerCase()));
+            positions = [...proof.positions, ...catalog.filter((position2) => !checked.has(position2.yieldOption.address.toLowerCase()))];
+          } else {
             positionsStatus = "unavailable";
             break;
           }
@@ -6070,7 +6079,7 @@ var YieldseekerAgent = class {
       }
     }
   }
-  /** A withdrawal-only liquidity floor; display snapshots never authorize it. */
+  /** Fresh position amounts for withdrawal planning, net of reserved fees. */
   async getWithdrawableBalance(state, chainId, asset, minimumAmount) {
     this.assertChain(chainId);
     this.assertAsset(asset);
@@ -6095,7 +6104,7 @@ var YieldseekerAgent = class {
     );
     return proof.available;
   }
-  async readVaultLiquidity(options, wallet, blockNumber) {
+  async readVaultShares(options, wallet, blockNumber) {
     const owner = getAddress5(wallet);
     const batches = Array.from({ length: Math.ceil(options.length / YIELDSEEKER_VAULTS_PER_RPC_BATCH) }, (_, index) => options.slice(index * YIELDSEEKER_VAULTS_PER_RPC_BATCH, (index + 1) * YIELDSEEKER_VAULTS_PER_RPC_BATCH));
     const results = await Promise.all(batches.map((batch) => this.getReceiptClient().multicall({
@@ -6105,8 +6114,7 @@ var YieldseekerAgent = class {
         const address = getAddress5(option.address);
         return [
           { address, abi: erc4626Abi2, functionName: "asset" },
-          { address, abi: erc20Abi5, functionName: "balanceOf", args: [owner] },
-          { address, abi: erc4626Abi2, functionName: "maxWithdraw", args: [owner] }
+          { address, abi: erc20Abi5, functionName: "balanceOf", args: [owner] }
         ];
       })
     })));
@@ -6176,7 +6184,7 @@ var YieldseekerAgent = class {
     );
     let active = true;
     let knownProof;
-    const hasUnverifiedIndexedFunds = (proof) => proof.indexedPositions.some((position2) => !proof.verifiedVaults.includes(position2.yieldOption.address.toLowerCase()) && BigInt(position2.withdrawableAssetsRaw) > 0n);
+    const hasUnverifiedIndexedFunds = (proof) => proof.indexedPositions.some((position2) => !proof.resolvedVaults.includes(position2.yieldOption.address.toLowerCase()) && BigInt(position2.withdrawableAssetsRaw) > 0n);
     const assertReadCurrent = () => {
       this.assertSession(generation, chainId, context.asset);
       if (!active || this.portfolioVersion(contextKey) !== version) throw unavailable();
@@ -6194,7 +6202,6 @@ var YieldseekerAgent = class {
       for (const position2 of indexedPositions) candidates.set(position2.yieldOption.address.toLowerCase(), position2.yieldOption);
       const options = [...candidates.values()];
       if (options.length > YIELDSEEKER_WITHDRAWAL_CANDIDATE_LIMIT) throw unavailable();
-      const checksRead = this.readVaultLiquidity(options, wallet, blockNumber).then((value) => ({ value }), (error) => ({ error }));
       const [idle, feeTracker] = await Promise.all([
         client.readContract({
           address: metadata.address,
@@ -6221,7 +6228,7 @@ var YieldseekerAgent = class {
       });
       if (typeof fees !== "bigint" || fees < 0n) throw unavailable();
       const verified = [];
-      const verifiedVaults = [];
+      const resolvedVaults = [];
       let deployed = 0n;
       const proof = (complete) => ({
         blockNumber,
@@ -6229,51 +6236,100 @@ var YieldseekerAgent = class {
         fees,
         available: idle + deployed > fees ? idle + deployed - fees : 0n,
         positions: [...verified],
-        verifiedVaults: [...verifiedVaults],
+        resolvedVaults: [...resolvedVaults],
         indexedPositions,
         complete
       });
       assertReadCurrent();
       knownProof = proof(false);
       if (requested !== void 0 && knownProof.available >= requested) return knownProof;
-      const collect = (options2, results) => {
+      const indexed = new Map(indexedPositions.map((position2) => [position2.yieldOption.address.toLowerCase(), position2]));
+      const indexedValue = indexedPositions.reduce((sum, position2) => sum + BigInt(position2.withdrawableAssetsRaw), 0n);
+      const missingKnownPosition = previousPositions.some((position2) => !indexed.has(position2.yieldOption.address.toLowerCase()));
+      const unvaluedPosition = indexedPositions.some((position2) => BigInt(position2.assetsRaw) > 0n && BigInt(position2.withdrawableAssetsRaw) === 0n);
+      const indexedAvailable = idle + indexedValue > fees ? idle + indexedValue - fees : 0n;
+      if (indexedValue > 0n && !missingKnownPosition && !unvaluedPosition && (requested === void 0 || indexedAvailable >= requested)) {
+        const known = this.balanceVaults.get(contextKey) ?? /* @__PURE__ */ new Set();
+        for (const position2 of indexedPositions) if (BigInt(position2.withdrawableAssetsRaw) > 0n)
+          known.add(position2.yieldOption.address.toLowerCase());
+        this.balanceVaults.set(contextKey, known);
+        return {
+          blockNumber,
+          idle,
+          fees,
+          available: indexedAvailable,
+          positions: indexedPositions,
+          resolvedVaults: [...indexed.keys()],
+          indexedPositions,
+          complete: true
+        };
+      }
+      const collect = async (options2, results) => {
         assertReadCurrent();
         const known = this.balanceVaults.get(contextKey) ?? /* @__PURE__ */ new Set();
         this.balanceVaults.set(contextKey, known);
-        let valid2 = true;
-        options2.forEach((option, index) => {
-          const group = results.slice(index * 3, index * 3 + 3);
-          const shareProbe = group[1];
-          if (shareProbe?.status === "success" && typeof shareProbe.result === "bigint" && shareProbe.result > 0n)
-            known.add(option.address.toLowerCase());
-          if (group.length !== 3 || group.some((value) => value.status !== "success")) {
-            valid2 = false;
-            return;
-          }
-          const [underlying, shares, withdrawable] = group.map((value) => value.result);
-          if (typeof underlying !== "string" || !isAddress4(underlying) || underlying.toLowerCase() !== metadata.address.toLowerCase() || typeof shares !== "bigint" || shares < 0n || typeof withdrawable !== "bigint" || withdrawable < 0n || shares === 0n && withdrawable > 0n) {
-            valid2 = false;
-            return;
-          }
-          verifiedVaults.push(option.address.toLowerCase());
-          deployed += withdrawable;
-          verified.push({
+        const valid2 = await Promise.all(options2.map(async (option, index) => {
+          const group = results.slice(index * 2, index * 2 + 2);
+          if (group.length !== 2 || group.some((value2) => value2.status !== "success")) return false;
+          const [underlying, shares] = group.map((value2) => value2.result);
+          if (typeof underlying !== "string" || !isAddress4(underlying) || underlying.toLowerCase() !== metadata.address.toLowerCase() || typeof shares !== "bigint" || shares < 0n) return false;
+          if (shares > 0n) known.add(option.address.toLowerCase());
+          const position2 = {
             yieldOption: option,
             assetsRaw: shares.toString(),
             assetsBase: "0",
             assetsUsd: 0,
-            withdrawableAssetsRaw: withdrawable.toString(),
-            withdrawableAssetsBase: withdrawable.toString()
-          });
-        });
-        return valid2;
+            withdrawableAssetsRaw: "0",
+            withdrawableAssetsBase: "0"
+          };
+          resolvedVaults.push(option.address.toLowerCase());
+          verified.push(position2);
+          knownProof = proof(false);
+          if (shares === 0n) return true;
+          let preview;
+          try {
+            const value2 = await client.readContract({
+              address: getAddress5(option.address),
+              abi: erc4626Abi2,
+              functionName: "previewRedeem",
+              args: [shares],
+              blockNumber
+            });
+            if (typeof value2 === "bigint" && value2 >= 0n) preview = value2;
+          } catch {
+          }
+          assertReadCurrent();
+          let value = preview;
+          if (value === void 0 || value === 0n) {
+            try {
+              const converted = await client.readContract({
+                address: getAddress5(option.address),
+                abi: erc4626Abi2,
+                functionName: "convertToAssets",
+                args: [shares],
+                blockNumber
+              });
+              if (typeof converted === "bigint" && converted >= 0n && (converted > 0n || preview === 0n)) value = converted;
+              else value = void 0;
+            } catch {
+              value = void 0;
+            }
+          }
+          assertReadCurrent();
+          if (value === void 0) return false;
+          position2.withdrawableAssetsRaw = value.toString();
+          position2.withdrawableAssetsBase = value.toString();
+          deployed += value;
+          knownProof = proof(false);
+          return true;
+        }));
+        return valid2.every(Boolean);
       };
-      const checks = await checksRead;
+      const checks = await this.readVaultShares(options, wallet, blockNumber);
       assertReadCurrent();
-      if ("error" in checks) throw checks.error;
-      const allKnownVerified = collect(options, checks.value);
+      const allKnownVerified = await collect(options, checks);
       knownProof = proof(false);
-      const indexed = new Map(indexedPositions.map((position2) => [position2.yieldOption.address.toLowerCase(), position2]));
+      if (requested !== void 0 && knownProof.available >= requested) return knownProof;
       const discrepancy = verified.some((position2) => {
         const row = indexed.get(position2.yieldOption.address.toLowerCase());
         return row ? BigInt(position2.withdrawableAssetsRaw) < BigInt(row.withdrawableAssetsRaw) : BigInt(position2.assetsRaw) > 0n;
@@ -6293,7 +6349,7 @@ var YieldseekerAgent = class {
       }
       const extra = [...eligible].filter(([address]) => !candidates.has(address)).map(([, option]) => option);
       if (options.length + extra.length > YIELDSEEKER_WITHDRAWAL_CANDIDATE_LIMIT) throw unavailable();
-      const allExtraVerified = collect(extra, await this.readVaultLiquidity(extra, wallet, blockNumber));
+      const allExtraVerified = await collect(extra, await this.readVaultShares(extra, wallet, blockNumber));
       assertReadCurrent();
       const result = proof(eligible.size > 0 && allKnownVerified && allExtraVerified);
       if (result.available === 0n && !result.complete && !hasUnverifiedIndexedFunds(result)) throw unavailable();

package/package.json

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