@owney/sdk 0.6.9-beta.7 → 0.6.9-beta.9

package/dist/index.cjs

@@ -334,27 +334,20 @@ var init_surfliquid_wallet_adapter = __esm({
 });
 
 // src/agents/surfliquid/surfliquid.morpho.ts
-async function fetchMorphoVaultStats(vaultAddress, chainId) {
+async function queryMorpho(query, vaultAddress, chainId) {
   try {
     const res = await fetch(MORPHO_API_URL, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({
-        query: VAULT_STATS_QUERY,
+        query,
         variables: { address: vaultAddress, chainId }
       })
     });
     if (!res.ok) return null;
     const json = await res.json();
     if (json.errors) return null;
-    const vault = json.data?.vaultByAddress;
-    const tvlUsd = vault?.state?.totalAssetsUsd;
-    const liquidityUsd = vault?.liquidity?.usd;
-    if (typeof tvlUsd !== "number" || typeof liquidityUsd !== "number") {
-      return null;
-    }
-    const name = typeof vault?.name === "string" ? vault.name : null;
-    return { name, tvlUsd, liquidityUsd };
+    return json.data ?? null;
   } catch (error) {
     console.warn("surfliquid: Morpho vault stats fetch failed", {
       vaultAddress,
@@ -364,6 +357,29 @@ async function fetchMorphoVaultStats(vaultAddress, chainId) {
     return null;
   }
 }
+function toStats(name, tvlUsd, liquidityUsd) {
+  if (typeof tvlUsd !== "number" || typeof liquidityUsd !== "number") {
+    return null;
+  }
+  return {
+    name: typeof name === "string" ? name : null,
+    tvlUsd,
+    liquidityUsd
+  };
+}
+async function fetchMorphoVaultStats(vaultAddress, chainId) {
+  const v1 = await queryMorpho(VAULT_STATS_QUERY, vaultAddress, chainId);
+  const vault = v1?.vaultByAddress;
+  const v1Stats = toStats(
+    vault?.name,
+    vault?.state?.totalAssetsUsd,
+    vault?.liquidity?.usd
+  );
+  if (v1Stats) return v1Stats;
+  const v2 = await queryMorpho(VAULT_V2_STATS_QUERY, vaultAddress, chainId);
+  const vaultV2 = v2?.vaultV2ByAddress;
+  return toStats(vaultV2?.name, vaultV2?.totalAssetsUsd, vaultV2?.liquidityUsd);
+}
 async function fetchMorphoStatsByVault(vaultAddresses, chainId) {
   const unique = [...new Set(vaultAddresses.map((a) => a.toLowerCase()))];
   const entries = await Promise.all(
@@ -377,7 +393,7 @@ async function fetchMorphoStatsByVault(vaultAddresses, chainId) {
   }
   return byVault;
 }
-var MORPHO_API_URL, VAULT_STATS_QUERY;
+var MORPHO_API_URL, VAULT_STATS_QUERY, VAULT_V2_STATS_QUERY;
 var init_surfliquid_morpho = __esm({
   "src/agents/surfliquid/surfliquid.morpho.ts"() {
     "use strict";
@@ -390,6 +406,15 @@ var init_surfliquid_morpho = __esm({
       liquidity { usd }
     }
   }
+`;
+    VAULT_V2_STATS_QUERY = `
+  query VaultV2Stats($address: String!, $chainId: Int!) {
+    vaultV2ByAddress(address: $address, chainId: $chainId) {
+      name
+      totalAssetsUsd
+      liquidityUsd
+    }
+  }
 `;
   }
 });
@@ -723,6 +748,12 @@ var isValidChainId = (chainId) => {
   }
   return chainId;
 };
+function isSameAsset(tokenSymbol, asset) {
+  const token = tokenSymbol.toLowerCase();
+  const target = asset.toLowerCase();
+  if (token === target) return true;
+  return target === "weth" && token === "eth" || target === "eth" && token === "weth";
+}
 function hexToDecimal(hex, decimals = 6) {
   const normalized = hex.startsWith("0x") || hex.startsWith("0X") ? hex : `0x${hex}`;
   const parsed = BigInt(normalized);
@@ -748,6 +779,10 @@ var DECIMALS_BY_SYMBOL = {
   wbtc: 8,
   cbbtc: 8
 };
+function canonicalSymbol(symbol) {
+  const upper = symbol.toUpperCase();
+  return upper === "ETH" ? "WETH" : upper;
+}
 function tokenDecimals(symbol, explicit) {
   if (typeof explicit === "number" && Number.isFinite(explicit))
     return explicit;
@@ -790,7 +825,7 @@ function mapBalances(raw, _chainId, smartWallet) {
   const detailByKey = /* @__PURE__ */ new Map();
   for (const p of rawPositions) {
     const cid = resolveChainId(p.chain ?? "");
-    const symbol = (p.token_symbol ?? "").toUpperCase();
+    const symbol = canonicalSymbol(p.token_symbol ?? "");
     if (Number.isFinite(cid) && symbol) detailByKey.set(`${cid}:${symbol}`, p);
   }
   let totalBalance = 0;
@@ -810,13 +845,17 @@ function mapBalances(raw, _chainId, smartWallet) {
         asset: symbol,
         amount: String(amount)
       });
-      const detail = detailByKey.get(`${positionChainId}:${symbol.toUpperCase()}`);
+      const detail = detailByKey.get(
+        `${positionChainId}:${canonicalSymbol(symbol)}`
+      );
       positions.push({
         chain: chainName,
         protocol: detail?.protocol_name ?? detail?.protocol_id ?? "",
         protocolId: detail?.protocol_id,
         pool: detail?.pool,
-        asset: symbol,
+        // Report the token the way the rest of owney spells it ("WETH", as the
+        // pre-portfolioByChain mapper did), not Zyfai's internal "eth".
+        asset: canonicalSymbol(symbol),
         amount: String(amount),
         apy: detail?.pool_apy,
         tvl: detail?.pool_tvl,
@@ -1931,6 +1970,37 @@ var ZyfaiAgent = class {
       );
     }
   }
+  /**
+   * Records the deposit with Zyfai, retrying transient failures.
+   *
+   * This runs AFTER the transfer has already landed on-chain, so it must never
+   * fail the deposit — the funds moved. But it is also the ONLY source of the
+   * "Top up wallet" entry the history is built from: Zyfai auto-deploys the
+   * balance it detects either way, so when this call is lost the user's deposit
+   * never appears in Activity (an earlier withdrawal stays the newest row) and
+   * nothing ever backfills it. Retry, then log loudly enough to be recoverable.
+   */
+  async logDepositWithRetry(chainId, txHash, amount, tokenAddress) {
+    const ATTEMPTS = 3;
+    const RETRY_DELAY_MS = 1e3;
+    for (let attempt = 1; attempt <= ATTEMPTS; attempt++) {
+      try {
+        await (tokenAddress ? this.sdk.logDeposit(chainId, txHash, amount, tokenAddress) : this.sdk.logDeposit(chainId, txHash, amount));
+        return;
+      } catch (logError) {
+        if (attempt === ATTEMPTS) {
+          console.error(
+            "[owney-sdk] Deposit landed on-chain but logDeposit failed \u2014 it will be missing from Zyfai history:",
+            { txHash, chainId, amount, tokenAddress, error: logError }
+          );
+          return;
+        }
+        await new Promise(
+          (resolve) => setTimeout(resolve, RETRY_DELAY_MS * attempt)
+        );
+      }
+    }
+  }
   async deposit(state, chainId, amount, asset, depositCallback) {
     try {
       await this.connectFull(state, chainId);
@@ -1946,14 +2016,12 @@ var ZyfaiAgent = class {
           amount
         );
         const tokenAddress = asset === "WETH" ? WETH_ADDRESS_BY_CHAIN[validChainId] : void 0;
-        try {
-          await (tokenAddress ? this.sdk.logDeposit(validChainId, txHash, amount, tokenAddress) : this.sdk.logDeposit(validChainId, txHash, amount));
-        } catch (logError) {
-          console.warn(
-            "[owney-sdk] Deposit landed on-chain but logDeposit failed (non-fatal):",
-            logError
-          );
-        }
+        await this.logDepositWithRetry(
+          validChainId,
+          txHash,
+          amount,
+          tokenAddress
+        );
         return { txHash, smartWallet: wallet.address, amount };
       }
       const raw = await this.sdk.depositFunds(
@@ -2197,11 +2265,10 @@ async function withFailureReporting(apiKey, agentType, fn) {
 // src/lib/helpers/withdraw-helper.ts
 var import_viem2 = require("viem");
 function projectAgentBalancesForAsset(agents, aggregated, chainId, asset, decimals) {
-  const target = asset.toUpperCase();
   return agents.map((agent) => {
     const agentBalance = aggregated[agent.id];
     const tokenBalance = agentBalance?.tokens.find(
-      (t) => t.chainId === chainId && t.asset.toUpperCase() === target
+      (t) => t.chainId === chainId && isSameAsset(t.asset, asset)
     );
     if (!tokenBalance) return { agent, balance: 0n };
     return { agent, balance: (0, import_viem2.parseUnits)(tokenBalance.amount, decimals) };
@@ -3235,9 +3302,8 @@ var OwneySDK = class {
   async hasExistingBalance(agent, state, chainId, asset) {
     try {
       const balance = await agent.getBalances(state, chainId);
-      const target = asset.toLowerCase();
       const token = balance.tokens.find(
-        (t) => t.chainId === chainId && t.asset.toLowerCase() === target
+        (t) => t.chainId === chainId && isSameAsset(t.asset, asset)
       );
       return !!token && Number(token.amount) > 0;
     } catch {

package/dist/index.js

@@ -81,6 +81,12 @@ var isValidChainId = (chainId) => {
   }
   return chainId;
 };
+function isSameAsset(tokenSymbol, asset) {
+  const token = tokenSymbol.toLowerCase();
+  const target = asset.toLowerCase();
+  if (token === target) return true;
+  return target === "weth" && token === "eth" || target === "eth" && token === "weth";
+}
 function hexToDecimal(hex, decimals = 6) {
   const normalized = hex.startsWith("0x") || hex.startsWith("0X") ? hex : `0x${hex}`;
   const parsed = BigInt(normalized);
@@ -106,6 +112,10 @@ var DECIMALS_BY_SYMBOL = {
   wbtc: 8,
   cbbtc: 8
 };
+function canonicalSymbol(symbol) {
+  const upper = symbol.toUpperCase();
+  return upper === "ETH" ? "WETH" : upper;
+}
 function tokenDecimals(symbol, explicit) {
   if (typeof explicit === "number" && Number.isFinite(explicit))
     return explicit;
@@ -148,7 +158,7 @@ function mapBalances(raw, _chainId, smartWallet) {
   const detailByKey = /* @__PURE__ */ new Map();
   for (const p of rawPositions) {
     const cid = resolveChainId(p.chain ?? "");
-    const symbol = (p.token_symbol ?? "").toUpperCase();
+    const symbol = canonicalSymbol(p.token_symbol ?? "");
     if (Number.isFinite(cid) && symbol) detailByKey.set(`${cid}:${symbol}`, p);
   }
   let totalBalance = 0;
@@ -168,13 +178,17 @@ function mapBalances(raw, _chainId, smartWallet) {
         asset: symbol,
         amount: String(amount)
       });
-      const detail = detailByKey.get(`${positionChainId}:${symbol.toUpperCase()}`);
+      const detail = detailByKey.get(
+        `${positionChainId}:${canonicalSymbol(symbol)}`
+      );
       positions.push({
         chain: chainName,
         protocol: detail?.protocol_name ?? detail?.protocol_id ?? "",
         protocolId: detail?.protocol_id,
         pool: detail?.pool,
-        asset: symbol,
+        // Report the token the way the rest of owney spells it ("WETH", as the
+        // pre-portfolioByChain mapper did), not Zyfai's internal "eth".
+        asset: canonicalSymbol(symbol),
         amount: String(amount),
         apy: detail?.pool_apy,
         tvl: detail?.pool_tvl,
@@ -1286,6 +1300,37 @@ var ZyfaiAgent = class {
       );
     }
   }
+  /**
+   * Records the deposit with Zyfai, retrying transient failures.
+   *
+   * This runs AFTER the transfer has already landed on-chain, so it must never
+   * fail the deposit — the funds moved. But it is also the ONLY source of the
+   * "Top up wallet" entry the history is built from: Zyfai auto-deploys the
+   * balance it detects either way, so when this call is lost the user's deposit
+   * never appears in Activity (an earlier withdrawal stays the newest row) and
+   * nothing ever backfills it. Retry, then log loudly enough to be recoverable.
+   */
+  async logDepositWithRetry(chainId, txHash, amount, tokenAddress) {
+    const ATTEMPTS = 3;
+    const RETRY_DELAY_MS = 1e3;
+    for (let attempt = 1; attempt <= ATTEMPTS; attempt++) {
+      try {
+        await (tokenAddress ? this.sdk.logDeposit(chainId, txHash, amount, tokenAddress) : this.sdk.logDeposit(chainId, txHash, amount));
+        return;
+      } catch (logError) {
+        if (attempt === ATTEMPTS) {
+          console.error(
+            "[owney-sdk] Deposit landed on-chain but logDeposit failed \u2014 it will be missing from Zyfai history:",
+            { txHash, chainId, amount, tokenAddress, error: logError }
+          );
+          return;
+        }
+        await new Promise(
+          (resolve) => setTimeout(resolve, RETRY_DELAY_MS * attempt)
+        );
+      }
+    }
+  }
   async deposit(state, chainId, amount, asset, depositCallback) {
     try {
       await this.connectFull(state, chainId);
@@ -1301,14 +1346,12 @@ var ZyfaiAgent = class {
           amount
         );
         const tokenAddress = asset === "WETH" ? WETH_ADDRESS_BY_CHAIN[validChainId] : void 0;
-        try {
-          await (tokenAddress ? this.sdk.logDeposit(validChainId, txHash, amount, tokenAddress) : this.sdk.logDeposit(validChainId, txHash, amount));
-        } catch (logError) {
-          console.warn(
-            "[owney-sdk] Deposit landed on-chain but logDeposit failed (non-fatal):",
-            logError
-          );
-        }
+        await this.logDepositWithRetry(
+          validChainId,
+          txHash,
+          amount,
+          tokenAddress
+        );
         return { txHash, smartWallet: wallet.address, amount };
       }
       const raw = await this.sdk.depositFunds(
@@ -1547,11 +1590,10 @@ async function withFailureReporting(apiKey, agentType, fn) {
 // src/lib/helpers/withdraw-helper.ts
 import { parseUnits } from "viem";
 function projectAgentBalancesForAsset(agents, aggregated, chainId, asset, decimals) {
-  const target = asset.toUpperCase();
   return agents.map((agent) => {
     const agentBalance = aggregated[agent.id];
     const tokenBalance = agentBalance?.tokens.find(
-      (t) => t.chainId === chainId && t.asset.toUpperCase() === target
+      (t) => t.chainId === chainId && isSameAsset(t.asset, asset)
     );
     if (!tokenBalance) return { agent, balance: 0n };
     return { agent, balance: parseUnits(tokenBalance.amount, decimals) };
@@ -2278,7 +2320,7 @@ var OwneySDK = class {
     }
     if (agentId === "surfliquid") {
       if (!projectName) return null;
-      const { SurfLiquidAgent } = await import("./surfliquid.agent-JOJJ3C5Y.js");
+      const { SurfLiquidAgent } = await import("./surfliquid.agent-VNGQUSXN.js");
       return new SurfLiquidAgent({
         projectName,
         appId: key2,
@@ -2581,9 +2623,8 @@ var OwneySDK = class {
   async hasExistingBalance(agent, state, chainId, asset) {
     try {
       const balance = await agent.getBalances(state, chainId);
-      const target = asset.toLowerCase();
       const token = balance.tokens.find(
-        (t) => t.chainId === chainId && t.asset.toLowerCase() === target
+        (t) => t.chainId === chainId && isSameAsset(t.asset, asset)
       );
       return !!token && Number(token.amount) > 0;
     } catch {

package/dist/{surfliquid.agent-JOJJ3C5Y.js → surfliquid.agent-VNGQUSXN.js}

@@ -174,27 +174,29 @@ var VAULT_STATS_QUERY = `
     }
   }
 `;
-async function fetchMorphoVaultStats(vaultAddress, chainId) {
+var VAULT_V2_STATS_QUERY = `
+  query VaultV2Stats($address: String!, $chainId: Int!) {
+    vaultV2ByAddress(address: $address, chainId: $chainId) {
+      name
+      totalAssetsUsd
+      liquidityUsd
+    }
+  }
+`;
+async function queryMorpho(query, vaultAddress, chainId) {
   try {
     const res = await fetch(MORPHO_API_URL, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({
-        query: VAULT_STATS_QUERY,
+        query,
         variables: { address: vaultAddress, chainId }
       })
     });
     if (!res.ok) return null;
     const json = await res.json();
     if (json.errors) return null;
-    const vault = json.data?.vaultByAddress;
-    const tvlUsd = vault?.state?.totalAssetsUsd;
-    const liquidityUsd = vault?.liquidity?.usd;
-    if (typeof tvlUsd !== "number" || typeof liquidityUsd !== "number") {
-      return null;
-    }
-    const name = typeof vault?.name === "string" ? vault.name : null;
-    return { name, tvlUsd, liquidityUsd };
+    return json.data ?? null;
   } catch (error) {
     console.warn("surfliquid: Morpho vault stats fetch failed", {
       vaultAddress,
@@ -204,6 +206,29 @@ async function fetchMorphoVaultStats(vaultAddress, chainId) {
     return null;
   }
 }
+function toStats(name, tvlUsd, liquidityUsd) {
+  if (typeof tvlUsd !== "number" || typeof liquidityUsd !== "number") {
+    return null;
+  }
+  return {
+    name: typeof name === "string" ? name : null,
+    tvlUsd,
+    liquidityUsd
+  };
+}
+async function fetchMorphoVaultStats(vaultAddress, chainId) {
+  const v1 = await queryMorpho(VAULT_STATS_QUERY, vaultAddress, chainId);
+  const vault = v1?.vaultByAddress;
+  const v1Stats = toStats(
+    vault?.name,
+    vault?.state?.totalAssetsUsd,
+    vault?.liquidity?.usd
+  );
+  if (v1Stats) return v1Stats;
+  const v2 = await queryMorpho(VAULT_V2_STATS_QUERY, vaultAddress, chainId);
+  const vaultV2 = v2?.vaultV2ByAddress;
+  return toStats(vaultV2?.name, vaultV2?.totalAssetsUsd, vaultV2?.liquidityUsd);
+}
 async function fetchMorphoStatsByVault(vaultAddresses, chainId) {
   const unique = [...new Set(vaultAddresses.map((a) => a.toLowerCase()))];
   const entries = await Promise.all(

package/package.json

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