@trustware/sdk-staging 1.1.12-staging.6 → 1.1.12-staging.7

package/dist/core.mjs

@@ -61,7 +61,7 @@ var init_constants = __esm({
   "src/constants.ts"() {
     "use strict";
     SDK_NAME = "@trustware/sdk";
-    SDK_VERSION = "1.1.12-staging.6";
+    SDK_VERSION = "1.1.12-staging.7";
     API_ROOT = "https://bv-staging-api.trustware.io";
     API_PREFIX = "/api";
     WALLETCONNECT_PROJECT_ID = "72ea74c400f5111d43aea638d7d83a24";
@@ -285,6 +285,104 @@ var init_chains = __esm({
   }
 });
 
+// src/wallets/chainParams.ts
+function chainParamsFor(chainId) {
+  return registered.get(chainId) ?? BUILTIN_CHAIN_PARAMS[chainId];
+}
+function registerChainParams(chainId, params) {
+  registered.set(chainId, params);
+}
+function usableRpcUrls(chain) {
+  const candidates = [
+    ...Array.isArray(chain.rpcList) ? chain.rpcList : [],
+    ...chain.rpc ? [chain.rpc] : []
+  ];
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const raw of candidates) {
+    const url = String(raw ?? "").trim();
+    if (!/^https?:\/\//i.test(url) || seen.has(url)) continue;
+    seen.add(url);
+    out.push(url);
+  }
+  return out;
+}
+function chainParamsFromChainDef(chain) {
+  const chainType = String(
+    chain.chainType ?? chain.type ?? "evm"
+  ).toLowerCase();
+  if (chainType !== "evm") return void 0;
+  const numericId = Number(chain.chainId ?? chain.id);
+  if (!Number.isSafeInteger(numericId) || numericId <= 0) return void 0;
+  const rpcUrls = usableRpcUrls(chain);
+  if (rpcUrls.length === 0) return void 0;
+  const native = chain.nativeCurrency;
+  const symbol = String(native?.symbol ?? "").trim();
+  if (!symbol) return void 0;
+  const decimals = Number(native?.decimals);
+  const chainName = String(
+    chain.networkName ?? chain.axelarChainName ?? chain.networkIdentifier ?? ""
+  ).trim();
+  const explorers = (chain.blockExplorerUrls ?? []).filter(
+    (u) => /^https?:\/\//i.test(String(u ?? ""))
+  );
+  return {
+    chainIdHex: `0x${numericId.toString(16)}`,
+    chainName: chainName || `Chain ${numericId}`,
+    rpcUrls,
+    nativeCurrency: {
+      name: String(native?.name ?? symbol),
+      symbol,
+      decimals: Number.isFinite(decimals) ? decimals : 18
+    },
+    ...explorers.length > 0 ? { blockExplorerUrls: explorers } : {}
+  };
+}
+var BUILTIN_CHAIN_PARAMS, registered;
+var init_chainParams = __esm({
+  "src/wallets/chainParams.ts"() {
+    "use strict";
+    BUILTIN_CHAIN_PARAMS = {
+      1: {
+        chainIdHex: "0x1",
+        chainName: "Ethereum",
+        rpcUrls: ["https://eth.llamarpc.com"],
+        nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
+        blockExplorerUrls: ["https://etherscan.io"]
+      },
+      137: {
+        chainIdHex: "0x89",
+        chainName: "Polygon",
+        rpcUrls: ["https://polygon-rpc.com"],
+        nativeCurrency: { name: "POL", symbol: "POL", decimals: 18 },
+        blockExplorerUrls: ["https://polygonscan.com"]
+      },
+      8453: {
+        chainIdHex: "0x2105",
+        chainName: "Base",
+        rpcUrls: ["https://mainnet.base.org"],
+        nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
+        blockExplorerUrls: ["https://basescan.org"]
+      },
+      42161: {
+        chainIdHex: "0xa4b1",
+        chainName: "Arbitrum One",
+        rpcUrls: ["https://arb1.arbitrum.io/rpc"],
+        nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
+        blockExplorerUrls: ["https://arbiscan.io"]
+      },
+      43114: {
+        chainIdHex: "0xa86a",
+        chainName: "Avalanche C-Chain",
+        rpcUrls: ["https://api.avax.network/ext/bc/C/rpc"],
+        nativeCurrency: { name: "Avalanche", symbol: "AVAX", decimals: 18 },
+        blockExplorerUrls: ["https://snowtrace.io"]
+      }
+    };
+    registered = /* @__PURE__ */ new Map();
+  }
+});
+
 // src/registry.ts
 function getChainAliases(chain) {
   const values = [
@@ -329,6 +427,7 @@ var init_registry = __esm({
     "use strict";
     init_store();
     init_chains();
+    init_chainParams();
     NATIVE = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";
     PAGE_CACHE_TTL_MS = 5 * 60 * 1e3;
     PAGE_CACHE_LIMIT = 100;
@@ -407,6 +506,10 @@ var init_registry = __esm({
         for (const alias of getChainAliases(normalized)) {
           this._chainAliases.set(alias, canonicalKey);
         }
+        const addParams = chainParamsFromChainDef(normalized);
+        if (addParams) {
+          registerChainParams(Number(normalized.chainId ?? canonical), addParams);
+        }
       }
       storeTokenForAlias(chainKey, token) {
         const key = tokenKey(token);
@@ -1984,7 +2087,7 @@ var init_balances = __esm({
 
 // src/wallets/eipWallets.ts
 async function addThenSwitch(eth, chainId) {
-  const p = CHAIN_PARAMS[chainId];
+  const p = chainParamsFor(chainId);
   if (!p) throw new Error(`Unknown chain ${chainId} (no params to add)`);
   await eth.request({ method: "wallet_addEthereumChain", params: [p] });
   await eth.request({
@@ -2012,7 +2115,7 @@ function useEIP1193(eth) {
     async switchChain(chainId) {
       if (switching) return;
       switching = true;
-      const hex = CHAIN_PARAMS[chainId]?.chainIdHex ?? `0x${chainId.toString(16)}`;
+      const hex = chainParamsFor(chainId)?.chainIdHex ?? `0x${chainId.toString(16)}`;
       try {
         await eth.request({
           method: "wallet_switchEthereumChain",
@@ -2021,7 +2124,6 @@ function useEIP1193(eth) {
       } catch (e2) {
         if (e2?.code === 4902) {
           await addThenSwitch(eth, chainId);
-        } else if (e2?.code === 4001) {
         } else {
           throw e2;
         }
@@ -2032,47 +2134,10 @@ function useEIP1193(eth) {
     request: (args) => eth.request(args)
   };
 }
-var CHAIN_PARAMS;
 var init_eipWallets = __esm({
   "src/wallets/eipWallets.ts"() {
     "use strict";
-    CHAIN_PARAMS = {
-      1: {
-        chainIdHex: "0x1",
-        chainName: "Ethereum",
-        rpcUrls: ["https://eth.llamarpc.com"],
-        nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
-        blockExplorerUrls: ["https://etherscan.io"]
-      },
-      137: {
-        chainIdHex: "0x89",
-        chainName: "Polygon",
-        rpcUrls: ["https://polygon-rpc.com"],
-        nativeCurrency: { name: "POL", symbol: "POL", decimals: 18 },
-        blockExplorerUrls: ["https://polygonscan.com"]
-      },
-      8453: {
-        chainIdHex: "0x2105",
-        chainName: "Base",
-        rpcUrls: ["https://mainnet.base.org"],
-        nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
-        blockExplorerUrls: ["https://basescan.org"]
-      },
-      42161: {
-        chainIdHex: "0xa4b1",
-        chainName: "Arbitrum One",
-        rpcUrls: ["https://arb1.arbitrum.io/rpc"],
-        nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
-        blockExplorerUrls: ["https://arbiscan.io"]
-      },
-      43114: {
-        chainIdHex: "0xa86a",
-        chainName: "Avalanche C-Chain",
-        rpcUrls: ["https://api.avax.network/ext/bc/C/rpc"],
-        nativeCurrency: { name: "Avalanche", symbol: "AVAX", decimals: 18 },
-        blockExplorerUrls: ["https://snowtrace.io"]
-      }
-    };
+    init_chainParams();
   }
 });
 
@@ -6298,6 +6363,25 @@ function backendChainId(chain, fallback) {
 function sleep2(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
+async function ensureWalletOnChain(wallet, target) {
+  if (!Number.isSafeInteger(target) || target <= 0) {
+    throw new Error(`Invalid chain id: ${target}`);
+  }
+  if (await wallet.getChainId() === target) return;
+  let switchError;
+  try {
+    await wallet.switchChain(target);
+  } catch (e2) {
+    switchError = e2;
+  }
+  if (await wallet.getChainId() === target) return;
+  if (switchError && isUserRejected(switchError)) {
+    throw switchError;
+  }
+  throw new Error(
+    `Wallet is on the wrong network. Switch to chain ${target} and try again.`
+  );
+}
 async function sendEvmTx(w, tx) {
   if (w.type === "eip1193") {
     const from = await w.getAddress();
@@ -6324,19 +6408,37 @@ async function sendEvmTx(w, tx) {
   });
   return response.hash;
 }
-async function waitForTxConfirmation(chainId, txHash) {
-  const timeoutMs = 12e4;
-  const intervalMs = 2e3;
+async function waitForEvmTxConfirmation(chainId, txHash, label, options = {}) {
+  const {
+    readStatus = getEVMTxStatus,
+    timeoutMs = 12e4,
+    intervalMs = 2e3,
+    notFoundGraceMs = NOT_FOUND_GRACE_MS
+  } = options;
   const started = Date.now();
+  let notFoundSince = null;
   while (Date.now() - started < timeoutMs) {
-    const status = await getEVMTxStatus({ chainId, txHash });
+    const status = await readStatus({ chainId, txHash });
     if (status.status === "success") return;
     if (status.status === "reverted") {
-      throw new Error("Approval transaction reverted");
+      throw new Error(`${label} transaction reverted`);
+    }
+    if (status.status === "not_found") {
+      notFoundSince ?? (notFoundSince = Date.now());
+      if (Date.now() - notFoundSince >= notFoundGraceMs) {
+        throw new Error(
+          `${label} transaction ${txHash} was not found on chain ${chainId}. It may have been sent on a different network \u2014 check your wallet's selected network and try again.`
+        );
+      }
+    } else {
+      notFoundSince = null;
     }
     await sleep2(intervalMs);
   }
-  throw new Error("Timed out waiting for approval confirmation");
+  throw new Error(`Timed out waiting for ${label.toLowerCase()} confirmation`);
+}
+function waitForApprovalConfirmation(chainId, txHash, options) {
+  return waitForEvmTxConfirmation(chainId, txHash, "Approval", options);
 }
 function requiredApprovalAmount(planAmountWei, routeAmountWei) {
   if (planAmountWei >= UNLIMITED_APPROVAL_FLOOR && routeAmountWei !== void 0 && routeAmountWei > 0n) {
@@ -6376,17 +6478,22 @@ async function ensureApprovals(w, approvals, fallbackChainId, intentId, routeAmo
       functionName: "approve",
       args: [spender, amountWei]
     });
+    const approvalChainId = Number(chainId);
+    if (!Number.isSafeInteger(approvalChainId) || approvalChainId <= 0) {
+      throw new Error(`Approval has an invalid chain id: ${chainId}`);
+    }
+    await ensureWalletOnChain(w, approvalChainId);
     const hash = await sendEvmTx(w, {
       to: tokenAddress,
       data,
       value: 0n,
-      chainId: Number.isFinite(Number(chainId)) ? Number(chainId) : void 0
+      chainId: approvalChainId
     });
     if (intentId) {
       void submitStepReceipt(intentId, stepIndex, hash).catch(() => {
       });
     }
-    await waitForTxConfirmation(chainId, hash);
+    await waitForApprovalConfirmation(chainId, hash);
   }
 }
 function isUserRejected(e2) {
@@ -6413,15 +6520,14 @@ async function sendRouteTransaction(b, fallbackChainId, options) {
         validatedSponsorship = b.sponsorship;
       }
     }
-    if (Number.isFinite(target)) {
-      const current = await w.getChainId();
-      if (current !== target) {
-        try {
-          await w.switchChain(target);
-        } catch {
-        }
-      }
+    if (!Number.isSafeInteger(target) || target <= 0) {
+      throw new Error(
+        `Route is missing a usable chain id (got ${String(
+          txReq.chainId ?? fallbackChainId
+        )}).`
+      );
     }
+    await ensureWalletOnChain(w, target);
     if (!validatedSponsorship && !options?.approvalsEnsured) {
       await ensureApprovals(
         w,
@@ -6527,7 +6633,7 @@ async function runTopUp(params) {
     }
   }
 }
-var erc20ApproveAbi, UNLIMITED_APPROVAL_FLOOR;
+var erc20ApproveAbi, NOT_FOUND_GRACE_MS, UNLIMITED_APPROVAL_FLOOR;
 var init_tx = __esm({
   "src/core/tx.ts"() {
     "use strict";
@@ -6537,6 +6643,7 @@ var init_tx = __esm({
     erc20ApproveAbi = parseAbi([
       "function approve(address spender, uint256 amount) returns (bool)"
     ]);
+    NOT_FOUND_GRACE_MS = 2e4;
     UNLIMITED_APPROVAL_FLOOR = 1n << 255n;
   }
 });