@owney/sdk 0.4.3 → 0.4.5

package/dist/index.cjs

@@ -240,7 +240,6 @@ function mapApyHistory(raw) {
 }
 function mapEntries(rawEntries, chainId) {
   const actionMap = {
-    "Deposit to protocol": "Deposit",
     "Top up wallet": "Top up",
     "Partial withdraw from protocol": "Withdraw",
     "Withdraw from protocol": "Withdraw",
@@ -662,7 +661,7 @@ var ZyfaiAgent = class {
   }
   async getEarnings(state, chainId) {
     const { smartWallet } = await this.resolveSmartWallet(state, chainId);
-    const raw = await this.sdk.calculateOnchainEarnings(smartWallet);
+    const raw = await this.sdk.getOnchainEarnings(smartWallet);
     return mapEarnings(raw, smartWallet);
   }
   async getAccountApy(state, chainId, days) {
@@ -688,17 +687,24 @@ var ZyfaiAgent = class {
         fromDate: options?.fromDate,
         toDate
       });
-      matched.push(...raw.data.filter((e) => e.chainId === validChainId));
+      raw.data.forEach((entry, idx) => {
+        if (entry.chainId === validChainId && entry.action !== "Deposit to protocol") {
+          matched.push({ entry, rawIdx: offset + idx });
+        }
+      });
       offset += raw.data.length;
       if (raw.data.length < backendPageSize) {
         backendExhausted = true;
         break;
       }
     }
-    const overshoot = Math.max(0, matched.length - limit);
-    const pageData = matched.slice(0, limit);
-    const hasMore = !backendExhausted || overshoot > 0;
-    const nextCursor = hasMore ? encodeHistoryCursor({ toDate, rawOffset: offset - overshoot }) : void 0;
+    const pageData = matched.slice(0, limit).map((m) => m.entry);
+    const firstOvershoot = matched[limit];
+    const hasMore = !backendExhausted || firstOvershoot !== void 0;
+    const nextCursor = hasMore ? encodeHistoryCursor({
+      toDate,
+      rawOffset: firstOvershoot ? firstOvershoot.rawIdx : offset
+    }) : void 0;
     return {
       data: mapEntries(pageData, validChainId),
       hasMore,
@@ -1677,9 +1683,20 @@ var OwneySDK = class {
         hasMore = true;
       }
     }
-    merged.sort(
-      (a, b) => new Date(b.date).getTime() - new Date(a.date).getTime()
-    );
+    merged.sort((a, b) => {
+      const dateDiff = new Date(b.date).getTime() - new Date(a.date).getTime();
+      if (dateDiff !== 0)
+        return dateDiff;
+      if (a.agent !== b.agent)
+        return a.agent < b.agent ? -1 : 1;
+      const aTx = a.transactions?.[0]?.txHashes?.[0] ?? "";
+      const bTx = b.transactions?.[0]?.txHashes?.[0] ?? "";
+      if (aTx !== bTx)
+        return aTx < bTx ? -1 : 1;
+      if (a.action !== b.action)
+        return a.action < b.action ? -1 : 1;
+      return 0;
+    });
     return {
       data: merged,
       hasMore,

package/dist/index.d.cts

@@ -170,6 +170,12 @@ interface RebalanceLog {
     amount: string;
     status: "success" | "failed";
 }
+interface AgentHistoryPosition {
+    protocol: string;
+    pool?: string;
+    tokenSymbol?: string;
+    amount?: string;
+}
 interface AgentHistoryEntry {
     agent: AgentId;
     action: HistoryAction;
@@ -178,6 +184,7 @@ interface AgentHistoryEntry {
     newApy: string | null;
     transactions: HistoryTransaction[];
     rebalanceLog: RebalanceLog[];
+    positions?: AgentHistoryPosition[];
 }
 interface OwneyAgentHistory {
     data: AgentHistoryEntry[];
@@ -411,4 +418,4 @@ declare class InvalidHistoryCursorError extends Error {
     constructor(message: string);
 }
 
-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, InvalidHistoryCursorError, 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, 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, OwneyAgentStatus, OwneyBalances, OwneyDepositResult, OwneyEarnings, OwneyError, OwneyErrorCode, OwneyMultiDepositResult, OwneySDK, OwneySDKConfig, OwneySupportedChainId, OwneySupportedChains, OwneySupportedTokens, OwneyToken, OwneyUserProfile, OwneyWithdrawResult, RebalanceLog, WithdrawOptions };

package/dist/index.d.ts

@@ -170,6 +170,12 @@ interface RebalanceLog {
     amount: string;
     status: "success" | "failed";
 }
+interface AgentHistoryPosition {
+    protocol: string;
+    pool?: string;
+    tokenSymbol?: string;
+    amount?: string;
+}
 interface AgentHistoryEntry {
     agent: AgentId;
     action: HistoryAction;
@@ -178,6 +184,7 @@ interface AgentHistoryEntry {
     newApy: string | null;
     transactions: HistoryTransaction[];
     rebalanceLog: RebalanceLog[];
+    positions?: AgentHistoryPosition[];
 }
 interface OwneyAgentHistory {
     data: AgentHistoryEntry[];
@@ -411,4 +418,4 @@ declare class InvalidHistoryCursorError extends Error {
     constructor(message: string);
 }
 
-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, InvalidHistoryCursorError, 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, 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, OwneyAgentStatus, OwneyBalances, OwneyDepositResult, OwneyEarnings, OwneyError, OwneyErrorCode, OwneyMultiDepositResult, OwneySDK, OwneySDKConfig, OwneySupportedChainId, OwneySupportedChains, OwneySupportedTokens, OwneyToken, OwneyUserProfile, OwneyWithdrawResult, RebalanceLog, WithdrawOptions };

package/dist/index.js

@@ -209,7 +209,6 @@ function mapApyHistory(raw) {
 }
 function mapEntries(rawEntries, chainId) {
   const actionMap = {
-    "Deposit to protocol": "Deposit",
     "Top up wallet": "Top up",
     "Partial withdraw from protocol": "Withdraw",
     "Withdraw from protocol": "Withdraw",
@@ -631,7 +630,7 @@ var ZyfaiAgent = class {
   }
   async getEarnings(state, chainId) {
     const { smartWallet } = await this.resolveSmartWallet(state, chainId);
-    const raw = await this.sdk.calculateOnchainEarnings(smartWallet);
+    const raw = await this.sdk.getOnchainEarnings(smartWallet);
     return mapEarnings(raw, smartWallet);
   }
   async getAccountApy(state, chainId, days) {
@@ -657,17 +656,24 @@ var ZyfaiAgent = class {
         fromDate: options?.fromDate,
         toDate
       });
-      matched.push(...raw.data.filter((e) => e.chainId === validChainId));
+      raw.data.forEach((entry, idx) => {
+        if (entry.chainId === validChainId && entry.action !== "Deposit to protocol") {
+          matched.push({ entry, rawIdx: offset + idx });
+        }
+      });
       offset += raw.data.length;
       if (raw.data.length < backendPageSize) {
         backendExhausted = true;
         break;
       }
     }
-    const overshoot = Math.max(0, matched.length - limit);
-    const pageData = matched.slice(0, limit);
-    const hasMore = !backendExhausted || overshoot > 0;
-    const nextCursor = hasMore ? encodeHistoryCursor({ toDate, rawOffset: offset - overshoot }) : void 0;
+    const pageData = matched.slice(0, limit).map((m) => m.entry);
+    const firstOvershoot = matched[limit];
+    const hasMore = !backendExhausted || firstOvershoot !== void 0;
+    const nextCursor = hasMore ? encodeHistoryCursor({
+      toDate,
+      rawOffset: firstOvershoot ? firstOvershoot.rawIdx : offset
+    }) : void 0;
     return {
       data: mapEntries(pageData, validChainId),
       hasMore,
@@ -1646,9 +1652,20 @@ var OwneySDK = class {
         hasMore = true;
       }
     }
-    merged.sort(
-      (a, b) => new Date(b.date).getTime() - new Date(a.date).getTime()
-    );
+    merged.sort((a, b) => {
+      const dateDiff = new Date(b.date).getTime() - new Date(a.date).getTime();
+      if (dateDiff !== 0)
+        return dateDiff;
+      if (a.agent !== b.agent)
+        return a.agent < b.agent ? -1 : 1;
+      const aTx = a.transactions?.[0]?.txHashes?.[0] ?? "";
+      const bTx = b.transactions?.[0]?.txHashes?.[0] ?? "";
+      if (aTx !== bTx)
+        return aTx < bTx ? -1 : 1;
+      if (a.action !== b.action)
+        return a.action < b.action ? -1 : 1;
+      return 0;
+    });
     return {
       data: merged,
       hasMore,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owney/sdk",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -23,7 +23,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@zyfai/sdk": "^0.2.35",
+    "@zyfai/sdk": "^0.2.36",
     "viem": "^2.48.1"
   },
   "devDependencies": {
@@ -35,4 +35,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}