0xtrails 0.4.2 → 0.5.0

package/src/transactionIntent/handlers/crossChain.ts

@@ -145,6 +145,8 @@ export async function handleCrossChain({
   abortSignal,
   commitIntentFn,
   executeIntentFn,
+  sequenceProjectAccessKey,
+  sequenceIndexerUrl,
 }: {
   mainSignerAddress: string
   originChainId: number
@@ -187,6 +189,8 @@ export async function handleCrossChain({
     depositTransactionHash?: string
     depositSignature?: DepositSignature
   }) => Promise<ExecuteIntentResponse>
+  sequenceProjectAccessKey?: string
+  sequenceIndexerUrl?: string
 }): Promise<PrepareSendReturn> {
   const testnet = isTestnetDebugMode()
   const useCctp = shouldUseCctp(
@@ -324,6 +328,10 @@ export async function handleCrossChain({
         )
 
         onTransactionStateChange(transactionStates)
+        // Also trigger checkout status update if handler is provided
+        if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+          checkoutOnHandlers.triggerCheckoutStatusUpdate(transactionStates)
+        }
 
         const attestation = await waitForAttestation()
 
@@ -380,12 +388,16 @@ export async function handleCrossChain({
           "[trails-sdk] sequenceWalletAddress",
           sequenceWalletAddress,
         )
+        if (!sequenceProjectAccessKey) {
+          throw new Error("Trails api key is required")
+        }
         const sequenceTxHash = await sequenceSendTransaction(
           sequenceWalletAddress,
           delegatorClient,
           destinationPublicClient,
           calls,
           destinationChain,
+          sequenceProjectAccessKey,
         )
 
         const destinationReceipt =
@@ -407,6 +419,10 @@ export async function handleCrossChain({
         }
 
         onTransactionStateChange(transactionStates)
+        // Also trigger checkout status update if handler is provided
+        if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+          checkoutOnHandlers.triggerCheckoutStatusUpdate(transactionStates)
+        }
 
         return {
           depositUserTxnReceipt: receipt,
@@ -751,6 +767,7 @@ export async function handleCrossChain({
               selectedFeeToken: effectiveSelectedFeeToken,
               selectedFeeTokenType: typeof effectiveSelectedFeeToken,
               selectedFeeTokenValue: JSON.stringify(effectiveSelectedFeeToken),
+              checkoutOnHandlers,
             },
           )
 
@@ -778,6 +795,7 @@ export async function handleCrossChain({
             destinationTokenSymbol,
             depositAmountUsd,
             feeOptions: gasFeeOptions,
+            checkoutOnHandlers,
             trailsClient,
             selectedFeeToken: effectiveSelectedFeeToken,
             walletId,
@@ -886,6 +904,10 @@ export async function handleCrossChain({
             }
 
             onTransactionStateChange(transactionStates)
+            // Also trigger checkout status update if handler is provided
+            if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+              checkoutOnHandlers.triggerCheckoutStatusUpdate(transactionStates)
+            }
 
             setTimeout(() => {
               const destinationChain = getChainInfo(destinationChainId)
@@ -916,10 +938,15 @@ export async function handleCrossChain({
             }
 
             try {
+              if (!sequenceIndexerUrl) {
+                throw new Error("sequenceIndexerUrl is required")
+              }
               const response = await getAccountTransactionHistory({
                 chainId: originChainId,
                 accountAddress: originIntentAddress,
                 abortSignal,
+                apiKey: sequenceProjectAccessKey!,
+                indexerUrl: sequenceIndexerUrl,
               })
               logger.console.log(
                 "[trails-sdk] getAccountTransactionHistory response",
@@ -953,6 +980,12 @@ export async function handleCrossChain({
                   transactionStates[0]?.label,
                 )
                 onTransactionStateChange(transactionStates)
+                // Also trigger checkout status update if handler is provided
+                if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                  checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                    transactionStates,
+                  )
+                }
 
                 if (onOriginSend) {
                   onOriginSend()
@@ -980,11 +1013,16 @@ export async function handleCrossChain({
               }
 
               try {
+                if (!sequenceIndexerUrl) {
+                  throw new Error("sequenceIndexerUrl is required")
+                }
                 const response = await getAccountTransactionHistory({
                   chainId: destinationChainId,
                   accountAddress:
                     intent.destinationIntentAddress as `0x${string}`,
                   abortSignal,
+                  apiKey: sequenceProjectAccessKey!,
+                  indexerUrl: sequenceIndexerUrl,
                 })
                 logger.console.log(
                   "[trails-sdk] getAccountTransactionHistory response",
@@ -1019,6 +1057,12 @@ export async function handleCrossChain({
                     transactionStates[2]?.label,
                   )
                   onTransactionStateChange(transactionStates)
+                  // Also trigger checkout status update if handler is provided
+                  if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                    checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                      transactionStates,
+                    )
+                  }
 
                   return destinationDepositTxReceipt
                 }
@@ -1092,6 +1136,12 @@ export async function handleCrossChain({
                         transactionStates[0]?.label,
                       )
                       onTransactionStateChange(transactionStates)
+                      // Also trigger checkout status update if handler is provided
+                      if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                        checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                          transactionStates,
+                        )
+                      }
 
                       // Decode events for the deposit transaction
                       try {
@@ -1147,6 +1197,12 @@ export async function handleCrossChain({
                         }
 
                         onTransactionStateChange(transactionStates)
+                        // Also trigger checkout status update if handler is provided
+                        if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                          checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                            transactionStates,
+                          )
+                        }
                       } catch (error) {
                         logger.console.error(
                           "Error decoding deposit tx events",
@@ -1192,6 +1248,12 @@ export async function handleCrossChain({
                       transactionStates[1]?.label,
                     )
                     onTransactionStateChange(transactionStates)
+                    // Also trigger checkout status update if handler is provided
+                    if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                      checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                        transactionStates,
+                      )
+                    }
                   }
 
                   // Decode events for the origin transaction
@@ -1241,6 +1303,12 @@ export async function handleCrossChain({
                     }
 
                     onTransactionStateChange(transactionStates)
+                    // Also trigger checkout status update if handler is provided
+                    if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                      checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                        transactionStates,
+                      )
+                    }
                   } catch (error) {
                     logger.console.error(
                       "Error decoding origin tx events",
@@ -1281,6 +1349,12 @@ export async function handleCrossChain({
                       transactionStates[2]?.label,
                     )
                     onTransactionStateChange(transactionStates)
+                    // Also trigger checkout status update if handler is provided
+                    if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                      checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                        transactionStates,
+                      )
+                    }
                   }
 
                   // Decode events for the destination transaction
@@ -1339,6 +1413,12 @@ export async function handleCrossChain({
                     }
 
                     onTransactionStateChange(transactionStates)
+                    // Also trigger checkout status update if handler is provided
+                    if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                      checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                        transactionStates,
+                      )
+                    }
                   } catch (error) {
                     logger.console.error(
                       "Error decoding destination tx events",
@@ -1631,6 +1711,10 @@ export async function handleCrossChain({
           ) {
             transactionStates[1].state = "aborted"
             onTransactionStateChange(transactionStates)
+            // Also trigger checkout status update if handler is provided
+            if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+              checkoutOnHandlers.triggerCheckoutStatusUpdate(transactionStates)
+            }
           }
           if (
             transactionStates[2] &&
@@ -1639,6 +1723,10 @@ export async function handleCrossChain({
           ) {
             transactionStates[2].state = "aborted"
             onTransactionStateChange(transactionStates)
+            // Also trigger checkout status update if handler is provided
+            if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+              checkoutOnHandlers.triggerCheckoutStatusUpdate(transactionStates)
+            }
           }
 
           // Track payment error if transactions didn't complete successfully

package/src/transactionIntent/handlers/sameChainSameToken.ts

@@ -418,6 +418,12 @@ export async function handleSameChainSameToken({
 
           try {
             onTransactionStateChange(localTransactionStates)
+            // Also trigger checkout status update if handler is provided
+            if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+              checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                localTransactionStates,
+              )
+            }
           } catch (error) {
             logger.console.error(
               "[trails-sdk] Error calling onTransactionStateChange:",
@@ -514,6 +520,12 @@ export async function handleSameChainSameToken({
                             localTransactionStates[0]?.label,
                           )
                         onTransactionStateChange(localTransactionStates)
+                        // Also trigger checkout status update if handler is provided
+                        if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                          checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                            localTransactionStates,
+                          )
+                        }
                       } catch (error) {
                         logger.console.error(
                           "[trails-sdk] Error fetching deposit transaction receipt:",
@@ -551,6 +563,12 @@ export async function handleSameChainSameToken({
                             localTransactionStates[1]?.label,
                           )
                         onTransactionStateChange(localTransactionStates)
+                        // Also trigger checkout status update if handler is provided
+                        if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                          checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                            localTransactionStates,
+                          )
+                        }
                       } catch (error) {
                         logger.console.error(
                           "[trails-sdk] Error fetching origin transaction receipt:",
@@ -580,6 +598,10 @@ export async function handleSameChainSameToken({
                 ),
               ]
               onTransactionStateChange(updatedStates)
+              // Also trigger checkout status update if handler is provided
+              if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                checkoutOnHandlers.triggerCheckoutStatusUpdate(updatedStates)
+              }
             } catch (error) {
               logger.console.error(
                 "[trails-sdk] Error calling onTransactionStateChange:",

package/src/transactionIntent/types.ts

@@ -55,6 +55,7 @@ export type PrepareSendOptions = {
   originTokenSymbol: string
   destinationTokenSymbol: string
   sequenceProjectAccessKey?: string
+  sequenceIndexerUrl?: string
   fee: string
   client?: WalletClient
   dryMode: boolean

package/src/transactions.ts

@@ -1,14 +1,14 @@
 import { useQuery } from "@tanstack/react-query"
 import { getChainInfo } from "./chains.js"
-import { getSequenceProjectAccessKey } from "./config.js"
 import { getTrailsClient } from "./trailsClient.js"
 import type { GuestModuleEvent, TrailsTokenSweeperEvent } from "./decoders.js"
 import { logger } from "./logger.js"
 import { bigintReplacer } from "./utils.js"
 import { getExplorerUrl } from "./explorer.js"
-import { SortOrder } from "@0xsequence/trails-api"
+import { SortOrder, type IntentSummary } from "@0xsequence/trails-api"
 import { getChainIndexerUrl } from "./indexerClient.js"
 import { abortControllerRegistry } from "./abortController.js"
+import { useTrails } from "./widget/providers/TrailsProvider.js"
 
 export type TransactionStateStatus =
   | "pending"
@@ -161,11 +161,14 @@ export async function getAccountTransactionHistory({
   page = 1,
   includeMetadata = true,
   abortSignal,
-}: GetAccountTransactionHistoryParams): Promise<TransactionHistoryResponse> {
-  const accessKey = getSequenceProjectAccessKey()
-
-  if (!accessKey) {
-    throw new Error("Sequence project access key is required")
+  apiKey,
+  indexerUrl,
+}: GetAccountTransactionHistoryParams & {
+  apiKey: string
+  indexerUrl: string
+}): Promise<TransactionHistoryResponse> {
+  if (!apiKey) {
+    throw new Error("Trails api key is required")
   }
 
   // Create a unique ID for this operation
@@ -187,7 +190,7 @@ export async function getAccountTransactionHistory({
     }
 
     // Get the chain-specific indexer URL
-    const chainIndexerUrl = getChainIndexerUrl(chainId)
+    const chainIndexerUrl = getChainIndexerUrl(chainId, indexerUrl)
     if (!chainIndexerUrl) {
       throw new Error(`Unsupported chain ID: ${chainId}`)
     }
@@ -217,7 +220,7 @@ export async function getAccountTransactionHistory({
       method: "POST",
       headers: {
         "Content-Type": "application/json",
-        "X-Access-Key": accessKey,
+        "X-Access-Key": apiKey,
       },
       body: JSON.stringify(requestBody, bigintReplacer, 2),
       signal: abortSignal || operationAbortController.signal,
@@ -317,21 +320,24 @@ export type GetIntentTransactionHistoryParams = {
 }
 
 export async function getIntentTransactionHistory({
-  accountAddress: _accountAddress,
+  accountAddress,
   pageSize = 10,
   page = 1,
-}: GetIntentTransactionHistoryParams): Promise<IntentTransactionHistoryResponse> {
-  const accessKey = getSequenceProjectAccessKey()
-
-  if (!accessKey) {
-    throw new Error("Sequence project access key is required")
+  apiKey,
+  apiUrl,
+}: GetIntentTransactionHistoryParams & {
+  apiKey: string
+  apiUrl: string
+}): Promise<IntentTransactionHistoryResponse> {
+  if (!apiKey) {
+    throw new Error("Trails api key is required")
   }
 
   try {
-    const trailsClient = getTrailsClient()
+    const trailsClient = getTrailsClient({ apiKey, hostname: apiUrl })
 
-    // Use the hybrid client's getIntentTransactionHistory method which tries Trails API first, then Sequence API
-    const result = await trailsClient.getIntentTransactionHistory({
+    const requestParams = {
+      byOwnerAddress: accountAddress,
       page: {
         pageSize,
         sort: [
@@ -341,25 +347,111 @@ export async function getIntentTransactionHistory({
           },
         ],
       },
+    }
+
+    logger.console.log(
+      "[trails-sdk] getIntentTransactionHistory request:",
+      requestParams,
+    )
+
+    // Use the hybrid client's getIntentTransactionHistory method which tries Trails API first, then Sequence API
+    const result = await trailsClient.getIntentTransactionHistory(requestParams)
+
+    logger.console.log("[trails-sdk] getIntentTransactionHistory response:", {
+      intentCount: result.intents?.length || 0,
+      hasNextPage: !!result.nextPage,
+      firstIntent: result.intents?.[0],
     })
 
-    // Note: The new API has a different IntentTransaction structure.
-    // We need to map the API response to our local type structure.
-    // For now, return an empty result as the API structure has changed significantly.
-    // TODO: Implement proper mapping from new API IntentTransaction to SDK IntentTransaction
+    // Map the API response to our local type structure
+    const mappedTransactions: IntentTransaction[] = (result.intents || []).map(
+      (intent: IntentSummary) => {
+        // Map API status to UI status format
+        const mapStatus = (apiStatus: string): string => {
+          const status = apiStatus?.toUpperCase() || "UNKNOWN"
+          switch (status) {
+            case "SUCCEEDED":
+              return "completed"
+            case "EXECUTING":
+              return "processing"
+            case "PENDING":
+              return "pending"
+            case "FAILED":
+              return "failed"
+            case "CREATED":
+              return "created"
+            default:
+              return apiStatus?.toLowerCase() || "unknown"
+          }
+        }
+
+        return {
+          originIntentAddress: intent.originIntentAddress,
+          destinationIntentAddress: intent.destinationIntentAddress,
+          mainSigner: intent.ownerAddress,
+          metaTxnId: intent.intentId,
+          txnHash:
+            intent.originTransactionHash ||
+            intent.destinationTransactionHash ||
+            undefined,
+          executionStatus: mapStatus(intent.status),
+          originChainId: intent.originChainId,
+          destinationChainId: intent.destinationChainId,
+          originTokenAddress: intent.originTokenAddress,
+          originTokenAmount: intent.originTokenAmount.toString(),
+          destinationTokenAddress: intent.destinationTokenAddress,
+          destinationTokenAmount: intent.destinationTokenAmount.toString(),
+          destinationToAddress: intent.ownerAddress,
+          createdAt: intent.createdAt,
+          // Map origin token metadata if available
+          originToken: intent.originTokenMetadata
+            ? ({
+                symbol: intent.originTokenMetadata.symbol || "",
+                name: intent.originTokenMetadata.name || "",
+                decimals: intent.originTokenMetadata.decimals ?? 18,
+                imageUrl: intent.originTokenMetadata.logoUri ?? "",
+                chainId: intent.originTokenMetadata.chainId,
+              } as {
+                symbol: string
+                name: string
+                decimals: number
+                imageUrl: string
+                chainId: number
+              })
+            : undefined,
+          // Map destination token metadata if available
+          destinationToken: intent.destinationTokenMetadata
+            ? ({
+                symbol: intent.destinationTokenMetadata.symbol || "",
+                name: intent.destinationTokenMetadata.name || "",
+                decimals: intent.destinationTokenMetadata.decimals ?? 18,
+                imageUrl: intent.destinationTokenMetadata.logoUri ?? "",
+                chainId: intent.destinationTokenMetadata.chainId,
+              } as {
+                symbol: string
+                name: string
+                decimals: number
+                imageUrl: string
+                chainId: number
+              })
+            : undefined,
+        }
+      },
+    )
+
     return {
       page: result.nextPage
         ? {
             page,
             pageSize,
-            more: true,
+            more: result.nextPage.more || false,
           }
         : {
             page,
             pageSize,
             more: false,
           },
-      transactions: [], // TODO: Map result.transactions to SDK IntentTransaction format
+      transactions: mappedTransactions,
     }
   } catch (error) {
     logger.console.error(
@@ -393,6 +485,7 @@ export function useAccountTransactionHistory({
   includeMetadata = true,
   abortSignal,
 }: UseAccountTransactionHistoryParams): UseAccountTransactionHistoryReturn {
+  const { trailsApiKey, sequenceIndexerUrl } = useTrails()
   const { data, isLoading, error } = useQuery({
     queryKey: [
       "accountTransactionHistory",
@@ -417,6 +510,8 @@ export function useAccountTransactionHistory({
         page,
         includeMetadata,
         abortSignal: effectiveSignal,
+        apiKey: trailsApiKey,
+        indexerUrl: sequenceIndexerUrl!,
       })
     },
     enabled: Boolean(chainId && accountAddress),
@@ -452,6 +547,7 @@ export function useIntentTransactionHistory({
   pageSize = 10,
   page = 1,
 }: UseIntentTransactionHistoryParams): UseIntentTransactionHistoryReturn {
+  const { trailsApiKey, trailsApiUrl } = useTrails()
   const { data, isLoading, error } = useQuery({
     queryKey: ["intentTransactionHistory", accountAddress, pageSize, page],
     queryFn: async () => {
@@ -463,6 +559,8 @@ export function useIntentTransactionHistory({
         accountAddress,
         pageSize,
         page,
+        apiKey: trailsApiKey,
+        apiUrl: trailsApiUrl!,
       })
     },
     enabled: Boolean(accountAddress),

package/src/wallets.ts

@@ -1,7 +1,5 @@
-import {
-  getSequenceProjectAccessKey,
-  getWalletConnectProjectId,
-} from "./config.js"
+import { getConfig } from "./config.js"
+import { DEFAULT_WALLETCONNECT_PROJECT_ID } from "./constants.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"
@@ -30,7 +28,8 @@ let wcConnectorSingleton: ReturnType<typeof walletConnect> | null = null
 function getWalletConnectConnectorSingleton() {
   if (!wcConnectorSingleton) {
     wcConnectorSingleton = walletConnect({
-      projectId: getWalletConnectProjectId(),
+      projectId:
+        getConfig("walletConnectProjectId") || DEFAULT_WALLETCONNECT_PROJECT_ID,
       showQrModal: false,
     })
   }
@@ -149,7 +148,7 @@ export const coinbaseWalletConnector = windowProviderOrWalletConnect(
 export const sequenceConnector: any = sequenceWallet({
   connect: {
     app: "Trails",
-    projectAccessKey: getSequenceProjectAccessKey(),
+    projectAccessKey: getConfig("trailsApiKey"),
   },
   defaultNetwork: 1,
   walletAppURL: "https://sequence.app",

package/src/widget/components/AccountIntentTransactionHistory.tsx

@@ -259,6 +259,11 @@ export const AccountIntentTransactionHistory: React.FC<
   // Use selected wallet or fall back to accountAddress
   const effectiveAccountAddress = selectedWalletAddress || accountAddress
 
+  console.log(
+    "[AccountIntentTransactionHistory] Using account address:",
+    effectiveAccountAddress,
+  )
+
   const {
     transactions,
     loading,