@shogun-sdk/swap 0.0.2-test.2 → 0.0.2-test.21

package/dist/index.js

@@ -139,22 +139,25 @@ async function getQuote(params) {
     tokenOut: params.tokenOut.address,
     amount: params.amount
   });
-  const inputSlippage = params.slippage ?? 5;
-  const slippageDecimal = inputSlippage / 100;
-  const slippage = Math.min(Math.max(slippageDecimal, 0), 0.5);
+  const slippagePercent = Math.min(Math.max(params.slippage ?? 0.5, 0), 50);
   let warning;
-  if (slippage > 0.1) {
-    warning = `\u26A0\uFE0F High slippage tolerance (${(slippage * 100).toFixed(2)}%) \u2014 price may vary significantly.`;
+  if (slippagePercent > 10) {
+    warning = `\u26A0\uFE0F High slippage tolerance (${slippagePercent.toFixed(2)}%) \u2014 price may vary significantly.`;
   }
-  const estimatedAmountOut = BigInt(data.estimatedAmountOutReduced);
-  const slippageBps = BigInt(Math.round(slippage * 1e4));
+  const estimatedAmountOut = BigInt(data.estimatedAmountOut);
+  const slippageBps = BigInt(Math.round(slippagePercent * 100));
   const estimatedAmountOutAfterSlippage = estimatedAmountOut * (10000n - slippageBps) / 10000n;
+  const pricePerTokenOutInUsd = data.estimatedAmountOutUsd / Number(data.estimatedAmountOut);
+  const amountOutUsdAfterSlippage = Number(estimatedAmountOutAfterSlippage) * pricePerTokenOutInUsd;
+  const minStablecoinsAmountValue = BigInt(data.estimatedAmountInAsMinStablecoinAmount);
+  const minStablecoinsAmountAfterSlippage = minStablecoinsAmountValue * (10000n - slippageBps) / 10000n;
   const pricePerInputToken = estimatedAmountOut * 10n ** BigInt(params.tokenIn.decimals ?? 18) / BigInt(params.amount);
   return {
-    amountOut: estimatedAmountOut,
-    amountOutUsd: data.estimatedAmountOutUsd,
+    amountOut: estimatedAmountOutAfterSlippage,
+    amountOutUsd: amountOutUsdAfterSlippage,
     amountInUsd: data.amountInUsd,
-    minStablecoinsAmount: data.estimatedAmountInAsMinStablecoinAmount,
+    // Input USD stays the same
+    minStablecoinsAmount: minStablecoinsAmountAfterSlippage,
     tokenIn: {
       address: params.tokenIn.address,
       decimals: params.tokenIn.decimals ?? 18,
@@ -167,10 +170,11 @@ async function getQuote(params) {
     },
     amountIn: params.amount,
     pricePerInputToken,
-    slippage,
+    slippage: slippagePercent,
     internal: {
       ...data,
-      estimatedAmountOutReduced: estimatedAmountOutAfterSlippage
+      estimatedAmountOutReduced: estimatedAmountOutAfterSlippage,
+      estimatedAmountOutUsdReduced: amountOutUsdAfterSlippage
     },
     warning
   };
@@ -243,7 +247,7 @@ async function getBalances(params, options) {
 }
 
 // src/core/executeOrder/execute.ts
-import { ChainID as ChainID4, isEvmChain as isEvmChain2 } from "@shogun-sdk/intents-sdk";
+import { ChainID as ChainID3, isEvmChain as isEvmChain2 } from "@shogun-sdk/intents-sdk";
 import { BaseError } from "viem";
 
 // src/wallet-adapter/svm-wallet-adapter/adapter.ts
@@ -256,7 +260,7 @@ var adaptSolanaWallet = (walletAddress, chainId, rpcUrl, signAndSendTransaction)
   const getChainId = async () => _chainId;
   const sendTransaction = async (transaction) => {
     const txHash = await signAndSendTransaction(transaction);
-    console.log(`\u{1F6F0} Sent transaction: ${txHash}`);
+    console.debug(`\u{1F6F0} Sent transaction: ${txHash}`);
     const maxRetries = 20;
     const delayMs = 2e3;
     for (let attempt = 0; attempt < maxRetries; attempt++) {
@@ -350,15 +354,26 @@ var adaptViemWallet = (wallet) => {
     if (!isEVMTransaction(transaction)) {
       throw new Error("Expected EVMTransaction but got SolanaTransaction");
     }
-    const tx = await wallet.sendTransaction({
-      from: transaction.from,
-      to: transaction.to,
-      data: transaction.data,
-      value: transaction.value,
-      account: wallet.account?.address,
-      chain: wallet.chain
-    });
-    return tx;
+    if (wallet.transport.type === "http") {
+      const request = await wallet.prepareTransactionRequest({
+        to: transaction.to,
+        data: transaction.data,
+        value: transaction.value,
+        chain: wallet.chain
+      });
+      const serializedTransaction = await wallet.signTransaction(request);
+      const tx = await wallet.sendRawTransaction({ serializedTransaction });
+      return tx;
+    } else {
+      const hash = await wallet.sendTransaction({
+        to: transaction.to,
+        data: transaction.data,
+        value: transaction.value,
+        chain: wallet.chain,
+        account: wallet.account
+      });
+      return hash;
+    }
   };
   const switchChain = async (chainId) => {
     try {
@@ -405,10 +420,12 @@ var DEFAULT_STAGE_MESSAGES = {
   processing: "Preparing transaction for execution",
   approving: "Approving token allowance",
   approved: "Token approved successfully",
-  signing: "Signing order for submission",
-  submitting: "Submitting order to Auctioneer",
-  success: "Order executed successfully",
-  error: "Order execution failed"
+  signing: "Signing transaction for submission",
+  submitting: "Submitting transaction",
+  initiated: "Transaction initiated.",
+  success: "Transaction Executed successfully",
+  shogun_processing: "Shogun is processing your transaction",
+  error: "Transaction failed during submission"
 };
 
 // src/core/executeOrder/buildOrder.ts
@@ -447,6 +464,110 @@ async function buildOrder({
   });
 }
 
+// src/utils/pollOrderStatus.ts
+import { AUCTIONEER_URL } from "@shogun-sdk/intents-sdk";
+async function pollOrderStatus(address, orderId, options = {}) {
+  const { intervalMs = 2e3, timeoutMs = 3e5 } = options;
+  const startTime = Date.now();
+  const isDebug = process.env.NODE_ENV !== "production";
+  const isEvmAddress = /^0x[a-fA-F0-9]{40}$/.test(address);
+  const isSuiAddress = /^0x[a-fA-F0-9]{64}$/.test(address);
+  const isSolanaAddress = /^[1-9A-HJ-NP-Za-km-z]{32,44}$/.test(address);
+  let queryParam;
+  if (isEvmAddress) queryParam = `evmWallets=${address}`;
+  else if (isSuiAddress) queryParam = `suiWallets=${address}`;
+  else if (isSolanaAddress) queryParam = `solanaWallets=${address}`;
+  else throw new Error(`Unrecognized wallet address format: ${address}`);
+  const queryUrl = `${AUCTIONEER_URL}/user_intent?${queryParam}`;
+  return new Promise((resolve, reject) => {
+    const pollInterval = setInterval(async () => {
+      try {
+        if (Date.now() - startTime > timeoutMs) {
+          clearInterval(pollInterval);
+          return resolve("Timeout");
+        }
+        const res = await fetch(queryUrl, {
+          method: "GET",
+          headers: { "Content-Type": "application/json" }
+        });
+        if (!res.ok) {
+          clearInterval(pollInterval);
+          return reject(
+            new Error(`Failed to fetch orders: ${res.status} ${res.statusText}`)
+          );
+        }
+        const json = await res.json();
+        const data = json?.data ?? {};
+        const allOrders = [
+          ...data.crossChainDcaOrders ?? [],
+          ...data.crossChainLimitOrders ?? [],
+          ...data.singleChainDcaOrders ?? [],
+          ...data.singleChainLimitOrders ?? []
+        ];
+        const targetOrder = allOrders.find((o) => o.orderId === orderId);
+        if (!targetOrder) {
+          if (isDebug)
+            console.debug(`[pollOrderStatus] [${orderId}] Not found yet`);
+          return;
+        }
+        const { orderStatus } = targetOrder;
+        if (isDebug) {
+          const elapsed = ((Date.now() - startTime) / 1e3).toFixed(1);
+          console.debug(`targetOrder`, targetOrder);
+          console.debug(
+            `[pollOrderStatus] [${orderId}] status=${orderStatus} (elapsed ${elapsed}s)`
+          );
+        }
+        if (["Fulfilled", "Cancelled", "Outdated"].includes(orderStatus)) {
+          clearInterval(pollInterval);
+          return resolve(orderStatus);
+        }
+      } catch (error) {
+        clearInterval(pollInterval);
+        return reject(error);
+      }
+    }, intervalMs);
+  });
+}
+
+// src/core/executeOrder/handleOrderPollingResult.ts
+async function handleOrderPollingResult({
+  status,
+  orderId,
+  chainId,
+  update,
+  messageFor
+}) {
+  switch (status) {
+    case "Fulfilled":
+      update("success", messageFor("success"));
+      return {
+        status: true,
+        orderId,
+        chainId,
+        finalStatus: status,
+        stage: "success"
+      };
+    case "Cancelled":
+      update("error", "Order was cancelled before fulfillment");
+      break;
+    case "Timeout":
+      update("error", "Order polling timed out");
+      break;
+    case "NotFound":
+    default:
+      update("error", "Order not found");
+      break;
+  }
+  return {
+    status: false,
+    orderId,
+    chainId,
+    finalStatus: status,
+    stage: "error"
+  };
+}
+
 // src/core/executeOrder/handleEvmExecution.ts
 async function handleEvmExecution({
   recipientAddress,
@@ -475,18 +596,18 @@ async function handleEvmExecution({
       from: accountAddress
     });
   }
-  update("approving", messageFor("approving"));
+  update("processing", messageFor("approving"));
   await wallet.sendTransaction({
     to: tokenIn,
     data: encodeFunctionData({
       abi: erc20Abi,
       functionName: "approve",
-      args: [PERMIT2_ADDRESS[chainId], BigInt(quote.amountIn)]
+      args: [PERMIT2_ADDRESS[chainId], quote.amountIn]
     }),
     value: 0n,
     from: accountAddress
   });
-  update("approved", messageFor("approved"));
+  update("processing", messageFor("approved"));
   const destination = recipientAddress ?? accountAddress;
   const order = await buildOrder({
     quote,
@@ -495,24 +616,40 @@ async function handleEvmExecution({
     deadline,
     isSingleChain
   });
-  update("signing", messageFor("signing"));
+  console.debug(`order`, order);
+  update("processing", messageFor("signing"));
   const { orderTypedData, nonce } = isSingleChain ? await getEVMSingleChainOrderTypedData(order) : await getEVMCrossChainOrderTypedData(order);
+  const typedData = serializeBigIntsToStrings(orderTypedData);
   if (!wallet.signTypedData) {
     throw new Error("Wallet does not support EIP-712 signing");
   }
-  const signature = await wallet.signTypedData(serializeBigIntsToStrings(orderTypedData));
-  update("submitting", messageFor("submitting"));
+  const signature = await wallet.signTypedData({
+    domain: typedData.domain,
+    types: typedData.types,
+    primaryType: typedData.primaryType,
+    value: typedData.message,
+    message: typedData.message
+  });
+  update("processing", messageFor("submitting"));
   const res = await order.sendToAuctioneer({ signature, nonce: nonce.toString() });
   if (!res.success) {
     throw new Error("Auctioneer submission failed");
   }
-  update("success", messageFor("success"));
-  return { status: true, txHash: res.data, chainId, stage: "success" };
+  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
+  });
 }
 
 // src/core/executeOrder/handleSolanaExecution.ts
 import {
-  ChainID as ChainID3,
   getSolanaSingleChainOrderInstructions,
   getSolanaCrossChainOrderInstructions
 } from "@shogun-sdk/intents-sdk";
@@ -545,10 +682,9 @@ async function handleSolanaExecution({
     rpcUrl: wallet.rpcUrl
   });
   const transaction = VersionedTransaction2.deserialize(Uint8Array.from(txData.txBytes));
-  update("signing", messageFor("signing"));
-  console.log({ order });
-  const txSignature = await wallet.sendTransaction(transaction);
-  update("submitting", messageFor("submitting"));
+  update("processing", messageFor("signing"));
+  await wallet.sendTransaction(transaction);
+  update("processing", messageFor("submitting"));
   const response = await submitToAuctioneer({
     order,
     isSingleChain,
@@ -557,13 +693,17 @@ async function handleSolanaExecution({
   if (!response.success) {
     throw new Error("Auctioneer submission failed");
   }
-  update("success", messageFor("success"));
-  return {
-    status: true,
-    txHash: txSignature,
-    chainId: ChainID3.Solana,
-    stage: "success"
-  };
+  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
+  });
 }
 async function getSolanaOrderInstructions({
   order,
@@ -605,18 +745,33 @@ async function executeOrder({
   onStatus,
   options = {}
 }) {
-  const deadline = options.deadline ?? Math.floor(Date.now() / 1e3) + 20 * 60;
+  const isDev = process.env.NODE_ENV !== "production";
+  const log = (...args) => {
+    if (isDev) console.debug("[OneShot::executeOrder]", ...args);
+  };
   const messageFor = (stage) => DEFAULT_STAGE_MESSAGES[stage];
-  const update = (stage, message) => onStatus?.(stage, message ?? messageFor(stage));
+  const update = (stage, message) => {
+    log("Stage:", stage, "| Message:", message ?? messageFor(stage));
+    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 isSingleChain = tokenIn.chainId === tokenOut.chainId;
     const chainId = Number(tokenIn.chainId);
-    update("processing", messageFor("processing"));
+    update("processing");
     if (isEvmChain2(chainId)) {
-      return await handleEvmExecution({
+      log("Detected EVM chain:", chainId);
+      const result = await handleEvmExecution({
         recipientAddress,
         quote,
         chainId,
@@ -626,9 +781,12 @@ async function executeOrder({
         deadline,
         update
       });
+      log("EVM execution result:", result);
+      return result;
     }
-    if (chainId === ChainID4.Solana) {
-      return await handleSolanaExecution({
+    if (chainId === ChainID3.Solana) {
+      log("Detected Solana chain");
+      const result = await handleSolanaExecution({
         recipientAddress,
         quote,
         accountAddress,
@@ -637,11 +795,16 @@ async function executeOrder({
         deadline,
         update
       });
+      log("Solana execution result:", result);
+      return result;
     }
-    update("error", "Unsupported chain");
-    return { status: false, message: "Unsupported chain", stage: "error" };
+    const unsupported = `Unsupported chain: ${chainId}`;
+    update("error", unsupported);
+    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 });
     update("error", message);
     return { status: false, message, stage: "error" };
   }
@@ -822,77 +985,64 @@ function useQuote(params, options) {
   const autoRefreshMs = options?.autoRefreshMs;
   const abortRef = useRef3(null);
   const debounceRef = useRef3(null);
-  const mountedRef = useRef3(true);
+  const mounted = useRef3(false);
+  const paramsKey = useMemo2(
+    () => params ? JSON.stringify(serializeBigIntsToStrings(params)) : null,
+    [params]
+  );
   useEffect3(() => {
+    mounted.current = true;
     return () => {
-      mountedRef.current = false;
+      mounted.current = false;
       abortRef.current?.abort();
       if (debounceRef.current) clearTimeout(debounceRef.current);
     };
   }, []);
-  const fetchQuote = useCallback2(
-    async (signal) => {
-      if (!params) return;
-      try {
-        setLoading(true);
-        setWarning(null);
-        const result = await getQuote({ ...params, signal });
-        if (!mountedRef.current) return;
-        setData((prev) => {
-          if (JSON.stringify(prev) === JSON.stringify(result)) return prev;
-          return result;
-        });
-        setWarning(result.warning ?? null);
-        setError(null);
-      } catch (err) {
-        if (err.name === "AbortError") return;
-        const e = err instanceof Error ? err : new Error(String(err));
-        if (mountedRef.current) setError(e);
-      } finally {
-        if (mountedRef.current) setLoading(false);
-      }
-    },
-    [params]
-  );
-  useEffect3(() => {
+  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);
-    abortRef.current?.abort();
-    const controller = new AbortController();
-    abortRef.current = controller;
     debounceRef.current = setTimeout(() => {
-      fetchQuote(controller.signal);
+      fetchQuote();
     }, debounceMs);
     return () => {
-      controller.abort();
       if (debounceRef.current) clearTimeout(debounceRef.current);
+      abortRef.current?.abort();
     };
-  }, [
-    params?.tokenIn?.address,
-    params?.tokenOut?.address,
-    params?.sourceChainId,
-    params?.destChainId,
-    params?.amount,
-    debounceMs,
-    fetchQuote
-  ]);
+  }, [paramsKey, debounceMs, fetchQuote]);
   useEffect3(() => {
-    if (!autoRefreshMs || !params) return;
+    if (!autoRefreshMs || !paramsKey) return;
     const interval = setInterval(() => fetchQuote(), autoRefreshMs);
     return () => clearInterval(interval);
-  }, [autoRefreshMs, params, fetchQuote]);
+  }, [autoRefreshMs, paramsKey, fetchQuote]);
   return useMemo2(
     () => ({
-      /** Latest quote data */
       data,
-      /** Whether a fetch is ongoing */
       loading,
-      /** Error (if any) */
       error,
-      /** Warning (e.g. high slippage alert) */
       warning,
-      /** Manual refetch */
-      refetch: () => fetchQuote()
+      refetch: fetchQuote
     }),
     [data, loading, error, warning, fetchQuote]
   );