@owney/sdk 0.7.28-beta.7 → 0.7.28

package/README.md

@@ -134,6 +134,13 @@ Deposit funds into a specific agent, or split equally across all agents if `agen
 | `options.depositCallback` | `DepositCallback`    | Callback that performs the token transfer and returns a tx hash |
 | `options.agentId`         | `AgentId` (optional) | Target agent. Omit to split equally across all agents.          |
 
+Zyfai's native transfer path uses `sendDeposit()`. It returns after the token
+transfer confirms and the deposit is registered, while balance credit may still
+be queued. Balance reads reflect subsequent credit and allocation; the deposit
+call does not wait for `waitForDepositCredit()`.
+A successful deposit result confirms the transfer; it does not guarantee that
+the funds are already credited or earning yield.
+
 Returns: `OwneyDepositResult` (single agent) or `OwneyMultiDepositResult` (all agents)
 
 ```typescript

package/dist/index.cjs

@@ -351,6 +351,9 @@ var NAME_TO_CHAIN_ID = Object.entries(
   acc[name.toLowerCase()] = Number(id);
   return acc;
 }, {});
+NAME_TO_CHAIN_ID.mainnet = 1;
+NAME_TO_CHAIN_ID["ethereum mainnet"] = 1;
+NAME_TO_CHAIN_ID["arbitrum one"] = 42161;
 function resolveChainId(chain) {
   const asNum = Number(chain);
   if (Number.isFinite(asNum) && asNum > 0) return asNum;
@@ -1441,7 +1444,7 @@ var ZyfaiAgent = class _ZyfaiAgent {
    * chain/account switch fires the provider's `accountsChanged` →
    * `disconnectAccount` (nulls walletClient + authenticatedUserId) while our
    * own `connectAuth` guard still believes this chain is connected and
-   * early-returns. Without this, authenticated calls (depositFunds,
+   * early-returns. Without this, authenticated calls (sendDeposit,
    * withdrawFunds) fail with "No account connected".
    */
   async ensureConnected(state, chainId) {
@@ -2924,9 +2927,24 @@ async function wrapNative(deps, options) {
       message: error instanceof Error ? error.message : String(error)
     });
   }
+  let approvalPending = true;
+  if (options.spender && deps.readAllowance) {
+    try {
+      const allowance = await deps.readAllowance(wrapper, options.spender);
+      approvalPending = allowance < requested;
+    } catch (error) {
+      debugLog(
+        "owney-sdk",
+        "wrap: allowance read failed, assuming an approve",
+        {
+          message: error instanceof Error ? error.message : String(error)
+        }
+      );
+    }
+  }
   const measured = await deps.getMaxFeePerGas();
   const gasPrice = measured > MIN_WALLET_GAS_PRICE ? measured : MIN_WALLET_GAS_PRICE;
-  const reserve = (wrapGas + APPROVE_GAS) * gasPrice * GAS_SAFETY;
+  const reserve = (wrapGas + (approvalPending ? APPROVE_GAS : 0n)) * gasPrice * GAS_SAFETY;
   const spendable = balance > reserve ? balance - reserve : 0n;
   const wrapped = requested < spendable ? requested : spendable;
   debugLog("owney-sdk", "wrap: sizing", {
@@ -2934,6 +2952,7 @@ async function wrapNative(deps, options) {
     requested: requested.toString(),
     measuredGasPrice: measured.toString(),
     reservedAtGasPrice: gasPrice.toString(),
+    approvalPending,
     reserve: reserve.toString(),
     wrapped: wrapped.toString()
   });
@@ -3483,7 +3502,14 @@ async function executeSwap(deps, options) {
   try {
     result = quote.rail === "classic" ? await runClassic(deps, options) : quote.rail === "fusion" ? await runSameChainFusion(deps, options, walletAddress) : await runFusion(deps, options, walletAddress);
   } catch (error) {
-    if (!stoppedWatching(error)) throw error;
+    if (!stoppedWatching(error)) {
+      if (quote.rail !== "fusion") throw error;
+      const now = await deps.readTargetBalance().catch(() => before);
+      if (now <= before) throw error;
+      debugLog("owney-sdk", "swap: rail said no but the funds are here", {
+        message: error instanceof Error ? error.message : String(error)
+      });
+    }
     railError = error;
     debugLog("owney-sdk", "swap: rail failed, checking whether funds landed", {
       message: error instanceof Error ? error.message : String(error)
@@ -3572,7 +3598,7 @@ async function runSameChainFusion(deps, options, walletAddress) {
   const isNativeSource = quote.src.address.toLowerCase().startsWith("0xeeee");
   const amount = isNativeSource ? BigInt(quote.src.amount) : await affordableAmount(deps, BigInt(quote.src.amount));
   const permit = await authoriseSpend(deps, options, amount, isNativeSource);
-  onStage?.("quoting");
+  onStage?.("building");
   debugLog("owney-sdk", "swap: building same-chain fusion order");
   const built = await deps.api.buildOrder({
     from: {
@@ -3654,7 +3680,7 @@ async function runFusion(deps, options, walletAddress) {
   const amount = await affordableAmount(deps, BigInt(quote.src.amount));
   const permit = await authoriseSpend(deps, options, amount, false);
   const { secrets, secretHashes } = mintSecrets(quote.secretsCount ?? 1);
-  onStage?.("quoting");
+  onStage?.("building");
   debugLog("owney-sdk", "swap: building fusion order", {
     secrets: secretHashes.length
   });
@@ -5562,13 +5588,25 @@ var OwneySDK = class {
           }
           return hash;
         },
-        ensureChain: (id) => this.ensureSwapChain(id)
+        ensureChain: (id) => this.ensureSwapChain(id),
+        // Read through the same public client as every other sizing input, so
+        // a wallet sitting on the wrong chain cannot answer for this one.
+        readAllowance: (token, spender) => publicClient.readContract({
+          address: token,
+          abi: ERC20_ALLOWANCE_ABI,
+          functionName: "allowance",
+          args: [walletAddress, spender]
+        })
       },
       {
         chainId,
         wrapper: wrapper.address,
         nativeSymbol: quote.src.symbol,
         requested: BigInt(quote.src.amount),
+        // Lets the reserve skip the approve's gas when one is already in
+        // place. Absent on a quote that names no spender, which keeps the
+        // full reserve (ROUT-242, comment 16234).
+        ...quote.spender ? { spender: quote.spender } : {},
         onSubmitted: () => onStage?.("wrapped")
       }
     );

package/dist/index.d.cts

@@ -220,7 +220,7 @@ type SwapOrderStatus = "pending" | "executed" | "expired" | "cancelled" | "refun
  * of the flow and the one place a user would otherwise think nothing is
  * happening.
  */
-type SwapStage = "withdrawing" | "withdrawn" | "quoting" | "wrapping" | "wrapped" | "approving" | "signing" | "swapping" | "swapped" | "depositing" | "refunding" | "refunded";
+type SwapStage = "withdrawing" | "withdrawn" | "quoting" | "wrapping" | "wrapped" | "approving" | "building" | "signing" | "swapping" | "swapped" | "depositing" | "refunding" | "refunded";
 /**
  * Which way the funds travel, which decides what each side may be.
  *

package/dist/index.d.ts

@@ -220,7 +220,7 @@ type SwapOrderStatus = "pending" | "executed" | "expired" | "cancelled" | "refun
  * of the flow and the one place a user would otherwise think nothing is
  * happening.
  */
-type SwapStage = "withdrawing" | "withdrawn" | "quoting" | "wrapping" | "wrapped" | "approving" | "signing" | "swapping" | "swapped" | "depositing" | "refunding" | "refunded";
+type SwapStage = "withdrawing" | "withdrawn" | "quoting" | "wrapping" | "wrapped" | "approving" | "building" | "signing" | "swapping" | "swapped" | "depositing" | "refunding" | "refunded";
 /**
  * Which way the funds travel, which decides what each side may be.
  *

package/dist/index.js

@@ -311,6 +311,9 @@ var NAME_TO_CHAIN_ID = Object.entries(
   acc[name.toLowerCase()] = Number(id);
   return acc;
 }, {});
+NAME_TO_CHAIN_ID.mainnet = 1;
+NAME_TO_CHAIN_ID["ethereum mainnet"] = 1;
+NAME_TO_CHAIN_ID["arbitrum one"] = 42161;
 function resolveChainId(chain) {
   const asNum = Number(chain);
   if (Number.isFinite(asNum) && asNum > 0) return asNum;
@@ -1401,7 +1404,7 @@ var ZyfaiAgent = class _ZyfaiAgent {
    * chain/account switch fires the provider's `accountsChanged` →
    * `disconnectAccount` (nulls walletClient + authenticatedUserId) while our
    * own `connectAuth` guard still believes this chain is connected and
-   * early-returns. Without this, authenticated calls (depositFunds,
+   * early-returns. Without this, authenticated calls (sendDeposit,
    * withdrawFunds) fail with "No account connected".
    */
   async ensureConnected(state, chainId) {
@@ -2884,9 +2887,24 @@ async function wrapNative(deps, options) {
       message: error instanceof Error ? error.message : String(error)
     });
   }
+  let approvalPending = true;
+  if (options.spender && deps.readAllowance) {
+    try {
+      const allowance = await deps.readAllowance(wrapper, options.spender);
+      approvalPending = allowance < requested;
+    } catch (error) {
+      debugLog(
+        "owney-sdk",
+        "wrap: allowance read failed, assuming an approve",
+        {
+          message: error instanceof Error ? error.message : String(error)
+        }
+      );
+    }
+  }
   const measured = await deps.getMaxFeePerGas();
   const gasPrice = measured > MIN_WALLET_GAS_PRICE ? measured : MIN_WALLET_GAS_PRICE;
-  const reserve = (wrapGas + APPROVE_GAS) * gasPrice * GAS_SAFETY;
+  const reserve = (wrapGas + (approvalPending ? APPROVE_GAS : 0n)) * gasPrice * GAS_SAFETY;
   const spendable = balance > reserve ? balance - reserve : 0n;
   const wrapped = requested < spendable ? requested : spendable;
   debugLog("owney-sdk", "wrap: sizing", {
@@ -2894,6 +2912,7 @@ async function wrapNative(deps, options) {
     requested: requested.toString(),
     measuredGasPrice: measured.toString(),
     reservedAtGasPrice: gasPrice.toString(),
+    approvalPending,
     reserve: reserve.toString(),
     wrapped: wrapped.toString()
   });
@@ -3453,7 +3472,14 @@ async function executeSwap(deps, options) {
   try {
     result = quote.rail === "classic" ? await runClassic(deps, options) : quote.rail === "fusion" ? await runSameChainFusion(deps, options, walletAddress) : await runFusion(deps, options, walletAddress);
   } catch (error) {
-    if (!stoppedWatching(error)) throw error;
+    if (!stoppedWatching(error)) {
+      if (quote.rail !== "fusion") throw error;
+      const now = await deps.readTargetBalance().catch(() => before);
+      if (now <= before) throw error;
+      debugLog("owney-sdk", "swap: rail said no but the funds are here", {
+        message: error instanceof Error ? error.message : String(error)
+      });
+    }
     railError = error;
     debugLog("owney-sdk", "swap: rail failed, checking whether funds landed", {
       message: error instanceof Error ? error.message : String(error)
@@ -3542,7 +3568,7 @@ async function runSameChainFusion(deps, options, walletAddress) {
   const isNativeSource = quote.src.address.toLowerCase().startsWith("0xeeee");
   const amount = isNativeSource ? BigInt(quote.src.amount) : await affordableAmount(deps, BigInt(quote.src.amount));
   const permit = await authoriseSpend(deps, options, amount, isNativeSource);
-  onStage?.("quoting");
+  onStage?.("building");
   debugLog("owney-sdk", "swap: building same-chain fusion order");
   const built = await deps.api.buildOrder({
     from: {
@@ -3624,7 +3650,7 @@ async function runFusion(deps, options, walletAddress) {
   const amount = await affordableAmount(deps, BigInt(quote.src.amount));
   const permit = await authoriseSpend(deps, options, amount, false);
   const { secrets, secretHashes } = mintSecrets(quote.secretsCount ?? 1);
-  onStage?.("quoting");
+  onStage?.("building");
   debugLog("owney-sdk", "swap: building fusion order", {
     secrets: secretHashes.length
   });
@@ -5543,13 +5569,25 @@ var OwneySDK = class {
           }
           return hash;
         },
-        ensureChain: (id) => this.ensureSwapChain(id)
+        ensureChain: (id) => this.ensureSwapChain(id),
+        // Read through the same public client as every other sizing input, so
+        // a wallet sitting on the wrong chain cannot answer for this one.
+        readAllowance: (token, spender) => publicClient.readContract({
+          address: token,
+          abi: ERC20_ALLOWANCE_ABI,
+          functionName: "allowance",
+          args: [walletAddress, spender]
+        })
       },
       {
         chainId,
         wrapper: wrapper.address,
         nativeSymbol: quote.src.symbol,
         requested: BigInt(quote.src.amount),
+        // Lets the reserve skip the approve's gas when one is already in
+        // place. Absent on a quote that names no spender, which keeps the
+        // full reserve (ROUT-242, comment 16234).
+        ...quote.spender ? { spender: quote.spender } : {},
         onSubmitted: () => onStage?.("wrapped")
       }
     );

package/package.json

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