@owney/sdk 0.7.18 → 0.7.20

package/dist/index.cjs

@@ -495,7 +495,7 @@ function rawPoolApyForChain(entry, chainId, tokenSymbol) {
   let totalBalance = 0;
   for (const p of entry.positions ?? []) {
     if (p.chainId !== chainId) continue;
-    if (tokenSymbol && p.tokenSymbol !== tokenSymbol) continue;
+    if (tokenSymbol && p.tokenSymbol?.toUpperCase() !== tokenSymbol.toUpperCase()) continue;
     const balance = p.balance ?? 0;
     const apy = netApy(p.apy_withFee, p.apy, "apy_withFee");
     if (balance <= 0 || typeof apy !== "number") continue;
@@ -507,7 +507,18 @@ function rawPoolApyForChain(entry, chainId, tokenSymbol) {
 function mapApyHistory(raw, chainId, tokenSymbol) {
   const history = Object.entries(raw.history ?? {}).map(([date, entry]) => ({
     date,
-    apy: rawPoolApyForChain(entry, chainId, tokenSymbol)
+    apy: rawPoolApyForChain(entry, chainId, tokenSymbol),
+    // Provider position balances are treated as decimal amounts of the
+    // selected token. Carry its unit dynamically for every asset; never
+    // attach a token unit to an unscoped mix of assets.
+    ...tokenSymbol ? {
+      historicalBalance: {
+        amount: (entry.positions ?? []).filter(
+          (p) => p.chainId === chainId && p.tokenSymbol?.toUpperCase() === tokenSymbol.toUpperCase() && Number.isFinite(p.balance) && p.balance > 0 && Number.isFinite(p.apy_withFee ?? p.apy)
+        ).reduce((sum, p) => sum + p.balance, 0),
+        unit: tokenSymbol.toUpperCase()
+      }
+    } : {}
   })).filter((p) => p.apy !== null).sort((a, b) => a.date.localeCompare(b.date));
   return {
     walletAddress: raw.walletAddress,
@@ -2223,6 +2234,46 @@ function sumWithdrawnAmount(results) {
 }
 
 // src/lib/helpers/account-apy-helper.ts
+function balanceForApyScope(balance, chainId, tokenSymbol) {
+  if (!tokenSymbol) {
+    const total = Number(balance.totalBalance);
+    return Number.isFinite(total) && total > 0 ? total : 0;
+  }
+  const normalizedToken = tokenSymbol.toUpperCase();
+  return balance.tokens.reduce((total, token) => {
+    if (Number(token.chainId) !== chainId || String(token.asset).toUpperCase() !== normalizedToken) {
+      return total;
+    }
+    const amount = Number(token.amount);
+    return Number.isFinite(amount) && amount > 0 ? total + amount : total;
+  }, 0);
+}
+function aggregateApyHistory(agentApys) {
+  const byDate = /* @__PURE__ */ new Map();
+  for (const accountApy of Object.values(agentApys)) {
+    const seen = /* @__PURE__ */ new Set();
+    for (const point of accountApy.history ?? []) {
+      if (!point.date || seen.has(point.date) || !Number.isFinite(point.apy)) continue;
+      seen.add(point.date);
+      const points = byDate.get(point.date) ?? [];
+      points.push(point);
+      byDate.set(point.date, points);
+    }
+  }
+  return [...byDate.entries()].sort(([left], [right]) => left.localeCompare(right)).flatMap(([date, points]) => {
+    if (points.length === 1 && !points[0].historicalBalance) {
+      return [{ date, apy: points[0].apy }];
+    }
+    const unit = points[0].historicalBalance?.unit;
+    if (!unit || points.some(
+      ({ historicalBalance: balance }) => !balance || balance.unit !== unit || !Number.isFinite(balance.amount) || balance.amount < 0
+    )) return [];
+    const total = points.reduce((sum, p) => sum + p.historicalBalance.amount, 0);
+    if (total <= 0 || !Number.isFinite(total)) return [];
+    const apy = points.reduce((sum, p) => sum + p.apy * (p.historicalBalance.amount / total), 0);
+    return Number.isFinite(apy) ? [{ date, apy }] : [];
+  });
+}
 function aggregateApyByChainAndAsset(agentApys, agentBalances) {
   const sums = {};
   const weights = {};
@@ -3893,7 +3944,7 @@ var OwneySDK = class {
       Promise.all(
         entries.map(async ([id, agent]) => {
           const b = await this.readAgent(agent, "balances", () => agent.getBalances(state, chainId));
-          return [id, Number(b.totalBalance)];
+          return [id, balanceForApyScope(b, chainId, tokenSymbol)];
         })
       )
     ]);
@@ -3921,10 +3972,12 @@ var OwneySDK = class {
       }
     }
     const apyByChainAndAsset = aggregateApyByChainAndAsset(results, balances);
+    const history = aggregateApyHistory(results);
     return {
       totalApy: String(totalApy),
       agentApy: results,
-      apyByChainAndAsset
+      apyByChainAndAsset,
+      history
     };
   }
   /**

package/dist/index.d.cts

@@ -280,6 +280,11 @@ interface ApyHistoryPoint {
     date: string;
     /** Net (after-fee) weighted APY for that day, summed across tokens. */
     apy: number;
+    /** Balance on this date, in the explicitly named unit; never today's balance. */
+    historicalBalance?: {
+        amount: number;
+        unit: string;
+    };
 }
 interface AccountAgentApy {
     walletAddress: string;
@@ -296,6 +301,8 @@ interface OwneyAccountApy {
     totalApy: string;
     agentApy: Record<AgentId, AccountAgentApy>;
     apyByChainAndAsset: ApyByChainAndAsset;
+    /** APY weighted by same-date balances in matching units, independent of current balances. */
+    history?: ApyHistoryPoint[];
 }
 interface AllocationAgentApy {
     /** Account-wide weighted APY for this agent, as a decimal string. */

package/dist/index.d.ts

@@ -280,6 +280,11 @@ interface ApyHistoryPoint {
     date: string;
     /** Net (after-fee) weighted APY for that day, summed across tokens. */
     apy: number;
+    /** Balance on this date, in the explicitly named unit; never today's balance. */
+    historicalBalance?: {
+        amount: number;
+        unit: string;
+    };
 }
 interface AccountAgentApy {
     walletAddress: string;
@@ -296,6 +301,8 @@ interface OwneyAccountApy {
     totalApy: string;
     agentApy: Record<AgentId, AccountAgentApy>;
     apyByChainAndAsset: ApyByChainAndAsset;
+    /** APY weighted by same-date balances in matching units, independent of current balances. */
+    history?: ApyHistoryPoint[];
 }
 interface AllocationAgentApy {
     /** Account-wide weighted APY for this agent, as a decimal string. */

package/dist/index.js

@@ -462,7 +462,7 @@ function rawPoolApyForChain(entry, chainId, tokenSymbol) {
   let totalBalance = 0;
   for (const p of entry.positions ?? []) {
     if (p.chainId !== chainId) continue;
-    if (tokenSymbol && p.tokenSymbol !== tokenSymbol) continue;
+    if (tokenSymbol && p.tokenSymbol?.toUpperCase() !== tokenSymbol.toUpperCase()) continue;
     const balance = p.balance ?? 0;
     const apy = netApy(p.apy_withFee, p.apy, "apy_withFee");
     if (balance <= 0 || typeof apy !== "number") continue;
@@ -474,7 +474,18 @@ function rawPoolApyForChain(entry, chainId, tokenSymbol) {
 function mapApyHistory(raw, chainId, tokenSymbol) {
   const history = Object.entries(raw.history ?? {}).map(([date, entry]) => ({
     date,
-    apy: rawPoolApyForChain(entry, chainId, tokenSymbol)
+    apy: rawPoolApyForChain(entry, chainId, tokenSymbol),
+    // Provider position balances are treated as decimal amounts of the
+    // selected token. Carry its unit dynamically for every asset; never
+    // attach a token unit to an unscoped mix of assets.
+    ...tokenSymbol ? {
+      historicalBalance: {
+        amount: (entry.positions ?? []).filter(
+          (p) => p.chainId === chainId && p.tokenSymbol?.toUpperCase() === tokenSymbol.toUpperCase() && Number.isFinite(p.balance) && p.balance > 0 && Number.isFinite(p.apy_withFee ?? p.apy)
+        ).reduce((sum, p) => sum + p.balance, 0),
+        unit: tokenSymbol.toUpperCase()
+      }
+    } : {}
   })).filter((p) => p.apy !== null).sort((a, b) => a.date.localeCompare(b.date));
   return {
     walletAddress: raw.walletAddress,
@@ -2190,6 +2201,46 @@ function sumWithdrawnAmount(results) {
 }
 
 // src/lib/helpers/account-apy-helper.ts
+function balanceForApyScope(balance, chainId, tokenSymbol) {
+  if (!tokenSymbol) {
+    const total = Number(balance.totalBalance);
+    return Number.isFinite(total) && total > 0 ? total : 0;
+  }
+  const normalizedToken = tokenSymbol.toUpperCase();
+  return balance.tokens.reduce((total, token) => {
+    if (Number(token.chainId) !== chainId || String(token.asset).toUpperCase() !== normalizedToken) {
+      return total;
+    }
+    const amount = Number(token.amount);
+    return Number.isFinite(amount) && amount > 0 ? total + amount : total;
+  }, 0);
+}
+function aggregateApyHistory(agentApys) {
+  const byDate = /* @__PURE__ */ new Map();
+  for (const accountApy of Object.values(agentApys)) {
+    const seen = /* @__PURE__ */ new Set();
+    for (const point of accountApy.history ?? []) {
+      if (!point.date || seen.has(point.date) || !Number.isFinite(point.apy)) continue;
+      seen.add(point.date);
+      const points = byDate.get(point.date) ?? [];
+      points.push(point);
+      byDate.set(point.date, points);
+    }
+  }
+  return [...byDate.entries()].sort(([left], [right]) => left.localeCompare(right)).flatMap(([date, points]) => {
+    if (points.length === 1 && !points[0].historicalBalance) {
+      return [{ date, apy: points[0].apy }];
+    }
+    const unit = points[0].historicalBalance?.unit;
+    if (!unit || points.some(
+      ({ historicalBalance: balance }) => !balance || balance.unit !== unit || !Number.isFinite(balance.amount) || balance.amount < 0
+    )) return [];
+    const total = points.reduce((sum, p) => sum + p.historicalBalance.amount, 0);
+    if (total <= 0 || !Number.isFinite(total)) return [];
+    const apy = points.reduce((sum, p) => sum + p.apy * (p.historicalBalance.amount / total), 0);
+    return Number.isFinite(apy) ? [{ date, apy }] : [];
+  });
+}
 function aggregateApyByChainAndAsset(agentApys, agentBalances) {
   const sums = {};
   const weights = {};
@@ -3864,7 +3915,7 @@ var OwneySDK = class {
       Promise.all(
         entries.map(async ([id, agent]) => {
           const b = await this.readAgent(agent, "balances", () => agent.getBalances(state, chainId));
-          return [id, Number(b.totalBalance)];
+          return [id, balanceForApyScope(b, chainId, tokenSymbol)];
         })
       )
     ]);
@@ -3892,10 +3943,12 @@ var OwneySDK = class {
       }
     }
     const apyByChainAndAsset = aggregateApyByChainAndAsset(results, balances);
+    const history = aggregateApyHistory(results);
     return {
       totalApy: String(totalApy),
       agentApy: results,
-      apyByChainAndAsset
+      apyByChainAndAsset,
+      history
     };
   }
   /**

package/package.json

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