@owney/sdk 0.6.3 → 0.6.4-beta.0

package/dist/index.cjs

@@ -264,30 +264,22 @@ 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);
-  }
+function rawPoolApyForChain(entry, chainId) {
   let weightedSum = 0;
   let totalBalance = 0;
-  for (const [token, apy] of Object.entries(finalByToken)) {
-    const balance = balanceByToken[token] ?? 0;
-    weightedSum += apy * balance;
+  for (const p of entry.positions ?? []) {
+    if (p.chainId !== chainId)
+      continue;
+    const balance = p.balance ?? 0;
+    if (balance <= 0 || typeof p.apy !== "number")
+      continue;
+    weightedSum += p.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;
+  return totalBalance > 0 ? weightedSum / totalBalance : null;
 }
-function mapApyHistory(raw) {
-  const history = Object.entries(raw.history ?? {}).map(([date, entry]) => ({
-    date,
-    apy: weightedFinalApy(entry)
-  })).sort((a, b) => a.date.localeCompare(b.date));
+function mapApyHistory(raw, chainId) {
+  const history = Object.entries(raw.history ?? {}).map(([date, entry]) => ({ date, apy: rawPoolApyForChain(entry, chainId) })).filter((p) => p.apy !== null).sort((a, b) => a.date.localeCompare(b.date));
   return {
     walletAddress: raw.walletAddress,
     weightedApyAfterFee: raw.weightedApyAfterFee ? sumTokenValues(raw.weightedApyAfterFee) : void 0,
@@ -868,7 +860,7 @@ var ZyfaiAgent = class {
   async getAccountApy(state, chainId, days) {
     const { smartWallet } = await this.resolveSmartWallet(state, chainId);
     const raw = await this.sdk.getDailyApyHistory(smartWallet, days);
-    return mapApyHistory(raw);
+    return mapApyHistory(raw, chainId);
   }
   async getHistory(state, chainId, options) {
     const { smartWallet, chainId: validChainId } = await this.resolveSmartWallet(state, chainId);

package/dist/index.js

@@ -232,30 +232,22 @@ 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);
-  }
+function rawPoolApyForChain(entry, chainId) {
   let weightedSum = 0;
   let totalBalance = 0;
-  for (const [token, apy] of Object.entries(finalByToken)) {
-    const balance = balanceByToken[token] ?? 0;
-    weightedSum += apy * balance;
+  for (const p of entry.positions ?? []) {
+    if (p.chainId !== chainId)
+      continue;
+    const balance = p.balance ?? 0;
+    if (balance <= 0 || typeof p.apy !== "number")
+      continue;
+    weightedSum += p.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;
+  return totalBalance > 0 ? weightedSum / totalBalance : null;
 }
-function mapApyHistory(raw) {
-  const history = Object.entries(raw.history ?? {}).map(([date, entry]) => ({
-    date,
-    apy: weightedFinalApy(entry)
-  })).sort((a, b) => a.date.localeCompare(b.date));
+function mapApyHistory(raw, chainId) {
+  const history = Object.entries(raw.history ?? {}).map(([date, entry]) => ({ date, apy: rawPoolApyForChain(entry, chainId) })).filter((p) => p.apy !== null).sort((a, b) => a.date.localeCompare(b.date));
   return {
     walletAddress: raw.walletAddress,
     weightedApyAfterFee: raw.weightedApyAfterFee ? sumTokenValues(raw.weightedApyAfterFee) : void 0,
@@ -836,7 +828,7 @@ var ZyfaiAgent = class {
   async getAccountApy(state, chainId, days) {
     const { smartWallet } = await this.resolveSmartWallet(state, chainId);
     const raw = await this.sdk.getDailyApyHistory(smartWallet, days);
-    return mapApyHistory(raw);
+    return mapApyHistory(raw, chainId);
   }
   async getHistory(state, chainId, options) {
     const { smartWallet, chainId: validChainId } = await this.resolveSmartWallet(state, chainId);

package/package.json

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