From 2ce13c39b8d19a36b782b4dd2510d187a9d8471f Mon Sep 17 00:00:00 2001
From: ashwinrava <213675439+ashwinrava@users.noreply.github.com>
Date: Thu, 28 Aug 2025 16:53:16 -0400
Subject: [PATCH 1/3] Migrate example app to Swap API

---
 apps/example/app/viem/components/Bridge.tsx   |  24 ++--
 apps/example/app/viem/components/Progress.tsx |   4 +-
 .../example/lib/hooks/useExecuteSwapQuote.tsx | 111 ++++++++++++++++++
 apps/example/lib/hooks/useSwapQuote.tsx       |  36 ++++++
 4 files changed, 163 insertions(+), 12 deletions(-)
 create mode 100644 apps/example/lib/hooks/useExecuteSwapQuote.tsx
 create mode 100644 apps/example/lib/hooks/useSwapQuote.tsx

diff --git a/apps/example/app/viem/components/Bridge.tsx b/apps/example/app/viem/components/Bridge.tsx
index 7874411..5ffcc74 100644
--- a/apps/example/app/viem/components/Bridge.tsx
+++ b/apps/example/app/viem/components/Bridge.tsx
@@ -7,7 +7,7 @@ import { Button, Label, Skeleton } from "@/components/ui";
 import { useAvailableRoutes } from "@/lib/hooks/useAvailableRoutes";
 import { useInputTokens } from "@/lib/hooks/useInputTokens";
 import { useOutputTokens } from "@/lib/hooks/useOutputTokens";
-import { useQuote } from "@/lib/hooks/useQuote";
+import { useSwapQuote } from "@/lib/hooks/useSwapQuote";
 import { useSupportedAcrossChains } from "@/lib/hooks/useSupportedAcrossChains";
 import { getExplorerLink, isNativeToken } from "@/lib/utils";
 import { TokenInfo } from "@across-protocol/app-sdk";
@@ -15,7 +15,7 @@ import { useEffect, useState } from "react";
 import { formatUnits, parseUnits } from "viem";
 import { useAccount, useBalance, useChains } from "wagmi";
 import { useDebounceValue } from "usehooks-ts";
-import { useExecuteQuote } from "@/lib/hooks/useExecuteQuote";
+import { useExecuteSwapQuote } from "@/lib/hooks/useExecuteSwapQuote";
 import { Progress } from "./Progress";
 import { TokenInput } from "@/components/TokenInput";
 import { ExternalLink } from "@/components/ExternalLink";
@@ -101,11 +101,15 @@ export function Bridge() {
   });
 
   const quoteConfig =
-    route && debouncedInputAmount && fromToken
+    route && debouncedInputAmount && fromToken && destinationChainId && originChainId && address && toToken
       ? {
-          route,
+          originChainId: originChainId.toString(),
+          destinationChainId: destinationChainId.toString(),
+          inputToken: fromToken.address,
+          outputToken: toToken.address,
+          amount: parseUnits(debouncedInputAmount, fromToken?.decimals).toString(),
+          depositor: address,
           recipient: address,
-          inputAmount: parseUnits(debouncedInputAmount, fromToken?.decimals),
         }
       : undefined;
 
@@ -113,16 +117,16 @@ export function Bridge() {
     quote,
     isLoading: quoteLoading,
     isRefetching,
-  } = useQuote(quoteConfig);
+  } = useSwapQuote(quoteConfig);
 
   const {
-    executeQuote,
+    executeSwapQuote,
     progress,
     error,
     isPending,
     depositReceipt,
     fillReceipt,
-  } = useExecuteQuote(quote);
+  } = useExecuteSwapQuote(quote ? { swapQuote: quote } : undefined);
   const inputBalance = fromTokenBalance
     ? parseFloat(
         formatUnits(fromTokenBalance?.value, fromTokenBalance?.decimals),
@@ -232,12 +236,12 @@ export function Bridge() {
         {quote && toToken && (
           <p className="text-md font-normal text-text">
             {parseFloat(
-              formatUnits(quote.deposit.outputAmount, toToken.decimals),
+              formatUnits(BigInt(quote.minOutputAmount), toToken.decimals),
             ).toFixed(3)}
           </p>
         )}
         <Button
-          onClick={() => executeQuote()}
+          onClick={() => executeSwapQuote()}
           disabled={!(quote && toToken) || isRefetching || isPending}
           className="mt-2"
           variant="accent"
diff --git a/apps/example/app/viem/components/Progress.tsx b/apps/example/app/viem/components/Progress.tsx
index d8106ef..cfa16d5 100644
--- a/apps/example/app/viem/components/Progress.tsx
+++ b/apps/example/app/viem/components/Progress.tsx
@@ -1,9 +1,9 @@
 import { LoadingIndicator, Status } from "@/components/LoadingIndicator";
 import { cn } from "@/lib/utils";
-import { ExecutionProgress } from "@across-protocol/app-sdk";
+import { ExecutionProgress, SwapExecutionProgress } from "@across-protocol/app-sdk";
 
 export type ProgressProps = {
-  progress: ExecutionProgress;
+  progress: ExecutionProgress | SwapExecutionProgress;
   error?: Error | null;
   className?: string;
 };
diff --git a/apps/example/lib/hooks/useExecuteSwapQuote.tsx b/apps/example/lib/hooks/useExecuteSwapQuote.tsx
new file mode 100644
index 0000000..068f8eb
--- /dev/null
+++ b/apps/example/lib/hooks/useExecuteSwapQuote.tsx
@@ -0,0 +1,111 @@
+import { useMutation } from "@tanstack/react-query";
+import { useAcross } from "../across";
+import { buildQueryKey, getExplorerLink } from "../utils";
+import { AcrossClient, SwapExecutionProgress } from "@across-protocol/app-sdk";
+import { useChainId, useChains, useConfig, useSwitchChain } from "wagmi";
+import { useState } from "react";
+import { TransactionReceipt } from "viem";
+import { getWalletClient } from "wagmi/actions";
+
+export type useExecuteSwapQuoteParams =
+  | Omit<Parameters<AcrossClient["executeSwapQuote"]>[0], "walletClient">
+  | undefined;
+
+export function useExecuteSwapQuote(params: useExecuteSwapQuoteParams) {
+  const sdk = useAcross();
+  const config = useConfig();
+  const chains = useChains();
+  const { switchChainAsync } = useSwitchChain();
+  const chainId = useChainId();
+  const mutationKey = buildQueryKey("executeSwapQuote", params);
+
+  const [progress, setProgress] = useState<SwapExecutionProgress>({
+    status: "idle",
+    step: "approve",
+  });
+  const [depositReceipt, setDepositReceipt] = useState<TransactionReceipt>();
+  const [fillReceipt, setFillReceipt] = useState<TransactionReceipt>();
+
+  function resetProgress() {
+    setProgress({
+      status: "idle",
+      step: "approve",
+    });
+  }
+
+  const { mutate: executeSwapQuote, ...rest } = useMutation({
+    mutationKey,
+    mutationFn: async () => {
+      resetProgress();
+
+      if (!params) {
+        return;
+      }
+
+      const inputChainId = params.swapQuote.inputToken.chainId;
+
+      if (chainId !== inputChainId) {
+        await switchChainAsync({ chainId: inputChainId });
+      }
+
+      const walletClient = await getWalletClient(config);
+      if (!walletClient) {
+        return;
+      }
+
+      return sdk.executeSwapQuote({
+        ...params,
+        walletClient,
+        onProgress: (progress) => {
+          console.log(progress);
+          if (progress.status === "txSuccess" && progress.step === "swap") {
+            setDepositReceipt(progress.txReceipt);
+          }
+          if (progress.status === "txSuccess" && progress.step === "fill") {
+            setFillReceipt(progress.txReceipt);
+          }
+          setProgress(progress);
+        },
+      });
+    },
+    onError: (error) => {
+      console.log("ERROR", error);
+    },
+  });
+
+  const originChain = chains.find(
+    (chain) => chain.id === params?.swapQuote.inputToken.chainId,
+  );
+
+  const destinationChain = chains.find(
+    (chain) => chain.id === params?.swapQuote.outputToken.chainId,
+  );
+
+  const depositTxLink =
+    depositReceipt &&
+    originChain &&
+    getExplorerLink({
+      chain: originChain,
+      type: "transaction",
+      txHash: depositReceipt.transactionHash,
+    });
+
+  const fillTxLink =
+    fillReceipt &&
+    destinationChain &&
+    getExplorerLink({
+      chain: destinationChain,
+      type: "transaction",
+      txHash: fillReceipt.transactionHash,
+    });
+
+  return {
+    progress,
+    executeSwapQuote,
+    depositReceipt,
+    fillReceipt,
+    depositTxLink,
+    fillTxLink,
+    ...rest,
+  };
+}
diff --git a/apps/example/lib/hooks/useSwapQuote.tsx b/apps/example/lib/hooks/useSwapQuote.tsx
new file mode 100644
index 0000000..ae804d9
--- /dev/null
+++ b/apps/example/lib/hooks/useSwapQuote.tsx
@@ -0,0 +1,36 @@
+import { useQuery } from "@tanstack/react-query";
+import { useAcross } from "../across";
+import { AcrossClient } from "@across-protocol/app-sdk";
+import { buildQueryKey } from "../utils";
+
+export type useSwapQuoteParams =
+  | Parameters<AcrossClient["getSwapQuote"]>[0]
+  | undefined;
+
+export function useSwapQuote(
+  params: useSwapQuoteParams,
+  query?: Parameters<typeof useQuery>[1],
+) {
+  const sdk = useAcross();
+  const queryKey = buildQueryKey("getQuote", params);
+
+  const { data: quote, ...rest } = useQuery({
+    queryKey,
+    queryFn: async () => {
+      if (!params) return;
+      return await sdk.getSwapQuote(params);
+    },
+    enabled: Boolean(params),
+    refetchInterval: 10_000,
+    retryDelay(failureCount, error) {
+      return 10_000;
+    },
+    retry: (_, error) => {
+      console.log(error);
+      return true;
+    },
+    ...query,
+  });
+
+  return { quote, ...rest };
+}

From bdd814eb08ff9326294fc06d0dfe7c05a0d72f5c Mon Sep 17 00:00:00 2001
From: ashwinrava <213675439+ashwinrava@users.noreply.github.com>
Date: Tue, 2 Sep 2025 16:12:41 -0400
Subject: [PATCH 2/3] Update token and chain selection

---
 apps/example/app/viem/components/Bridge.tsx | 62 ++++++---------------
 apps/example/lib/hooks/useSwapChains.tsx    | 28 ++++++++++
 apps/example/lib/hooks/useSwapTokens.tsx    | 31 +++++++++++
 apps/example/next.config.mjs                |  6 +-
 4 files changed, 80 insertions(+), 47 deletions(-)
 create mode 100644 apps/example/lib/hooks/useSwapChains.tsx
 create mode 100644 apps/example/lib/hooks/useSwapTokens.tsx

diff --git a/apps/example/app/viem/components/Bridge.tsx b/apps/example/app/viem/components/Bridge.tsx
index 5ffcc74..60369b7 100644
--- a/apps/example/app/viem/components/Bridge.tsx
+++ b/apps/example/app/viem/components/Bridge.tsx
@@ -4,14 +4,10 @@ import { ChainSelect } from "@/components/ChainSelect";
 import { Divider } from "@/components/Divider";
 import { TokenSelect } from "@/components/TokenSelect";
 import { Button, Label, Skeleton } from "@/components/ui";
-import { useAvailableRoutes } from "@/lib/hooks/useAvailableRoutes";
-import { useInputTokens } from "@/lib/hooks/useInputTokens";
-import { useOutputTokens } from "@/lib/hooks/useOutputTokens";
 import { useSwapQuote } from "@/lib/hooks/useSwapQuote";
-import { useSupportedAcrossChains } from "@/lib/hooks/useSupportedAcrossChains";
 import { getExplorerLink, isNativeToken } from "@/lib/utils";
 import { TokenInfo } from "@across-protocol/app-sdk";
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { formatUnits, parseUnits } from "viem";
 import { useAccount, useBalance, useChains } from "wagmi";
 import { useDebounceValue } from "usehooks-ts";
@@ -20,12 +16,14 @@ import { Progress } from "./Progress";
 import { TokenInput } from "@/components/TokenInput";
 import { ExternalLink } from "@/components/ExternalLink";
 import { useAcrossChains } from "@/lib/hooks/useAcrossChains";
+import { useSwapTokens } from "@/lib/hooks/useSwapTokens";
+import { useSwapChains } from "@/lib/hooks/useSwapChains";
 
 export function Bridge() {
   const { address } = useAccount();
   const chains = useChains();
   // CHAINS
-  const { supportedChains } = useSupportedAcrossChains({});
+  const { swapChains: supportedChains } = useSwapChains({});
 
   // use only token data for chains we support
   const acrossChains = useAcrossChains();
@@ -37,7 +35,7 @@ export function Bridge() {
   );
 
   // FROM TOKEN
-  const { inputTokens } = useInputTokens(originChainId);
+  const { tokens: inputTokens } = useSwapTokens(originChainId);
 
   const [fromToken, setFromToken] = useState<TokenInfo | undefined>(
     inputTokens?.[0],
@@ -55,59 +53,31 @@ export function Bridge() {
     number | undefined
   >(chains.find((chain) => chain.id !== originChainId)?.id);
 
-  const { availableRoutes } = useAvailableRoutes({
-    originChainId,
-    destinationChainId,
-    originToken: fromToken?.address,
-  });
-
-  const outputTokensForRoute = availableRoutes?.map((route) =>
-    route.outputToken.toLowerCase(),
-  );
-
-  const { outputTokens: outputTokensForChain } =
-    useOutputTokens(destinationChainId);
-
-  const [outputTokens, setOutputTokens] = useState<TokenInfo[] | undefined>();
-
-  useEffect(() => {
-    const _outputTokens = outputTokensForChain?.filter((token) =>
-      outputTokensForRoute?.includes(token.address.toLowerCase()),
-    );
-    setOutputTokens(_outputTokens);
-  }, [availableRoutes]);
+  const { tokens: outputTokens } = useSwapTokens(destinationChainId);
 
   const [toToken, setToToken] = useState<TokenInfo | undefined>(
     outputTokens?.[0],
   );
 
-  useEffect(() => {
-    if (outputTokens) {
-      setToToken(
-        outputTokens.find((token) => token.symbol === fromToken?.symbol) ??
-          outputTokens?.[0],
-      );
-    }
-  }, [outputTokens]);
-
   const [inputAmount, setInputAmount] = useState<string>("");
   const [debouncedInputAmount] = useDebounceValue(inputAmount, 300);
-  const route = availableRoutes?.find((route) => {
-    return (
-      route.outputToken.toLocaleLowerCase() ===
-        toToken?.address?.toLowerCase() &&
-      route.outputTokenSymbol === toToken.symbol
-    );
-  });
 
   const quoteConfig =
-    route && debouncedInputAmount && fromToken && destinationChainId && originChainId && address && toToken
+    debouncedInputAmount &&
+    fromToken &&
+    toToken &&
+    destinationChainId &&
+    originChainId &&
+    address
       ? {
           originChainId: originChainId.toString(),
           destinationChainId: destinationChainId.toString(),
           inputToken: fromToken.address,
           outputToken: toToken.address,
-          amount: parseUnits(debouncedInputAmount, fromToken?.decimals).toString(),
+          amount: parseUnits(
+            debouncedInputAmount,
+            fromToken?.decimals,
+          ).toString(),
           depositor: address,
           recipient: address,
         }
diff --git a/apps/example/lib/hooks/useSwapChains.tsx b/apps/example/lib/hooks/useSwapChains.tsx
new file mode 100644
index 0000000..6c00e8e
--- /dev/null
+++ b/apps/example/lib/hooks/useSwapChains.tsx
@@ -0,0 +1,28 @@
+import { useQuery } from "@tanstack/react-query";
+import { useAcross } from "../across";
+import { AcrossClient } from "@across-protocol/app-sdk";
+import { buildQueryKey } from "../utils";
+
+export type useAcrossChainsParams = Parameters<
+  AcrossClient["getSwapChains"]
+>[0];
+
+export function useSwapChains(params: useAcrossChainsParams) {
+  const sdk = useAcross();
+  const queryKey = buildQueryKey("swapChains", params);
+
+  const { data: swapChains, ...rest } = useQuery({
+    queryKey,
+    queryFn: () => {
+      return sdk.getSwapChains(params);
+    },
+    enabled: true,
+    refetchInterval: Infinity,
+    retry: (_, error) => {
+      console.log(error);
+      return true;
+    },
+  });
+
+  return { swapChains, ...rest };
+}
diff --git a/apps/example/lib/hooks/useSwapTokens.tsx b/apps/example/lib/hooks/useSwapTokens.tsx
new file mode 100644
index 0000000..9e90b8b
--- /dev/null
+++ b/apps/example/lib/hooks/useSwapTokens.tsx
@@ -0,0 +1,31 @@
+import { useQuery } from "@tanstack/react-query";
+import { useAcross } from "../across";
+
+export function useSwapTokens(chainId: number | undefined) {
+  const sdk = useAcross();
+  const queryKey = ["swapTokens", chainId];
+
+  const { data: tokens, ...rest } = useQuery({
+    queryKey,
+    queryFn: () => {
+      return sdk.getSwapTokens({ chainId: chainId });
+    },
+    enabled: Boolean(chainId),
+    refetchInterval: Infinity,
+    retry: (_, error) => {
+      console.log(error);
+      return true;
+    },
+  });
+
+  return {
+    tokens: tokens?.map((token) => ({
+      address: token.address,
+      symbol: token.symbol,
+      name: token.name,
+      decimals: token.decimals,
+      logoUrl: token.logoUrl,
+    })),
+    ...rest,
+  };
+}
diff --git a/apps/example/next.config.mjs b/apps/example/next.config.mjs
index 4678774..ecaf250 100644
--- a/apps/example/next.config.mjs
+++ b/apps/example/next.config.mjs
@@ -1,4 +1,8 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {};
+const nextConfig = {
+  images: {
+    unoptimized: true, // Disable image optimization
+  },
+};
 
 export default nextConfig;

From f8c81c7f4fedc83134e06fdb69e10efffbebc8e2 Mon Sep 17 00:00:00 2001
From: ashwinrava <213675439+ashwinrava@users.noreply.github.com>
Date: Wed, 3 Sep 2025 18:01:20 -0400
Subject: [PATCH 3/3] Add support for embedded actions

---
 apps/example/app/viem/components/Bridge.tsx  | 15 +++---
 apps/example/app/viem/components/Stake.tsx   | 35 ++++++-------
 apps/example/lib/hooks/useStakeQuote.tsx     | 53 +++++++-------------
 apps/example/lib/stake.ts                    |  2 +-
 packages/sdk/src/actions/executeSwapQuote.ts |  2 +-
 packages/sdk/src/utils/fetch.ts              |  7 ++-
 6 files changed, 47 insertions(+), 67 deletions(-)

diff --git a/apps/example/app/viem/components/Bridge.tsx b/apps/example/app/viem/components/Bridge.tsx
index 60369b7..b4be23a 100644
--- a/apps/example/app/viem/components/Bridge.tsx
+++ b/apps/example/app/viem/components/Bridge.tsx
@@ -70,14 +70,13 @@ export function Bridge() {
     originChainId &&
     address
       ? {
-          originChainId: originChainId.toString(),
-          destinationChainId: destinationChainId.toString(),
-          inputToken: fromToken.address,
-          outputToken: toToken.address,
-          amount: parseUnits(
-            debouncedInputAmount,
-            fromToken?.decimals,
-          ).toString(),
+          route: {
+            originChainId: originChainId,
+            destinationChainId: destinationChainId,
+            inputToken: fromToken.address,
+            outputToken: toToken.address,
+          },
+          amount: parseUnits(debouncedInputAmount, fromToken?.decimals),
           depositor: address,
           recipient: address,
         }
diff --git a/apps/example/app/viem/components/Stake.tsx b/apps/example/app/viem/components/Stake.tsx
index 5ff53b0..6983848 100644
--- a/apps/example/app/viem/components/Stake.tsx
+++ b/apps/example/app/viem/components/Stake.tsx
@@ -23,6 +23,7 @@ import { optimism } from "viem/chains";
 import { useAccount, useBalance } from "wagmi";
 import { useStakeQuote } from "@/lib/hooks/useStakeQuote";
 import { useQueryClient } from "@tanstack/react-query";
+import { useExecuteSwapQuote } from "@/lib/hooks/useExecuteSwapQuote";
 
 export function Stake() {
   const queryClient = useQueryClient();
@@ -44,8 +45,6 @@ export function Stake() {
     originChainIds.has(c.chainId),
   );
 
-  const toToken = stakeToken;
-
   const [originChainId, setOriginChainId] = useState<number | undefined>(
     originChains?.[0]?.chainId,
   );
@@ -94,14 +93,6 @@ export function Stake() {
 
   const [inputAmount, setInputAmount] = useState<string>("");
   const [debouncedInputAmount] = useDebounceValue(inputAmount, 300);
-  const route = availableRoutes?.find((route) => {
-    return (
-      route.outputToken.toLowerCase() === toToken?.address?.toLowerCase() &&
-      route.inputToken.toLowerCase() === fromToken?.address.toLowerCase() &&
-      route.originChainId === originChainId &&
-      route.outputTokenSymbol === toToken.symbol
-    );
-  });
 
   const { userStakeFormatted, userStakeQueryKey } = useUserStake();
   const {
@@ -114,24 +105,25 @@ export function Stake() {
 
   const {
     stakeQuote,
-    error: stakeQuoteError,
     isLoading: stakeQuotePending,
     isRefetching: stakeQuoteRefetching,
   } = useStakeQuote(
     {
-      route,
-      inputAmount: parseUnits(
-        debouncedInputAmount,
-        STAKE_CONTRACT.token.decimals,
-      ),
+      route: {
+        originChainId: originChainId!,
+        destinationChainId: routeConfig.destinationChainId,
+        inputToken: fromToken?.address!,
+        outputToken: stakeToken.address,
+      },
+      amount: parseUnits(debouncedInputAmount, STAKE_CONTRACT.token.decimals),
     },
     {
       enabled: Boolean(debouncedInputAmount),
     },
   );
 
-  const { executeQuote, progress, isPending, fillTxLink, depositTxLink } =
-    useExecuteQuote(stakeQuote);
+  const { executeSwapQuote, progress, isPending, fillTxLink, depositTxLink } =
+    useExecuteSwapQuote(stakeQuote ? { swapQuote: stakeQuote } : undefined);
 
   useEffect(() => {
     if (withdrawConfirming) {
@@ -250,7 +242,7 @@ export function Stake() {
             onChange={(e) => setInputAmount(e.currentTarget.value)}
           />
           <Button
-            onClick={() => executeQuote()}
+            onClick={() => executeSwapQuote()}
             disabled={!stakeQuote || stakeQuoteRefetching || isPending}
             className="mt-2"
             variant="accent"
@@ -270,7 +262,10 @@ export function Stake() {
           {stakeQuote && fromToken && (
             <p className="text-md font-normal text-text">
               {parseFloat(
-                formatUnits(stakeQuote.deposit.outputAmount, toToken.decimals),
+                formatUnits(
+                  BigInt(stakeQuote.minOutputAmount),
+                  stakeToken.decimals,
+                ),
               ).toFixed(6)}
             </p>
           )}
diff --git a/apps/example/lib/hooks/useStakeQuote.tsx b/apps/example/lib/hooks/useStakeQuote.tsx
index db410e2..9ba5c12 100644
--- a/apps/example/lib/hooks/useStakeQuote.tsx
+++ b/apps/example/lib/hooks/useStakeQuote.tsx
@@ -1,12 +1,12 @@
 import { useAccount } from "wagmi";
 import { useAcross } from "../across";
 import { AcrossClient, Amount } from "@across-protocol/app-sdk";
-import { generateUnwrapCallData, WETH_OPTIMISM } from "../weth";
-import { generateStakeCallData, STAKE_CONTRACT } from "../stake";
+import { WETH_OPTIMISM } from "../weth";
+import { STAKE_CONTRACT } from "../stake";
 import { UseQueryOptions, useQuery } from "@tanstack/react-query";
 import { buildQueryKey } from "../utils";
 
-type StakeQuoteParams = Partial<Parameters<AcrossClient["getQuote"]>[0]>;
+type StakeQuoteParams = Partial<Parameters<AcrossClient["getSwapQuote"]>[0]>;
 
 export function useStakeQuote(
   params: StakeQuoteParams,
@@ -15,54 +15,35 @@ export function useStakeQuote(
   const { address } = useAccount();
   const sdk = useAcross();
 
-  function buildCrossChainMessage(
-    inputAmount: Amount,
-  ): StakeQuoteParams["crossChainMessage"] {
+  function buildCrossChainMessage(): StakeQuoteParams["actions"] {
     if (!address) {
       throw new Error("No account connected");
     }
 
-    return {
-      actions: [
-        {
-          target: WETH_OPTIMISM.address,
-          callData: generateUnwrapCallData(inputAmount),
-          value: 0n,
-          update: (updatedOutputAmount) => {
-            return {
-              callData: generateUnwrapCallData(updatedOutputAmount),
-            };
-          },
-        },
-        {
-          target: STAKE_CONTRACT.address,
-          callData: generateStakeCallData(address),
-          value: inputAmount,
-          update: (updatedOutputAmount) => {
-            return {
-              value: updatedOutputAmount,
-            };
-          },
-        },
-      ],
-      fallbackRecipient: address,
-    };
+    return [
+      {
+        target: STAKE_CONTRACT.address,
+        functionSignature: "function stake(address recipient)",
+        args: [{ value: address }],
+        populateCallValueDynamically: true,
+      },
+    ];
   }
 
   const queryKey = buildQueryKey("getStakeQuote", params);
 
   const enabled = Boolean(
-    params.route && params.inputAmount && (queryOptions?.enabled ?? true),
+    params.route && params.amount && (queryOptions?.enabled ?? true),
   );
 
   const { data: stakeQuote, ...rest } = useQuery({
     queryKey,
     queryFn: () =>
-      sdk.getQuote({
+      sdk.getSwapQuote({
         route: params.route!,
-        inputAmount: params.inputAmount!,
-        recipient: STAKE_CONTRACT.multicallHandler,
-        crossChainMessage: buildCrossChainMessage(params.inputAmount!),
+        amount: params.amount!,
+        depositor: address!,
+        actions: buildCrossChainMessage(),
       }),
     enabled,
   });
diff --git a/apps/example/lib/stake.ts b/apps/example/lib/stake.ts
index 3df7971..be6f374 100644
--- a/apps/example/lib/stake.ts
+++ b/apps/example/lib/stake.ts
@@ -8,7 +8,7 @@ export const routeConfig = {
 } as const;
 
 export const stakeToken = {
-  address: "0x4200000000000000000000000000000000000006",
+  address: "0x0000000000000000000000000000000000000000",
   symbol: "ETH",
   name: "Ether",
   decimals: 18,
diff --git a/packages/sdk/src/actions/executeSwapQuote.ts b/packages/sdk/src/actions/executeSwapQuote.ts
index 85341f9..7939a31 100644
--- a/packages/sdk/src/actions/executeSwapQuote.ts
+++ b/packages/sdk/src/actions/executeSwapQuote.ts
@@ -285,7 +285,7 @@ export async function executeSwapQuote(
     onProgressHandler(currentTransactionProgress);
 
     // simulate swap transaction
-    await originClient.call(txRequest);
+    await originClient.call({ account, ...txRequest });
 
     currentTransactionProgress = {
       step: "swap",
diff --git a/packages/sdk/src/utils/fetch.ts b/packages/sdk/src/utils/fetch.ts
index 5740991..125cad0 100644
--- a/packages/sdk/src/utils/fetch.ts
+++ b/packages/sdk/src/utils/fetch.ts
@@ -72,7 +72,12 @@ function makeFetcher(
 
     const res = await fetch(url, {
       method,
-      body: method === "POST" ? JSON.stringify(body) : undefined,
+      body:
+        method === "POST"
+          ? JSON.stringify(body, (_, value) =>
+              typeof value === "bigint" ? value.toString() : value,
+            )
+          : undefined,
       headers:
         method === "POST"
           ? {