@owney/sdk 0.5.4 → 0.5.5

package/dist/index.cjs

@@ -32,6 +32,8 @@ module.exports = __toCommonJS(src_exports);
 
 // src/agents/zyfai/zyfai.agent.ts
 var import_sdk = require("@zyfai/sdk");
+var import_viem = require("viem");
+var import_chains = require("viem/chains");
 
 // src/types/config.ts
 var P_SUPPORTED_CHAINS = {
@@ -309,11 +311,12 @@ function mapEntries(rawEntries, chainId) {
         }
       ];
     }
+    const mappedAction = (entry.action ? actionMap[entry.action] : void 0) ?? entry.action;
     const rawAmount = entry?.positions?.[0]?.amount;
-    const hasAmount = typeof rawAmount === "string" && rawAmount !== "" && rawAmount !== "0x" && rawAmount !== "0x0" && rawAmount !== "0";
+    const hasAmount = mappedAction !== "Withdraw" && typeof rawAmount === "string" && rawAmount !== "" && rawAmount !== "0x" && rawAmount !== "0x0" && rawAmount !== "0";
     return {
       agent: "zyfai",
-      action: (entry.action ? actionMap[entry.action] : void 0) ?? entry.action,
+      action: mappedAction,
       date: entry.date || "",
       newApy: newApy === null ? null : String(newApy),
       oldApy: oldApy === null ? null : String(oldApy),
@@ -405,6 +408,33 @@ function computeAllocationApy(positions) {
   return { totalApy, apyByChainAndAsset };
 }
 
+// src/agents/zyfai/zyfai.withdraw-amount.ts
+var TRANSFER_TOPIC = "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef";
+function topicToAddress(topic) {
+  return `0x${(topic ?? "").slice(-40)}`.toLowerCase();
+}
+function extractWithdrawnAmount(logs, recipient, token, decimals) {
+  const wantRecipient = recipient.toLowerCase();
+  const wantToken = token.toLowerCase();
+  let total = 0n;
+  let matched = false;
+  for (const log of logs) {
+    if (log.address.toLowerCase() !== wantToken)
+      continue;
+    if ((log.topics[0] ?? "").toLowerCase() !== TRANSFER_TOPIC)
+      continue;
+    if (topicToAddress(log.topics[2]) !== wantRecipient)
+      continue;
+    if (!log.data || log.data === "0x")
+      continue;
+    total += BigInt(log.data);
+    matched = true;
+  }
+  if (!matched)
+    return void 0;
+  return String(hexToDecimal(`0x${total.toString(16)}`, decimals));
+}
+
 // src/agents/zyfai/zyfai.history-cursor.ts
 var InvalidHistoryCursorError = class extends Error {
   code = "invalid_cursor";
@@ -503,6 +533,7 @@ var DEFAULT_ZYFAI_RPC_URLS = {
   8453: "https://base-mainnet.g.alchemy.com/v2/ZWyVU-9XfS3z8Rn-xkq7V",
   42161: "https://arb-mainnet.g.alchemy.com/v2/ZWyVU-9XfS3z8Rn-xkq7V"
 };
+var VIEM_CHAIN = { 8453: import_chains.base, 42161: import_chains.arbitrum };
 var ZyfaiAgent = class {
   id = "zyfai";
   supportedChainIds = [8453, 42161];
@@ -523,13 +554,83 @@ var ZyfaiAgent = class {
   connectedChainId = null;
   smartWalletCache = /* @__PURE__ */ new Map();
   connectAuthPromise = null;
+  rpcUrls;
+  publicClients = /* @__PURE__ */ new Map();
+  // txHash -> resolved withdrawn amount. Receipts are immutable, so a
+  // successful decode is cached forever; failures are NOT cached so a transient
+  // RPC error retries on the next fetch.
+  withdrawAmountCache = /* @__PURE__ */ new Map();
   constructor(apiKey, rpcUrls) {
+    this.rpcUrls = rpcUrls ?? DEFAULT_ZYFAI_RPC_URLS;
     this.sdk = new import_sdk.ZyfaiSDK({
       apiKey,
-      rpcUrls: rpcUrls ?? DEFAULT_ZYFAI_RPC_URLS
+      rpcUrls: this.rpcUrls
     });
     this.installAuthCache();
   }
+  getPublicClient(chainId) {
+    const cached = this.publicClients.get(chainId);
+    if (cached)
+      return cached;
+    const client = (0, import_viem.createPublicClient)({
+      chain: VIEM_CHAIN[chainId],
+      transport: (0, import_viem.http)(this.rpcUrls[chainId])
+    });
+    this.publicClients.set(chainId, client);
+    return client;
+  }
+  /**
+   * Fills in the true withdrawn amount for `Withdraw` entries by decoding the
+   * USDC `Transfer` that lands in the user's wallet on-chain. The Zyfai history
+   * payload only reports the *remaining* position for a partial withdraw (see
+   * the note in `mapEntries`), so without this the UI shows the leftover
+   * balance instead of the amount withdrawn.
+   *
+   * Mutates `entries` in place. Runs all lookups concurrently and is tolerant
+   * of RPC failures: an entry whose amount can't be resolved keeps
+   * `amount: undefined`, which consumers render as a hidden/retryable row
+   * rather than a wrong number.
+   */
+  async resolveWithdrawnAmounts(entries, chainId, recipient) {
+    const asset = SupportedAssets.find(
+      (a) => a.chainId === chainId && a.symbol === "USDC"
+    );
+    if (!asset)
+      return;
+    const withdrawals = entries.filter(
+      (e) => e.action === "Withdraw" && e.transactions[0]?.txHashes[0]
+    );
+    if (withdrawals.length === 0)
+      return;
+    const client = this.getPublicClient(chainId);
+    await Promise.all(
+      withdrawals.map(async (entry) => {
+        const tx = entry.transactions[0];
+        const txHash = tx.txHashes[0];
+        const cached = this.withdrawAmountCache.get(txHash);
+        if (cached !== void 0) {
+          tx.amount = cached;
+          return;
+        }
+        try {
+          const receipt = await client.getTransactionReceipt({
+            hash: txHash
+          });
+          const amount = extractWithdrawnAmount(
+            receipt.logs,
+            recipient,
+            asset.address,
+            asset.decimals
+          );
+          if (amount !== void 0) {
+            this.withdrawAmountCache.set(txHash, amount);
+            tx.amount = amount;
+          }
+        } catch {
+        }
+      })
+    );
+  }
   /**
    * Patches `sdk.authenticateUser` so a fresh page can reuse the JWT from a
    * prior session instead of triggering a new SIWE prompt. Runs inside
@@ -780,8 +881,10 @@ var ZyfaiAgent = class {
       toDate,
       rawOffset: firstOvershoot ? firstOvershoot.rawIdx : offset
     }) : void 0;
+    const data = mapEntries(pageData, validChainId);
+    await this.resolveWithdrawnAmounts(data, validChainId, state.walletAddress);
     return {
-      data: mapEntries(pageData, validChainId),
+      data,
       hasMore,
       nextCursor
     };
@@ -872,7 +975,7 @@ async function withFailureReporting(apiKey, agentType, fn) {
 }
 
 // src/lib/helpers/withdraw-helper.ts
-var import_viem = require("viem");
+var import_viem2 = require("viem");
 function projectAgentBalancesForAsset(agents, aggregated, chainId, asset, decimals) {
   const target = asset.toUpperCase();
   return agents.map((agent) => {
@@ -882,7 +985,7 @@ function projectAgentBalancesForAsset(agents, aggregated, chainId, asset, decima
     );
     if (!tokenBalance)
       return { agent, balance: 0n };
-    return { agent, balance: (0, import_viem.parseUnits)(tokenBalance.amount, decimals) };
+    return { agent, balance: (0, import_viem2.parseUnits)(tokenBalance.amount, decimals) };
   });
 }
 function planProportionalShares(balances, requested, totalAvailable) {
@@ -998,11 +1101,11 @@ function aggregateApyByChainAndAsset(agentApys, agentBalances) {
 }
 
 // src/client.ts
-var import_viem3 = require("viem");
-var import_chains = require("viem/chains");
+var import_viem4 = require("viem");
+var import_chains2 = require("viem/chains");
 
 // src/lib/transfer-auth.ts
-var import_viem2 = require("viem");
+var import_viem3 = require("viem");
 var ERC20_META_ABI = [
   { type: "function", name: "name", stateMutability: "view", inputs: [], outputs: [{ name: "", type: "string" }] },
   { type: "function", name: "version", stateMutability: "view", inputs: [], outputs: [{ name: "", type: "string" }] }
@@ -1034,16 +1137,16 @@ async function readTokenMeta(publicClient, token) {
 function randomAuthNonce() {
   const bytes = new Uint8Array(32);
   globalThis.crypto.getRandomValues(bytes);
-  return (0, import_viem2.bytesToHex)(bytes);
+  return (0, import_viem3.bytesToHex)(bytes);
 }
 
 // src/lib/sponsor-client.ts
 var ROUTING_API_BASE_URL3 = "https://owney-routing-api-243946518160.europe-west4.run.app";
 async function postSponsorTransferAuth(input) {
-  const base2 = input.baseUrl ?? ROUTING_API_BASE_URL3;
+  const base3 = input.baseUrl ?? ROUTING_API_BASE_URL3;
   let res;
   try {
-    res = await fetch(`${base2}/api/v1/sponsor/erc20-transfer-auth`, {
+    res = await fetch(`${base3}/api/v1/sponsor/erc20-transfer-auth`, {
       method: "POST",
       headers: { "content-type": "application/json", "x-owney-api-key": input.apiKey },
       body: JSON.stringify(input.body)
@@ -1146,9 +1249,9 @@ var SPONSORED_USDC_BY_CHAIN = {
   8453: "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
   42161: "0xaf88d065e77c8cc2239327c5edb3a432268e5831"
 };
-var VIEM_CHAIN = {
-  8453: import_chains.base,
-  42161: import_chains.arbitrum
+var VIEM_CHAIN2 = {
+  8453: import_chains2.base,
+  42161: import_chains2.arbitrum
 };
 var OwneySDK = class {
   agents = /* @__PURE__ */ new Map();
@@ -1261,14 +1364,14 @@ var OwneySDK = class {
       // Casts work around viem's chain-narrowed Client vs the generic
       // PublicClient/WalletClient param types — structurally identical at
       // runtime, but the two share a name TS treats as unrelated.
-      getPublicClient: (cid) => (0, import_viem3.createPublicClient)({
-        chain: VIEM_CHAIN[cid],
-        transport: (0, import_viem3.custom)(provider)
+      getPublicClient: (cid) => (0, import_viem4.createPublicClient)({
+        chain: VIEM_CHAIN2[cid],
+        transport: (0, import_viem4.custom)(provider)
       }),
-      getWalletClient: (cid) => (0, import_viem3.createWalletClient)({
+      getWalletClient: (cid) => (0, import_viem4.createWalletClient)({
         account: owner,
-        chain: VIEM_CHAIN[cid],
-        transport: (0, import_viem3.custom)(provider)
+        chain: VIEM_CHAIN2[cid],
+        transport: (0, import_viem4.custom)(provider)
       })
     });
     return this.cachedSponsoredCallback;
@@ -2128,7 +2231,7 @@ var OwneySDK = class {
 };
 
 // src/agents/zyfai/zyfai.siwx.ts
-var import_viem4 = require("viem");
+var import_viem5 = require("viem");
 var import_siwe = require("siwe");
 var import_sdk2 = require("@zyfai/sdk");
 
@@ -2210,7 +2313,7 @@ function buildSIWXConfig(deps) {
       issuedAt,
       toString() {
         return new import_siwe.SiweMessage({
-          address: (0, import_viem4.getAddress)(accountAddress),
+          address: (0, import_viem5.getAddress)(accountAddress),
           chainId: numericChainId(chainId),
           domain,
           uri,
@@ -2286,9 +2389,9 @@ function buildSIWXConfig(deps) {
 }
 function createOwneySIWX(config) {
   const zyfai = new import_sdk2.ZyfaiSDK({ apiKey: config.apiKey });
-  const http = zyfai.httpClient;
+  const http2 = zyfai.httpClient;
   return buildSIWXConfig({
-    post: (url, data) => http.post(url, data),
+    post: (url, data) => http2.post(url, data),
     referralSource: config.referralSource
   });
 }

package/dist/index.js

@@ -1,5 +1,7 @@
 // src/agents/zyfai/zyfai.agent.ts
 import { ZyfaiSDK } from "@zyfai/sdk";
+import { createPublicClient, http } from "viem";
+import { base, arbitrum } from "viem/chains";
 
 // src/types/config.ts
 var P_SUPPORTED_CHAINS = {
@@ -277,11 +279,12 @@ function mapEntries(rawEntries, chainId) {
         }
       ];
     }
+    const mappedAction = (entry.action ? actionMap[entry.action] : void 0) ?? entry.action;
     const rawAmount = entry?.positions?.[0]?.amount;
-    const hasAmount = typeof rawAmount === "string" && rawAmount !== "" && rawAmount !== "0x" && rawAmount !== "0x0" && rawAmount !== "0";
+    const hasAmount = mappedAction !== "Withdraw" && typeof rawAmount === "string" && rawAmount !== "" && rawAmount !== "0x" && rawAmount !== "0x0" && rawAmount !== "0";
     return {
       agent: "zyfai",
-      action: (entry.action ? actionMap[entry.action] : void 0) ?? entry.action,
+      action: mappedAction,
       date: entry.date || "",
       newApy: newApy === null ? null : String(newApy),
       oldApy: oldApy === null ? null : String(oldApy),
@@ -373,6 +376,33 @@ function computeAllocationApy(positions) {
   return { totalApy, apyByChainAndAsset };
 }
 
+// src/agents/zyfai/zyfai.withdraw-amount.ts
+var TRANSFER_TOPIC = "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef";
+function topicToAddress(topic) {
+  return `0x${(topic ?? "").slice(-40)}`.toLowerCase();
+}
+function extractWithdrawnAmount(logs, recipient, token, decimals) {
+  const wantRecipient = recipient.toLowerCase();
+  const wantToken = token.toLowerCase();
+  let total = 0n;
+  let matched = false;
+  for (const log of logs) {
+    if (log.address.toLowerCase() !== wantToken)
+      continue;
+    if ((log.topics[0] ?? "").toLowerCase() !== TRANSFER_TOPIC)
+      continue;
+    if (topicToAddress(log.topics[2]) !== wantRecipient)
+      continue;
+    if (!log.data || log.data === "0x")
+      continue;
+    total += BigInt(log.data);
+    matched = true;
+  }
+  if (!matched)
+    return void 0;
+  return String(hexToDecimal(`0x${total.toString(16)}`, decimals));
+}
+
 // src/agents/zyfai/zyfai.history-cursor.ts
 var InvalidHistoryCursorError = class extends Error {
   code = "invalid_cursor";
@@ -471,6 +501,7 @@ var DEFAULT_ZYFAI_RPC_URLS = {
   8453: "https://base-mainnet.g.alchemy.com/v2/ZWyVU-9XfS3z8Rn-xkq7V",
   42161: "https://arb-mainnet.g.alchemy.com/v2/ZWyVU-9XfS3z8Rn-xkq7V"
 };
+var VIEM_CHAIN = { 8453: base, 42161: arbitrum };
 var ZyfaiAgent = class {
   id = "zyfai";
   supportedChainIds = [8453, 42161];
@@ -491,13 +522,83 @@ var ZyfaiAgent = class {
   connectedChainId = null;
   smartWalletCache = /* @__PURE__ */ new Map();
   connectAuthPromise = null;
+  rpcUrls;
+  publicClients = /* @__PURE__ */ new Map();
+  // txHash -> resolved withdrawn amount. Receipts are immutable, so a
+  // successful decode is cached forever; failures are NOT cached so a transient
+  // RPC error retries on the next fetch.
+  withdrawAmountCache = /* @__PURE__ */ new Map();
   constructor(apiKey, rpcUrls) {
+    this.rpcUrls = rpcUrls ?? DEFAULT_ZYFAI_RPC_URLS;
     this.sdk = new ZyfaiSDK({
       apiKey,
-      rpcUrls: rpcUrls ?? DEFAULT_ZYFAI_RPC_URLS
+      rpcUrls: this.rpcUrls
     });
     this.installAuthCache();
   }
+  getPublicClient(chainId) {
+    const cached = this.publicClients.get(chainId);
+    if (cached)
+      return cached;
+    const client = createPublicClient({
+      chain: VIEM_CHAIN[chainId],
+      transport: http(this.rpcUrls[chainId])
+    });
+    this.publicClients.set(chainId, client);
+    return client;
+  }
+  /**
+   * Fills in the true withdrawn amount for `Withdraw` entries by decoding the
+   * USDC `Transfer` that lands in the user's wallet on-chain. The Zyfai history
+   * payload only reports the *remaining* position for a partial withdraw (see
+   * the note in `mapEntries`), so without this the UI shows the leftover
+   * balance instead of the amount withdrawn.
+   *
+   * Mutates `entries` in place. Runs all lookups concurrently and is tolerant
+   * of RPC failures: an entry whose amount can't be resolved keeps
+   * `amount: undefined`, which consumers render as a hidden/retryable row
+   * rather than a wrong number.
+   */
+  async resolveWithdrawnAmounts(entries, chainId, recipient) {
+    const asset = SupportedAssets.find(
+      (a) => a.chainId === chainId && a.symbol === "USDC"
+    );
+    if (!asset)
+      return;
+    const withdrawals = entries.filter(
+      (e) => e.action === "Withdraw" && e.transactions[0]?.txHashes[0]
+    );
+    if (withdrawals.length === 0)
+      return;
+    const client = this.getPublicClient(chainId);
+    await Promise.all(
+      withdrawals.map(async (entry) => {
+        const tx = entry.transactions[0];
+        const txHash = tx.txHashes[0];
+        const cached = this.withdrawAmountCache.get(txHash);
+        if (cached !== void 0) {
+          tx.amount = cached;
+          return;
+        }
+        try {
+          const receipt = await client.getTransactionReceipt({
+            hash: txHash
+          });
+          const amount = extractWithdrawnAmount(
+            receipt.logs,
+            recipient,
+            asset.address,
+            asset.decimals
+          );
+          if (amount !== void 0) {
+            this.withdrawAmountCache.set(txHash, amount);
+            tx.amount = amount;
+          }
+        } catch {
+        }
+      })
+    );
+  }
   /**
    * Patches `sdk.authenticateUser` so a fresh page can reuse the JWT from a
    * prior session instead of triggering a new SIWE prompt. Runs inside
@@ -748,8 +849,10 @@ var ZyfaiAgent = class {
       toDate,
       rawOffset: firstOvershoot ? firstOvershoot.rawIdx : offset
     }) : void 0;
+    const data = mapEntries(pageData, validChainId);
+    await this.resolveWithdrawnAmounts(data, validChainId, state.walletAddress);
     return {
-      data: mapEntries(pageData, validChainId),
+      data,
       hasMore,
       nextCursor
     };
@@ -967,11 +1070,11 @@ function aggregateApyByChainAndAsset(agentApys, agentBalances) {
 
 // src/client.ts
 import {
-  createPublicClient,
+  createPublicClient as createPublicClient2,
   createWalletClient,
   custom
 } from "viem";
-import { base, arbitrum } from "viem/chains";
+import { base as base2, arbitrum as arbitrum2 } from "viem/chains";
 
 // src/lib/transfer-auth.ts
 import { bytesToHex } from "viem";
@@ -1012,10 +1115,10 @@ function randomAuthNonce() {
 // src/lib/sponsor-client.ts
 var ROUTING_API_BASE_URL3 = "https://owney-routing-api-243946518160.europe-west4.run.app";
 async function postSponsorTransferAuth(input) {
-  const base2 = input.baseUrl ?? ROUTING_API_BASE_URL3;
+  const base3 = input.baseUrl ?? ROUTING_API_BASE_URL3;
   let res;
   try {
-    res = await fetch(`${base2}/api/v1/sponsor/erc20-transfer-auth`, {
+    res = await fetch(`${base3}/api/v1/sponsor/erc20-transfer-auth`, {
       method: "POST",
       headers: { "content-type": "application/json", "x-owney-api-key": input.apiKey },
       body: JSON.stringify(input.body)
@@ -1118,9 +1221,9 @@ var SPONSORED_USDC_BY_CHAIN = {
   8453: "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
   42161: "0xaf88d065e77c8cc2239327c5edb3a432268e5831"
 };
-var VIEM_CHAIN = {
-  8453: base,
-  42161: arbitrum
+var VIEM_CHAIN2 = {
+  8453: base2,
+  42161: arbitrum2
 };
 var OwneySDK = class {
   agents = /* @__PURE__ */ new Map();
@@ -1233,13 +1336,13 @@ var OwneySDK = class {
       // Casts work around viem's chain-narrowed Client vs the generic
       // PublicClient/WalletClient param types — structurally identical at
       // runtime, but the two share a name TS treats as unrelated.
-      getPublicClient: (cid) => createPublicClient({
-        chain: VIEM_CHAIN[cid],
+      getPublicClient: (cid) => createPublicClient2({
+        chain: VIEM_CHAIN2[cid],
         transport: custom(provider)
       }),
       getWalletClient: (cid) => createWalletClient({
         account: owner,
-        chain: VIEM_CHAIN[cid],
+        chain: VIEM_CHAIN2[cid],
         transport: custom(provider)
       })
     });
@@ -2258,9 +2361,9 @@ function buildSIWXConfig(deps) {
 }
 function createOwneySIWX(config) {
   const zyfai = new ZyfaiSDK2({ apiKey: config.apiKey });
-  const http = zyfai.httpClient;
+  const http2 = zyfai.httpClient;
   return buildSIWXConfig({
-    post: (url, data) => http.post(url, data),
+    post: (url, data) => http2.post(url, data),
     referralSource: config.referralSource
   });
 }

package/package.json

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