@owney/sdk 0.7.12-beta.1 → 0.7.12-beta.2

package/dist/index.js

@@ -1,17 +1,3 @@
-import {
-  AgentChainIncompatibleError,
-  AgentNotFoundError,
-  ERC20_ALLOWANCE_ABI,
-  MAX_UINT256,
-  NotConnectedError,
-  OwneyError,
-  PERMIT2_ADDRESS,
-  buildPermitTransferFromTypedData,
-  randomPermit2Nonce,
-  readErc20Balance,
-  readPermit2Allowance
-} from "./chunk-PWIKIQOX.js";
-
 // src/agents/zyfai/zyfai.agent.ts
 import { SMART_SESSIONS_VALIDATOR, ZyfaiSDK } from "@zyfai/sdk";
 import { createPublicClient, http, parseAbi } from "viem";
@@ -70,6 +56,55 @@ var SupportedAssets = [
   }
 ];
 
+// src/errors.ts
+var OwneyError = class extends Error {
+  code;
+  details;
+  agentId;
+  constructor(code, message, details, agentId) {
+    const prefix = agentId ? `[${code}][agent:${agentId}]` : `[${code}]`;
+    super(`${prefix} ${message}`);
+    this.name = "OwneyError";
+    this.code = code;
+    this.details = details;
+    this.agentId = agentId;
+  }
+};
+var AgentNotFoundError = class extends OwneyError {
+  constructor(agentId, available) {
+    super(
+      "AGENT_NOT_FOUND",
+      `Unknown agent "${agentId}". Available agents: ${available.join(", ")}`,
+      { agentId, available },
+      agentId
+    );
+    this.name = "AgentNotFoundError";
+  }
+};
+var NotConnectedError = class extends OwneyError {
+  constructor() {
+    super("NOT_CONNECTED", "Not connected. Call sdk.connect(provider) first.");
+    this.name = "NotConnectedError";
+  }
+};
+var AgentChainIncompatibleError = class extends OwneyError {
+  incompatibleAgents;
+  connectedChainId;
+  constructor(incompatibleAgents, connectedChainId) {
+    const details = incompatibleAgents.map(
+      ({ agentId, supportedChainIds }) => `"${agentId}" supports chains [${supportedChainIds.join(", ")}]`
+    ).join("; ");
+    super(
+      "AGENT_CHAIN_INCOMPATIBLE",
+      `Chain ${connectedChainId} is not supported by the following agents: ${details}`,
+      { incompatibleAgents, connectedChainId }
+    );
+    this.name = "AgentChainIncompatibleError";
+    this.incompatibleAgents = incompatibleAgents;
+    this.connectedChainId = connectedChainId;
+  }
+};
+
 // src/lib/utils.ts
 var isValidChainId = (chainId) => {
   if (!SUPPORTED_CHAIN_IDS.includes(chainId)) {
@@ -81,12 +116,6 @@ 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);
@@ -120,10 +149,6 @@ 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;
@@ -188,89 +213,55 @@ function mapPendingAllocations(raw) {
 function mapBalances(raw, _chainId, smartWallet) {
   const portfolio = raw.portfolio;
   const portfolioByChain = portfolio.portfolioByChain ?? {};
-  const rawPositions = portfolio.positions ?? [];
-  const detailByKey = /* @__PURE__ */ new Map();
-  for (const p of rawPositions) {
-    const cid = resolveChainId(p.chain ?? "");
-    const symbol = canonicalSymbol(p.token_symbol ?? "");
-    if (Number.isFinite(cid) && symbol) detailByKey.set(`${cid}:${symbol}`, p);
-  }
   let totalBalance = 0;
   const tokens = [];
-  const positions = [];
   for (const [chainIdKey, tokensBySymbol] of Object.entries(portfolioByChain)) {
     const positionChainId = Number(chainIdKey);
-    const chainName2 = CHAIN_ID_TO_NAME[positionChainId] ?? "BASE";
     for (const [
       symbol,
       { balance, balanceWithFee, decimals }
     ] of Object.entries(tokensBySymbol ?? {})) {
-      const amount = hexToDecimal(
-        balanceWithFee ?? balance ?? "0",
-        tokenDecimals(symbol, decimals)
-      );
+      const amount = hexToDecimal(balanceWithFee ?? balance ?? "0", decimals);
       totalBalance += amount;
       tokens.push({
-        chain: chainName2,
+        chain: CHAIN_ID_TO_NAME[positionChainId] ?? "BASE",
         chainId: positionChainId,
         asset: symbol,
         amount: String(amount)
       });
-      const detail = detailByKey.get(
-        `${positionChainId}:${canonicalSymbol(symbol)}`
-      );
-      positions.push({
-        chain: chainName2,
-        protocol: detail?.protocol_name ?? detail?.protocol_id ?? "",
-        protocolId: detail?.protocol_id,
-        pool: detail?.pool,
-        // 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,
-        // PositionSlot has no `liquidity` field yet; Zyfai will add it. Narrow
-        // structural read keeps it undefined today and auto-populates later.
-        liquidity: detail?.liquidity
-      });
     }
   }
-  if (positions.length === 0) {
-    positions.push(
-      ...(portfolio.positions ?? []).map((p) => ({
-        chain: p.chain ?? "",
-        protocol: p.protocol_name ?? p.protocol_id ?? "",
-        protocolId: p.protocol_id,
-        pool: p.pool,
-        asset: p.token_symbol ?? "",
-        // Fee-adjusted underlying amounts are decimal base-unit strings; the
-        // legacy `amount` fallback is hex. Runtime getBalances payloads often
-        // carry `decimals` (e.g. 18 for WETH) — prefer it when present,
-        // otherwise fall back to the per-symbol lookup.
-        amount: String(
-          p.underlyingAmountWithFee ?? p.underlyingAmount ? normalizeDecimalPlace(
-            p.underlyingAmountWithFee ?? p.underlyingAmount ?? "0",
-            tokenDecimals(
-              p.token_symbol,
-              p.decimals
-            )
-          ) : 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
-        // structural read keeps it undefined today and auto-populates later.
-        liquidity: p.liquidity
-      }))
-    );
-  }
+  const positions = (portfolio.positions ?? []).map((p) => ({
+    chain: p.chain ?? "",
+    protocol: p.protocol_name ?? p.protocol_id ?? "",
+    protocolId: p.protocol_id,
+    pool: p.pool,
+    asset: p.token_symbol ?? "",
+    // Fee-adjusted underlying amounts are decimal base-unit strings. The
+    // legacy `amount` fallback is hex. Runtime
+    // getBalances payloads often carry one (e.g. 18 for WETH) — prefer that
+    // when present, otherwise fall back to the per-symbol lookup.
+    amount: String(
+      p.underlyingAmountWithFee ?? p.underlyingAmount ? normalizeDecimalPlace(
+        p.underlyingAmountWithFee ?? p.underlyingAmount ?? "0",
+        tokenDecimals(
+          p.token_symbol,
+          p.decimals
+        )
+      ) : 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
+    // structural read keeps it undefined today and auto-populates later.
+    liquidity: p.liquidity
+  }));
   const pendingAllocations = mapPendingAllocations(
     portfolio.staleBalances
   );
@@ -1353,37 +1344,6 @@ var ZyfaiAgent = class _ZyfaiAgent {
       );
     }
   }
-  /**
-   * 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)
-        );
-      }
-    }
-  }
   /**
    * True when `smartWallet` is the backend-managed pool wallet Zyfai assigned
    * to this EOA — the "new wallet" kind that is predeployed on the chains it
@@ -1687,12 +1647,14 @@ var ZyfaiAgent = class _ZyfaiAgent {
         );
         const txHash = await depositCallback(smartWallet, validChainId, amount);
         const tokenAddress = asset === "WETH" ? WETH_ADDRESS_BY_CHAIN[validChainId] : void 0;
-        await this.logDepositWithRetry(
-          validChainId,
-          txHash,
-          amount,
-          tokenAddress
-        );
+        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
+          );
+        }
         return { txHash, smartWallet, amount };
       }
       await this.ensureWalletDeployed(this.getAddress(), validChainId);
@@ -1973,10 +1935,11 @@ 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 && isSameAsset(t.asset, asset)
+      (t) => t.chainId === chainId && t.asset.toUpperCase() === target
     );
     if (!tokenBalance) return { agent, balance: 0n };
     return { agent, balance: parseUnits(tokenBalance.amount, decimals) };
@@ -2246,6 +2209,84 @@ async function getSponsorRelayerAddress(input) {
   return parsed.data.relayer;
 }
 
+// src/lib/permit2.ts
+import { bytesToHex as bytesToHex2 } from "viem";
+var PERMIT2_ADDRESS = "0x000000000022D473030F116dDEE9F6B43aC78BA3";
+var MAX_UINT256 = 2n ** 256n - 1n;
+var ERC20_ALLOWANCE_ABI = [
+  {
+    type: "function",
+    name: "allowance",
+    stateMutability: "view",
+    inputs: [
+      { name: "owner", type: "address" },
+      { name: "spender", type: "address" }
+    ],
+    outputs: [{ name: "", type: "uint256" }]
+  },
+  {
+    type: "function",
+    name: "approve",
+    stateMutability: "nonpayable",
+    inputs: [
+      { name: "spender", type: "address" },
+      { name: "amount", type: "uint256" }
+    ],
+    outputs: [{ name: "", type: "bool" }]
+  },
+  {
+    type: "function",
+    name: "balanceOf",
+    stateMutability: "view",
+    inputs: [{ name: "account", type: "address" }],
+    outputs: [{ name: "", type: "uint256" }]
+  }
+];
+function buildPermitTransferFromTypedData(input) {
+  return {
+    domain: {
+      name: "Permit2",
+      chainId: input.chainId,
+      verifyingContract: PERMIT2_ADDRESS
+    },
+    types: {
+      PermitTransferFrom: [
+        { name: "permitted", type: "TokenPermissions" },
+        { name: "spender", type: "address" },
+        { name: "nonce", type: "uint256" },
+        { name: "deadline", type: "uint256" }
+      ],
+      TokenPermissions: [
+        { name: "token", type: "address" },
+        { name: "amount", type: "uint256" }
+      ]
+    },
+    primaryType: "PermitTransferFrom",
+    message: input.message
+  };
+}
+function randomPermit2Nonce() {
+  const bytes = new Uint8Array(32);
+  globalThis.crypto.getRandomValues(bytes);
+  return BigInt(bytesToHex2(bytes));
+}
+async function readPermit2Allowance(publicClient, token, owner) {
+  return publicClient.readContract({
+    address: token,
+    abi: ERC20_ALLOWANCE_ABI,
+    functionName: "allowance",
+    args: [owner, PERMIT2_ADDRESS]
+  });
+}
+async function readErc20Balance(publicClient, token, owner) {
+  return publicClient.readContract({
+    address: token,
+    abi: ERC20_ALLOWANCE_ABI,
+    functionName: "balanceOf",
+    args: [owner]
+  });
+}
+
 // src/lib/chain-guard.ts
 var CHAIN_NAMES = {
   1: "Ethereum",
@@ -2564,7 +2605,6 @@ var VIEM_CHAIN2 = {
   42161: arbitrum2,
   1: mainnet2
 };
-var AGENT_ELIGIBILITY_ORDER = ["surfliquid", "zyfai", "sail"];
 var SPONSORED_WETH_BY_CHAIN = {
   8453: "0x4200000000000000000000000000000000000006",
   42161: "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1",
@@ -2593,7 +2633,6 @@ var OwneySDK = class {
   zyfaiRpcUrls;
   routingApiBaseUrl;
   referralSource;
-  surfliquidApiBaseUrl;
   cachedSponsoredCallback = null;
   cachedWethSponsoredCallback = null;
   paymasterServiceUrl;
@@ -2606,7 +2645,6 @@ var OwneySDK = class {
     this.routingApiBaseUrl = config.routingApiBaseUrl;
     this.paymasterServiceUrl = config.paymasterServiceUrl;
     this.referralSource = config.referralSource;
-    this.surfliquidApiBaseUrl = config.surfliquidApiBaseUrl;
   }
   /**
    * Establish connection state for all subsequent SDK calls.
@@ -2836,8 +2874,8 @@ var OwneySDK = class {
       this.initializingAgentsPromise = (async () => {
         const agentKeys = await fetchAgentKeys(this.apiKey);
         this.disabledAgents.clear();
-        for (const { key: key2, agent_type, project_name, is_enabled } of agentKeys) {
-          const agent = await this.createAgent(agent_type, key2, project_name);
+        for (const { key: key2, agent_type, is_enabled } of agentKeys) {
+          const agent = this.createAgent(agent_type, key2);
           if (!agent) continue;
           this.agents.set(agent_type, agent);
           if (is_enabled === false) {
@@ -2858,22 +2896,10 @@ var OwneySDK = class {
       this.initializingAgentsPromise = null;
     }
   }
-  async createAgent(agentId, key2, projectName) {
+  createAgent(agentId, key2) {
     if (agentId === "zyfai") {
       return new ZyfaiAgent(key2, this.zyfaiRpcUrls, this.referralSource);
     }
-    if (agentId === "surfliquid") {
-      if (!projectName) return null;
-      const { SurfLiquidAgent } = await import("./surfliquid.agent-VNGQUSXN.js");
-      return new SurfLiquidAgent({
-        projectName,
-        appId: key2,
-        // Same-origin proxy override — SurfLiquid auth is an httpOnly cookie,
-        // which WebKit (iOS) discards when it is third-party. See
-        // OwneySDKConfig.surfliquidApiBaseUrl.
-        apiBaseUrl: this.surfliquidApiBaseUrl
-      });
-    }
     return null;
   }
   // --- Account lifecycle ---
@@ -2955,9 +2981,9 @@ var OwneySDK = class {
   /**
    * Activate agents ONE AT A TIME, each followed by its org policy.
    *
-   * Every agent opens its activation with its own wallet signature — Zyfai's
-   * SIWX (exchanged for a JWT) and SurfLiquid's SIWE (exchanged for an httpOnly
-   * cookie). Run in parallel, that puts two `personal_sign` requests on one
+   * Every agent opens its activation with its own wallet signature, each
+   * exchanged for that agent's own backend session — Zyfai's SIWX for a JWT,
+   * Sail's SIWE. Run in parallel, that puts two `personal_sign` requests on one
    * wallet connection in the same instant. Over WalletConnect both are
    * delivered to the wallet, which renders one signing request at a time and
    * queues or silently drops the other: neither promise settles, so activation
@@ -3057,30 +3083,18 @@ var OwneySDK = class {
       );
     }
     const agentResults = {};
-    const agentErrors = {};
     for (const { agent, amount: agentAmount } of agentAmounts) {
-      try {
-        agentResults[agent.id] = await this.depositWithFallback(
-          agent,
-          state,
-          chainId,
-          agentAmount,
-          asset,
-          effectiveCallback,
-          depositCallback
-        );
-      } catch (error) {
-        agentErrors[agent.id] = error instanceof Error ? error.message : String(error);
-      }
-    }
-    if (Object.keys(agentResults).length === 0) {
-      throw new OwneyError(
-        "DEPOSIT_ALL_FAILED",
-        `All ${agentAmounts.length} agent deposit(s) failed.`,
-        { agentErrors }
+      agentResults[agent.id] = await this.depositWithFallback(
+        agent,
+        state,
+        chainId,
+        agentAmount,
+        asset,
+        effectiveCallback,
+        depositCallback
       );
     }
-    return Object.keys(agentErrors).length > 0 ? { agentResults, agentErrors } : { agentResults };
+    return { agentResults };
   }
   /**
    * Invokes `agent.deposit` with the resolved sponsored callback, composing
@@ -3196,8 +3210,9 @@ 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 && isSameAsset(t.asset, asset)
+        (t) => t.chainId === chainId && t.asset.toLowerCase() === target
       );
       return !!token && Number(token.amount) > 0;
     } catch {
@@ -3236,34 +3251,6 @@ var OwneySDK = class {
     }
     return eligible;
   }
-  /**
-   * Agent ids the routing API provisioned for this org that support the given
-   * chain + asset, ordered by preference ({@link AGENT_ELIGIBILITY_ORDER},
-   * surfliquid first). Returns `[]` when the org has no compatible agent — never
-   * throws on an empty org. Loads agent keys on first call (apiKey only, no
-   * wallet), so the UI can resolve which agent to use before the user connects.
-   *
-   * This is the source of truth for agent availability: an agent appears here
-   * iff the routing API returned its key. No per-app feature flags.
-   */
-  async getEligibleAgentIds(chainId, asset) {
-    try {
-      await this.ensureAgentsInitialized();
-    } catch (error) {
-      if (error instanceof OwneyError && error.code === "API_NO_AGENTS") {
-        return [];
-      }
-      throw error;
-    }
-    return [...this.agents.values()].filter((agent) => {
-      const chainAssets = agent.supportedAssets.find(
-        (sa) => sa.chainId === chainId
-      );
-      return chainAssets?.assets.some((a) => a.symbol === asset) ?? false;
-    }).map((agent) => agent.id).sort(
-      (a, b) => AGENT_ELIGIBILITY_ORDER.indexOf(a) - AGENT_ELIGIBILITY_ORDER.indexOf(b)
-    );
-  }
   // --- Fund operations ---
   /**
    * Withdraw funds from a specific agent, or all agents that support the active chain+asset if agentId is omitted.
@@ -3299,17 +3286,9 @@ var OwneySDK = class {
     }
     const eligibleAgents = this.getEligibleAgents(chainId, asset);
     if (!amount) {
-      const aggregated2 = await this.getBalances();
-      const funded = projectAgentBalancesForAsset(
-        eligibleAgents,
-        aggregated2.agentBalances,
-        chainId,
-        asset,
-        assetInfo.decimals
-      ).filter((b) => b.balance > 0n);
       const results2 = {};
       const agentErrors2 = {};
-      for (const { agent } of funded) {
+      for (const agent of eligibleAgents) {
         try {
           results2[agent.id] = await agent.withdraw(state, chainId, token);
         } catch (err) {
@@ -3326,10 +3305,9 @@ var OwneySDK = class {
           { asset, agentErrors: agentErrors2 }
         );
       }
-      const totalWithdrawn = funded.filter(({ agent }) => results2[agent.id] !== void 0).reduce((sum, { balance }) => sum + balance, 0n);
       return {
         agentResult: results2,
-        totalWithdrawn: totalWithdrawn.toString()
+        totalWithdrawn: sumWithdrawnAmount(results2).toString()
       };
     }
     const requested = BigInt(amount);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owney/sdk",
-  "version": "0.7.12-beta.1",
+  "version": "0.7.12-beta.2",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -23,9 +23,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@surf_liquid/core-sdk": "^0.4.0",
     "@zyfai/sdk": "0.2.50",
-    "ethers": "^6.17.0",
     "siwe": "^3.0.0",
     "viem": "^2.48.1"
   },