@owney/sdk 0.6.1-beta.1 → 0.6.1-beta.2

package/dist/index.cjs

@@ -264,10 +264,29 @@ function mapWeightedApyByChain(raw) {
   }
   return Object.keys(out).length > 0 ? out : void 0;
 }
+function weightedFinalApy(entry) {
+  const finalByToken = entry.final_weighted_apy ?? {};
+  const balanceByToken = {};
+  for (const p of entry.positions ?? []) {
+    const token = p.tokenSymbol ?? "";
+    balanceByToken[token] = (balanceByToken[token] ?? 0) + (p.balance ?? 0);
+  }
+  let weightedSum = 0;
+  let totalBalance = 0;
+  for (const [token, apy] of Object.entries(finalByToken)) {
+    const balance = balanceByToken[token] ?? 0;
+    weightedSum += apy * balance;
+    totalBalance += balance;
+  }
+  if (totalBalance > 0)
+    return weightedSum / totalBalance;
+  const values = Object.values(finalByToken);
+  return values.length ? values.reduce((sum, v) => sum + v, 0) / values.length : 0;
+}
 function mapApyHistory(raw) {
   const history = Object.entries(raw.history ?? {}).map(([date, entry]) => ({
     date,
-    apy: sumTokenValues(entry.final_weighted_apy)
+    apy: weightedFinalApy(entry)
   })).sort((a, b) => a.date.localeCompare(b.date));
   return {
     walletAddress: raw.walletAddress,

package/dist/index.js

@@ -232,10 +232,29 @@ function mapWeightedApyByChain(raw) {
   }
   return Object.keys(out).length > 0 ? out : void 0;
 }
+function weightedFinalApy(entry) {
+  const finalByToken = entry.final_weighted_apy ?? {};
+  const balanceByToken = {};
+  for (const p of entry.positions ?? []) {
+    const token = p.tokenSymbol ?? "";
+    balanceByToken[token] = (balanceByToken[token] ?? 0) + (p.balance ?? 0);
+  }
+  let weightedSum = 0;
+  let totalBalance = 0;
+  for (const [token, apy] of Object.entries(finalByToken)) {
+    const balance = balanceByToken[token] ?? 0;
+    weightedSum += apy * balance;
+    totalBalance += balance;
+  }
+  if (totalBalance > 0)
+    return weightedSum / totalBalance;
+  const values = Object.values(finalByToken);
+  return values.length ? values.reduce((sum, v) => sum + v, 0) / values.length : 0;
+}
 function mapApyHistory(raw) {
   const history = Object.entries(raw.history ?? {}).map(([date, entry]) => ({
     date,
-    apy: sumTokenValues(entry.final_weighted_apy)
+    apy: weightedFinalApy(entry)
   })).sort((a, b) => a.date.localeCompare(b.date));
   return {
     walletAddress: raw.walletAddress,

package/package.json

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