@shogun-sdk/swap 0.0.2-test.24 → 0.0.2-test.26

package/dist/index.js

@@ -1,17 +1,16 @@
-// src/core/token-list.ts
-import { getTokenList as intentsGetTokenList } from "@shogun-sdk/intents-sdk";
-async function getTokenList(params) {
-  return intentsGetTokenList(params);
-}
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 
 // src/core/getQuote.ts
 import { QuoteProvider } from "@shogun-sdk/intents-sdk";
 import { parseUnits } from "viem";
 
-// src/core/executeOrder/normalizeNative.ts
-import { isEvmChain } from "@shogun-sdk/intents-sdk";
+// src/core/execute/normalizeNative.ts
+import { isEvmChain as isEvmChain2 } from "@shogun-sdk/intents-sdk";
 
 // src/utils/address.ts
+import { zeroAddress } from "viem";
 var NATIVE_TOKEN = {
   ETH: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
   SOL: "So11111111111111111111111111111111111111111",
@@ -22,13 +21,31 @@ var isNativeAddress = (tokenAddress) => {
   const normalizedTokenAddress = tokenAddress.toLowerCase();
   return !!tokenAddress && NATIVE_ADDRESSES.includes(normalizedTokenAddress);
 };
+function normalizeEvmTokenAddress(address) {
+  const lower = address.toLowerCase();
+  return lower === NATIVE_TOKEN.ETH.toLowerCase() ? zeroAddress : address;
+}
 
 // src/utils/chain.ts
-import { ChainID } from "@shogun-sdk/intents-sdk";
-var SOLANA_CHAIN_ID = ChainID.Solana;
-var SupportedChains = [
+import { ChainID as BaseChainID, isEvmChain as isEvmChainIntent } from "@shogun-sdk/intents-sdk";
+var SOLANA_CHAIN_ID = BaseChainID.Solana;
+var CURRENT_SUPPORTED = [
+  BaseChainID.Solana,
+  BaseChainID.BSC,
+  BaseChainID.Base
+];
+var ChainId = Object.entries(BaseChainID).reduce(
+  (acc, [key, value]) => {
+    if (typeof value === "number" && CURRENT_SUPPORTED.includes(value)) {
+      acc[key] = value;
+    }
+    return acc;
+  },
+  {}
+);
+var SupportedChainsInternal = [
   {
-    id: ChainID.Arbitrum,
+    id: BaseChainID.Arbitrum,
     name: "Arbitrum",
     isEVM: true,
     wrapped: "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1",
@@ -37,7 +54,7 @@ var SupportedChains = [
     tokenAddress: NATIVE_TOKEN.ETH
   },
   {
-    id: ChainID.Optimism,
+    id: BaseChainID.Optimism,
     name: "Optimism",
     isEVM: true,
     wrapped: "0x4200000000000000000000000000000000000006",
@@ -46,7 +63,7 @@ var SupportedChains = [
     tokenAddress: NATIVE_TOKEN.ETH
   },
   {
-    id: ChainID.Base,
+    id: BaseChainID.Base,
     name: "Base",
     isEVM: true,
     wrapped: "0x4200000000000000000000000000000000000006",
@@ -55,7 +72,7 @@ var SupportedChains = [
     tokenAddress: NATIVE_TOKEN.ETH
   },
   {
-    id: ChainID.Hyperliquid,
+    id: BaseChainID.Hyperliquid,
     name: "Hyperliquid",
     isEVM: true,
     wrapped: "0x5555555555555555555555555555555555555555",
@@ -64,7 +81,7 @@ var SupportedChains = [
     tokenAddress: NATIVE_TOKEN.ETH
   },
   {
-    id: ChainID.BSC,
+    id: BaseChainID.BSC,
     name: "BSC",
     isEVM: true,
     wrapped: "0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c",
@@ -82,6 +99,10 @@ var SupportedChains = [
     tokenAddress: NATIVE_TOKEN.SOL
   }
 ];
+var SupportedChains = SupportedChainsInternal.filter(
+  (c) => CURRENT_SUPPORTED.includes(c.id)
+);
+var isEvmChain = isEvmChainIntent;
 
 // src/utils/viem.ts
 function isViemWalletClient(wallet) {
@@ -109,9 +130,9 @@ function serializeBigIntsToStrings(obj) {
   return obj;
 }
 
-// src/core/executeOrder/normalizeNative.ts
+// src/core/execute/normalizeNative.ts
 function normalizeNative(chainId, address) {
-  if (isEvmChain(chainId) && isNativeAddress(address)) {
+  if (isEvmChain2(chainId) && isNativeAddress(address)) {
     const chain = SupportedChains.find((c) => c.id === chainId);
     if (!chain?.wrapped)
       throw new Error(`Wrapped token not found for chainId ${chainId}`);
@@ -122,13 +143,14 @@ function normalizeNative(chainId, address) {
 
 // src/core/getQuote.ts
 async function getQuote(params) {
+  const amount = BigInt(params.amount);
   if (!params.tokenIn?.address || !params.tokenOut?.address) {
     throw new Error("Both tokenIn and tokenOut must include an address.");
   }
   if (!params.sourceChainId || !params.destChainId) {
     throw new Error("Both sourceChainId and destChainId are required.");
   }
-  if (params.amount <= 0n) {
+  if (amount <= 0n) {
     throw new Error("Amount must be greater than 0.");
   }
   const normalizedTokenIn = normalizeNative(params.sourceChainId, params.tokenIn.address);
@@ -137,7 +159,7 @@ async function getQuote(params) {
     destChainId: params.destChainId,
     tokenIn: normalizedTokenIn,
     tokenOut: params.tokenOut.address,
-    amount: params.amount
+    amount
   });
   const slippagePercent = Math.min(Math.max(params.slippage ?? 0.5, 0), 50);
   let warning;
@@ -168,7 +190,7 @@ async function getQuote(params) {
       decimals: params.tokenOut.decimals ?? 18,
       chainId: params.destChainId
     },
-    amountIn: params.amount,
+    amountIn: BigInt(params.amount),
     pricePerInputToken,
     slippage: slippagePercent,
     internal: {
@@ -192,7 +214,7 @@ function buildQuoteParams({
     tokenOut,
     sourceChainId,
     destChainId,
-    amount: parseUnits(amount.toString(), tokenIn.decimals ?? 18),
+    amount: parseUnits(amount.toString(), tokenIn.decimals ?? 18).toString(),
     slippage
   };
 }
@@ -239,59 +261,66 @@ async function getBalances(params, options) {
   const evmItems = data.evm?.items ?? [];
   const svmItems = data.svm?.items ?? [];
   const combined = [...evmItems, ...svmItems];
+  const filtered = combined.filter(
+    (b) => CURRENT_SUPPORTED.includes(b.chainId)
+  );
   return {
-    results: combined,
+    results: filtered,
     nextCursorEvm: data.evm?.cursor ?? null,
     nextCursorSvm: data.svm?.cursor ?? null
   };
 }
 
-// src/core/executeOrder/execute.ts
-import { ChainID as ChainID3, isEvmChain as isEvmChain2 } from "@shogun-sdk/intents-sdk";
-import { BaseError } from "viem";
-
-// src/wallet-adapter/svm-wallet-adapter/adapter.ts
-import {
-  Connection
-} from "@solana/web3.js";
-var adaptSolanaWallet = (walletAddress, chainId, rpcUrl, signAndSendTransaction) => {
-  let _chainId = chainId;
-  const connection = new Connection(rpcUrl, { commitment: "confirmed" });
-  const getChainId = async () => _chainId;
-  const sendTransaction = async (transaction) => {
-    const txHash = await signAndSendTransaction(transaction);
-    console.debug(`\u{1F6F0} Sent transaction: ${txHash}`);
-    const maxRetries = 20;
-    const delayMs = 2e3;
-    for (let attempt = 0; attempt < maxRetries; attempt++) {
-      const res = await connection.getSignatureStatus(txHash, { searchTransactionHistory: true });
-      if (res?.value?.confirmationStatus === "confirmed" || res?.value?.confirmationStatus === "finalized") {
-        return txHash;
-      }
-      await new Promise((resolve) => setTimeout(resolve, delayMs));
-    }
-    throw new Error(`Transaction not confirmed after ${maxRetries * (delayMs / 1e3)}s`);
-  };
-  const signTypedData = async () => {
-    throw new Error("signTypedData not implemented for Solana");
-  };
-  const switchChain = async (newChainId) => {
-    _chainId = newChainId;
-  };
+// src/core/token-list.ts
+import { TOKEN_SEARCH_API_BASE_URL as TOKEN_SEARCH_API_BASE_URL2 } from "@shogun-sdk/intents-sdk";
+async function getTokenList(params) {
+  const url = new URL(`${TOKEN_SEARCH_API_BASE_URL2}/tokens/search`);
+  if (params.q) url.searchParams.append("q", params.q);
+  if (params.networkId) url.searchParams.append("networkId", String(params.networkId));
+  if (params.page) url.searchParams.append("page", String(params.page));
+  if (params.limit) url.searchParams.append("limit", String(params.limit));
+  const res = await fetch(url.toString(), {
+    signal: params.signal
+  });
+  if (!res.ok) {
+    throw new Error(`Failed to fetch tokens: ${res.status} ${res.statusText}`);
+  }
+  const data = await res.json();
+  const filteredResults = data.results.filter(
+    (token) => CURRENT_SUPPORTED.includes(token.chainId)
+  );
   return {
-    vmType: "SVM" /* SVM */,
-    getChainId,
-    address: async () => walletAddress,
-    sendTransaction,
-    switchChain,
-    signTypedData,
-    rpcUrl
+    ...data,
+    results: filteredResults,
+    count: filteredResults.length
   };
-};
+}
+
+// src/core/token.ts
+import { TOKEN_SEARCH_API_BASE_URL as TOKEN_SEARCH_API_BASE_URL3 } from "@shogun-sdk/intents-sdk";
+async function getTokensData(addresses) {
+  if (!addresses?.length) return [];
+  const response = await fetch(`${TOKEN_SEARCH_API_BASE_URL3}/tokens/tokens`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      accept: "*/*"
+    },
+    body: JSON.stringify({ addresses })
+  });
+  if (!response.ok) {
+    throw new Error(`Failed to fetch token data: ${response.statusText}`);
+  }
+  const data = await response.json();
+  const filtered = data.filter((t) => CURRENT_SUPPORTED.includes(Number(t.chainId)));
+  return filtered;
+}
+
+// src/core/execute/execute.ts
+import { ChainID as ChainID2, isEvmChain as isEvmChain3 } from "@shogun-sdk/intents-sdk";
+import "viem";
 
 // src/wallet-adapter/evm-wallet-adapter/adapter.ts
-import { utils as ethersUtils } from "ethers/lib/ethers.js";
-import { hexValue } from "ethers/lib/utils.js";
 import {
   custom,
   publicActions
@@ -299,64 +328,6 @@ import {
 function isEVMTransaction(tx) {
   return typeof tx.from === "string";
 }
-var adaptEthersSigner = (signer, transport) => {
-  const signTypedData = async (signData) => {
-    const typedSigner = signer;
-    return await typedSigner._signTypedData(
-      signData.domain,
-      signData.types,
-      signData.value
-    );
-  };
-  const sendTransaction = async (transaction) => {
-    if (!isEVMTransaction(transaction)) {
-      throw new Error("Expected EVMTransaction but got SolanaTransaction");
-    }
-    const tx = await signer.sendTransaction({
-      from: transaction.from,
-      to: transaction.to,
-      data: transaction.data,
-      value: transaction.value
-    });
-    return tx.hash;
-  };
-  const switchChain = async (chainId) => {
-    try {
-      await window.ethereum.request({
-        method: "wallet_switchEthereumChain",
-        params: [{ chainId: hexValue(chainId) }]
-      });
-    } catch (error) {
-      console.error("Failed to switch chain:", error);
-      throw error;
-    }
-  };
-  const readContract = async ({
-    address,
-    abi,
-    functionName,
-    args = []
-  }) => {
-    const iface = new ethersUtils.Interface(abi);
-    const fnArgs = Array.isArray(args) ? args : [];
-    const data = iface.encodeFunctionData(functionName, fnArgs);
-    const provider = signer.provider;
-    if (!provider) throw new Error("Signer has no provider");
-    const result = await provider.call({ to: address, data });
-    const decoded = iface.decodeFunctionResult(functionName, result);
-    return decoded[0];
-  };
-  return {
-    vmType: "EVM" /* EVM */,
-    transport,
-    getChainId: async () => signer.getChainId(),
-    address: async () => signer.getAddress(),
-    sendTransaction,
-    signTypedData,
-    switchChain,
-    readContract
-  };
-};
 var adaptViemWallet = (wallet) => {
   const signTypedData = async (signData) => {
     return await wallet.signTypedData({
@@ -439,14 +410,14 @@ var adaptViemWallet = (wallet) => {
   };
 };
 
-// src/core/executeOrder/handleEvmExecution.ts
+// src/core/execute/handleEvmExecution.ts
 import {
   getEVMSingleChainOrderTypedData,
   getEVMCrossChainOrderTypedData
 } from "@shogun-sdk/intents-sdk";
 import { encodeFunctionData as encodeFunctionData2 } from "viem";
 
-// src/core/executeOrder/stageMessages.ts
+// src/core/execute/stageMessages.ts
 var DEFAULT_STAGE_MESSAGES = {
   processing: "Preparing transaction for execution",
   approving: "Approving token allowance",
@@ -455,20 +426,44 @@ var DEFAULT_STAGE_MESSAGES = {
   submitting: "Submitting transaction",
   initiated: "Transaction initiated.",
   success: "Transaction Executed successfully",
+  success_limit: "Limit order has been submitted successfully.",
   shogun_processing: "Shogun is processing your transaction",
   error: "Transaction failed during submission"
 };
 
-// src/core/executeOrder/buildOrder.ts
+// src/core/execute/buildOrder.ts
 import { CrossChainOrder, SingleChainOrder } from "@shogun-sdk/intents-sdk";
+import { formatUnits, parseUnits as parseUnits2 } from "viem";
+
+// src/utils/order.ts
+var OrderExecutionType = /* @__PURE__ */ ((OrderExecutionType2) => {
+  OrderExecutionType2["LIMIT"] = "limit";
+  OrderExecutionType2["MARKET"] = "market";
+  return OrderExecutionType2;
+})(OrderExecutionType || {});
+
+// src/core/execute/buildOrder.ts
 async function buildOrder({
   quote,
   accountAddress,
   destination,
   deadline,
-  isSingleChain
+  isSingleChain,
+  orderType,
+  options
 }) {
   const { tokenIn, tokenOut } = quote;
+  let amountOutMin = BigInt(quote.internal.estimatedAmountOutReduced);
+  if (orderType === "limit" /* LIMIT */ && options && "executionPrice" in options) {
+    const executionPrice = Number(options.executionPrice);
+    if (Number.isFinite(executionPrice) && executionPrice > 0) {
+      const decimalsIn = tokenIn.decimals ?? 18;
+      const decimalsOut = tokenOut.decimals ?? 18;
+      const formattedAmountIn = Number(formatUnits(BigInt(quote.amountIn.toString()), decimalsIn));
+      const rawAmountOut = formattedAmountIn * executionPrice;
+      amountOutMin = parseUnits2(rawAmountOut.toString(), decimalsOut);
+    }
+  }
   if (isSingleChain) {
     return await SingleChainOrder.create({
       user: accountAddress,
@@ -476,7 +471,7 @@ async function buildOrder({
       tokenIn: tokenIn.address,
       tokenOut: tokenOut.address,
       amountIn: quote.amountIn,
-      amountOutMin: quote.internal.estimatedAmountOutReduced,
+      amountOutMin,
       deadline,
       destinationAddress: destination
     });
@@ -490,7 +485,7 @@ async function buildOrder({
     destinationTokenAddress: tokenOut.address,
     destinationAddress: destination,
     deadline,
-    destinationTokenMinAmount: quote.internal.estimatedAmountOutReduced,
+    destinationTokenMinAmount: amountOutMin,
     minStablecoinAmount: quote.minStablecoinsAmount
   });
 }
@@ -561,7 +556,7 @@ async function pollOrderStatus(address, orderId, options = {}) {
   });
 }
 
-// src/core/executeOrder/handleOrderPollingResult.ts
+// src/core/execute/handleOrderPollingResult.ts
 async function handleOrderPollingResult({
   status,
   orderId,
@@ -599,7 +594,7 @@ async function handleOrderPollingResult({
   };
 }
 
-// src/core/executeOrder/ensurePermit2Allowance.ts
+// src/core/execute/ensurePermit2Allowance.ts
 import { encodeFunctionData, erc20Abi, maxUint256 } from "viem";
 import { PERMIT2_ADDRESS } from "@shogun-sdk/intents-sdk";
 async function ensurePermit2Allowance({
@@ -644,7 +639,7 @@ async function ensurePermit2Allowance({
   );
 }
 
-// src/core/executeOrder/handleEvmExecution.ts
+// src/core/execute/handleEvmExecution.ts
 async function handleEvmExecution({
   recipientAddress,
   quote,
@@ -652,15 +647,19 @@ async function handleEvmExecution({
   accountAddress,
   wallet,
   isSingleChain,
-  deadline,
-  update
+  update,
+  orderType,
+  options
 }) {
-  const messageFor = (stage) => DEFAULT_STAGE_MESSAGES[stage];
+  const messageFor = (stage) => DEFAULT_STAGE_MESSAGES[stage] ?? "";
+  const deadline = options?.deadline ?? Math.floor(Date.now() / 1e3) + 20 * 60;
   await wallet.switchChain(chainId);
   const tokenIn = normalizeNative(chainId, quote.tokenIn.address);
+  quote.tokenOut.address = normalizeEvmTokenAddress(quote.tokenOut.address);
   const shouldWrapNative = isNativeAddress(quote.tokenIn.address);
   update("processing", shouldWrapNative ? `${messageFor("processing")} (wrapping native token)` : messageFor("processing"));
   if (shouldWrapNative) {
+    quote.tokenIn.address === tokenIn;
     await wallet.sendTransaction({
       to: tokenIn,
       data: encodeFunctionData2({
@@ -687,7 +686,9 @@ async function handleEvmExecution({
     accountAddress,
     destination,
     deadline,
-    isSingleChain
+    isSingleChain,
+    orderType,
+    options
   });
   console.debug(`order`, order);
   update("processing", messageFor("signing"));
@@ -711,22 +712,33 @@ async function handleEvmExecution({
   update("initiated", messageFor("initiated"));
   const { intentId: orderId } = res.data;
   update("initiated", messageFor("shogun_processing"));
-  const status = await pollOrderStatus(accountAddress, orderId);
-  return await handleOrderPollingResult({
-    status,
-    orderId,
-    chainId,
-    update,
-    messageFor
-  });
+  if (orderType === "limit" /* LIMIT */) {
+    update("success", messageFor("success_limit"));
+    return {
+      status: true,
+      orderId,
+      chainId,
+      finalStatus: "OrderPlaced",
+      stage: "success"
+    };
+  } else {
+    const status = await pollOrderStatus(accountAddress, orderId);
+    return await handleOrderPollingResult({
+      status,
+      orderId,
+      chainId,
+      update,
+      messageFor
+    });
+  }
 }
 
-// src/core/executeOrder/handleSolanaExecution.ts
+// src/core/execute/handleSolanaExecution.ts
 import {
   getSolanaSingleChainOrderInstructions,
   getSolanaCrossChainOrderInstructions
 } from "@shogun-sdk/intents-sdk";
-import { VersionedTransaction as VersionedTransaction2 } from "@solana/web3.js";
+import { VersionedTransaction } from "@solana/web3.js";
 async function handleSolanaExecution({
   recipientAddress,
   quote,
@@ -734,12 +746,14 @@ async function handleSolanaExecution({
   isSingleChain,
   update,
   accountAddress,
-  deadline
+  orderType,
+  options
 }) {
   if (!wallet.rpcUrl) {
     throw new Error("Solana wallet is missing rpcUrl");
   }
-  const messageFor = (stage) => DEFAULT_STAGE_MESSAGES[stage];
+  const deadline = options?.deadline ?? Math.floor(Date.now() / 1e3) + 20 * 60;
+  const messageFor = (stage) => DEFAULT_STAGE_MESSAGES[stage] ?? "";
   update("processing", messageFor("processing"));
   const destination = recipientAddress ?? accountAddress;
   const order = await buildOrder({
@@ -747,14 +761,16 @@ async function handleSolanaExecution({
     accountAddress,
     destination,
     deadline,
-    isSingleChain
+    isSingleChain,
+    orderType,
+    options
   });
   const txData = await getSolanaOrderInstructions({
     order,
     isSingleChain,
     rpcUrl: wallet.rpcUrl
   });
-  const transaction = VersionedTransaction2.deserialize(Uint8Array.from(txData.txBytes));
+  const transaction = VersionedTransaction.deserialize(Uint8Array.from(txData.txBytes));
   update("processing", messageFor("signing"));
   await wallet.sendTransaction(transaction);
   update("processing", messageFor("submitting"));
@@ -769,14 +785,25 @@ async function handleSolanaExecution({
   update("initiated", messageFor("initiated"));
   const { jwt, intentId: orderId } = response.data;
   update("initiated", messageFor("shogun_processing"));
-  const status = await pollOrderStatus(jwt, orderId);
-  return await handleOrderPollingResult({
-    status,
-    orderId,
-    chainId: SOLANA_CHAIN_ID,
-    update,
-    messageFor
-  });
+  if (orderType === "limit" /* LIMIT */) {
+    update("success", messageFor("success_limit"));
+    return {
+      status: true,
+      orderId,
+      chainId: SOLANA_CHAIN_ID,
+      finalStatus: "OrderPlaced",
+      stage: "success"
+    };
+  } else {
+    const status = await pollOrderStatus(jwt, orderId);
+    return await handleOrderPollingResult({
+      status,
+      orderId,
+      chainId: SOLANA_CHAIN_ID,
+      update,
+      messageFor
+    });
+  }
 }
 async function getSolanaOrderInstructions({
   order,
@@ -809,13 +836,14 @@ async function submitToAuctioneer({
   });
 }
 
-// src/core/executeOrder/execute.ts
+// src/core/execute/execute.ts
 async function executeOrder({
   quote,
   accountAddress,
   recipientAddress,
   wallet,
   onStatus,
+  orderType = "market" /* MARKET */,
   options = {}
 }) {
   const isDev = process.env.NODE_ENV !== "production";
@@ -828,21 +856,31 @@ async function executeOrder({
     onStatus?.(stage, message ?? messageFor(stage));
   };
   try {
-    const deadline = options.deadline ?? Math.floor(Date.now() / 1e3) + 20 * 60;
     log("Starting execution:", {
       accountAddress,
       recipientAddress,
-      deadline,
       tokenIn: quote?.tokenIn,
       tokenOut: quote?.tokenOut
     });
     const adapter = normalizeWallet(wallet);
     if (!adapter) throw new Error("No wallet provided");
     const { tokenIn, tokenOut } = quote;
+    const srcChain = Number(tokenIn.chainId);
+    const destChain = Number(tokenOut.chainId);
+    if (!CURRENT_SUPPORTED.includes(srcChain) || !CURRENT_SUPPORTED.includes(destChain)) {
+      const unsupportedChains = [
+        !CURRENT_SUPPORTED.includes(srcChain) ? srcChain : null,
+        !CURRENT_SUPPORTED.includes(destChain) ? destChain : null
+      ].filter(Boolean).join(", ");
+      const errorMsg = `Unsupported chain(s): ${unsupportedChains}`;
+      update("error", errorMsg);
+      log("Error:", errorMsg);
+      throw new Error(errorMsg);
+    }
     const isSingleChain = tokenIn.chainId === tokenOut.chainId;
     const chainId = Number(tokenIn.chainId);
     update("processing");
-    if (isEvmChain2(chainId)) {
+    if (isEvmChain3(chainId)) {
       log("Detected EVM chain:", chainId);
       const result = await handleEvmExecution({
         recipientAddress,
@@ -851,13 +889,14 @@ async function executeOrder({
         accountAddress,
         wallet: adapter,
         isSingleChain,
-        deadline,
-        update
+        update,
+        orderType,
+        options
       });
       log("EVM execution result:", result);
       return result;
     }
-    if (chainId === ChainID3.Solana) {
+    if (chainId === ChainID2.Solana) {
       log("Detected Solana chain");
       const result = await handleSolanaExecution({
         recipientAddress,
@@ -865,8 +904,9 @@ async function executeOrder({
         accountAddress,
         wallet: adapter,
         isSingleChain,
-        deadline,
-        update
+        update,
+        orderType,
+        options
       });
       log("Solana execution result:", result);
       return result;
@@ -876,8 +916,13 @@ async function executeOrder({
     log("Error:", unsupported);
     return { status: false, message: unsupported, stage: "error" };
   } catch (error) {
-    const message = error instanceof BaseError ? error.shortMessage : error instanceof Error ? error.message : String(error);
-    log("Execution failed:", { message, error });
+    let message = "An unknown error occurred";
+    if (error && typeof error === "object") {
+      const err = error;
+      message = err.details ?? err.message ?? message;
+    } else if (typeof error === "string") {
+      message = error;
+    }
     update("error", message);
     return { status: false, message, stage: "error" };
   }
@@ -888,319 +933,147 @@ function normalizeWallet(wallet) {
   return wallet;
 }
 
-// src/react/useTokenList.ts
-import { useEffect, useMemo, useRef, useState } from "react";
-var tokenCache = /* @__PURE__ */ new Map();
-function useTokenList(params) {
-  const [data, setData] = useState(null);
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState(null);
-  const controllerRef = useRef(null);
-  const debounceRef = useRef(null);
-  const debounceMs = params.debounceMs ?? 250;
-  const cacheKey = useMemo(() => {
-    return JSON.stringify({
-      q: params.q?.trim().toLowerCase() ?? "",
-      networkId: params.networkId ?? "all",
-      page: params.page ?? 1,
-      limit: params.limit ?? 50
-    });
-  }, [params.q, params.networkId, params.page, params.limit]);
-  async function fetchTokens(signal) {
-    if (tokenCache.has(cacheKey)) {
-      setData(tokenCache.get(cacheKey));
-      setLoading(false);
-      setError(null);
-      return;
-    }
-    try {
-      setLoading(true);
-      const result = await getTokenList({ ...params, signal });
-      tokenCache.set(cacheKey, result);
-      setData(result);
-      setError(null);
-    } catch (err) {
-      if (err.name !== "AbortError") {
-        const e = err instanceof Error ? err : new Error("Unknown error while fetching tokens");
-        setError(e);
-      }
-    } finally {
-      setLoading(false);
+// src/core/client.ts
+var SwapSDK = class {
+  constructor(config) {
+    __publicField(this, "apiKey");
+    /**
+     * Fetches metadata for one or more tokens from the Shogun Token Search API.
+     *
+     * ---
+     * ### Overview
+     * `getTokensData` retrieves normalized token information — such as symbol, name,
+     * decimals, logo URI, and verified status — for a given list of token addresses.
+     *
+     * It supports both **EVM** and **SVM (Solana)** tokens, returning metadata from
+     * Shogun’s unified token registry.
+     *
+     * ---
+     * @example
+     * ```ts
+     * const tokens = await getTokensData([
+     *   "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", // USDC
+     *   "So11111111111111111111111111111111111111112", // SOL
+     * ]);
+     *
+     * console.log(tokens);
+     * [
+     * { symbol: "USDC", name: "USD Coin", chainId: 1, decimals: 6, ... },
+     * { symbol: "SOL", name: "Solana", chainId: 101, decimals: 9, ... }
+     * ]
+     * ```
+     *
+     * @param addresses - An array of token addresses (EVM or SVM) to fetch metadata for.
+     * @returns A promise resolving to an array of {@link TokenInfo} objects.
+     *
+     * @throws Will throw an error if the network request fails or the API responds with a non-OK status.
+     */
+    __publicField(this, "getTokensData", getTokensData.bind(this));
+    if (!config.apiKey) {
+      throw new Error("SwapSDK: Missing API key");
     }
+    this.apiKey = config.apiKey;
+    if (this.apiKey) void this.apiKey;
   }
-  useEffect(() => {
-    if (!params.q && !params.networkId) return;
-    if (debounceRef.current) clearTimeout(debounceRef.current);
-    if (controllerRef.current) controllerRef.current.abort();
-    const controller = new AbortController();
-    controllerRef.current = controller;
-    debounceRef.current = setTimeout(() => {
-      fetchTokens(controller.signal);
-    }, debounceMs);
-    return () => {
-      controller.abort();
-      if (debounceRef.current) clearTimeout(debounceRef.current);
-    };
-  }, [cacheKey, debounceMs]);
-  return useMemo(
-    () => ({
-      /** Current fetched data (cached when possible) */
-      data,
-      /** Whether a request is in progress */
-      loading,
-      /** Error object if a request failed */
-      error,
-      /** Manually refetch the token list */
-      refetch: () => fetchTokens(),
-      /** Clear all cached token results (shared across hook instances) */
-      clearCache: () => tokenCache.clear()
-    }),
-    [data, loading, error]
-  );
-}
-
-// src/react/useExecuteOrder.ts
-import { useState as useState2, useCallback, useRef as useRef2, useEffect as useEffect2 } from "react";
-function useExecuteOrder() {
-  const [status, setStatus] = useState2("processing");
-  const [message, setMessage] = useState2(null);
-  const [loading, setLoading] = useState2(false);
-  const [data, setData] = useState2(null);
-  const [error, setError] = useState2(null);
-  const isMounted = useRef2(true);
-  useEffect2(() => {
-    return () => {
-      isMounted.current = false;
-    };
-  }, []);
-  const execute = useCallback(
-    async ({
+  /**
+   * Retrieves a swap quote for the given input and output tokens.
+   *
+   * @param params - Quote parameters including source/destination tokens and amount.
+   * @returns A normalized `SwapQuoteResponse` containing output amount, route, and metadata.
+   */
+  async getQuote(params) {
+    return getQuote(params);
+  }
+  /**
+   * Fetches token balances for the specified user wallet(s).
+   *
+   * Supports both EVM and SVM (Solana) wallet addresses.
+   *
+   * @param params - Wallet address and optional chain filters.
+   * @param options - Optional abort signal for cancellation.
+   * @returns A unified balance response with per-chain token details.
+   */
+  async getBalances(params, options) {
+    return getBalances(params, options);
+  }
+  /**
+   * Retrieves a list of verified tokens based on search query or chain filter.
+   *
+   * @param params - Search parameters (query, chain ID, pagination options).
+   * @returns Paginated `TokenSearchResponse` containing token metadata.
+   */
+  async getTokenList(params) {
+    return getTokenList(params);
+  }
+  /**
+   * Executes a prepared swap quote using the provided wallet and configuration.
+   *
+   * Handles:
+   * - Token approval (if required)
+   * - Transaction signing and broadcasting
+   * - Confirmation polling and stage-based status updates
+   *
+   * Supports both:
+   * - Market orders (with optional deadline)
+   * - Limit orders (requires executionPrice and deadline)
+   *
+   * @param quote - The swap quote to execute, containing route and metadata.
+   * @param accountAddress - The user's wallet address executing the swap.
+   * @param recipientAddress - Optional recipient address for the output tokens (defaults to sender).
+   * @param wallet - Adapted wallet instance (EVM/Solana) or a standard Viem `WalletClient`.
+   * @param onStatus - Optional callback for receiving execution stage updates and messages.
+   * @param orderType - Defines whether this is a market or limit order.
+   * @param options - Execution parameters (different per order type).
+   *
+   * @returns A finalized execution result containing transaction hash, status, and any returned data.
+   *
+   * @example
+   * ```ts
+   * * Market order
+   * const result = await sdk.executeTransaction({
+   *   quote,
+   *   accountAddress: "0x123...",
+   *   wallet,
+   *   orderType: OrderExecutionType.MARKET,
+   *   options: { deadline: 1800 },
+   *   onStatus: (stage, msg) => console.log(stage, msg),
+   * });
+   *
+   * * Limit order
+   * const result = await sdk.executeTransaction({
+   *   quote,
+   *   accountAddress: "0x123...",
+   *   wallet,
+   *   orderType: OrderExecutionType.LIMIT,
+   *   options: { executionPrice: "0.0021", deadline: 3600 },
+   * });
+   * ```
+   */
+  async executeTransaction({
+    quote,
+    accountAddress,
+    recipientAddress,
+    wallet,
+    onStatus,
+    orderType,
+    options
+  }) {
+    return executeOrder({
       quote,
+      wallet,
       accountAddress,
       recipientAddress,
-      wallet,
-      deadline
-    }) => {
-      if (!quote || !wallet) {
-        throw new Error("Quote and wallet are required for order execution.");
-      }
-      setLoading(true);
-      setError(null);
-      setData(null);
-      setMessage(null);
-      try {
-        const effectiveDeadline = deadline ?? Math.floor(Date.now() / 1e3) + 20 * 60;
-        const onStatus = (stage, msg) => {
-          if (!isMounted.current) return;
-          setStatus(stage);
-          if (msg) setMessage(msg);
-        };
-        const result = await executeOrder({
-          quote,
-          accountAddress,
-          recipientAddress,
-          wallet,
-          onStatus,
-          options: { deadline: effectiveDeadline }
-        });
-        if (!isMounted.current) return result;
-        setData(result);
-        setStatus(result.stage);
-        setMessage("Order executed successfully");
-        return result;
-      } catch (err) {
-        const errorObj = err instanceof Error ? err : new Error(String(err));
-        if (isMounted.current) {
-          setError(errorObj);
-          setStatus("error");
-          setMessage(errorObj.message);
-          setData({
-            status: false,
-            stage: "error",
-            message: errorObj.message
-          });
-        }
-        return {
-          status: false,
-          stage: "error",
-          message: errorObj.message
-        };
-      } finally {
-        if (isMounted.current) setLoading(false);
-      }
-    },
-    []
-  );
-  return {
-    /** Executes the swap order. */
-    execute,
-    /** Current execution stage. */
-    status,
-    /** Human-readable status message. */
-    message,
-    /** Whether execution is ongoing. */
-    loading,
-    /** Raw SDK response data. */
-    data,
-    /** Captured error (if execution failed). */
-    error
-  };
-}
-
-// src/react/useQuote.ts
-import { useCallback as useCallback2, useEffect as useEffect3, useMemo as useMemo2, useRef as useRef3, useState as useState3 } from "react";
-function useQuote(params, options) {
-  const [data, setData] = useState3(null);
-  const [loading, setLoading] = useState3(false);
-  const [error, setError] = useState3(null);
-  const [warning, setWarning] = useState3(null);
-  const debounceMs = options?.debounceMs ?? 250;
-  const autoRefreshMs = options?.autoRefreshMs;
-  const abortRef = useRef3(null);
-  const debounceRef = useRef3(null);
-  const mounted = useRef3(false);
-  const paramsKey = useMemo2(
-    () => params ? JSON.stringify(serializeBigIntsToStrings(params)) : null,
-    [params]
-  );
-  useEffect3(() => {
-    mounted.current = true;
-    return () => {
-      mounted.current = false;
-      abortRef.current?.abort();
-      if (debounceRef.current) clearTimeout(debounceRef.current);
-    };
-  }, []);
-  const fetchQuote = useCallback2(async () => {
-    if (!params) return;
-    try {
-      setLoading(true);
-      setWarning(null);
-      const result = await getQuote(params);
-      const serializeResult = serializeBigIntsToStrings(result);
-      if (!mounted.current) return;
-      setData((prev) => {
-        if (JSON.stringify(prev) === JSON.stringify(serializeResult)) return prev;
-        return serializeResult;
-      });
-      setWarning(result.warning ?? null);
-      setError(null);
-    } catch (err) {
-      if (err.name === "AbortError") return;
-      console.error("[useQuote] fetch error:", err);
-      if (mounted.current) setError(err instanceof Error ? err : new Error(String(err)));
-    } finally {
-      if (mounted.current) setLoading(false);
-    }
-  }, [paramsKey]);
-  useEffect3(() => {
-    if (!paramsKey) return;
-    if (debounceRef.current) clearTimeout(debounceRef.current);
-    debounceRef.current = setTimeout(() => {
-      fetchQuote();
-    }, debounceMs);
-    return () => {
-      if (debounceRef.current) clearTimeout(debounceRef.current);
-      abortRef.current?.abort();
-    };
-  }, [paramsKey, debounceMs, fetchQuote]);
-  useEffect3(() => {
-    if (!autoRefreshMs || !paramsKey) return;
-    const interval = setInterval(() => fetchQuote(), autoRefreshMs);
-    return () => clearInterval(interval);
-  }, [autoRefreshMs, paramsKey, fetchQuote]);
-  return useMemo2(
-    () => ({
-      data,
-      loading,
-      error,
-      warning,
-      refetch: fetchQuote
-    }),
-    [data, loading, error, warning, fetchQuote]
-  );
-}
-
-// src/react/useBalances.ts
-import { useCallback as useCallback3, useEffect as useEffect4, useMemo as useMemo3, useRef as useRef4, useState as useState4 } from "react";
-function useBalances(params) {
-  const [data, setData] = useState4(null);
-  const [loading, setLoading] = useState4(false);
-  const [error, setError] = useState4(null);
-  const abortRef = useRef4(null);
-  const stableParams = useMemo3(() => {
-    if (!params) return null;
-    const { addresses, cursorEvm, cursorSvm } = params;
-    return {
-      addresses: {
-        evm: addresses?.evm ?? void 0,
-        svm: addresses?.svm ?? void 0
-      },
-      cursorEvm,
-      cursorSvm
-    };
-  }, [params?.addresses?.evm, params?.addresses?.svm, params?.cursorEvm, params?.cursorSvm]);
-  const fetchBalances = useCallback3(async () => {
-    if (!stableParams) return;
-    if (abortRef.current) abortRef.current.abort();
-    const controller = new AbortController();
-    abortRef.current = controller;
-    setLoading(true);
-    setError(null);
-    try {
-      const result = await getBalances(stableParams, { signal: controller.signal });
-      setData((prev) => {
-        if (JSON.stringify(prev) === JSON.stringify(result)) return prev;
-        return result;
-      });
-      return result;
-    } catch (err) {
-      if (err.name === "AbortError") return;
-      const e = err instanceof Error ? err : new Error(String(err));
-      setError(e);
-      throw e;
-    } finally {
-      setLoading(false);
-    }
-  }, [stableParams]);
-  useEffect4(() => {
-    if (stableParams) fetchBalances().catch(() => {
+      onStatus,
+      orderType,
+      options
     });
-    return () => {
-      if (abortRef.current) abortRef.current.abort();
-    };
-  }, [fetchBalances]);
-  return useMemo3(
-    () => ({
-      /** Latest fetched balance data */
-      data,
-      /** Whether the hook is currently fetching */
-      loading,
-      /** Error object if fetching failed */
-      error,
-      /** Manually trigger a refresh */
-      refetch: fetchBalances
-    }),
-    [data, loading, error, fetchBalances]
-  );
-}
+  }
+};
 export {
-  NATIVE_TOKEN,
-  SOLANA_CHAIN_ID,
+  ChainId,
+  OrderExecutionType,
   SupportedChains,
-  adaptEthersSigner,
-  adaptSolanaWallet,
-  adaptViemWallet,
+  SwapSDK,
   buildQuoteParams,
-  executeOrder,
-  getBalances,
-  getQuote,
-  getTokenList,
-  isNativeAddress,
-  isViemWalletClient,
-  serializeBigIntsToStrings,
-  useBalances,
-  useExecuteOrder,
-  useQuote,
-  useTokenList
+  isEvmChain
 };