0xtrails 0.1.13 → 0.2.0

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,
       })
     }
   }, [
@@ -1571,16 +1571,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 +1594,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 +1621,7 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
 
             if (
               isCctp &&
-              apiClient &&
+              trailsClient &&
               transactionHash &&
               typeof originChainIdForCctp === "number" &&
               typeof destinationChainIdForCctp === "number" &&
@@ -1627,7 +1630,7 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
             ) {
               lastQueuedCctpSourceTxHash.current = transactionHash
               await queueCCTPTransfer({
-                apiClient,
+                trailsClient,
                 sourceTxHash: transactionHash,
                 sourceChainId: originChainIdForCctp,
                 destinationChainId: destinationChainIdForCctp,
@@ -1671,7 +1674,7 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
     metaTxnBlockTimestamps,
     trailsFee,
     createIntentMutation.variables,
-    apiClient,
+    trailsClient,
   ])
 
   const updateAutoExecute = (enabled: boolean) => {
@@ -1732,7 +1735,7 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
   const sendMetaTxnArgs = sendMetaTxnMutation.variables
 
   return {
-    apiClient,
+    trailsClient,
     metaTxns,
     intentCallsPayloads,
     intentPreconditions,

package/src/trailsClient.ts

@@ -0,0 +1,45 @@
+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: config?.projectAccessKey || projectAccessKey,
+      jwt: config?.jwt || jwt,
+    })
+  }, [
+    config?.hostname,
+    config?.projectAccessKey,
+    config?.jwt,
+    projectAccessKey,
+    jwt,
+  ])
+
+  return trailsClient
+}

package/src/transactions.ts

@@ -1,11 +1,8 @@
 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, getSequenceEnv } from "./config.js"
+import { getTrailsClient } from "./trailsClient.js"
 import type { GuestModuleEvent, TrailsTokenSweeperEvent } from "./decoders.js"
 import {
   arbitrum,
@@ -29,6 +26,7 @@ import {
 import { logger } from "./logger.js"
 import { bigintReplacer } from "./utils.js"
 import { getExplorerUrl } from "./explorer.js"
+import { SortOrder } from "@0xsequence/trails-api"
 
 export type TransactionStateStatus =
   | "pending"
@@ -336,6 +334,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 +371,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

package/src/wallets.ts

@@ -3,6 +3,7 @@ import {
   getWalletConnectProjectId,
 } from "./config.js"
 import WalletConnectLogo from "./widget/assets/WalletConnect-logo-blue-bg.svg"
+import SequenceLogo from "./widget/assets/sequence-logo.svg"
 import { Wallet as WalletIcon } from "lucide-react"
 import {
   injected,
@@ -279,7 +280,7 @@ export const WALLET_CONFIGS: Record<string, WalletConfig> = {
     id: "sequence",
     name: "Sequence",
     connector: sequenceConnector,
-    icon: "https://sequence.app/icon.svg",
+    icon: SequenceLogo as string,
   },
 }
 

package/src/widget/assets/sequence-logo.svg

@@ -0,0 +1,15 @@
+<svg width="500" height="365" viewBox="0 0 500 365" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_29_10159)">
+<path d="M496.448 181.441C496.448 158.416 478.089 139.75 455.442 139.75C432.796 139.75 414.437 158.416 414.437 181.441C414.437 204.467 432.796 223.132 455.442 223.132C478.089 223.132 496.448 204.467 496.448 181.441Z" fill="#7C3AED"/>
+<path d="M82.0114 42.2523C82.0114 19.227 63.6525 0.561279 41.0057 0.561279C18.3589 0.561279 0 19.227 0 42.2523C0 65.2776 18.3589 83.9433 41.0057 83.9433C63.6525 83.9433 82.0114 65.2776 82.0114 42.2523Z" fill="#7C3AED"/>
+<path d="M82.0114 322.846C82.0114 299.821 63.6525 281.155 41.0057 281.155C18.3589 281.155 0 299.821 0 322.846C0 345.871 18.3589 364.537 41.0057 364.537C63.6525 364.537 82.0114 345.871 82.0114 322.846Z" fill="#7C3AED"/>
+<path d="M500 320.63C500 301.412 484.677 285.833 465.775 285.833H161.879C142.977 285.833 127.654 301.412 127.654 320.63C127.654 339.848 142.977 355.427 161.879 355.427H465.775C484.677 355.427 500 339.848 500 320.63Z" fill="#7C3AED"/>
+<path d="M368.794 181.441C368.794 162.223 353.471 146.644 334.569 146.644H34.2255C15.3234 146.644 0.000265708 162.223 0.000265708 181.441C0.000265708 200.659 15.3234 216.238 34.2255 216.238H334.569C353.471 216.238 368.794 200.659 368.794 181.441Z" fill="#7C3AED"/>
+<path d="M500 42.2523C500 23.0343 484.677 7.45507 465.775 7.45507H161.879C142.977 7.45507 127.654 23.0343 127.654 42.2523C127.654 61.4703 142.977 77.0495 161.879 77.0495H465.775C484.677 77.0495 500 61.4703 500 42.2523Z" fill="#7C3AED"/>
+</g>
+<defs>
+<clipPath id="clip0_29_10159">
+<rect width="500" height="363.98" fill="white" transform="translate(0 0.561279)"/>
+</clipPath>
+</defs>
+</svg>