@owney/sdk 0.2.11 → 0.2.13

package/README.md

@@ -244,11 +244,17 @@ Returns: `AgentEarnings` (single agent) or `OwneyEarnings` (all agents)
 const earnings = await sdk.getEarnings("zyfai");
 console.log(earnings.smartWallet); // "0x..."
 console.log(earnings.lifetimeEarnings); // 42.5
+console.log(earnings.tokens);
+// [
+//   { chain: "BASE", chainId: 8453, asset: "USDC", amount: "30.0" },
+//   { chain: "ARBITRUM", chainId: 42161, asset: "USDC", amount: "12.5" },
+// ]
 
 // All agents
 const allEarnings = await sdk.getEarnings();
 console.log(allEarnings.totalEarnings); // "85.0"
 console.log(allEarnings.agentEarnings.zyfai.lifetimeEarnings); // 42.5
+console.log(allEarnings.agentEarnings.zyfai.tokens); // per-chain, per-asset breakdown
 ```
 
 ### `getAccountApy({ agentId?, days })`
@@ -535,6 +541,7 @@ interface OwneyBalances {
 interface AgentEarnings {
   smartWallet: `0x${string}`;
   lifetimeEarnings: number;
+  tokens: OwneyToken[];
 }
 
 interface OwneyEarnings {
@@ -718,7 +725,3 @@ The three convenience subclasses extend `OwneyError` and remain backwards-compat
 | `NotConnectedError`           | `NOT_CONNECTED`            | —                                        |
 | `AgentNotFoundError`          | `AGENT_NOT_FOUND`          | —                                        |
 | `AgentChainIncompatibleError` | `AGENT_CHAIN_INCOMPATIBLE` | `incompatibleAgents`, `connectedChainId` |
-
-## License
-
-MIT

package/dist/index.cjs

@@ -128,15 +128,6 @@ function hexToDecimal(hex, decimals = 6) {
   const remainder = parsed % divisor;
   return Number(whole) + Number(remainder) / Number(divisor);
 }
-function normalizeDecimalPlace(value, decimals = 6) {
-  const parsed = BigInt(value);
-  if (decimals <= 0)
-    return Number(parsed);
-  const divisor = BigInt(10 ** decimals);
-  const whole = parsed / divisor;
-  const remainder = parsed % divisor;
-  return Number(whole) + Number(remainder) / Number(divisor);
-}
 var DayFilterMapping = {
   "30D": 30,
   "14D": 14,
@@ -162,34 +153,25 @@ var CHAIN_ID_TO_NAME = {
   8453: "BASE",
   42161: "ARBITRUM"
 };
-var CHAIN_NAME_TO_ID = {
-  BASE: 8453,
-  ARBITRUM: 42161
-};
-function mapBalances(raw, chainId, smartWallet) {
+function mapBalances(raw, _chainId, smartWallet) {
   const portfolio = raw.portfolio;
-  const tokenMap = /* @__PURE__ */ new Map();
-  for (const p of portfolio.positions || []) {
-    const symbol = p.token_symbol || "USDC";
-    const positionChainId = (p.chain ? CHAIN_NAME_TO_ID[p.chain.toUpperCase()] : void 0) ?? chainId;
-    const key = `${symbol}:${positionChainId}`;
-    const current = tokenMap.get(key);
-    tokenMap.set(key, {
-      symbol,
-      chainId: positionChainId,
-      amount: (current?.amount ?? 0) + normalizeDecimalPlace(p.underlyingAmount || "0")
-    });
-  }
+  const portfolioByChain = portfolio.portfolioByChain ?? {};
   let totalBalance = 0;
   const tokens = [];
-  for (const [, entry] of tokenMap) {
-    totalBalance += entry.amount;
-    tokens.push({
-      chain: CHAIN_ID_TO_NAME[entry.chainId] ?? "BASE",
-      chainId: entry.chainId,
-      asset: entry.symbol,
-      amount: String(entry.amount)
-    });
+  for (const [chainIdKey, tokensBySymbol] of Object.entries(portfolioByChain)) {
+    const positionChainId = Number(chainIdKey);
+    for (const [symbol, { balance, decimals }] of Object.entries(
+      tokensBySymbol ?? {}
+    )) {
+      const amount = hexToDecimal(balance || "0", decimals);
+      totalBalance += amount;
+      tokens.push({
+        chain: CHAIN_ID_TO_NAME[positionChainId] ?? "BASE",
+        chainId: positionChainId,
+        asset: symbol,
+        amount: String(amount)
+      });
+    }
   }
   return {
     smartWallet,
@@ -204,9 +186,26 @@ function sumTokenEarnings(tokens) {
   return Object.values(tokens).reduce((sum, val) => sum + Number(val), 0);
 }
 function mapEarnings(raw, smartWallet) {
+  const totalEarningsByChain = raw.data.totalEarningsByChain;
+  const tokens = [];
+  for (const [chainIdKey, tokensBySymbol] of Object.entries(
+    totalEarningsByChain
+  )) {
+    const positionChainId = Number(chainIdKey);
+    for (const [symbol, earnings] of Object.entries(tokensBySymbol ?? {})) {
+      const amount = Number(earnings);
+      tokens.push({
+        chain: CHAIN_ID_TO_NAME[positionChainId] ?? "BASE",
+        chainId: positionChainId,
+        asset: symbol,
+        amount: String(amount)
+      });
+    }
+  }
   return {
     smartWallet,
-    lifetimeEarnings: sumTokenEarnings(raw.data.totalEarningsByToken)
+    lifetimeEarnings: sumTokenEarnings(raw.data.totalEarningsByToken),
+    tokens
   };
 }
 function mapApyHistory(raw) {
@@ -215,7 +214,7 @@ function mapApyHistory(raw) {
     weightedApyAfterFee: raw.weightedApyAfterFee ? sumTokenValues(raw.weightedApyAfterFee) : void 0
   };
 }
-function mapHistory(raw) {
+function mapHistory(raw, chainId) {
   const actionMap = {
     "Deposit to protocol": "Deposit",
     "Top up wallet": "Top up",
@@ -224,7 +223,7 @@ function mapHistory(raw) {
   };
   return {
     total: raw.total,
-    data: raw.data.map((entry) => {
+    data: raw.data.filter((d) => d.chainId === chainId).map((entry) => {
       const rawLog = entry.rebalanceLog;
       const positions = entry.positions ?? [];
       let rebalanceLog = [];
@@ -257,7 +256,9 @@ function mapHistory(raw) {
             txHashes: entry.transactionHash ? [entry.transactionHash] : [],
             chainId: entry.chainId,
             tokenSymbol: entry?.positions?.[0]?.token_symbol,
-            amount: String(hexToDecimal(entry?.positions?.[0]?.amount || "0x"))
+            amount: String(
+              hexToDecimal(entry?.positions?.[0]?.amount || "0x")
+            )
           }
         ],
         rebalanceLog
@@ -483,7 +484,7 @@ var ZyfaiAgent = class {
   async getHistory(state, chainId, options) {
     const { smartWallet, chainId: validChainId } = await this.resolveSmartWallet(state, chainId);
     const raw = await this.sdk.getHistory(smartWallet, validChainId, options);
-    return mapHistory(raw);
+    return mapHistory(raw, validChainId);
   }
   // --- IAgent: Agent control ---
   async pause(state, chainId) {
@@ -792,7 +793,7 @@ var OwneySDK = class {
   }
   /**
    * Deposit funds into a specific agent, or split equally across all agents if agentId is omitted.
-    * Validates that the asset is supported and amount meets minimums for the target agent(s).
+   * Validates that the asset is supported and amount meets minimums for the target agent(s).
    * @param options - Deposit parameters
    * @param options.amount - Amount to deposit in smallest unit (e.g. "100000000" for 100 USDC)
    * @param options.asset - Asset symbol to deposit (e.g. "USDC")
@@ -851,7 +852,10 @@ var OwneySDK = class {
     if (valid.length === agents.length) {
       return splits.map((s) => ({ agent: s.agent, amount: String(s.amount) }));
     }
-    return this.splitDepositAmount(totalAmount, valid.map((s) => s.agent));
+    return this.splitDepositAmount(
+      totalAmount,
+      valid.map((s) => s.agent)
+    );
   }
   validateMinDepositAmount(agent, amount) {
     const minDepositAmount = BigInt(agent.minDepositAmount);

package/dist/index.d.cts

@@ -130,6 +130,7 @@ interface OwneyBalances {
 interface AgentEarnings {
     smartWallet: `0x${string}`;
     lifetimeEarnings: number;
+    tokens: OwneyToken[];
 }
 interface OwneyEarnings {
     totalEarnings: string;
@@ -249,7 +250,7 @@ declare class OwneySDK {
     activateAgent(chainId: number, agentId?: AgentId[]): Promise<void>;
     /**
      * Deposit funds into a specific agent, or split equally across all agents if agentId is omitted.
-      * Validates that the asset is supported and amount meets minimums for the target agent(s).
+     * Validates that the asset is supported and amount meets minimums for the target agent(s).
      * @param options - Deposit parameters
      * @param options.amount - Amount to deposit in smallest unit (e.g. "100000000" for 100 USDC)
      * @param options.asset - Asset symbol to deposit (e.g. "USDC")

package/dist/index.d.ts

@@ -130,6 +130,7 @@ interface OwneyBalances {
 interface AgentEarnings {
     smartWallet: `0x${string}`;
     lifetimeEarnings: number;
+    tokens: OwneyToken[];
 }
 interface OwneyEarnings {
     totalEarnings: string;
@@ -249,7 +250,7 @@ declare class OwneySDK {
     activateAgent(chainId: number, agentId?: AgentId[]): Promise<void>;
     /**
      * Deposit funds into a specific agent, or split equally across all agents if agentId is omitted.
-      * Validates that the asset is supported and amount meets minimums for the target agent(s).
+     * Validates that the asset is supported and amount meets minimums for the target agent(s).
      * @param options - Deposit parameters
      * @param options.amount - Amount to deposit in smallest unit (e.g. "100000000" for 100 USDC)
      * @param options.asset - Asset symbol to deposit (e.g. "USDC")

package/dist/index.js

@@ -98,15 +98,6 @@ function hexToDecimal(hex, decimals = 6) {
   const remainder = parsed % divisor;
   return Number(whole) + Number(remainder) / Number(divisor);
 }
-function normalizeDecimalPlace(value, decimals = 6) {
-  const parsed = BigInt(value);
-  if (decimals <= 0)
-    return Number(parsed);
-  const divisor = BigInt(10 ** decimals);
-  const whole = parsed / divisor;
-  const remainder = parsed % divisor;
-  return Number(whole) + Number(remainder) / Number(divisor);
-}
 var DayFilterMapping = {
   "30D": 30,
   "14D": 14,
@@ -132,34 +123,25 @@ var CHAIN_ID_TO_NAME = {
   8453: "BASE",
   42161: "ARBITRUM"
 };
-var CHAIN_NAME_TO_ID = {
-  BASE: 8453,
-  ARBITRUM: 42161
-};
-function mapBalances(raw, chainId, smartWallet) {
+function mapBalances(raw, _chainId, smartWallet) {
   const portfolio = raw.portfolio;
-  const tokenMap = /* @__PURE__ */ new Map();
-  for (const p of portfolio.positions || []) {
-    const symbol = p.token_symbol || "USDC";
-    const positionChainId = (p.chain ? CHAIN_NAME_TO_ID[p.chain.toUpperCase()] : void 0) ?? chainId;
-    const key = `${symbol}:${positionChainId}`;
-    const current = tokenMap.get(key);
-    tokenMap.set(key, {
-      symbol,
-      chainId: positionChainId,
-      amount: (current?.amount ?? 0) + normalizeDecimalPlace(p.underlyingAmount || "0")
-    });
-  }
+  const portfolioByChain = portfolio.portfolioByChain ?? {};
   let totalBalance = 0;
   const tokens = [];
-  for (const [, entry] of tokenMap) {
-    totalBalance += entry.amount;
-    tokens.push({
-      chain: CHAIN_ID_TO_NAME[entry.chainId] ?? "BASE",
-      chainId: entry.chainId,
-      asset: entry.symbol,
-      amount: String(entry.amount)
-    });
+  for (const [chainIdKey, tokensBySymbol] of Object.entries(portfolioByChain)) {
+    const positionChainId = Number(chainIdKey);
+    for (const [symbol, { balance, decimals }] of Object.entries(
+      tokensBySymbol ?? {}
+    )) {
+      const amount = hexToDecimal(balance || "0", decimals);
+      totalBalance += amount;
+      tokens.push({
+        chain: CHAIN_ID_TO_NAME[positionChainId] ?? "BASE",
+        chainId: positionChainId,
+        asset: symbol,
+        amount: String(amount)
+      });
+    }
   }
   return {
     smartWallet,
@@ -174,9 +156,26 @@ function sumTokenEarnings(tokens) {
   return Object.values(tokens).reduce((sum, val) => sum + Number(val), 0);
 }
 function mapEarnings(raw, smartWallet) {
+  const totalEarningsByChain = raw.data.totalEarningsByChain;
+  const tokens = [];
+  for (const [chainIdKey, tokensBySymbol] of Object.entries(
+    totalEarningsByChain
+  )) {
+    const positionChainId = Number(chainIdKey);
+    for (const [symbol, earnings] of Object.entries(tokensBySymbol ?? {})) {
+      const amount = Number(earnings);
+      tokens.push({
+        chain: CHAIN_ID_TO_NAME[positionChainId] ?? "BASE",
+        chainId: positionChainId,
+        asset: symbol,
+        amount: String(amount)
+      });
+    }
+  }
   return {
     smartWallet,
-    lifetimeEarnings: sumTokenEarnings(raw.data.totalEarningsByToken)
+    lifetimeEarnings: sumTokenEarnings(raw.data.totalEarningsByToken),
+    tokens
   };
 }
 function mapApyHistory(raw) {
@@ -185,7 +184,7 @@ function mapApyHistory(raw) {
     weightedApyAfterFee: raw.weightedApyAfterFee ? sumTokenValues(raw.weightedApyAfterFee) : void 0
   };
 }
-function mapHistory(raw) {
+function mapHistory(raw, chainId) {
   const actionMap = {
     "Deposit to protocol": "Deposit",
     "Top up wallet": "Top up",
@@ -194,7 +193,7 @@ function mapHistory(raw) {
   };
   return {
     total: raw.total,
-    data: raw.data.map((entry) => {
+    data: raw.data.filter((d) => d.chainId === chainId).map((entry) => {
       const rawLog = entry.rebalanceLog;
       const positions = entry.positions ?? [];
       let rebalanceLog = [];
@@ -227,7 +226,9 @@ function mapHistory(raw) {
             txHashes: entry.transactionHash ? [entry.transactionHash] : [],
             chainId: entry.chainId,
             tokenSymbol: entry?.positions?.[0]?.token_symbol,
-            amount: String(hexToDecimal(entry?.positions?.[0]?.amount || "0x"))
+            amount: String(
+              hexToDecimal(entry?.positions?.[0]?.amount || "0x")
+            )
           }
         ],
         rebalanceLog
@@ -453,7 +454,7 @@ var ZyfaiAgent = class {
   async getHistory(state, chainId, options) {
     const { smartWallet, chainId: validChainId } = await this.resolveSmartWallet(state, chainId);
     const raw = await this.sdk.getHistory(smartWallet, validChainId, options);
-    return mapHistory(raw);
+    return mapHistory(raw, validChainId);
   }
   // --- IAgent: Agent control ---
   async pause(state, chainId) {
@@ -762,7 +763,7 @@ var OwneySDK = class {
   }
   /**
    * Deposit funds into a specific agent, or split equally across all agents if agentId is omitted.
-    * Validates that the asset is supported and amount meets minimums for the target agent(s).
+   * Validates that the asset is supported and amount meets minimums for the target agent(s).
    * @param options - Deposit parameters
    * @param options.amount - Amount to deposit in smallest unit (e.g. "100000000" for 100 USDC)
    * @param options.asset - Asset symbol to deposit (e.g. "USDC")
@@ -821,7 +822,10 @@ var OwneySDK = class {
     if (valid.length === agents.length) {
       return splits.map((s) => ({ agent: s.agent, amount: String(s.amount) }));
     }
-    return this.splitDepositAmount(totalAmount, valid.map((s) => s.agent));
+    return this.splitDepositAmount(
+      totalAmount,
+      valid.map((s) => s.agent)
+    );
   }
   validateMinDepositAmount(agent, amount) {
     const minDepositAmount = BigInt(agent.minDepositAmount);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owney/sdk",
-  "version": "0.2.11",
+  "version": "0.2.13",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -20,7 +20,7 @@
     "dev": "tsup --watch"
   },
   "dependencies": {
-    "@zyfai/sdk": "^0.2.30",
+    "@zyfai/sdk": "^0.2.32",
     "viem": "^2.48.1"
   },
   "devDependencies": {