@owney/sdk 0.6.5-beta.0 → 0.6.5-beta.1

package/dist/index.cjs

@@ -153,6 +153,20 @@ var DayFilterMapping = {
 };
 
 // src/agents/zyfai/zyfai.mapper.ts
+var DECIMALS_BY_SYMBOL = {
+  usdc: 6,
+  usdt: 6,
+  weth: 18,
+  eth: 18,
+  cbeth: 18,
+  wbtc: 8,
+  cbbtc: 8
+};
+function tokenDecimals(symbol, explicit) {
+  if (typeof explicit === "number" && Number.isFinite(explicit))
+    return explicit;
+  return DECIMALS_BY_SYMBOL[(symbol ?? "").toLowerCase()] ?? 6;
+}
 function mapDeposit(raw) {
   return {
     txHash: raw.txHash,
@@ -210,9 +224,16 @@ function mapBalances(raw, _chainId, smartWallet) {
     pool: p.pool,
     asset: p.token_symbol ?? "",
     // Position amount is hex-encoded base units (like the token balances
-    // above). Supported assets (USDC/USDT) are 6-decimal — hexToDecimal's
-    // default — so no per-token decimals lookup is needed.
-    amount: String(hexToDecimal(p.amount || "0")),
+    // above). `PositionSlot` doesn't type a `decimals` field, but runtime
+    // getBalances payloads often carry one (e.g. 18 for WETH) — prefer that
+    // when present, otherwise fall back to the per-symbol lookup so
+    // non-6-decimal assets like WETH don't render 1e12 too large.
+    amount: String(
+      hexToDecimal(
+        p.amount || "0",
+        tokenDecimals(p.token_symbol, p.decimals)
+      )
+    ),
     apy: p.pool_apy,
     tvl: p.pool_tvl,
     // PositionSlot has no `liquidity` field yet; Zyfai will add it. Narrow
@@ -335,7 +356,15 @@ function mapEntries(rawEntries, chainId) {
           fromPool: from.pool,
           toPool: to.pool,
           tokenSymbol: matched?.token_symbol ?? "",
-          amount: matched ? String(hexToDecimal(matched.amount || "0x")) : "",
+          amount: matched ? String(
+            hexToDecimal(
+              matched.amount || "0x",
+              tokenDecimals(
+                matched.token_symbol,
+                matched.decimals
+              )
+            )
+          ) : "",
           status: "success"
         }
       ];
@@ -354,7 +383,12 @@ function mapEntries(rawEntries, chainId) {
           txHashes: entry.transactionHash ? [entry.transactionHash] : [],
           chainId: entry.chainId,
           tokenSymbol: entry?.positions?.[0]?.token_symbol,
-          amount: hasAmount ? String(hexToDecimal(rawAmount)) : void 0
+          amount: hasAmount ? String(
+            hexToDecimal(
+              rawAmount,
+              tokenDecimals(entry?.positions?.[0]?.token_symbol)
+            )
+          ) : void 0
         }
       ],
       rebalanceLog
@@ -631,22 +665,24 @@ var ZyfaiAgent = class {
   }
   /**
    * 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
+   * on-chain `Transfer` that lands in the user's wallet. 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.
    *
+   * The withdrawn asset varies per entry (USDC or WETH), so it's resolved
+   * from `tx.tokenSymbol` (set by `mapEntries` from the entry's own
+   * position) rather than assumed to always be USDC. Zyfai sometimes
+   * denominates WETH as lowercase "eth" — that's normalized to WETH.
+   * Entries with no symbol (older payload shapes) fall back to USDC to
+   * preserve prior behavior.
+   *
    * 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]
     );
@@ -657,7 +693,17 @@ var ZyfaiAgent = class {
       withdrawals.map(async (entry) => {
         const tx = entry.transactions[0];
         const txHash = tx.txHashes[0];
-        const cached = this.withdrawAmountCache.get(txHash);
+        const rawSymbol = tx.tokenSymbol;
+        const normalizedSymbol = rawSymbol ? rawSymbol.toLowerCase() === "eth" ? "WETH" : rawSymbol.toUpperCase() : "USDC";
+        const asset = SupportedAssets.find(
+          (a) => a.chainId === chainId && a.symbol === normalizedSymbol
+        ) ?? SupportedAssets.find(
+          (a) => a.chainId === chainId && a.symbol === "USDC"
+        );
+        if (!asset)
+          return;
+        const cacheKey = `${txHash}:${asset.address}`;
+        const cached = this.withdrawAmountCache.get(cacheKey);
         if (cached !== void 0) {
           tx.amount = cached;
           return;
@@ -673,7 +719,7 @@ var ZyfaiAgent = class {
             asset.decimals
           );
           if (amount !== void 0) {
-            this.withdrawAmountCache.set(txHash, amount);
+            this.withdrawAmountCache.set(cacheKey, amount);
             tx.amount = amount;
           }
         } catch {

package/dist/index.js

@@ -121,6 +121,20 @@ var DayFilterMapping = {
 };
 
 // src/agents/zyfai/zyfai.mapper.ts
+var DECIMALS_BY_SYMBOL = {
+  usdc: 6,
+  usdt: 6,
+  weth: 18,
+  eth: 18,
+  cbeth: 18,
+  wbtc: 8,
+  cbbtc: 8
+};
+function tokenDecimals(symbol, explicit) {
+  if (typeof explicit === "number" && Number.isFinite(explicit))
+    return explicit;
+  return DECIMALS_BY_SYMBOL[(symbol ?? "").toLowerCase()] ?? 6;
+}
 function mapDeposit(raw) {
   return {
     txHash: raw.txHash,
@@ -178,9 +192,16 @@ function mapBalances(raw, _chainId, smartWallet) {
     pool: p.pool,
     asset: p.token_symbol ?? "",
     // Position amount is hex-encoded base units (like the token balances
-    // above). Supported assets (USDC/USDT) are 6-decimal — hexToDecimal's
-    // default — so no per-token decimals lookup is needed.
-    amount: String(hexToDecimal(p.amount || "0")),
+    // above). `PositionSlot` doesn't type a `decimals` field, but runtime
+    // getBalances payloads often carry one (e.g. 18 for WETH) — prefer that
+    // when present, otherwise fall back to the per-symbol lookup so
+    // non-6-decimal assets like WETH don't render 1e12 too large.
+    amount: String(
+      hexToDecimal(
+        p.amount || "0",
+        tokenDecimals(p.token_symbol, p.decimals)
+      )
+    ),
     apy: p.pool_apy,
     tvl: p.pool_tvl,
     // PositionSlot has no `liquidity` field yet; Zyfai will add it. Narrow
@@ -303,7 +324,15 @@ function mapEntries(rawEntries, chainId) {
           fromPool: from.pool,
           toPool: to.pool,
           tokenSymbol: matched?.token_symbol ?? "",
-          amount: matched ? String(hexToDecimal(matched.amount || "0x")) : "",
+          amount: matched ? String(
+            hexToDecimal(
+              matched.amount || "0x",
+              tokenDecimals(
+                matched.token_symbol,
+                matched.decimals
+              )
+            )
+          ) : "",
           status: "success"
         }
       ];
@@ -322,7 +351,12 @@ function mapEntries(rawEntries, chainId) {
           txHashes: entry.transactionHash ? [entry.transactionHash] : [],
           chainId: entry.chainId,
           tokenSymbol: entry?.positions?.[0]?.token_symbol,
-          amount: hasAmount ? String(hexToDecimal(rawAmount)) : void 0
+          amount: hasAmount ? String(
+            hexToDecimal(
+              rawAmount,
+              tokenDecimals(entry?.positions?.[0]?.token_symbol)
+            )
+          ) : void 0
         }
       ],
       rebalanceLog
@@ -599,22 +633,24 @@ var ZyfaiAgent = class {
   }
   /**
    * 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
+   * on-chain `Transfer` that lands in the user's wallet. 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.
    *
+   * The withdrawn asset varies per entry (USDC or WETH), so it's resolved
+   * from `tx.tokenSymbol` (set by `mapEntries` from the entry's own
+   * position) rather than assumed to always be USDC. Zyfai sometimes
+   * denominates WETH as lowercase "eth" — that's normalized to WETH.
+   * Entries with no symbol (older payload shapes) fall back to USDC to
+   * preserve prior behavior.
+   *
    * 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]
     );
@@ -625,7 +661,17 @@ var ZyfaiAgent = class {
       withdrawals.map(async (entry) => {
         const tx = entry.transactions[0];
         const txHash = tx.txHashes[0];
-        const cached = this.withdrawAmountCache.get(txHash);
+        const rawSymbol = tx.tokenSymbol;
+        const normalizedSymbol = rawSymbol ? rawSymbol.toLowerCase() === "eth" ? "WETH" : rawSymbol.toUpperCase() : "USDC";
+        const asset = SupportedAssets.find(
+          (a) => a.chainId === chainId && a.symbol === normalizedSymbol
+        ) ?? SupportedAssets.find(
+          (a) => a.chainId === chainId && a.symbol === "USDC"
+        );
+        if (!asset)
+          return;
+        const cacheKey = `${txHash}:${asset.address}`;
+        const cached = this.withdrawAmountCache.get(cacheKey);
         if (cached !== void 0) {
           tx.amount = cached;
           return;
@@ -641,7 +687,7 @@ var ZyfaiAgent = class {
             asset.decimals
           );
           if (amount !== void 0) {
-            this.withdrawAmountCache.set(txHash, amount);
+            this.withdrawAmountCache.set(cacheKey, amount);
             tx.amount = amount;
           }
         } catch {

package/package.json

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