@owney/sdk 0.5.2 → 0.5.3

package/dist/index.cjs

@@ -157,6 +157,18 @@ var CHAIN_ID_TO_NAME = {
   8453: "BASE",
   42161: "ARBITRUM"
 };
+var NAME_TO_CHAIN_ID = Object.entries(
+  CHAIN_ID_TO_NAME
+).reduce((acc, [id, name]) => {
+  acc[name.toLowerCase()] = Number(id);
+  return acc;
+}, {});
+function resolveChainId(chain) {
+  const asNum = Number(chain);
+  if (Number.isFinite(asNum) && asNum > 0)
+    return asNum;
+  return NAME_TO_CHAIN_ID[chain.trim().toLowerCase()] ?? NaN;
+}
 function mapBalances(raw, _chainId, smartWallet) {
   const portfolio = raw.portfolio;
   const portfolioByChain = portfolio.portfolioByChain ?? {};
@@ -340,6 +352,46 @@ function mapApyByStrategy(raw) {
     detailedApys: hasDetails ? { apyPerAsset } : void 0
   };
 }
+function computeAllocationApy(positions) {
+  let weightedSum = 0;
+  let totalValue = 0;
+  const buckets = {};
+  for (const p of positions) {
+    const apy = p.apy;
+    const value = Number(p.amount);
+    if (typeof apy !== "number" || !Number.isFinite(value) || value <= 0) {
+      continue;
+    }
+    weightedSum += apy * value;
+    totalValue += value;
+    const chainId = resolveChainId(p.chain);
+    const token = p.asset;
+    if (!SUPPORTED_CHAIN_IDS.includes(chainId))
+      continue;
+    if (!SUPPORTED_TOKENS.includes(token))
+      continue;
+    const perAsset = buckets[chainId] ?? {};
+    const cell = perAsset[token] ?? { weightedSum: 0, value: 0 };
+    cell.weightedSum += apy * value;
+    cell.value += value;
+    perAsset[token] = cell;
+    buckets[chainId] = perAsset;
+  }
+  const apyByChainAndAsset = {};
+  for (const [chainKey, perAsset] of Object.entries(buckets)) {
+    const chainId = Number(chainKey);
+    const out = {};
+    for (const [token, cell] of Object.entries(perAsset ?? {})) {
+      if (cell && cell.value > 0) {
+        out[token] = cell.weightedSum / cell.value;
+      }
+    }
+    if (Object.keys(out).length > 0)
+      apyByChainAndAsset[chainId] = out;
+  }
+  const totalApy = totalValue > 0 ? String(weightedSum / totalValue) : "0";
+  return { totalApy, apyByChainAndAsset };
+}
 
 // src/agents/zyfai/zyfai.history-cursor.ts
 var InvalidHistoryCursorError = class extends Error {
@@ -1082,7 +1134,10 @@ var SPONSORED_USDC_BY_CHAIN = {
   8453: "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
   42161: "0xaf88d065e77c8cc2239327c5edb3a432268e5831"
 };
-var VIEM_CHAIN = { 8453: import_chains.base, 42161: import_chains.arbitrum };
+var VIEM_CHAIN = {
+  8453: import_chains.base,
+  42161: import_chains.arbitrum
+};
 var OwneySDK = class {
   agents = /* @__PURE__ */ new Map();
   activeAgents = /* @__PURE__ */ new Set();
@@ -1602,10 +1657,7 @@ var OwneySDK = class {
       disabledBalances,
       requested
     );
-    const enabledTotal = enabledBalances.reduce(
-      (s, b) => s + b.balance,
-      0n
-    );
+    const enabledTotal = enabledBalances.reduce((s, b) => s + b.balance, 0n);
     const enabledPlans = afterDrain > 0n ? planProportionalShares(enabledBalances, afterDrain, enabledTotal) : enabledBalances.map(({ agent, balance }) => ({
       agent,
       balance,
@@ -2005,6 +2057,62 @@ var OwneySDK = class {
       agentPositions: positionsByAgent
     };
   }
+  /**
+   * Allocation-weighted APY from the current portfolio: each pool's APY
+   * weighted by the user's position value in it. More accurate per-user than
+   * the historical 30D APY. (ROUT-228)
+   * @param options.agentId - Optional. Scope to one agent. Omit to aggregate
+   *   positions across all active agents.
+   */
+  async getAllocationApy({
+    agentId
+  } = {}) {
+    const state = this.requireState();
+    const chainId = this.requireChainId();
+    const activeAgents = agentId ? /* @__PURE__ */ new Map([[agentId, this.getAgent(agentId)]]) : this.getActiveAgents();
+    const entries = [...activeAgents.entries()];
+    const balanceResults = await Promise.allSettled(
+      entries.map(async ([id, agent]) => {
+        const b = await agent.getBalances(state, chainId);
+        return [id, b.positions ?? []];
+      })
+    );
+    const agentApy = {};
+    const allPositions = [];
+    let successCount = 0;
+    const agentErrors = {};
+    for (let i = 0; i < balanceResults.length; i++) {
+      const settled = balanceResults[i];
+      const [aid] = entries[i];
+      if (settled.status === "fulfilled") {
+        const [id, positions] = settled.value;
+        const per = computeAllocationApy(positions);
+        agentApy[id] = {
+          totalApy: per.totalApy,
+          apyByChainAndAsset: per.apyByChainAndAsset
+        };
+        allPositions.push(...positions);
+        successCount += 1;
+      } else {
+        const reason = settled.reason;
+        agentErrors[aid] = reason instanceof Error ? reason.message : String(reason);
+        console.error(`getAllocationApy agent "${aid}" failed:`, reason);
+      }
+    }
+    if (successCount === 0) {
+      throw new OwneyError(
+        "ALLOCATION_ALL_FAILED",
+        "Failed to fetch allocation APY: all agents failed.",
+        { agentErrors }
+      );
+    }
+    const overall = computeAllocationApy(allPositions);
+    return {
+      totalApy: overall.totalApy,
+      apyByChainAndAsset: overall.apyByChainAndAsset,
+      agentApy
+    };
+  }
 };
 
 // src/agents/zyfai/zyfai.siwx.ts

package/dist/index.d.cts

@@ -93,6 +93,17 @@ interface OwneyAccountApy {
     agentApy: Record<AgentId, AccountAgentApy>;
     apyByChainAndAsset: ApyByChainAndAsset;
 }
+interface AllocationAgentApy {
+    /** Account-wide weighted APY for this agent, as a decimal string. */
+    totalApy: string;
+    apyByChainAndAsset: ApyByChainAndAsset;
+}
+interface OwneyAllocationApy {
+    /** Account-wide weighted APY across all active agents, as a decimal string. */
+    totalApy: string;
+    apyByChainAndAsset: ApyByChainAndAsset;
+    agentApy: Record<AgentId, AllocationAgentApy>;
+}
 type HistoryAction = "Rebalance" | "Deposit" | "Top up" | "Withdraw" | "Earned";
 interface HistoryTransaction {
     txHashes: string[];
@@ -399,6 +410,16 @@ declare class OwneySDK {
      * @returns Object with agent names as keys and allocation percentages as values
      */
     getAgentAllocation(): Promise<OwneyAgentAllocation>;
+    /**
+     * Allocation-weighted APY from the current portfolio: each pool's APY
+     * weighted by the user's position value in it. More accurate per-user than
+     * the historical 30D APY. (ROUT-228)
+     * @param options.agentId - Optional. Scope to one agent. Omit to aggregate
+     *   positions across all active agents.
+     */
+    getAllocationApy({ agentId, }?: {
+        agentId?: AgentId;
+    }): Promise<OwneyAllocationApy>;
 }
 
 type OwneyErrorCode = "NOT_CONNECTED" | "NO_ACTIVE_CHAIN" | "WALLET_NO_ACCOUNTS" | "WALLET_ADDRESS_REQUIRED" | "AGENT_NOT_FOUND" | "AGENT_CHAIN_INCOMPATIBLE" | "AGENT_EMPTY_LIST" | "AGENT_DISABLED" | "CHAIN_UNSUPPORTED" | "CHAIN_NO_COMPATIBLE_AGENTS" | "ASSET_UNSUPPORTED" | "ASSET_NO_COMPATIBLE_AGENTS" | "DEPOSIT_AMOUNT_BELOW_MINIMUM" | "DEPOSIT_CALLBACK_REQUIRED" | "DEPOSIT_CALLBACK_INVALID" | "DEPOSIT_NO_PERMITTED_TOKENS" | "WITHDRAW_NO_PERMITTED_TOKENS" | "WITHDRAW_INSUFFICIENT_BALANCE" | "WITHDRAW_ALL_FAILED" | "WITHDRAW_PARTIAL_FAILURE" | "WITHDRAW_FAILED" | "API_ROUTING_ERROR" | "API_ROUTING_FAILED" | "API_SAIL_ERROR" | "API_SAIL_TIMEOUT" | "API_NO_AGENTS" | "SPONSOR_REQUEST_FAILED" | "BALANCE_ALL_FAILED" | "ALLOCATION_ALL_FAILED" | "VALIDATION_INVALID_DAYS";
@@ -444,4 +465,4 @@ type OwneySIWXConfig = {
  */
 declare function createOwneySIWX(config: OwneySIWXConfig): SIWXConfig;
 
-export { AccountAgentApy, AccountApyOptions, AgentApy, AgentApyDetails, AgentBalance, AgentChainIncompatibleError, AgentEarnings, AgentHistoryEntry, AgentHistoryPosition, AgentId, AgentNotFoundError, AgentSupportedAsset, AgentSupportedAssets, AgentUserProfile, AgentWithdrawResult, AgentsApyOptions, ApyByChainAndAsset, Asset, ConnectionState, DailyApyDays, DepositCallback, DepositOptions, HistoryAction, HistoryFilters, HistoryOptions, HistoryTransaction, IAgent, InvalidHistoryCursorError, NotConnectedError, OwneyAccountApy, OwneyAgentAllocation, OwneyAgentApy, OwneyAgentHistory, OwneyBalances, OwneyDepositResult, OwneyEarnings, OwneyError, OwneyErrorCode, OwneyMultiDepositResult, OwneyPosition, OwneySDK, OwneySDKConfig, OwneySIWXConfig, OwneySupportedChainId, OwneySupportedChains, OwneySupportedTokens, OwneyToken, OwneyUserProfile, OwneyWithdrawResult, RebalanceLog, WithdrawOptions, createOwneySIWX };
+export { AccountAgentApy, AccountApyOptions, AgentApy, AgentApyDetails, AgentBalance, AgentChainIncompatibleError, AgentEarnings, AgentHistoryEntry, AgentHistoryPosition, AgentId, AgentNotFoundError, AgentSupportedAsset, AgentSupportedAssets, AgentUserProfile, AgentWithdrawResult, AgentsApyOptions, AllocationAgentApy, ApyByChainAndAsset, Asset, ConnectionState, DailyApyDays, DepositCallback, DepositOptions, HistoryAction, HistoryFilters, HistoryOptions, HistoryTransaction, IAgent, InvalidHistoryCursorError, NotConnectedError, OwneyAccountApy, OwneyAgentAllocation, OwneyAgentApy, OwneyAgentHistory, OwneyAllocationApy, OwneyBalances, OwneyDepositResult, OwneyEarnings, OwneyError, OwneyErrorCode, OwneyMultiDepositResult, OwneyPosition, OwneySDK, OwneySDKConfig, OwneySIWXConfig, OwneySupportedChainId, OwneySupportedChains, OwneySupportedTokens, OwneyToken, OwneyUserProfile, OwneyWithdrawResult, RebalanceLog, WithdrawOptions, createOwneySIWX };

package/dist/index.d.ts

@@ -93,6 +93,17 @@ interface OwneyAccountApy {
     agentApy: Record<AgentId, AccountAgentApy>;
     apyByChainAndAsset: ApyByChainAndAsset;
 }
+interface AllocationAgentApy {
+    /** Account-wide weighted APY for this agent, as a decimal string. */
+    totalApy: string;
+    apyByChainAndAsset: ApyByChainAndAsset;
+}
+interface OwneyAllocationApy {
+    /** Account-wide weighted APY across all active agents, as a decimal string. */
+    totalApy: string;
+    apyByChainAndAsset: ApyByChainAndAsset;
+    agentApy: Record<AgentId, AllocationAgentApy>;
+}
 type HistoryAction = "Rebalance" | "Deposit" | "Top up" | "Withdraw" | "Earned";
 interface HistoryTransaction {
     txHashes: string[];
@@ -399,6 +410,16 @@ declare class OwneySDK {
      * @returns Object with agent names as keys and allocation percentages as values
      */
     getAgentAllocation(): Promise<OwneyAgentAllocation>;
+    /**
+     * Allocation-weighted APY from the current portfolio: each pool's APY
+     * weighted by the user's position value in it. More accurate per-user than
+     * the historical 30D APY. (ROUT-228)
+     * @param options.agentId - Optional. Scope to one agent. Omit to aggregate
+     *   positions across all active agents.
+     */
+    getAllocationApy({ agentId, }?: {
+        agentId?: AgentId;
+    }): Promise<OwneyAllocationApy>;
 }
 
 type OwneyErrorCode = "NOT_CONNECTED" | "NO_ACTIVE_CHAIN" | "WALLET_NO_ACCOUNTS" | "WALLET_ADDRESS_REQUIRED" | "AGENT_NOT_FOUND" | "AGENT_CHAIN_INCOMPATIBLE" | "AGENT_EMPTY_LIST" | "AGENT_DISABLED" | "CHAIN_UNSUPPORTED" | "CHAIN_NO_COMPATIBLE_AGENTS" | "ASSET_UNSUPPORTED" | "ASSET_NO_COMPATIBLE_AGENTS" | "DEPOSIT_AMOUNT_BELOW_MINIMUM" | "DEPOSIT_CALLBACK_REQUIRED" | "DEPOSIT_CALLBACK_INVALID" | "DEPOSIT_NO_PERMITTED_TOKENS" | "WITHDRAW_NO_PERMITTED_TOKENS" | "WITHDRAW_INSUFFICIENT_BALANCE" | "WITHDRAW_ALL_FAILED" | "WITHDRAW_PARTIAL_FAILURE" | "WITHDRAW_FAILED" | "API_ROUTING_ERROR" | "API_ROUTING_FAILED" | "API_SAIL_ERROR" | "API_SAIL_TIMEOUT" | "API_NO_AGENTS" | "SPONSOR_REQUEST_FAILED" | "BALANCE_ALL_FAILED" | "ALLOCATION_ALL_FAILED" | "VALIDATION_INVALID_DAYS";
@@ -444,4 +465,4 @@ type OwneySIWXConfig = {
  */
 declare function createOwneySIWX(config: OwneySIWXConfig): SIWXConfig;
 
-export { AccountAgentApy, AccountApyOptions, AgentApy, AgentApyDetails, AgentBalance, AgentChainIncompatibleError, AgentEarnings, AgentHistoryEntry, AgentHistoryPosition, AgentId, AgentNotFoundError, AgentSupportedAsset, AgentSupportedAssets, AgentUserProfile, AgentWithdrawResult, AgentsApyOptions, ApyByChainAndAsset, Asset, ConnectionState, DailyApyDays, DepositCallback, DepositOptions, HistoryAction, HistoryFilters, HistoryOptions, HistoryTransaction, IAgent, InvalidHistoryCursorError, NotConnectedError, OwneyAccountApy, OwneyAgentAllocation, OwneyAgentApy, OwneyAgentHistory, OwneyBalances, OwneyDepositResult, OwneyEarnings, OwneyError, OwneyErrorCode, OwneyMultiDepositResult, OwneyPosition, OwneySDK, OwneySDKConfig, OwneySIWXConfig, OwneySupportedChainId, OwneySupportedChains, OwneySupportedTokens, OwneyToken, OwneyUserProfile, OwneyWithdrawResult, RebalanceLog, WithdrawOptions, createOwneySIWX };
+export { AccountAgentApy, AccountApyOptions, AgentApy, AgentApyDetails, AgentBalance, AgentChainIncompatibleError, AgentEarnings, AgentHistoryEntry, AgentHistoryPosition, AgentId, AgentNotFoundError, AgentSupportedAsset, AgentSupportedAssets, AgentUserProfile, AgentWithdrawResult, AgentsApyOptions, AllocationAgentApy, ApyByChainAndAsset, Asset, ConnectionState, DailyApyDays, DepositCallback, DepositOptions, HistoryAction, HistoryFilters, HistoryOptions, HistoryTransaction, IAgent, InvalidHistoryCursorError, NotConnectedError, OwneyAccountApy, OwneyAgentAllocation, OwneyAgentApy, OwneyAgentHistory, OwneyAllocationApy, OwneyBalances, OwneyDepositResult, OwneyEarnings, OwneyError, OwneyErrorCode, OwneyMultiDepositResult, OwneyPosition, OwneySDK, OwneySDKConfig, OwneySIWXConfig, OwneySupportedChainId, OwneySupportedChains, OwneySupportedTokens, OwneyToken, OwneyUserProfile, OwneyWithdrawResult, RebalanceLog, WithdrawOptions, createOwneySIWX };

package/dist/index.js

@@ -125,6 +125,18 @@ var CHAIN_ID_TO_NAME = {
   8453: "BASE",
   42161: "ARBITRUM"
 };
+var NAME_TO_CHAIN_ID = Object.entries(
+  CHAIN_ID_TO_NAME
+).reduce((acc, [id, name]) => {
+  acc[name.toLowerCase()] = Number(id);
+  return acc;
+}, {});
+function resolveChainId(chain) {
+  const asNum = Number(chain);
+  if (Number.isFinite(asNum) && asNum > 0)
+    return asNum;
+  return NAME_TO_CHAIN_ID[chain.trim().toLowerCase()] ?? NaN;
+}
 function mapBalances(raw, _chainId, smartWallet) {
   const portfolio = raw.portfolio;
   const portfolioByChain = portfolio.portfolioByChain ?? {};
@@ -308,6 +320,46 @@ function mapApyByStrategy(raw) {
     detailedApys: hasDetails ? { apyPerAsset } : void 0
   };
 }
+function computeAllocationApy(positions) {
+  let weightedSum = 0;
+  let totalValue = 0;
+  const buckets = {};
+  for (const p of positions) {
+    const apy = p.apy;
+    const value = Number(p.amount);
+    if (typeof apy !== "number" || !Number.isFinite(value) || value <= 0) {
+      continue;
+    }
+    weightedSum += apy * value;
+    totalValue += value;
+    const chainId = resolveChainId(p.chain);
+    const token = p.asset;
+    if (!SUPPORTED_CHAIN_IDS.includes(chainId))
+      continue;
+    if (!SUPPORTED_TOKENS.includes(token))
+      continue;
+    const perAsset = buckets[chainId] ?? {};
+    const cell = perAsset[token] ?? { weightedSum: 0, value: 0 };
+    cell.weightedSum += apy * value;
+    cell.value += value;
+    perAsset[token] = cell;
+    buckets[chainId] = perAsset;
+  }
+  const apyByChainAndAsset = {};
+  for (const [chainKey, perAsset] of Object.entries(buckets)) {
+    const chainId = Number(chainKey);
+    const out = {};
+    for (const [token, cell] of Object.entries(perAsset ?? {})) {
+      if (cell && cell.value > 0) {
+        out[token] = cell.weightedSum / cell.value;
+      }
+    }
+    if (Object.keys(out).length > 0)
+      apyByChainAndAsset[chainId] = out;
+  }
+  const totalApy = totalValue > 0 ? String(weightedSum / totalValue) : "0";
+  return { totalApy, apyByChainAndAsset };
+}
 
 // src/agents/zyfai/zyfai.history-cursor.ts
 var InvalidHistoryCursorError = class extends Error {
@@ -1054,7 +1106,10 @@ var SPONSORED_USDC_BY_CHAIN = {
   8453: "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
   42161: "0xaf88d065e77c8cc2239327c5edb3a432268e5831"
 };
-var VIEM_CHAIN = { 8453: base, 42161: arbitrum };
+var VIEM_CHAIN = {
+  8453: base,
+  42161: arbitrum
+};
 var OwneySDK = class {
   agents = /* @__PURE__ */ new Map();
   activeAgents = /* @__PURE__ */ new Set();
@@ -1574,10 +1629,7 @@ var OwneySDK = class {
       disabledBalances,
       requested
     );
-    const enabledTotal = enabledBalances.reduce(
-      (s, b) => s + b.balance,
-      0n
-    );
+    const enabledTotal = enabledBalances.reduce((s, b) => s + b.balance, 0n);
     const enabledPlans = afterDrain > 0n ? planProportionalShares(enabledBalances, afterDrain, enabledTotal) : enabledBalances.map(({ agent, balance }) => ({
       agent,
       balance,
@@ -1977,6 +2029,62 @@ var OwneySDK = class {
       agentPositions: positionsByAgent
     };
   }
+  /**
+   * Allocation-weighted APY from the current portfolio: each pool's APY
+   * weighted by the user's position value in it. More accurate per-user than
+   * the historical 30D APY. (ROUT-228)
+   * @param options.agentId - Optional. Scope to one agent. Omit to aggregate
+   *   positions across all active agents.
+   */
+  async getAllocationApy({
+    agentId
+  } = {}) {
+    const state = this.requireState();
+    const chainId = this.requireChainId();
+    const activeAgents = agentId ? /* @__PURE__ */ new Map([[agentId, this.getAgent(agentId)]]) : this.getActiveAgents();
+    const entries = [...activeAgents.entries()];
+    const balanceResults = await Promise.allSettled(
+      entries.map(async ([id, agent]) => {
+        const b = await agent.getBalances(state, chainId);
+        return [id, b.positions ?? []];
+      })
+    );
+    const agentApy = {};
+    const allPositions = [];
+    let successCount = 0;
+    const agentErrors = {};
+    for (let i = 0; i < balanceResults.length; i++) {
+      const settled = balanceResults[i];
+      const [aid] = entries[i];
+      if (settled.status === "fulfilled") {
+        const [id, positions] = settled.value;
+        const per = computeAllocationApy(positions);
+        agentApy[id] = {
+          totalApy: per.totalApy,
+          apyByChainAndAsset: per.apyByChainAndAsset
+        };
+        allPositions.push(...positions);
+        successCount += 1;
+      } else {
+        const reason = settled.reason;
+        agentErrors[aid] = reason instanceof Error ? reason.message : String(reason);
+        console.error(`getAllocationApy agent "${aid}" failed:`, reason);
+      }
+    }
+    if (successCount === 0) {
+      throw new OwneyError(
+        "ALLOCATION_ALL_FAILED",
+        "Failed to fetch allocation APY: all agents failed.",
+        { agentErrors }
+      );
+    }
+    const overall = computeAllocationApy(allPositions);
+    return {
+      totalApy: overall.totalApy,
+      apyByChainAndAsset: overall.apyByChainAndAsset,
+      agentApy
+    };
+  }
 };
 
 // src/agents/zyfai/zyfai.siwx.ts

package/package.json

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