@owney/sdk 0.7.26-beta.0 → 0.7.26-beta.2

package/dist/index.cjs

@@ -2208,7 +2208,21 @@ var CHAIN_NAMES = {
 function chainName(chainId) {
   return CHAIN_NAMES[chainId] ?? `chain ${chainId}`;
 }
-async function ensureWalletOnChain(pub, wallet, expected) {
+var SETTLE_TIMEOUT_MS = 8e3;
+var POLL_INTERVAL_MS = 200;
+var wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+async function readChainId(pub) {
+  try {
+    return await pub.getChainId();
+  } catch {
+    return void 0;
+  }
+}
+async function ensureWalletOnChain(pub, wallet, expected, options = {}) {
+  const {
+    settleTimeoutMs = SETTLE_TIMEOUT_MS,
+    pollIntervalMs = POLL_INTERVAL_MS
+  } = options;
   const actual = await pub.getChainId();
   if (actual === expected) return;
   try {
@@ -2224,14 +2238,18 @@ async function ensureWalletOnChain(pub, wallet, expected) {
       }
     );
   }
-  const after = await pub.getChainId();
-  if (after !== expected) {
-    throw new OwneyError(
-      "CHAIN_MISMATCH",
-      `Your wallet is still on ${chainName(after)}. Switch it to ${chainName(expected)} and try again.`,
-      { expectedChainId: expected, actualChainId: after }
-    );
-  }
+  const deadline = Date.now() + settleTimeoutMs;
+  let after = await readChainId(pub);
+  while (after !== expected && Date.now() < deadline) {
+    await wait(pollIntervalMs);
+    after = await readChainId(pub);
+  }
+  if (after === expected) return;
+  throw new OwneyError(
+    "CHAIN_MISMATCH",
+    `Your wallet is still on ${chainName(after ?? actual)}. Switch it to ${chainName(expected)} and try again.`,
+    { expectedChainId: expected, actualChainId: after ?? actual }
+  );
 }
 
 // src/lib/swap/swap-api.ts
@@ -2282,7 +2300,7 @@ function createSwapApi(baseUrl, apiKey) {
     /** Source assets the user may pay with, and each chain's deposit targets. */
     listTokens: () => request(baseUrl, apiKey, "/tokens"),
     /**
-     * Search one chain's payable-with assets by name, symbol or address.
+     * Search the payable-with assets by name, symbol or address.
      *
      * Separate from `listTokens` on purpose: the full set is thousands of
      * tokens per chain, far too much to ship to a picker, so the short list
@@ -2295,8 +2313,10 @@ function createSwapApi(baseUrl, apiKey) {
       baseUrl,
       apiKey,
       `/tokens/search?${new URLSearchParams({
-        chainId: String(params.chainId),
         query: params.query,
+        // Omitted, the routing API searches every supported chain — which is
+        // what a picker wants, since its rows already span all three.
+        ...params.chainId === void 0 ? {} : { chainId: String(params.chainId) },
         ...params.limit === void 0 ? {} : { limit: String(params.limit) }
       }).toString()}`
     ),
@@ -4429,7 +4449,7 @@ var OwneySDK = class {
     return this.swapApi().listTokens();
   }
   /**
-   * Search the assets a user may pay with on one chain.
+   * Search the assets a user may pay with, across every supported chain.
    *
    * `getSwapTokens` returns the short list worth rendering unprompted. This
    * reaches everything else the routing API will accept — thousands per chain
@@ -4447,8 +4467,8 @@ var OwneySDK = class {
     const query = params.query.trim();
     if (!query) return { tokens: [] };
     return this.swapApi().searchTokens({
-      chainId: params.chainId,
       query,
+      ...params.chainId === void 0 ? {} : { chainId: params.chainId },
       ...params.limit === void 0 ? {} : { limit: params.limit }
     });
   }
@@ -4573,7 +4593,7 @@ var OwneySDK = class {
     options.onSwapProgress?.("withdrawing");
     const withdraw = await this.withdraw({
       asset: options.from.symbol,
-      ...options.amount === void 0 ? {} : { amount: options.amount },
+      ...options.amount === void 0 ? {} : { amount: (0, import_viem8.parseUnits)(options.amount, asset.decimals).toString() },
       ...options.agentId ? { agentId: options.agentId } : {}
     });
     const arrived = await awaitWithdrawalArrival({

package/dist/index.d.cts

@@ -910,7 +910,7 @@ declare class OwneySDK {
         chains: SwapChainTokens[];
     }>;
     /**
-     * Search the assets a user may pay with on one chain.
+     * Search the assets a user may pay with, across every supported chain.
      *
      * `getSwapTokens` returns the short list worth rendering unprompted. This
      * reaches everything else the routing API will accept — thousands per chain
@@ -925,7 +925,8 @@ declare class OwneySDK {
      * Returns nothing for a blank query rather than asking for the whole list.
      */
     searchSwapTokens(params: {
-        chainId: number;
+        /** Omit to search every supported chain. */
+        chainId?: number;
         query: string;
         limit?: number;
     }): Promise<{

package/dist/index.d.ts

@@ -910,7 +910,7 @@ declare class OwneySDK {
         chains: SwapChainTokens[];
     }>;
     /**
-     * Search the assets a user may pay with on one chain.
+     * Search the assets a user may pay with, across every supported chain.
      *
      * `getSwapTokens` returns the short list worth rendering unprompted. This
      * reaches everything else the routing API will accept — thousands per chain
@@ -925,7 +925,8 @@ declare class OwneySDK {
      * Returns nothing for a blank query rather than asking for the whole list.
      */
     searchSwapTokens(params: {
-        chainId: number;
+        /** Omit to search every supported chain. */
+        chainId?: number;
         query: string;
         limit?: number;
     }): Promise<{

package/dist/index.js

@@ -2174,7 +2174,21 @@ var CHAIN_NAMES = {
 function chainName(chainId) {
   return CHAIN_NAMES[chainId] ?? `chain ${chainId}`;
 }
-async function ensureWalletOnChain(pub, wallet, expected) {
+var SETTLE_TIMEOUT_MS = 8e3;
+var POLL_INTERVAL_MS = 200;
+var wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+async function readChainId(pub) {
+  try {
+    return await pub.getChainId();
+  } catch {
+    return void 0;
+  }
+}
+async function ensureWalletOnChain(pub, wallet, expected, options = {}) {
+  const {
+    settleTimeoutMs = SETTLE_TIMEOUT_MS,
+    pollIntervalMs = POLL_INTERVAL_MS
+  } = options;
   const actual = await pub.getChainId();
   if (actual === expected) return;
   try {
@@ -2190,14 +2204,18 @@ async function ensureWalletOnChain(pub, wallet, expected) {
       }
     );
   }
-  const after = await pub.getChainId();
-  if (after !== expected) {
-    throw new OwneyError(
-      "CHAIN_MISMATCH",
-      `Your wallet is still on ${chainName(after)}. Switch it to ${chainName(expected)} and try again.`,
-      { expectedChainId: expected, actualChainId: after }
-    );
-  }
+  const deadline = Date.now() + settleTimeoutMs;
+  let after = await readChainId(pub);
+  while (after !== expected && Date.now() < deadline) {
+    await wait(pollIntervalMs);
+    after = await readChainId(pub);
+  }
+  if (after === expected) return;
+  throw new OwneyError(
+    "CHAIN_MISMATCH",
+    `Your wallet is still on ${chainName(after ?? actual)}. Switch it to ${chainName(expected)} and try again.`,
+    { expectedChainId: expected, actualChainId: after ?? actual }
+  );
 }
 
 // src/lib/swap/swap-api.ts
@@ -2248,7 +2266,7 @@ function createSwapApi(baseUrl, apiKey) {
     /** Source assets the user may pay with, and each chain's deposit targets. */
     listTokens: () => request(baseUrl, apiKey, "/tokens"),
     /**
-     * Search one chain's payable-with assets by name, symbol or address.
+     * Search the payable-with assets by name, symbol or address.
      *
      * Separate from `listTokens` on purpose: the full set is thousands of
      * tokens per chain, far too much to ship to a picker, so the short list
@@ -2261,8 +2279,10 @@ function createSwapApi(baseUrl, apiKey) {
       baseUrl,
       apiKey,
       `/tokens/search?${new URLSearchParams({
-        chainId: String(params.chainId),
         query: params.query,
+        // Omitted, the routing API searches every supported chain — which is
+        // what a picker wants, since its rows already span all three.
+        ...params.chainId === void 0 ? {} : { chainId: String(params.chainId) },
         ...params.limit === void 0 ? {} : { limit: String(params.limit) }
       }).toString()}`
     ),
@@ -3028,6 +3048,7 @@ function aggregateApyByChainAndAsset(agentApys, agentBalances) {
 
 // src/client.ts
 import {
+  parseUnits as parseUnits2,
   createPublicClient as createPublicClient2,
   createWalletClient,
   custom,
@@ -4400,7 +4421,7 @@ var OwneySDK = class {
     return this.swapApi().listTokens();
   }
   /**
-   * Search the assets a user may pay with on one chain.
+   * Search the assets a user may pay with, across every supported chain.
    *
    * `getSwapTokens` returns the short list worth rendering unprompted. This
    * reaches everything else the routing API will accept — thousands per chain
@@ -4418,8 +4439,8 @@ var OwneySDK = class {
     const query = params.query.trim();
     if (!query) return { tokens: [] };
     return this.swapApi().searchTokens({
-      chainId: params.chainId,
       query,
+      ...params.chainId === void 0 ? {} : { chainId: params.chainId },
       ...params.limit === void 0 ? {} : { limit: params.limit }
     });
   }
@@ -4544,7 +4565,7 @@ var OwneySDK = class {
     options.onSwapProgress?.("withdrawing");
     const withdraw = await this.withdraw({
       asset: options.from.symbol,
-      ...options.amount === void 0 ? {} : { amount: options.amount },
+      ...options.amount === void 0 ? {} : { amount: parseUnits2(options.amount, asset.decimals).toString() },
       ...options.agentId ? { agentId: options.agentId } : {}
     });
     const arrived = await awaitWithdrawalArrival({

package/package.json

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