@owney/sdk 0.7.16-beta.2 → 0.7.16-beta.3

package/dist/index.cjs

@@ -2825,6 +2825,7 @@ function transactionHashes(details) {
   ).filter((value, index, all) => all.indexOf(value) === index);
 }
 function actionEntry(action) {
+  if (action.actionType.toLowerCase().includes("withdraw")) return void 0;
   return {
     agent: "yieldseeker",
     action: actionType(action.actionType),
@@ -2840,11 +2841,27 @@ function actionEntry(action) {
     rebalanceLog: []
   };
 }
-function movementEntry(movement, wallet, agent, asset) {
-  const isDeposit = movement.toAddress.toLowerCase() === wallet.walletAddress.toLowerCase();
+function movementEntry(movement, wallet, agent, asset, ownerAddress, vaultAddresses) {
+  const from = movement.fromAddress.toLowerCase();
+  const to = movement.toAddress.toLowerCase();
+  const owner = ownerAddress.toLowerCase();
+  const agentWallet = wallet.walletAddress.toLowerCase();
+  const baseAsset = agent.assetAddress.toLowerCase();
+  if (movement.chainId !== agent.chainId || movement.assetAddress.toLowerCase() !== baseAsset) {
+    return void 0;
+  }
+  let action;
+  if (from === owner && to === agentWallet) {
+    action = "Top up";
+  } else if (from === agentWallet && to === owner) {
+    action = "Withdraw";
+  } else if (from === agentWallet && vaultAddresses.has(to)) {
+    action = "Deposit";
+  }
+  if (!action) return void 0;
   return {
     agent: "yieldseeker",
-    action: isDeposit ? "Deposit" : "Withdraw",
+    action,
     date: movement.blockDate,
     oldApy: null,
     newApy: null,
@@ -2864,19 +2881,35 @@ function movementEntry(movement, wallet, agent, asset) {
   };
 }
 function mapYieldseekerHistory(contexts, options) {
-  const entries = contexts.flatMap((context) => [
-    ...(context.actions ?? []).map(actionEntry),
-    ...(context.historic?.movements ?? []).map(
-      (movement) => movementEntry(movement, context.wallet, context.agent, context.asset)
-    )
-  ]);
+  const entries = contexts.flatMap((context) => {
+    const vaultAddresses = new Set(
+      context.positions.map(
+        (position2) => position2.yieldOption.address.toLowerCase()
+      )
+    );
+    return [
+      ...(context.historic?.movements ?? []).map(
+        (movement) => movementEntry(
+          movement,
+          context.wallet,
+          context.agent,
+          context.asset,
+          options.ownerAddress,
+          vaultAddresses
+        )
+      ),
+      ...(context.actions ?? []).map(actionEntry)
+    ].filter((entry) => entry !== void 0);
+  });
   const filtered = entries.filter(
     (entry) => (!options.fromDate || entry.date >= options.fromDate) && (!options.toDate || entry.date <= options.toDate)
-  ).filter(
-    (entry, index, all) => all.findIndex(
-      (candidate) => candidate.action === entry.action && candidate.date === entry.date && candidate.transactions[0]?.txHashes[0] === entry.transactions[0]?.txHashes[0]
-    ) === index
-  ).sort((left, right) => right.date.localeCompare(left.date));
+  ).filter((entry, index, all) => {
+    const transactionHash = entry.transactions[0]?.txHashes[0];
+    if (!transactionHash) return true;
+    return all.findIndex(
+      (candidate) => candidate.action === entry.action && candidate.transactions[0]?.txHashes[0] === transactionHash
+    ) === index;
+  }).sort((left, right) => right.date.localeCompare(left.date));
   return {
     data: filtered.slice(0, options.limit),
     // v1 returns the whole action/movement collection and defines no cursor.
@@ -3195,6 +3228,7 @@ var YieldseekerAgent = class {
     });
     return mapYieldseekerHistory(contexts, {
       limit: options?.limit ?? 10,
+      ownerAddress: state.walletAddress,
       ...options?.fromDate ? { fromDate: options.fromDate } : {},
       ...options?.toDate ? { toDate: options.toDate } : {}
     });

package/dist/index.js

@@ -2804,6 +2804,7 @@ function transactionHashes(details) {
   ).filter((value, index, all) => all.indexOf(value) === index);
 }
 function actionEntry(action) {
+  if (action.actionType.toLowerCase().includes("withdraw")) return void 0;
   return {
     agent: "yieldseeker",
     action: actionType(action.actionType),
@@ -2819,11 +2820,27 @@ function actionEntry(action) {
     rebalanceLog: []
   };
 }
-function movementEntry(movement, wallet, agent, asset) {
-  const isDeposit = movement.toAddress.toLowerCase() === wallet.walletAddress.toLowerCase();
+function movementEntry(movement, wallet, agent, asset, ownerAddress, vaultAddresses) {
+  const from = movement.fromAddress.toLowerCase();
+  const to = movement.toAddress.toLowerCase();
+  const owner = ownerAddress.toLowerCase();
+  const agentWallet = wallet.walletAddress.toLowerCase();
+  const baseAsset = agent.assetAddress.toLowerCase();
+  if (movement.chainId !== agent.chainId || movement.assetAddress.toLowerCase() !== baseAsset) {
+    return void 0;
+  }
+  let action;
+  if (from === owner && to === agentWallet) {
+    action = "Top up";
+  } else if (from === agentWallet && to === owner) {
+    action = "Withdraw";
+  } else if (from === agentWallet && vaultAddresses.has(to)) {
+    action = "Deposit";
+  }
+  if (!action) return void 0;
   return {
     agent: "yieldseeker",
-    action: isDeposit ? "Deposit" : "Withdraw",
+    action,
     date: movement.blockDate,
     oldApy: null,
     newApy: null,
@@ -2843,19 +2860,35 @@ function movementEntry(movement, wallet, agent, asset) {
   };
 }
 function mapYieldseekerHistory(contexts, options) {
-  const entries = contexts.flatMap((context) => [
-    ...(context.actions ?? []).map(actionEntry),
-    ...(context.historic?.movements ?? []).map(
-      (movement) => movementEntry(movement, context.wallet, context.agent, context.asset)
-    )
-  ]);
+  const entries = contexts.flatMap((context) => {
+    const vaultAddresses = new Set(
+      context.positions.map(
+        (position2) => position2.yieldOption.address.toLowerCase()
+      )
+    );
+    return [
+      ...(context.historic?.movements ?? []).map(
+        (movement) => movementEntry(
+          movement,
+          context.wallet,
+          context.agent,
+          context.asset,
+          options.ownerAddress,
+          vaultAddresses
+        )
+      ),
+      ...(context.actions ?? []).map(actionEntry)
+    ].filter((entry) => entry !== void 0);
+  });
   const filtered = entries.filter(
     (entry) => (!options.fromDate || entry.date >= options.fromDate) && (!options.toDate || entry.date <= options.toDate)
-  ).filter(
-    (entry, index, all) => all.findIndex(
-      (candidate) => candidate.action === entry.action && candidate.date === entry.date && candidate.transactions[0]?.txHashes[0] === entry.transactions[0]?.txHashes[0]
-    ) === index
-  ).sort((left, right) => right.date.localeCompare(left.date));
+  ).filter((entry, index, all) => {
+    const transactionHash = entry.transactions[0]?.txHashes[0];
+    if (!transactionHash) return true;
+    return all.findIndex(
+      (candidate) => candidate.action === entry.action && candidate.transactions[0]?.txHashes[0] === transactionHash
+    ) === index;
+  }).sort((left, right) => right.date.localeCompare(left.date));
   return {
     data: filtered.slice(0, options.limit),
     // v1 returns the whole action/movement collection and defines no cursor.
@@ -3174,6 +3207,7 @@ var YieldseekerAgent = class {
     });
     return mapYieldseekerHistory(contexts, {
       limit: options?.limit ?? 10,
+      ownerAddress: state.walletAddress,
       ...options?.fromDate ? { fromDate: options.fromDate } : {},
       ...options?.toDate ? { toDate: options.toDate } : {}
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owney/sdk",
-  "version": "0.7.16-beta.2",
+  "version": "0.7.16-beta.3",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",