@owney/sdk 0.7.21-beta.1 → 0.7.21-beta.3

package/dist/index.cjs

@@ -2626,6 +2626,7 @@ var YieldseekerAuth = class {
     const inFlight = this.pending.get(key2);
     if (inFlight) return inFlight;
     const request = this.sign(state, chainId).then((token) => {
+      if (this.pending.get(key2) !== request) throw new Error("Wallet sign-in session changed. Please try again.");
       this.tokens.set(key2, token);
       writeYieldseekerSession(scope.address, scope.chainId, token);
       return token;
@@ -2634,9 +2635,17 @@ var YieldseekerAuth = class {
     try {
       return await request;
     } finally {
-      this.pending.delete(key2);
+      if (this.pending.get(key2) === request) this.pending.delete(key2);
     }
   }
+  async refreshToken(state, chainId, rejectedToken) {
+    const key2 = this.key(state, chainId);
+    if (this.tokens.get(key2) === rejectedToken) {
+      this.tokens.delete(key2);
+      clearYieldseekerSession(state.walletAddress, chainId);
+    }
+    return this.getToken(state, chainId);
+  }
   matchesOrigin(token) {
     try {
       const message = new import_siwe.SiweMessage(JSON.parse(atob(token)).message);
@@ -2784,7 +2793,7 @@ function providerError(body, fallback) {
   };
 }
 var YieldseekerApiClient = class {
-  constructor(owneyApiKey, baseUrl = YIELDSEEKER_API_BASE_URL, fetchFn = fetch) {
+  constructor(owneyApiKey, baseUrl = YIELDSEEKER_API_BASE_URL, fetchFn = fetch.bind(globalThis)) {
     this.owneyApiKey = owneyApiKey;
     this.baseUrl = baseUrl;
     this.fetchFn = fetchFn;
@@ -3130,7 +3139,16 @@ function actionEntry(action) {
     rebalanceLog: []
   };
 }
-function movementEntry(movement, wallet, agent, asset, ownerAddress, vaultAddresses) {
+function depositDestination(context, movement) {
+  const to = movement.toAddress.toLowerCase();
+  const option = context.positions.find(({ yieldOption }) => yieldOption.chainId === movement.chainId && yieldOption.assetAddress.toLowerCase() === context.agent.assetAddress.toLowerCase() && yieldOption.address.toLowerCase() === to)?.yieldOption;
+  if (option) return { protocol: option.provider || "Vault", pool: option.name, tokenSymbol: context.asset };
+  const receipt = context.historic?.assets.find((asset) => asset.chainId === movement.chainId && !asset.isSpam && asset.address.toLowerCase() === to && asset.address.toLowerCase() !== context.agent.assetAddress.toLowerCase());
+  const minted = receipt && context.historic?.movements.some((candidate) => candidate.chainId === movement.chainId && candidate.transactionHash.toLowerCase() === movement.transactionHash.toLowerCase() && candidate.assetAddress.toLowerCase() === receipt.address.toLowerCase() && candidate.fromAddress.toLowerCase() === "0x0000000000000000000000000000000000000000" && candidate.toAddress.toLowerCase() === context.wallet.walletAddress.toLowerCase() && raw(candidate.assetAmount, "historic position") > 0n);
+  if (receipt && minted) return { protocol: "Vault", pool: receipt.name || receipt.symbol, tokenSymbol: context.asset };
+  return void 0;
+}
+function movementEntry(movement, wallet, agent, asset, ownerAddress, destination) {
   const from = movement.fromAddress.toLowerCase();
   const to = movement.toAddress.toLowerCase();
   const owner = ownerAddress.toLowerCase();
@@ -3144,13 +3162,17 @@ function movementEntry(movement, wallet, agent, asset, ownerAddress, vaultAddres
     action = "Top up";
   } else if (from === agentWallet && to === owner) {
     action = "Withdraw";
-  } else if (from === agentWallet && vaultAddresses.has(to)) {
+  } else if (from === agentWallet && destination) {
     action = "Deposit";
   }
   if (!action) return void 0;
   return {
     agent: "yieldseeker",
     action,
+    ...action === "Deposit" && destination ? { positions: [{
+      ...destination,
+      amount: decimal(movement.assetAmount, YIELDSEEKER_ASSET_METADATA[asset].decimals, "historic position")
+    }] } : {},
     date: movement.blockDate,
     oldApy: null,
     newApy: null,
@@ -3171,34 +3193,52 @@ function movementEntry(movement, wallet, agent, asset, ownerAddress, vaultAddres
 }
 function mapYieldseekerHistory(contexts, options) {
   const entries = contexts.flatMap((context) => {
-    const vaultAddresses = new Set(
-      context.positions.map(
-        (position2) => position2.yieldOption.address.toLowerCase()
-      )
-    );
+    const seenMovements = /* @__PURE__ */ new Set();
+    const movements = (context.historic?.movements ?? []).filter((movement) => {
+      const key2 = `${movement.chainId}:${movement.transactionHash.toLowerCase()}:${movement.logIndex}`;
+      if (seenMovements.has(key2)) return false;
+      seenMovements.add(key2);
+      return true;
+    });
     return [
-      ...(context.historic?.movements ?? []).map(
+      ...movements.map(
         (movement) => movementEntry(
           movement,
           context.wallet,
           context.agent,
           context.asset,
           options.ownerAddress,
-          vaultAddresses
+          depositDestination(context, movement)
         )
       ),
       ...(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) => {
-    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));
+  const grouped = /* @__PURE__ */ new Map();
+  const ungrouped = [];
+  for (const entry of entries) {
+    const tx = entry.transactions[0];
+    const hash = tx?.txHashes[0];
+    if (!hash) {
+      ungrouped.push(entry);
+      continue;
+    }
+    const key2 = `${entry.agent}:${entry.action}:${tx.chainId}:${hash.toLowerCase()}`;
+    const previous = grouped.get(key2);
+    if (!previous) {
+      grouped.set(key2, entry);
+      continue;
+    }
+    if (entry.action === "Deposit" && entry.positions?.length) {
+      if (!previous.positions?.length) {
+        grouped.set(key2, entry);
+        continue;
+      }
+      previous.positions.push(...entry.positions);
+      previous.transactions.push(...entry.transactions);
+    }
+  }
+  const filtered = [...grouped.values(), ...ungrouped].filter((entry) => (!options.fromDate || entry.date >= options.fromDate) && (!options.toDate || entry.date <= options.toDate)).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.
@@ -3845,8 +3885,7 @@ var YieldseekerAgent = class {
       if (!(error instanceof YieldseekerApiError)) throw error;
       if (error.providerCode === "NO_USER") throw error;
       if (!error.isAuthenticationError) throw error;
-      this.auth.clear(state, chainId);
-      signature = await this.auth.getToken(state, chainId);
+      signature = await this.auth.refreshToken(state, chainId, signature);
       try {
         return await request(signature);
       } catch (retryError) {
@@ -4616,6 +4655,7 @@ var OwneySDK = class {
    * After calling this, `connect()` must be called again before using agent methods.
    */
   async disconnect() {
+    this.state = null;
     for (const agent of this.agents.values()) {
       await agent.disconnect();
     }
@@ -4912,6 +4952,7 @@ var OwneySDK = class {
   async activateAgent(chainId, agentId, asset) {
     const state = this.requireState();
     await this.ensureAgentsInitialized();
+    this.assertActivationSession(state);
     if (agentId !== void 0) {
       if (agentId.length === 0) {
         throw new OwneyError(
@@ -4968,6 +5009,11 @@ var OwneySDK = class {
     );
     await this.activateAgentsInTurn(enabledCompatible, state, chainId, asset);
   }
+  assertActivationSession(state) {
+    if (this.state !== state) {
+      throw new OwneyError("NOT_CONNECTED", "Wallet connection changed. Please try again.");
+    }
+  }
   /**
    * Activate agents ONE AT A TIME, each followed by its org policy.
    *
@@ -4991,15 +5037,21 @@ var OwneySDK = class {
     const activatedAgentIds = [];
     const failedAgents = [];
     for (const agent of agents) {
+      this.assertActivationSession(state);
       try {
         await agent.activateAgent(state, chainId, asset);
+        this.assertActivationSession(state);
         await this.applyOrgPolicyTo(agent, state, chainId);
+        this.assertActivationSession(state);
         activatedAgentIds.push(agent.id);
       } catch (error) {
+        this.assertActivationSession(state);
+        const message = error !== null && typeof error === "object" && "message" in error && typeof error.message === "string" ? error.message : typeof error === "string" ? error : "No activation error message was returned.";
         failedAgents.push({
           agentId: agent.id,
           code: error instanceof OwneyError ? error.code : void 0,
-          message: error instanceof Error ? error.message : String(error)
+          message,
+          ...error instanceof OwneyError && error.details ? { details: error.details } : {}
         });
         if (firstError === null) {
           firstError = error;
@@ -5012,10 +5064,12 @@ var OwneySDK = class {
     if (activatedAgentIds.length === 0) throw firstError;
     const failedAgentIds = failedAgents.map(({ agentId }) => agentId);
     const activeNames = activatedAgentIds.map(this.formatAgentName).join(", ");
-    const remainingNames = failedAgentIds.map(this.formatAgentName).join(", ");
+    const failureMessages = failedAgents.map(
+      ({ agentId, message }) => `${this.formatAgentName(agentId)} activation failed: ${message}`
+    ).join(" ");
     throw new OwneyError(
       "AGENT_ACTIVATION_PARTIAL_FAILURE",
-      `${activeNames} activated, but ${remainingNames} still needs activation. Try again and approve the remaining wallet request.`,
+      `${activeNames} activated. ${failureMessages}`,
       { activatedAgentIds, failedAgentIds, failures: failedAgents }
     );
   }

package/dist/index.d.cts

@@ -587,6 +587,7 @@ declare class OwneySDK {
      *   throws before activating any agent.
      */
     activateAgent(chainId: number, agentId?: AgentId[], asset?: OwneySupportedTokens): Promise<void>;
+    private assertActivationSession;
     /**
      * Activate agents ONE AT A TIME, each followed by its org policy.
      *

package/dist/index.d.ts

@@ -587,6 +587,7 @@ declare class OwneySDK {
      *   throws before activating any agent.
      */
     activateAgent(chainId: number, agentId?: AgentId[], asset?: OwneySupportedTokens): Promise<void>;
+    private assertActivationSession;
     /**
      * Activate agents ONE AT A TIME, each followed by its org policy.
      *

package/dist/index.js

@@ -2605,6 +2605,7 @@ var YieldseekerAuth = class {
     const inFlight = this.pending.get(key2);
     if (inFlight) return inFlight;
     const request = this.sign(state, chainId).then((token) => {
+      if (this.pending.get(key2) !== request) throw new Error("Wallet sign-in session changed. Please try again.");
       this.tokens.set(key2, token);
       writeYieldseekerSession(scope.address, scope.chainId, token);
       return token;
@@ -2613,9 +2614,17 @@ var YieldseekerAuth = class {
     try {
       return await request;
     } finally {
-      this.pending.delete(key2);
+      if (this.pending.get(key2) === request) this.pending.delete(key2);
     }
   }
+  async refreshToken(state, chainId, rejectedToken) {
+    const key2 = this.key(state, chainId);
+    if (this.tokens.get(key2) === rejectedToken) {
+      this.tokens.delete(key2);
+      clearYieldseekerSession(state.walletAddress, chainId);
+    }
+    return this.getToken(state, chainId);
+  }
   matchesOrigin(token) {
     try {
       const message = new SiweMessage(JSON.parse(atob(token)).message);
@@ -2763,7 +2772,7 @@ function providerError(body, fallback) {
   };
 }
 var YieldseekerApiClient = class {
-  constructor(owneyApiKey, baseUrl = YIELDSEEKER_API_BASE_URL, fetchFn = fetch) {
+  constructor(owneyApiKey, baseUrl = YIELDSEEKER_API_BASE_URL, fetchFn = fetch.bind(globalThis)) {
     this.owneyApiKey = owneyApiKey;
     this.baseUrl = baseUrl;
     this.fetchFn = fetchFn;
@@ -3109,7 +3118,16 @@ function actionEntry(action) {
     rebalanceLog: []
   };
 }
-function movementEntry(movement, wallet, agent, asset, ownerAddress, vaultAddresses) {
+function depositDestination(context, movement) {
+  const to = movement.toAddress.toLowerCase();
+  const option = context.positions.find(({ yieldOption }) => yieldOption.chainId === movement.chainId && yieldOption.assetAddress.toLowerCase() === context.agent.assetAddress.toLowerCase() && yieldOption.address.toLowerCase() === to)?.yieldOption;
+  if (option) return { protocol: option.provider || "Vault", pool: option.name, tokenSymbol: context.asset };
+  const receipt = context.historic?.assets.find((asset) => asset.chainId === movement.chainId && !asset.isSpam && asset.address.toLowerCase() === to && asset.address.toLowerCase() !== context.agent.assetAddress.toLowerCase());
+  const minted = receipt && context.historic?.movements.some((candidate) => candidate.chainId === movement.chainId && candidate.transactionHash.toLowerCase() === movement.transactionHash.toLowerCase() && candidate.assetAddress.toLowerCase() === receipt.address.toLowerCase() && candidate.fromAddress.toLowerCase() === "0x0000000000000000000000000000000000000000" && candidate.toAddress.toLowerCase() === context.wallet.walletAddress.toLowerCase() && raw(candidate.assetAmount, "historic position") > 0n);
+  if (receipt && minted) return { protocol: "Vault", pool: receipt.name || receipt.symbol, tokenSymbol: context.asset };
+  return void 0;
+}
+function movementEntry(movement, wallet, agent, asset, ownerAddress, destination) {
   const from = movement.fromAddress.toLowerCase();
   const to = movement.toAddress.toLowerCase();
   const owner = ownerAddress.toLowerCase();
@@ -3123,13 +3141,17 @@ function movementEntry(movement, wallet, agent, asset, ownerAddress, vaultAddres
     action = "Top up";
   } else if (from === agentWallet && to === owner) {
     action = "Withdraw";
-  } else if (from === agentWallet && vaultAddresses.has(to)) {
+  } else if (from === agentWallet && destination) {
     action = "Deposit";
   }
   if (!action) return void 0;
   return {
     agent: "yieldseeker",
     action,
+    ...action === "Deposit" && destination ? { positions: [{
+      ...destination,
+      amount: decimal(movement.assetAmount, YIELDSEEKER_ASSET_METADATA[asset].decimals, "historic position")
+    }] } : {},
     date: movement.blockDate,
     oldApy: null,
     newApy: null,
@@ -3150,34 +3172,52 @@ function movementEntry(movement, wallet, agent, asset, ownerAddress, vaultAddres
 }
 function mapYieldseekerHistory(contexts, options) {
   const entries = contexts.flatMap((context) => {
-    const vaultAddresses = new Set(
-      context.positions.map(
-        (position2) => position2.yieldOption.address.toLowerCase()
-      )
-    );
+    const seenMovements = /* @__PURE__ */ new Set();
+    const movements = (context.historic?.movements ?? []).filter((movement) => {
+      const key2 = `${movement.chainId}:${movement.transactionHash.toLowerCase()}:${movement.logIndex}`;
+      if (seenMovements.has(key2)) return false;
+      seenMovements.add(key2);
+      return true;
+    });
     return [
-      ...(context.historic?.movements ?? []).map(
+      ...movements.map(
         (movement) => movementEntry(
           movement,
           context.wallet,
           context.agent,
           context.asset,
           options.ownerAddress,
-          vaultAddresses
+          depositDestination(context, movement)
         )
       ),
       ...(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) => {
-    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));
+  const grouped = /* @__PURE__ */ new Map();
+  const ungrouped = [];
+  for (const entry of entries) {
+    const tx = entry.transactions[0];
+    const hash = tx?.txHashes[0];
+    if (!hash) {
+      ungrouped.push(entry);
+      continue;
+    }
+    const key2 = `${entry.agent}:${entry.action}:${tx.chainId}:${hash.toLowerCase()}`;
+    const previous = grouped.get(key2);
+    if (!previous) {
+      grouped.set(key2, entry);
+      continue;
+    }
+    if (entry.action === "Deposit" && entry.positions?.length) {
+      if (!previous.positions?.length) {
+        grouped.set(key2, entry);
+        continue;
+      }
+      previous.positions.push(...entry.positions);
+      previous.transactions.push(...entry.transactions);
+    }
+  }
+  const filtered = [...grouped.values(), ...ungrouped].filter((entry) => (!options.fromDate || entry.date >= options.fromDate) && (!options.toDate || entry.date <= options.toDate)).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.
@@ -3824,8 +3864,7 @@ var YieldseekerAgent = class {
       if (!(error instanceof YieldseekerApiError)) throw error;
       if (error.providerCode === "NO_USER") throw error;
       if (!error.isAuthenticationError) throw error;
-      this.auth.clear(state, chainId);
-      signature = await this.auth.getToken(state, chainId);
+      signature = await this.auth.refreshToken(state, chainId, signature);
       try {
         return await request(signature);
       } catch (retryError) {
@@ -4599,6 +4638,7 @@ var OwneySDK = class {
    * After calling this, `connect()` must be called again before using agent methods.
    */
   async disconnect() {
+    this.state = null;
     for (const agent of this.agents.values()) {
       await agent.disconnect();
     }
@@ -4895,6 +4935,7 @@ var OwneySDK = class {
   async activateAgent(chainId, agentId, asset) {
     const state = this.requireState();
     await this.ensureAgentsInitialized();
+    this.assertActivationSession(state);
     if (agentId !== void 0) {
       if (agentId.length === 0) {
         throw new OwneyError(
@@ -4951,6 +4992,11 @@ var OwneySDK = class {
     );
     await this.activateAgentsInTurn(enabledCompatible, state, chainId, asset);
   }
+  assertActivationSession(state) {
+    if (this.state !== state) {
+      throw new OwneyError("NOT_CONNECTED", "Wallet connection changed. Please try again.");
+    }
+  }
   /**
    * Activate agents ONE AT A TIME, each followed by its org policy.
    *
@@ -4974,15 +5020,21 @@ var OwneySDK = class {
     const activatedAgentIds = [];
     const failedAgents = [];
     for (const agent of agents) {
+      this.assertActivationSession(state);
       try {
         await agent.activateAgent(state, chainId, asset);
+        this.assertActivationSession(state);
         await this.applyOrgPolicyTo(agent, state, chainId);
+        this.assertActivationSession(state);
         activatedAgentIds.push(agent.id);
       } catch (error) {
+        this.assertActivationSession(state);
+        const message = error !== null && typeof error === "object" && "message" in error && typeof error.message === "string" ? error.message : typeof error === "string" ? error : "No activation error message was returned.";
         failedAgents.push({
           agentId: agent.id,
           code: error instanceof OwneyError ? error.code : void 0,
-          message: error instanceof Error ? error.message : String(error)
+          message,
+          ...error instanceof OwneyError && error.details ? { details: error.details } : {}
         });
         if (firstError === null) {
           firstError = error;
@@ -4995,10 +5047,12 @@ var OwneySDK = class {
     if (activatedAgentIds.length === 0) throw firstError;
     const failedAgentIds = failedAgents.map(({ agentId }) => agentId);
     const activeNames = activatedAgentIds.map(this.formatAgentName).join(", ");
-    const remainingNames = failedAgentIds.map(this.formatAgentName).join(", ");
+    const failureMessages = failedAgents.map(
+      ({ agentId, message }) => `${this.formatAgentName(agentId)} activation failed: ${message}`
+    ).join(" ");
     throw new OwneyError(
       "AGENT_ACTIVATION_PARTIAL_FAILURE",
-      `${activeNames} activated, but ${remainingNames} still needs activation. Try again and approve the remaining wallet request.`,
+      `${activeNames} activated. ${failureMessages}`,
       { activatedAgentIds, failedAgentIds, failures: failedAgents }
     );
   }

package/package.json

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