0xtrails 0.1.13 → 0.2.1

package/src/trails.ts

@@ -5,7 +5,7 @@ import type {
   IntentCallsPayload,
   IntentPrecondition,
 } from "@0xsequence/trails-api"
-import type { SequenceAPIClient } from "@0xsequence/trails-api"
+import type { TrailsClient } from "./trailsClient.js"
 import type { Relayer } from "@0xsequence/wallet-core"
 import { useMutation, useQuery } from "@tanstack/react-query"
 import { Address } from "ox"
@@ -27,14 +27,9 @@ import {
   useSwitchChain,
   useWaitForTransactionReceipt,
 } from "wagmi"
-import { useAPIClient } from "./apiClient.js"
+import { useTrailsClient } from "./trailsClient.js"
 import { attemptSwitchChain } from "./chainSwitch.js"
 import { getChainInfo } from "./chains.js"
-import {
-  TRAILS_CCTP_SAPIENT_SIGNER_ADDRESS,
-  TRAILS_LIFI_SAPIENT_SIGNER_ADDRESS,
-  TRAILS_RELAY_SAPIENT_SIGNER_ADDRESS,
-} from "./constants.js"
 import { getERC20TransferData } from "./encoders.js"
 import type {
   GetIntentCallsPayloadsReturn,
@@ -53,6 +48,7 @@ import { findPreconditionAddresses } from "./preconditions.js"
 import { getBackupRelayer, useRelayers } from "./relayer.js"
 import { queueCCTPTransfer } from "./cctpqueue.js"
 import { logger } from "./logger.js"
+import { SEQUENCE_V3_CONTRACT_ADDRESSES_OVERRIDES } from "./constants.js"
 
 export type WagmiAccount = {
   address: `0x${string}`
@@ -69,10 +65,12 @@ export type UseTrailsConfig = {
 }
 
 export type UseTrailsReturn = {
-  apiClient: SequenceAPIClient
-  metaTxns: GetIntentCallsPayloadsReturn["metaTxns"] | null
-  intentCallsPayloads: GetIntentCallsPayloadsReturn["calls"] | null
-  intentPreconditions: GetIntentCallsPayloadsReturn["preconditions"] | null
+  trailsClient: TrailsClient
+  metaTxns: GetIntentCallsPayloadsReturn["payloads"]["metaTxns"] | null
+  intentCallsPayloads: GetIntentCallsPayloadsReturn["payloads"]["calls"] | null
+  intentPreconditions:
+    | GetIntentCallsPayloadsReturn["payloads"]["preconditions"]
+    | null
   trailsFee: TrailsFee | null
   txnHash: Hex | undefined
   committedOriginIntentAddress: string | null
@@ -183,7 +181,9 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
     env,
     sequenceProjectAccessKey,
   } = config
-  const apiClient = useAPIClient({ projectAccessKey: sequenceProjectAccessKey })
+  const trailsClient = useTrailsClient({
+    projectAccessKey: sequenceProjectAccessKey,
+  })
 
   const [isAutoExecute, setIsAutoExecute] = useState(!disableAutoExecute)
   const [hasAutoExecuted, setHasAutoExecuted] = useState(false)
@@ -195,13 +195,13 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
 
   // State declarations
   const [metaTxns, setMetaTxns] = useState<
-    GetIntentCallsPayloadsReturn["metaTxns"] | null
+    GetIntentCallsPayloadsReturn["payloads"]["metaTxns"] | null
   >(null)
   const [intentCallsPayloads, setIntentCallsPayloads] = useState<
-    GetIntentCallsPayloadsReturn["calls"] | null
+    GetIntentCallsPayloadsReturn["payloads"]["calls"] | null
   >(null)
   const [intentPreconditions, setIntentPreconditions] = useState<
-    GetIntentCallsPayloadsReturn["preconditions"] | null
+    GetIntentCallsPayloadsReturn["payloads"]["preconditions"] | null
   >(null)
   const [trailsFee, setTrailsFee] = useState<TrailsFee | null>(null)
   const [txnHash, setTxnHash] = useState<Hex | undefined>()
@@ -291,7 +291,7 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
         "[useTrails] commitIntentConfigMutation started with args:",
         args,
       )
-      if (!apiClient) {
+      if (!trailsClient) {
         logger.console.error("[useTrails] API client not available")
         throw new Error("API client not available")
       }
@@ -305,9 +305,10 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
         logger.console.log("[useTrails] Main signer:", args.mainSignerAddress)
         logger.console.log("[useTrails] Calls:", args.calls)
 
-        const originChainId = createIntentMutation.variables?.originChainId
+        const originChainId =
+          createIntentMutation.variables?.params.originChainId
         const destinationChainId =
-          createIntentMutation.variables?.destinationChainId
+          createIntentMutation.variables?.params.destinationChainId
 
         if (!originChainId || !destinationChainId) {
           logger.console.error(
@@ -388,19 +389,17 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
 
         // Commit the intent config
         logger.console.log("[useTrails] Committing intent config to API...")
-        const response = await apiClient.commitIntentConfig({
-          originIntentAddress: originIntentAddress.toString(),
-          destinationIntentAddress: destinationIntentAddress.toString(),
-          mainSigner: args.mainSignerAddress,
-          calls: args.calls,
-          preconditions: args.preconditions,
-          addressOverrides: {
-            trailsLiFiSapientSignerAddress: TRAILS_LIFI_SAPIENT_SIGNER_ADDRESS,
-            trailsRelaySapientSignerAddress:
-              TRAILS_RELAY_SAPIENT_SIGNER_ADDRESS,
-            trailsCCTPV2SapientSignerAddress:
-              TRAILS_CCTP_SAPIENT_SIGNER_ADDRESS,
-            ...args.addressOverrides,
+        const response = await trailsClient.commitIntentConfig({
+          params: {
+            originIntentAddress: originIntentAddress.toString(),
+            destinationIntentAddress: destinationIntentAddress.toString(),
+            mainSigner: args.mainSignerAddress,
+            calls: args.calls,
+            preconditions: args.preconditions,
+            addressOverrides: {
+              ...SEQUENCE_V3_CONTRACT_ADDRESSES_OVERRIDES,
+              ...args.addressOverrides,
+            },
           },
         })
         logger.console.log("[useTrails] API Commit Response:", response)
@@ -441,33 +440,33 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
   } = useQuery<GetIntentConfigReturn, Error>({
     queryKey: ["getIntentConfig", committedOriginIntentAddress],
     queryFn: async () => {
-      if (!apiClient || !committedOriginIntentAddress) {
+      if (!trailsClient || !committedOriginIntentAddress) {
         throw new Error("API client or committed intent address not available")
       }
       logger.console.log(
         "Fetching intent config for address:",
         committedOriginIntentAddress,
       )
-      return await apiClient.getIntentConfig({
+      return await trailsClient.getIntentConfig({
         intentAddress: committedOriginIntentAddress,
       })
     },
     enabled:
       !!committedOriginIntentAddress &&
-      !!apiClient &&
+      !!trailsClient &&
       commitIntentConfigMutation.isSuccess,
     staleTime: 1000 * 60 * 5, // 5 minutes
     retry: 1,
   })
 
   async function getIntentCallsPayloads(args: GetIntentCallsPayloadsArgs) {
-    return getIntentCallsPayloadsFromIntents(apiClient, {
-      ...args,
-      addressOverrides: {
-        trailsLiFiSapientSignerAddress: TRAILS_LIFI_SAPIENT_SIGNER_ADDRESS,
-        trailsRelaySapientSignerAddress: TRAILS_RELAY_SAPIENT_SIGNER_ADDRESS,
-        trailsCCTPV2SapientSignerAddress: TRAILS_CCTP_SAPIENT_SIGNER_ADDRESS,
-        ...args.addressOverrides,
+    return getIntentCallsPayloadsFromIntents(trailsClient, {
+      params: {
+        ...args.params,
+        addressOverrides: {
+          ...SEQUENCE_V3_CONTRACT_ADDRESSES_OVERRIDES,
+          ...args.params.addressOverrides,
+        },
       },
     })
   }
@@ -480,10 +479,10 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
   >({
     mutationFn: async (args: GetIntentCallsPayloadsArgs) => {
       if (
-        args.originChainId === args.destinationChainId &&
+        args.params.originChainId === args.params.destinationChainId &&
         isAddressEqual(
-          Address.from(args.originTokenAddress),
-          Address.from(args.destinationTokenAddress),
+          Address.from(args.params.originTokenAddress),
+          Address.from(args.params.destinationTokenAddress),
         )
       ) {
         throw new Error(
@@ -506,12 +505,12 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
 
       const data = await getIntentCallsPayloads(args)
 
-      setMetaTxns(data.metaTxns)
-      setIntentCallsPayloads(data.calls)
-      setIntentPreconditions(data.preconditions)
-      setTrailsFee(data.trailsFee!)
-      setOriginIntentAddress(data.originIntentAddress)
-      setDestinationIntentAddress(data.destinationIntentAddress)
+      setMetaTxns(data.payloads.metaTxns)
+      setIntentCallsPayloads(data.payloads.calls)
+      setIntentPreconditions(data.payloads.preconditions)
+      setTrailsFee(data.payloads.trailsFee!)
+      setOriginIntentAddress(data.payloads.originIntentAddress)
+      setDestinationIntentAddress(data.payloads.destinationIntentAddress)
       setCommittedOriginIntentAddress(null)
       setCommittedDestinationIntentAddress(null)
 
@@ -521,21 +520,21 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
     onSuccess: (data) => {
       logger.console.log("Intent Config Success:", data)
 
-      setTrailsFee(data.trailsFee || null)
-      setOriginIntentAddress(data.originIntentAddress)
-      setDestinationIntentAddress(data.destinationIntentAddress)
+      setTrailsFee(data.payloads.trailsFee || null)
+      setOriginIntentAddress(data.payloads.originIntentAddress)
+      setDestinationIntentAddress(data.payloads.destinationIntentAddress)
 
       if (
-        data?.calls &&
-        data.calls.length > 0 &&
-        data.preconditions &&
-        data.preconditions.length > 0 &&
-        data.metaTxns &&
-        data.metaTxns.length > 0
+        data.payloads?.calls &&
+        data.payloads.calls.length > 0 &&
+        data.payloads.preconditions &&
+        data.payloads.preconditions.length > 0 &&
+        data.payloads.metaTxns &&
+        data.payloads.metaTxns.length > 0
       ) {
-        setIntentCallsPayloads(data.calls)
-        setIntentPreconditions(data.preconditions)
-        setMetaTxns(data.metaTxns)
+        setIntentCallsPayloads(data.payloads.calls)
+        setIntentPreconditions(data.payloads.preconditions)
+        setMetaTxns(data.payloads.metaTxns)
       } else {
         logger.console.warn("API returned success but no operations found.")
         setIntentCallsPayloads(null)
@@ -1033,7 +1032,8 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
         calls: intentCallsPayloads,
         preconditions: intentPreconditions,
         quoteProvider: trailsFee.quoteProvider as QuoteProvider,
-        addressOverrides: createIntentMutation.variables?.addressOverrides,
+        addressOverrides:
+          createIntentMutation.variables?.params.addressOverrides,
       })
     }
   }, [
@@ -1341,9 +1341,7 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
             (p.type === "transfer-native" || p.type === "native-balance") &&
             p.chainId === originChainId.toString(),
         )
-        const nativeMinAmount =
-          nativePrecondition?.data?.minAmount?.toString() ??
-          nativePrecondition?.data?.min?.toString()
+        const nativeMinAmount = nativePrecondition?.data?.min?.toString()
         if (nativeMinAmount === undefined) {
           throw new Error(
             "Could not find native precondition (transfer-native or native-balance) or min amount",
@@ -1571,16 +1569,19 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
             const providerFromQuote = trailsFee?.quoteProvider
               ? String(trailsFee.quoteProvider).toLowerCase()
               : undefined
-            const providerFromArgs = createIntentMutation.variables?.provider
-              ? String(createIntentMutation.variables.provider).toLowerCase()
+            const providerFromArgs = createIntentMutation.variables?.params
+              .provider
+              ? String(
+                  createIntentMutation.variables.params.provider,
+                ).toLowerCase()
               : undefined
             const isCctp =
               providerFromQuote === "cctp" || providerFromArgs === "cctp"
 
             const originChainIdForCctp =
-              createIntentMutation.variables?.originChainId
+              createIntentMutation.variables?.params.originChainId
             const destinationChainIdForCctp =
-              createIntentMutation.variables?.destinationChainId
+              createIntentMutation.variables?.params.destinationChainId
 
             logger.console.log("[Trails] isCctp", isCctp)
             logger.console.log("[Trails] providerFromQuote", providerFromQuote)
@@ -1591,16 +1592,16 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
               createIntentMutation.variables,
             )
             logger.console.log(
-              "[Trails] createIntentMutation.variables.provider",
-              createIntentMutation.variables?.provider,
+              "[Trails] createIntentMutation.variables.params.provider",
+              createIntentMutation.variables?.params.provider,
             )
             logger.console.log(
-              "[Trails] createIntentMutation.variables.originChainId",
-              createIntentMutation.variables?.originChainId,
+              "[Trails] createIntentMutation.variables.params.originChainId",
+              createIntentMutation.variables?.params.originChainId,
             )
             logger.console.log(
-              "[Trails] createIntentMutation.variables.destinationChainId",
-              createIntentMutation.variables?.destinationChainId,
+              "[Trails] createIntentMutation.variables.params.destinationChainId",
+              createIntentMutation.variables?.params.destinationChainId,
             )
             logger.console.log(
               "[Trails] lastQueuedCctpSourceTxHash",
@@ -1618,7 +1619,7 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
 
             if (
               isCctp &&
-              apiClient &&
+              trailsClient &&
               transactionHash &&
               typeof originChainIdForCctp === "number" &&
               typeof destinationChainIdForCctp === "number" &&
@@ -1627,7 +1628,7 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
             ) {
               lastQueuedCctpSourceTxHash.current = transactionHash
               await queueCCTPTransfer({
-                apiClient,
+                trailsClient,
                 sourceTxHash: transactionHash,
                 sourceChainId: originChainIdForCctp,
                 destinationChainId: destinationChainIdForCctp,
@@ -1671,7 +1672,7 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
     metaTxnBlockTimestamps,
     trailsFee,
     createIntentMutation.variables,
-    apiClient,
+    trailsClient,
   ])
 
   const updateAutoExecute = (enabled: boolean) => {
@@ -1732,7 +1733,7 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
   const sendMetaTxnArgs = sendMetaTxnMutation.variables
 
   return {
-    apiClient,
+    trailsClient,
     metaTxns,
     intentCallsPayloads,
     intentPreconditions,

package/src/trailsClient.ts

@@ -0,0 +1,48 @@
+import { useConfig } from "@0xsequence/hooks"
+import { TrailsAPIClient } from "@0xsequence/trails-api"
+import { useMemo } from "react"
+import { getTrailsApiUrl, getSequenceProjectAccessKey } from "./config.js"
+
+export type TrailsClientConfig = {
+  hostname?: string
+  projectAccessKey?: string
+  jwt?: string
+}
+
+// Trails client for interacting with Trails APIs only
+export class TrailsClient extends TrailsAPIClient {
+  constructor(hostname?: string, projectAccessKey?: string, jwt?: string) {
+    super(hostname || getTrailsApiUrl(), projectAccessKey, jwt)
+  }
+}
+
+export function getTrailsClient({
+  hostname,
+  projectAccessKey = getSequenceProjectAccessKey(),
+  jwt,
+}: TrailsClientConfig = {}): TrailsClient {
+  return new TrailsClient(hostname, projectAccessKey, jwt)
+}
+
+export const useTrailsClient = (config?: TrailsClientConfig) => {
+  const { projectAccessKey, jwt } = useConfig()
+
+  const trailsClient = useMemo(() => {
+    return getTrailsClient({
+      hostname: config?.hostname || getTrailsApiUrl(),
+      projectAccessKey:
+        getSequenceProjectAccessKey() ||
+        config?.projectAccessKey ||
+        projectAccessKey,
+      jwt: config?.jwt || jwt,
+    })
+  }, [
+    config?.hostname,
+    config?.projectAccessKey,
+    config?.jwt,
+    projectAccessKey,
+    jwt,
+  ])
+
+  return trailsClient
+}

package/src/{proxyCaller.ts → trailsRouter.ts}

@@ -1,7 +1,7 @@
-import { encodeFunctionData } from "viem"
-import { TRAILS_BALANCE_INJECTOR_ADDRESS } from "./constants.js"
+import { encodeFunctionData, zeroAddress } from "viem"
+import { TRAILS_ROUTER_ADDRESS } from "./constants.js"
 
-export const TRAILS_CONTRACT_PLACEHOLDER_AMOUNT =
+export const TRAILS_ROUTER_PLACEHOLDER_AMOUNT =
   0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefn
 
 function getAmountOffset(calldata: `0x${string}`, placeholder: bigint): number {
@@ -14,10 +14,10 @@ function getAmountOffset(calldata: `0x${string}`, placeholder: bigint): number {
   return byteOffset
 }
 
-const proxyCallerAbi = [
+const trailsRouterAbi = [
   {
     type: "function",
-    name: "sweepAndCall",
+    name: "injectAndCall",
     stateMutability: "nonpayable",
     inputs: [
       { name: "token", type: "address" },
@@ -30,29 +30,31 @@ const proxyCallerAbi = [
   },
 ]
 
-export function encodeProxyCallerCalldata({
+export function encodeTrailsRouterCalldata({
   token,
   target,
   calldata,
   amountOffset,
+  placeholder,
 }: {
   token: string
   target: string
   calldata: `0x${string}`
   amountOffset: number
+  placeholder: bigint
 }) {
   // Convert BigInt to bytes32 format
   const placeholderBytes32 =
-    `0x${TRAILS_CONTRACT_PLACEHOLDER_AMOUNT.toString(16).padStart(64, "0")}` as `0x${string}`
+    `0x${placeholder.toString(16).padStart(64, "0")}` as `0x${string}`
 
   return encodeFunctionData({
-    abi: proxyCallerAbi,
-    functionName: "sweepAndCall",
+    abi: trailsRouterAbi,
+    functionName: "injectAndCall",
     args: [token, target, calldata, amountOffset, placeholderBytes32],
   })
 }
 
-export function wrapCalldataWithProxyCallerIfNeeded({
+export function wrapCalldataWithTrailsRouterIfNeeded({
   token,
   target,
   calldata,
@@ -70,12 +72,13 @@ export function wrapCalldataWithProxyCallerIfNeeded({
   amount: string
   originTokenAddress: string
   destinationTokenAddress: string
-}): { encodedCalldata: `0x${string}`; proxyCallerAddress: string } | null {
+}): { encodedCalldata: `0x${string}`; trailsRouterAddress: string } | null {
   const isSameToken =
     originTokenAddress?.toLowerCase() === destinationTokenAddress?.toLowerCase()
+  const isDestinationNativeToken = destinationTokenAddress === zeroAddress
   if (originChainId === destinationChainId && isSameToken) {
     const amountHex = BigInt(amount).toString(16).padStart(64, "0") // 32-byte hex (no 0x)
-    const placeholderHex = TRAILS_CONTRACT_PLACEHOLDER_AMOUNT.toString(
+    const placeholderHex = TRAILS_ROUTER_PLACEHOLDER_AMOUNT.toString(
       16,
     ).padStart(64, "0")
 
@@ -86,29 +89,31 @@ export function wrapCalldataWithProxyCallerIfNeeded({
     const calldataWithAmount = calldata.replace(placeholderHex, amountHex)
     return {
       encodedCalldata: calldataWithAmount as `0x${string}`,
-      proxyCallerAddress: target,
+      trailsRouterAddress: target,
     }
   }
 
-  const proxyCallerAddress = TRAILS_BALANCE_INJECTOR_ADDRESS
+  const trailsRouterAddress = TRAILS_ROUTER_ADDRESS
 
-  const amountOffset = getAmountOffset(
-    calldata,
-    BigInt(TRAILS_CONTRACT_PLACEHOLDER_AMOUNT),
-  )
+  const amountOffset = isDestinationNativeToken
+    ? 0
+    : getAmountOffset(calldata, BigInt(TRAILS_ROUTER_PLACEHOLDER_AMOUNT))
   if (amountOffset === -1) {
     return null
   }
 
-  const encodedCalldata = encodeProxyCallerCalldata({
+  const encodedCalldata = encodeTrailsRouterCalldata({
     token,
     target,
     calldata,
     amountOffset,
+    placeholder: isDestinationNativeToken
+      ? BigInt(0)
+      : TRAILS_ROUTER_PLACEHOLDER_AMOUNT,
   })
 
   return {
     encodedCalldata,
-    proxyCallerAddress,
+    trailsRouterAddress,
   }
 }

package/src/transactions.ts

@@ -1,34 +1,14 @@
 import { createPublicClient, http } from "viem"
 import { useQuery } from "@tanstack/react-query"
 import { getChainInfo } from "./chains.js"
-import {
-  getSequenceProjectAccessKey,
-  getSequenceEnv,
-  getSequenceApiUrl,
-} from "./config.js"
+import { getSequenceProjectAccessKey } from "./config.js"
+import { getTrailsClient } from "./trailsClient.js"
 import type { GuestModuleEvent, TrailsTokenSweeperEvent } from "./decoders.js"
-import {
-  arbitrum,
-  base,
-  baseSepolia,
-  optimism,
-  polygon,
-  mainnet,
-  apeChain,
-  arbitrumNova,
-  avalanche,
-  b3,
-  blast,
-  gnosis,
-  soneium,
-  xai,
-  bsc,
-  etherlink,
-  katana,
-} from "viem/chains"
 import { logger } from "./logger.js"
 import { bigintReplacer } from "./utils.js"
 import { getExplorerUrl } from "./explorer.js"
+import { SortOrder } from "@0xsequence/trails-api"
+import { getChainIndexerUrl } from "./indexerClient.js"
 
 export type TransactionStateStatus =
   | "pending"
@@ -204,43 +184,12 @@ export async function getTxTimeDiff(
   }
 }
 
-export function getIndexerUrlFromChainSlug(chainSlug: string) {
-  const env = getSequenceEnv()
-  let envPrefix = ""
-
-  if (env === "dev") {
-    envPrefix = "dev-"
-  }
-
-  return `https://${envPrefix}${chainSlug}-indexer.sequence.app`
-}
-
-const chainIdToIndexerUrl = {
-  [arbitrum.id]: getIndexerUrlFromChainSlug("arbitrum"),
-  [base.id]: getIndexerUrlFromChainSlug("base"),
-  [baseSepolia.id]: getIndexerUrlFromChainSlug("base-sepolia"),
-  [optimism.id]: getIndexerUrlFromChainSlug("optimism"),
-  [polygon.id]: getIndexerUrlFromChainSlug("polygon"),
-  [mainnet.id]: getIndexerUrlFromChainSlug("mainnet"),
-  [apeChain.id]: getIndexerUrlFromChainSlug("apechain"),
-  [arbitrumNova.id]: getIndexerUrlFromChainSlug("arbitrum-nova"),
-  [avalanche.id]: getIndexerUrlFromChainSlug("avalanche"),
-  [b3.id]: getIndexerUrlFromChainSlug("b3"),
-  [blast.id]: getIndexerUrlFromChainSlug("blast"),
-  [gnosis.id]: getIndexerUrlFromChainSlug("gnosis"),
-  [soneium.id]: getIndexerUrlFromChainSlug("soneium"),
-  [xai.id]: getIndexerUrlFromChainSlug("xai"),
-  [bsc.id]: getIndexerUrlFromChainSlug("bsc"),
-  421613: getIndexerUrlFromChainSlug("arbitrum-nova-sepolia"),
-  [etherlink.id]: getIndexerUrlFromChainSlug("etherlink"),
-  [katana.id]: getIndexerUrlFromChainSlug("katana"),
-}
-
 export async function getAccountTransactionHistory({
   chainId,
   accountAddress,
   pageSize = 10,
   page = 1,
+
   includeMetadata = true,
 }: GetAccountTransactionHistoryParams): Promise<TransactionHistoryResponse> {
   const accessKey = getSequenceProjectAccessKey()
@@ -250,8 +199,7 @@ export async function getAccountTransactionHistory({
   }
 
   // Get the chain-specific indexer URL
-  const chainIndexerUrl =
-    chainIdToIndexerUrl[chainId as keyof typeof chainIdToIndexerUrl]
+  const chainIndexerUrl = getChainIndexerUrl(chainId)
   if (!chainIndexerUrl) {
     throw new Error(`Unsupported chain ID: ${chainId}`)
   }
@@ -336,6 +284,15 @@ export type IntentTransaction = {
     imageUrl: string
     chainId: number
   }
+  // Intent wallet transaction hashes
+  originIntentTxHash?: string // First action tx FROM origin intent (not deposit into it)
+  destinationIntentTxHash?: string // First action tx FROM destination intent (not deposit into it)
+  originIntentTxExplorerUrl?: string
+  destinationIntentTxExplorerUrl?: string
+  originIntentDepositTxHash?: string // First deposit tx INTO origin intent
+  destinationIntentDepositTxHash?: string // First deposit tx INTO destination intent
+  originIntentDepositTxExplorerUrl?: string
+  destinationIntentDepositTxExplorerUrl?: string
 }
 
 export type IntentTransactionHistoryResponse = {
@@ -364,40 +321,25 @@ export async function getIntentTransactionHistory({
     throw new Error("Sequence project access key is required")
   }
 
-  const apiUrl = getSequenceApiUrl()
-
-  const endpoint = `${apiUrl}/rpc/API/GetIntentTransactionHistory`
-
-  const requestBody = {
-    accountAddress: accountAddress.toLowerCase(),
-    page: {
-      page,
-      pageSize,
-      sort: [
-        {
-          column: "created_at",
-          order: "DESC",
-        },
-      ],
-    },
-  }
-
   try {
-    const response = await fetch(endpoint, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "X-Access-Key": accessKey,
+    const trailsClient = getTrailsClient()
+
+    // Use the hybrid client's getIntentTransactionHistory method which tries Trails API first, then Sequence API
+    const result = await trailsClient.getIntentTransactionHistory({
+      accountAddress: accountAddress.toLowerCase(),
+      page: {
+        page,
+        pageSize,
+        sort: [
+          {
+            column: "created_at",
+            order: SortOrder.DESC,
+          },
+        ],
       },
-      body: JSON.stringify(requestBody, bigintReplacer, 2),
     })
 
-    if (!response.ok) {
-      throw new Error(`HTTP error! status: ${response.status}`)
-    }
-
-    const data: IntentTransactionHistoryResponse = await response.json()
-    return data
+    return result
   } catch (error) {
     logger.console.error(
       "[trails-sdk] Error fetching intent transaction history:",

package/src/umd.tsx

@@ -10,7 +10,7 @@ interface TrailsGlobal {
     options: {
       projectAccessKey: string
       sequenceIndexerUrl?: string
-      sequenceApiUrl?: string
+      trailsApiUrl?: string
       sequenceEnv?: RelayerEnv
       toAddress?: string | null
       toAmount?: string | null