@owney/sdk 0.7.17 → 0.7.19

package/dist/index.cjs

@@ -762,7 +762,7 @@ var isJwtExpired = (token) => {
   }
 };
 var memorySessions = /* @__PURE__ */ new Map();
-var isFreshSession = (session) => !!session && !!session.token && !isJwtExpired(session.token);
+var isFreshSession = (session) => !!session && typeof session.isPredeployed === "boolean" && !!session.token && !isJwtExpired(session.token);
 var readLegacySession = (store, address) => {
   if (!store) return null;
   const prefix = legacyKeyPrefix(address);
@@ -1177,6 +1177,7 @@ var ZyfaiAgent = class _ZyfaiAgent {
           internals.httpClient.setAuthToken(cached.token);
           internals.authenticatedUserId = cached.userId;
           internals.hasActiveSessionKey = cached.hasActiveSessionKey;
+          internals.isPredeployed = cached.isPredeployed;
           return;
         }
       }
@@ -1188,7 +1189,8 @@ var ZyfaiAgent = class _ZyfaiAgent {
         writeSession(newAddress, newChainId, {
           token: newToken,
           userId: internals.authenticatedUserId,
-          hasActiveSessionKey: internals.hasActiveSessionKey
+          hasActiveSessionKey: internals.hasActiveSessionKey,
+          isPredeployed: internals.isPredeployed
         });
       }
     };
@@ -1639,12 +1641,10 @@ var ZyfaiAgent = class _ZyfaiAgent {
         );
         return;
       }
-      const { hasActiveSessionKey } = await this.readWalletState(ownerAddress);
       await this.ensureSessionKey(
         ownerAddress,
         chainId,
-        wallet.address,
-        hasActiveSessionKey
+        wallet.address
       );
     } catch (error) {
       console.warn(
@@ -1653,7 +1653,17 @@ var ZyfaiAgent = class _ZyfaiAgent {
       );
     }
   }
-  async ensureSessionKey(ownerAddress, chainId, smartWallet, hasActiveSessionKey) {
+  async ensureSessionKey(ownerAddress, chainId, smartWallet) {
+    const walletState = await this.readWalletState(ownerAddress);
+    const predeployed = walletState.predeployed;
+    if (predeployed !== false) {
+      debugLog("zyfai:onboard", "skipping manual session key", {
+        chainId,
+        predeployed
+      });
+      return;
+    }
+    const hasActiveSessionKey = walletState.hasActiveSessionKey;
     const attemptKey = `${ownerAddress.toLowerCase()}:${chainId}`;
     if (this.sessionKeyAttempts.has(attemptKey)) {
       debugLog(
@@ -1746,12 +1756,10 @@ var ZyfaiAgent = class _ZyfaiAgent {
         "zyfai:onboard",
         "Safe already has code -> no deploy needed, checking the session key"
       );
-      const { hasActiveSessionKey } = await this.readWalletState(ownerAddress);
       await this.ensureSessionKey(
         ownerAddress,
         chainId,
-        wallet.address,
-        hasActiveSessionKey
+        wallet.address
       );
       return wallet.address;
     }
@@ -2215,6 +2223,39 @@ 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, agentBalances) {
+  const byDate = /* @__PURE__ */ new Map();
+  for (const [id, accountApy] of Object.entries(agentApys)) {
+    const balance = agentBalances[id] ?? 0;
+    if (!Number.isFinite(balance) || balance <= 0) continue;
+    for (const point of accountApy.history ?? []) {
+      const apy = Number(point.apy);
+      if (!point.date || !Number.isFinite(apy)) continue;
+      const current = byDate.get(point.date) ?? { weightedSum: 0, weight: 0 };
+      current.weightedSum += apy * balance;
+      current.weight += balance;
+      byDate.set(point.date, current);
+    }
+  }
+  return [...byDate.entries()].sort(([left], [right]) => left.localeCompare(right)).map(([date, value]) => ({
+    date,
+    apy: value.weightedSum / value.weight
+  }));
+}
 function aggregateApyByChainAndAsset(agentApys, agentBalances) {
   const sums = {};
   const weights = {};
@@ -3885,7 +3926,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)];
         })
       )
     ]);
@@ -3913,10 +3954,12 @@ var OwneySDK = class {
       }
     }
     const apyByChainAndAsset = aggregateApyByChainAndAsset(results, balances);
+    const history = aggregateApyHistory(results, balances);
     return {
       totalApy: String(totalApy),
       agentApy: results,
-      apyByChainAndAsset
+      apyByChainAndAsset,
+      history
     };
   }
   /**
@@ -4369,7 +4412,8 @@ function buildSIWXConfig(deps) {
     writeSession(address, id, {
       token: login.accessToken,
       userId: login.userId ?? null,
-      hasActiveSessionKey: Boolean(login.hasActiveSessionKey)
+      hasActiveSessionKey: Boolean(login.hasActiveSessionKey),
+      isPredeployed: login.predeployed
     });
     const stored = {
       data: session.data,

package/dist/index.d.cts

@@ -296,6 +296,8 @@ interface OwneyAccountApy {
     totalApy: string;
     agentApy: Record<AgentId, AccountAgentApy>;
     apyByChainAndAsset: ApyByChainAndAsset;
+    /** Daily APY weighted by current balances in the requested chain/asset scope. */
+    history?: ApyHistoryPoint[];
 }
 interface AllocationAgentApy {
     /** Account-wide weighted APY for this agent, as a decimal string. */

package/dist/index.d.ts

@@ -296,6 +296,8 @@ interface OwneyAccountApy {
     totalApy: string;
     agentApy: Record<AgentId, AccountAgentApy>;
     apyByChainAndAsset: ApyByChainAndAsset;
+    /** Daily APY weighted by current balances in the requested chain/asset scope. */
+    history?: ApyHistoryPoint[];
 }
 interface AllocationAgentApy {
     /** Account-wide weighted APY for this agent, as a decimal string. */

package/dist/index.js

@@ -729,7 +729,7 @@ var isJwtExpired = (token) => {
   }
 };
 var memorySessions = /* @__PURE__ */ new Map();
-var isFreshSession = (session) => !!session && !!session.token && !isJwtExpired(session.token);
+var isFreshSession = (session) => !!session && typeof session.isPredeployed === "boolean" && !!session.token && !isJwtExpired(session.token);
 var readLegacySession = (store, address) => {
   if (!store) return null;
   const prefix = legacyKeyPrefix(address);
@@ -1144,6 +1144,7 @@ var ZyfaiAgent = class _ZyfaiAgent {
           internals.httpClient.setAuthToken(cached.token);
           internals.authenticatedUserId = cached.userId;
           internals.hasActiveSessionKey = cached.hasActiveSessionKey;
+          internals.isPredeployed = cached.isPredeployed;
           return;
         }
       }
@@ -1155,7 +1156,8 @@ var ZyfaiAgent = class _ZyfaiAgent {
         writeSession(newAddress, newChainId, {
           token: newToken,
           userId: internals.authenticatedUserId,
-          hasActiveSessionKey: internals.hasActiveSessionKey
+          hasActiveSessionKey: internals.hasActiveSessionKey,
+          isPredeployed: internals.isPredeployed
         });
       }
     };
@@ -1606,12 +1608,10 @@ var ZyfaiAgent = class _ZyfaiAgent {
         );
         return;
       }
-      const { hasActiveSessionKey } = await this.readWalletState(ownerAddress);
       await this.ensureSessionKey(
         ownerAddress,
         chainId,
-        wallet.address,
-        hasActiveSessionKey
+        wallet.address
       );
     } catch (error) {
       console.warn(
@@ -1620,7 +1620,17 @@ var ZyfaiAgent = class _ZyfaiAgent {
       );
     }
   }
-  async ensureSessionKey(ownerAddress, chainId, smartWallet, hasActiveSessionKey) {
+  async ensureSessionKey(ownerAddress, chainId, smartWallet) {
+    const walletState = await this.readWalletState(ownerAddress);
+    const predeployed = walletState.predeployed;
+    if (predeployed !== false) {
+      debugLog("zyfai:onboard", "skipping manual session key", {
+        chainId,
+        predeployed
+      });
+      return;
+    }
+    const hasActiveSessionKey = walletState.hasActiveSessionKey;
     const attemptKey = `${ownerAddress.toLowerCase()}:${chainId}`;
     if (this.sessionKeyAttempts.has(attemptKey)) {
       debugLog(
@@ -1713,12 +1723,10 @@ var ZyfaiAgent = class _ZyfaiAgent {
         "zyfai:onboard",
         "Safe already has code -> no deploy needed, checking the session key"
       );
-      const { hasActiveSessionKey } = await this.readWalletState(ownerAddress);
       await this.ensureSessionKey(
         ownerAddress,
         chainId,
-        wallet.address,
-        hasActiveSessionKey
+        wallet.address
       );
       return wallet.address;
     }
@@ -2182,6 +2190,39 @@ 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, agentBalances) {
+  const byDate = /* @__PURE__ */ new Map();
+  for (const [id, accountApy] of Object.entries(agentApys)) {
+    const balance = agentBalances[id] ?? 0;
+    if (!Number.isFinite(balance) || balance <= 0) continue;
+    for (const point of accountApy.history ?? []) {
+      const apy = Number(point.apy);
+      if (!point.date || !Number.isFinite(apy)) continue;
+      const current = byDate.get(point.date) ?? { weightedSum: 0, weight: 0 };
+      current.weightedSum += apy * balance;
+      current.weight += balance;
+      byDate.set(point.date, current);
+    }
+  }
+  return [...byDate.entries()].sort(([left], [right]) => left.localeCompare(right)).map(([date, value]) => ({
+    date,
+    apy: value.weightedSum / value.weight
+  }));
+}
 function aggregateApyByChainAndAsset(agentApys, agentBalances) {
   const sums = {};
   const weights = {};
@@ -3856,7 +3897,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)];
         })
       )
     ]);
@@ -3884,10 +3925,12 @@ var OwneySDK = class {
       }
     }
     const apyByChainAndAsset = aggregateApyByChainAndAsset(results, balances);
+    const history = aggregateApyHistory(results, balances);
     return {
       totalApy: String(totalApy),
       agentApy: results,
-      apyByChainAndAsset
+      apyByChainAndAsset,
+      history
     };
   }
   /**
@@ -4340,7 +4383,8 @@ function buildSIWXConfig(deps) {
     writeSession(address, id, {
       token: login.accessToken,
       userId: login.userId ?? null,
-      hasActiveSessionKey: Boolean(login.hasActiveSessionKey)
+      hasActiveSessionKey: Boolean(login.hasActiveSessionKey),
+      isPredeployed: login.predeployed
     });
     const stored = {
       data: session.data,

package/package.json

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