@owney/sdk 0.3.0-beta.0 → 0.3.1

package/README.md

@@ -280,12 +280,18 @@ console.log(apy.walletAddress); // "0x..."
 console.log(apy.weightedApyAfterFee); // 5.2
 // Per chain + token breakdown, when the agent reports it
 console.log(apy.weightedApyAfterFeeDetails?.apyPerAsset[8453]?.USDC); // 5.4
+// Same per-(chain, asset) breakdown surfaced under a unified key
+console.log(apy.apyByChainAndAsset?.[8453]?.USDC); // 5.4
 
 // All agents (balance-weighted)
 const allApy = await sdk.getAccountApy({ days: "30D" });
 console.log(allApy.totalApy); // "5.6"
 console.log(allApy.agentApy.zyfai.weightedApyAfterFee); // 6.0
 console.log(allApy.agentApy.sail.weightedApyAfterFee); // 4.0
+// Per (chain, asset), balance-weighted across all agents.
+// Cells with 0/missing APY for a given agent are excluded from that cell.
+console.log(allApy.apyByChainAndAsset[8453]?.USDC); // 5.3
+console.log(allApy.apyByChainAndAsset[42161]?.USDT); // 4.7
 ```
 
 ### `getHistory({ agentId?, filters? })`
@@ -560,15 +566,21 @@ interface OwneyEarnings {
   agentEarnings: Record<AgentId, AgentEarnings>;
 }
 
+type ApyByChainAndAsset = Partial<
+  Record<OwneySupportedChainId, Partial<Record<OwneySupportedTokens, number>>>
+>;
+
 interface AccountAgentApy {
   walletAddress: string;
   weightedApyAfterFee?: number;
   weightedApyAfterFeeDetails?: AgentApyDetails;
+  apyByChainAndAsset?: ApyByChainAndAsset;
 }
 
 interface OwneyAccountApy {
   totalApy: string;
   agentApy: Record<AgentId, AccountAgentApy>;
+  apyByChainAndAsset: ApyByChainAndAsset;
 }
 
 type HistoryAction = "Rebalance" | "Deposit" | "Top up" | "Withdraw" | "Earned";

package/dist/index.cjs

@@ -36,6 +36,7 @@ var P_SUPPORTED_CHAINS = {
   chainIds: [8453, 42161],
   chains: ["BASE", "ARBITRUM"]
 };
+var SUPPORTED_TOKENS = ["USDC", "USDT"];
 var SUPPORTED_CHAIN_IDS = P_SUPPORTED_CHAINS.chainIds;
 var SUPPORTED_CHAINS = P_SUPPORTED_CHAINS.chains;
 var SupportedAssets = [
@@ -209,16 +210,38 @@ function mapEarnings(raw, smartWallet) {
     tokens
   };
 }
+function mapWeightedApyByChain(raw) {
+  if (!raw)
+    return void 0;
+  const out = {};
+  for (const [chainKey, tokenApy] of Object.entries(raw)) {
+    const chainId = Number(chainKey);
+    if (!SUPPORTED_CHAIN_IDS.includes(chainId))
+      continue;
+    const perAsset = {};
+    for (const [symbol, apy] of Object.entries(tokenApy)) {
+      const token = symbol;
+      if (!SUPPORTED_TOKENS.includes(token))
+        continue;
+      perAsset[token] = apy;
+    }
+    if (Object.keys(perAsset).length > 0)
+      out[chainId] = perAsset;
+  }
+  return Object.keys(out).length > 0 ? out : void 0;
+}
 function mapApyHistory(raw) {
   return {
     walletAddress: raw.walletAddress,
-    weightedApyAfterFee: raw.weightedApyAfterFee ? sumTokenValues(raw.weightedApyAfterFee) : void 0
+    weightedApyAfterFee: raw.weightedApyAfterFee ? sumTokenValues(raw.weightedApyAfterFee) : void 0,
+    apyByChainAndAsset: mapWeightedApyByChain(raw.weightedApyAfterFeeByChain)
   };
 }
 function mapHistory(raw, chainId) {
   const actionMap = {
     "Deposit to protocol": "Deposit",
     "Top up wallet": "Top up",
+    "Partial withdraw from protocol": "Withdraw",
     "Withdraw from protocol": "Withdraw",
     Rebalance: "Rebalance"
   };
@@ -641,6 +664,46 @@ function sumWithdrawnAmount(results) {
   return Object.values(results).reduce((sum, r) => sum + BigInt(r.amount), 0n);
 }
 
+// src/lib/helpers/account-apy-helper.ts
+function aggregateApyByChainAndAsset(agentApys, agentBalances) {
+  const sums = {};
+  const weights = {};
+  for (const id of Object.keys(agentApys)) {
+    const cells = agentApys[id].apyByChainAndAsset;
+    const balance = agentBalances[id] ?? 0;
+    if (!cells || balance <= 0)
+      continue;
+    for (const [chainKey, perAsset] of Object.entries(cells)) {
+      if (!perAsset)
+        continue;
+      const chainId = Number(chainKey);
+      for (const [asset, apyValue] of Object.entries(perAsset)) {
+        const apy = Number(apyValue ?? 0);
+        if (apy === 0)
+          continue;
+        sums[chainId] ??= {};
+        weights[chainId] ??= {};
+        sums[chainId][asset] = (sums[chainId][asset] ?? 0) + apy * balance;
+        weights[chainId][asset] = (weights[chainId][asset] ?? 0) + balance;
+      }
+    }
+  }
+  const out = {};
+  for (const chainKey of Object.keys(sums)) {
+    const chainId = Number(chainKey);
+    const perAssetOut = {};
+    for (const asset of Object.keys(sums[chainId])) {
+      const w = weights[chainId][asset];
+      if (w > 0)
+        perAssetOut[asset] = sums[chainId][asset] / w;
+    }
+    if (Object.keys(perAssetOut).length > 0) {
+      out[chainId] = perAssetOut;
+    }
+  }
+  return out;
+}
+
 // src/client.ts
 var OwneySDK = class {
   agents = /* @__PURE__ */ new Map();
@@ -1042,7 +1105,10 @@ var OwneySDK = class {
           { asset, agentErrors: agentErrors2 }
         );
       }
-      return { agentResult: results2 };
+      return {
+        agentResult: results2,
+        totalWithdrawn: sumWithdrawnAmount(results2).toString()
+      };
     }
     const requested = BigInt(amount);
     const aggregated = await this.getBalances();
@@ -1131,7 +1197,7 @@ var OwneySDK = class {
         }
       );
     }
-    return { agentResult: results };
+    return { agentResult: results, totalWithdrawn: withdrawn.toString() };
   }
   // --- Portfolio reads ---
   /**
@@ -1269,9 +1335,11 @@ var OwneySDK = class {
         totalApy += agentApy * weight;
       }
     }
+    const apyByChainAndAsset = aggregateApyByChainAndAsset(results, balances);
     return {
       totalApy: String(totalApy),
-      agentApy: results
+      agentApy: results,
+      apyByChainAndAsset
     };
   }
   /**

package/dist/index.d.cts

@@ -114,6 +114,7 @@ interface AgentWithdrawResult {
 }
 interface OwneyWithdrawResult {
     agentResult: Record<AgentId, AgentWithdrawResult>;
+    totalWithdrawn: string;
 }
 interface OwneyToken {
     chain: OwneySupportedChains;
@@ -139,14 +140,17 @@ interface OwneyEarnings {
     totalEarnings: string;
     agentEarnings: Record<AgentId, AgentEarnings>;
 }
+type ApyByChainAndAsset = Partial<Record<OwneySupportedChainId, Partial<Record<OwneySupportedTokens, number>>>>;
 interface AccountAgentApy {
     walletAddress: string;
     weightedApyAfterFee?: number;
     weightedApyAfterFeeDetails?: AgentApyDetails;
+    apyByChainAndAsset?: ApyByChainAndAsset;
 }
 interface OwneyAccountApy {
     totalApy: string;
     agentApy: Record<AgentId, AccountAgentApy>;
+    apyByChainAndAsset: ApyByChainAndAsset;
 }
 type HistoryAction = "Rebalance" | "Deposit" | "Top up" | "Withdraw" | "Earned";
 interface HistoryTransaction {
@@ -378,4 +382,4 @@ declare class AgentChainIncompatibleError extends OwneyError {
     }>, connectedChainId: number);
 }
 
-export { AccountAgentApy, AccountApyOptions, AgentApy, AgentApyDetails, AgentBalance, AgentChainIncompatibleError, AgentEarnings, AgentHistoryEntry, AgentId, AgentNotFoundError, AgentSupportedAsset, AgentSupportedAssets, AgentUserProfile, AgentWithdrawResult, AgentsApyOptions, Asset, ConnectionState, DailyApyDays, DepositCallback, DepositOptions, HistoryAction, HistoryFilters, HistoryOptions, HistoryTransaction, IAgent, NotConnectedError, OwneyAccountApy, OwneyAgentAllocation, OwneyAgentApy, OwneyAgentHistory, OwneyAgentStatus, OwneyBalances, OwneyDepositResult, OwneyEarnings, OwneyError, OwneyErrorCode, OwneyMultiDepositResult, OwneySDK, OwneySDKConfig, OwneySupportedChainId, OwneySupportedChains, OwneySupportedTokens, OwneyToken, OwneyUserProfile, OwneyWithdrawResult, RebalanceLog, WithdrawOptions };
+export { AccountAgentApy, AccountApyOptions, AgentApy, AgentApyDetails, AgentBalance, AgentChainIncompatibleError, AgentEarnings, AgentHistoryEntry, AgentId, AgentNotFoundError, AgentSupportedAsset, AgentSupportedAssets, AgentUserProfile, AgentWithdrawResult, AgentsApyOptions, ApyByChainAndAsset, Asset, ConnectionState, DailyApyDays, DepositCallback, DepositOptions, HistoryAction, HistoryFilters, HistoryOptions, HistoryTransaction, IAgent, NotConnectedError, OwneyAccountApy, OwneyAgentAllocation, OwneyAgentApy, OwneyAgentHistory, OwneyAgentStatus, OwneyBalances, OwneyDepositResult, OwneyEarnings, OwneyError, OwneyErrorCode, OwneyMultiDepositResult, OwneySDK, OwneySDKConfig, OwneySupportedChainId, OwneySupportedChains, OwneySupportedTokens, OwneyToken, OwneyUserProfile, OwneyWithdrawResult, RebalanceLog, WithdrawOptions };

package/dist/index.d.ts

@@ -114,6 +114,7 @@ interface AgentWithdrawResult {
 }
 interface OwneyWithdrawResult {
     agentResult: Record<AgentId, AgentWithdrawResult>;
+    totalWithdrawn: string;
 }
 interface OwneyToken {
     chain: OwneySupportedChains;
@@ -139,14 +140,17 @@ interface OwneyEarnings {
     totalEarnings: string;
     agentEarnings: Record<AgentId, AgentEarnings>;
 }
+type ApyByChainAndAsset = Partial<Record<OwneySupportedChainId, Partial<Record<OwneySupportedTokens, number>>>>;
 interface AccountAgentApy {
     walletAddress: string;
     weightedApyAfterFee?: number;
     weightedApyAfterFeeDetails?: AgentApyDetails;
+    apyByChainAndAsset?: ApyByChainAndAsset;
 }
 interface OwneyAccountApy {
     totalApy: string;
     agentApy: Record<AgentId, AccountAgentApy>;
+    apyByChainAndAsset: ApyByChainAndAsset;
 }
 type HistoryAction = "Rebalance" | "Deposit" | "Top up" | "Withdraw" | "Earned";
 interface HistoryTransaction {
@@ -378,4 +382,4 @@ declare class AgentChainIncompatibleError extends OwneyError {
     }>, connectedChainId: number);
 }
 
-export { AccountAgentApy, AccountApyOptions, AgentApy, AgentApyDetails, AgentBalance, AgentChainIncompatibleError, AgentEarnings, AgentHistoryEntry, AgentId, AgentNotFoundError, AgentSupportedAsset, AgentSupportedAssets, AgentUserProfile, AgentWithdrawResult, AgentsApyOptions, Asset, ConnectionState, DailyApyDays, DepositCallback, DepositOptions, HistoryAction, HistoryFilters, HistoryOptions, HistoryTransaction, IAgent, NotConnectedError, OwneyAccountApy, OwneyAgentAllocation, OwneyAgentApy, OwneyAgentHistory, OwneyAgentStatus, OwneyBalances, OwneyDepositResult, OwneyEarnings, OwneyError, OwneyErrorCode, OwneyMultiDepositResult, OwneySDK, OwneySDKConfig, OwneySupportedChainId, OwneySupportedChains, OwneySupportedTokens, OwneyToken, OwneyUserProfile, OwneyWithdrawResult, RebalanceLog, WithdrawOptions };
+export { AccountAgentApy, AccountApyOptions, AgentApy, AgentApyDetails, AgentBalance, AgentChainIncompatibleError, AgentEarnings, AgentHistoryEntry, AgentId, AgentNotFoundError, AgentSupportedAsset, AgentSupportedAssets, AgentUserProfile, AgentWithdrawResult, AgentsApyOptions, ApyByChainAndAsset, Asset, ConnectionState, DailyApyDays, DepositCallback, DepositOptions, HistoryAction, HistoryFilters, HistoryOptions, HistoryTransaction, IAgent, NotConnectedError, OwneyAccountApy, OwneyAgentAllocation, OwneyAgentApy, OwneyAgentHistory, OwneyAgentStatus, OwneyBalances, OwneyDepositResult, OwneyEarnings, OwneyError, OwneyErrorCode, OwneyMultiDepositResult, OwneySDK, OwneySDKConfig, OwneySupportedChainId, OwneySupportedChains, OwneySupportedTokens, OwneyToken, OwneyUserProfile, OwneyWithdrawResult, RebalanceLog, WithdrawOptions };

package/dist/index.js

@@ -6,6 +6,7 @@ var P_SUPPORTED_CHAINS = {
   chainIds: [8453, 42161],
   chains: ["BASE", "ARBITRUM"]
 };
+var SUPPORTED_TOKENS = ["USDC", "USDT"];
 var SUPPORTED_CHAIN_IDS = P_SUPPORTED_CHAINS.chainIds;
 var SUPPORTED_CHAINS = P_SUPPORTED_CHAINS.chains;
 var SupportedAssets = [
@@ -179,16 +180,38 @@ function mapEarnings(raw, smartWallet) {
     tokens
   };
 }
+function mapWeightedApyByChain(raw) {
+  if (!raw)
+    return void 0;
+  const out = {};
+  for (const [chainKey, tokenApy] of Object.entries(raw)) {
+    const chainId = Number(chainKey);
+    if (!SUPPORTED_CHAIN_IDS.includes(chainId))
+      continue;
+    const perAsset = {};
+    for (const [symbol, apy] of Object.entries(tokenApy)) {
+      const token = symbol;
+      if (!SUPPORTED_TOKENS.includes(token))
+        continue;
+      perAsset[token] = apy;
+    }
+    if (Object.keys(perAsset).length > 0)
+      out[chainId] = perAsset;
+  }
+  return Object.keys(out).length > 0 ? out : void 0;
+}
 function mapApyHistory(raw) {
   return {
     walletAddress: raw.walletAddress,
-    weightedApyAfterFee: raw.weightedApyAfterFee ? sumTokenValues(raw.weightedApyAfterFee) : void 0
+    weightedApyAfterFee: raw.weightedApyAfterFee ? sumTokenValues(raw.weightedApyAfterFee) : void 0,
+    apyByChainAndAsset: mapWeightedApyByChain(raw.weightedApyAfterFeeByChain)
   };
 }
 function mapHistory(raw, chainId) {
   const actionMap = {
     "Deposit to protocol": "Deposit",
     "Top up wallet": "Top up",
+    "Partial withdraw from protocol": "Withdraw",
     "Withdraw from protocol": "Withdraw",
     Rebalance: "Rebalance"
   };
@@ -611,6 +634,46 @@ function sumWithdrawnAmount(results) {
   return Object.values(results).reduce((sum, r) => sum + BigInt(r.amount), 0n);
 }
 
+// src/lib/helpers/account-apy-helper.ts
+function aggregateApyByChainAndAsset(agentApys, agentBalances) {
+  const sums = {};
+  const weights = {};
+  for (const id of Object.keys(agentApys)) {
+    const cells = agentApys[id].apyByChainAndAsset;
+    const balance = agentBalances[id] ?? 0;
+    if (!cells || balance <= 0)
+      continue;
+    for (const [chainKey, perAsset] of Object.entries(cells)) {
+      if (!perAsset)
+        continue;
+      const chainId = Number(chainKey);
+      for (const [asset, apyValue] of Object.entries(perAsset)) {
+        const apy = Number(apyValue ?? 0);
+        if (apy === 0)
+          continue;
+        sums[chainId] ??= {};
+        weights[chainId] ??= {};
+        sums[chainId][asset] = (sums[chainId][asset] ?? 0) + apy * balance;
+        weights[chainId][asset] = (weights[chainId][asset] ?? 0) + balance;
+      }
+    }
+  }
+  const out = {};
+  for (const chainKey of Object.keys(sums)) {
+    const chainId = Number(chainKey);
+    const perAssetOut = {};
+    for (const asset of Object.keys(sums[chainId])) {
+      const w = weights[chainId][asset];
+      if (w > 0)
+        perAssetOut[asset] = sums[chainId][asset] / w;
+    }
+    if (Object.keys(perAssetOut).length > 0) {
+      out[chainId] = perAssetOut;
+    }
+  }
+  return out;
+}
+
 // src/client.ts
 var OwneySDK = class {
   agents = /* @__PURE__ */ new Map();
@@ -1012,7 +1075,10 @@ var OwneySDK = class {
           { asset, agentErrors: agentErrors2 }
         );
       }
-      return { agentResult: results2 };
+      return {
+        agentResult: results2,
+        totalWithdrawn: sumWithdrawnAmount(results2).toString()
+      };
     }
     const requested = BigInt(amount);
     const aggregated = await this.getBalances();
@@ -1101,7 +1167,7 @@ var OwneySDK = class {
         }
       );
     }
-    return { agentResult: results };
+    return { agentResult: results, totalWithdrawn: withdrawn.toString() };
   }
   // --- Portfolio reads ---
   /**
@@ -1239,9 +1305,11 @@ var OwneySDK = class {
         totalApy += agentApy * weight;
       }
     }
+    const apyByChainAndAsset = aggregateApyByChainAndAsset(results, balances);
     return {
       totalApy: String(totalApy),
-      agentApy: results
+      agentApy: results,
+      apyByChainAndAsset
     };
   }
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owney/sdk",
-  "version": "0.3.0-beta.0",
+  "version": "0.3.1",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -22,7 +22,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@zyfai/sdk": "^0.2.33",
+    "@zyfai/sdk": "^0.2.34",
     "viem": "^2.48.1"
   },
   "devDependencies": {