0xtrails 0.6.6 → 0.7.0

package/src/trailsClient.ts

@@ -1,4 +1,4 @@
-import { TrailsApi } from "@0xsequence/trails-api"
+import { TrailsApi } from "@0xtrails/api"
 import { useMemo } from "react"
 import { useTrails } from "./widget/providers/TrailsProvider.js"
 

package/src/trailsRouter.ts

@@ -1,5 +1,4 @@
 import { encodeFunctionData, zeroAddress } from "viem"
-import { TRAILS_ROUTER_ADDRESS } from "./constants.js"
 
 export const TRAILS_ROUTER_PLACEHOLDER_AMOUNT =
   0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefn
@@ -8,7 +7,7 @@ function getAmountOffset(calldata: `0x${string}`, placeholder: bigint): number {
   const hex = placeholder.toString(16).padStart(64, "0")
   const search = hex.toLowerCase()
   const offset = calldata.toLowerCase().indexOf(search)
-  if (offset === -1) throw new Error("Placeholder not found")
+  if (offset === -1) return -1 // placeholder not found
   const byteOffset = (offset - 2) / 2 // subtract '0x', convert to bytes
   if (byteOffset < 0 || byteOffset % 1 !== 0) throw new Error("Invalid offset")
   return byteOffset
@@ -63,6 +62,7 @@ export function wrapCalldataWithTrailsRouterIfNeeded({
   amount,
   originTokenAddress,
   destinationTokenAddress,
+  trailsRouterAddress,
 }: {
   token: string
   target: string
@@ -72,6 +72,7 @@ export function wrapCalldataWithTrailsRouterIfNeeded({
   amount: string
   originTokenAddress: string
   destinationTokenAddress: string
+  trailsRouterAddress: string
 }): { encodedCalldata: `0x${string}`; trailsRouterAddress: string } | null {
   const isSameToken =
     originTokenAddress?.toLowerCase() === destinationTokenAddress?.toLowerCase()
@@ -89,12 +90,10 @@ export function wrapCalldataWithTrailsRouterIfNeeded({
     const calldataWithAmount = calldata.replace(placeholderHex, amountHex)
     return {
       encodedCalldata: calldataWithAmount as `0x${string}`,
-      trailsRouterAddress: target,
+      trailsRouterAddress,
     }
   }
 
-  const trailsRouterAddress = TRAILS_ROUTER_ADDRESS
-
   const amountOffset = isDestinationNativeToken
     ? 0
     : getAmountOffset(calldata, BigInt(TRAILS_ROUTER_PLACEHOLDER_AMOUNT))

package/src/transactionIntent/deposits/depositOrchestrator.ts

@@ -5,14 +5,15 @@ import type {
   WalletClient,
   TransactionReceipt,
 } from "viem"
-import type { FeeOption, TrailsApi } from "@0xsequence/trails-api"
+import type { FeeOption, TrailsApi } from "@0xtrails/api"
 import type { TransactionState } from "../../transactions.js"
 import type { CheckoutOnHandlers } from "../../widget/hooks/useCheckout.js"
 import type {
   DepositSignature,
   GasFeeOptions,
   ExecuteIntentResponse,
-} from "@0xsequence/trails-api"
+  TrailsContracts,
+} from "@0xtrails/api"
 import { logger } from "../../logger.js"
 import { isNativeToken } from "../../utils.js"
 import { attemptGaslessDeposit, getDoGasless } from "./gaslessDeposit.js"
@@ -42,6 +43,7 @@ export async function attemptUserDepositTx({
   destinationTokenSymbol,
   depositAmountUsd,
   feeOptions,
+  trailsContracts,
   trailsClient,
   selectedFeeOption,
   walletId,
@@ -76,6 +78,7 @@ export async function attemptUserDepositTx({
   destinationTokenSymbol: string
   depositAmountUsd: number
   feeOptions?: GasFeeOptions
+  trailsContracts?: TrailsContracts
   trailsClient: TrailsApi
   selectedFeeOption?: FeeOption | null
   walletId?: string
@@ -158,6 +161,7 @@ export async function attemptUserDepositTx({
         account,
         trailsClient,
         feeOptions: feeOptions,
+        trailsContracts,
         selectedFeeOption,
         abortSignal,
         checkoutOnHandlers,

package/src/transactionIntent/deposits/gaslessDeposit.ts

@@ -6,7 +6,8 @@ import type {
   FeeOption,
   DepositSignature,
   ExecuteIntentResponse,
-} from "@0xsequence/trails-api"
+  TrailsContracts,
+} from "@0xtrails/api"
 import type { CheckoutOnHandlers } from "../../widget/hooks/useCheckout.js"
 import type { TransactionState } from "../../transactions.js"
 import { logger } from "../../logger.js"
@@ -18,7 +19,6 @@ import {
   getPaymasterGaslessTransaction,
   sendPaymasterGaslessTransaction,
 } from "../../paymasterSend.js"
-import { TRAILS_INTENT_ENTRYPOINT_ADDRESS } from "../../constants.js"
 import {
   getNeedsIntentEntrypointApproval,
   getUserNonce,
@@ -28,6 +28,7 @@ import {
 } from "../../gasless.js"
 import { getIsUserRejectionError } from "../../error.js"
 import { getChainRpcClient } from "../../chains.js"
+import { TRAILS_CONTRACTS } from "../../constants.js"
 
 export async function attemptGaslessDeposit({
   paymasterUrl,
@@ -57,6 +58,7 @@ export async function attemptGaslessDeposit({
   account: Account
   trailsClient: TrailsApi
   feeOptions?: GasFeeOptions
+  trailsContracts?: TrailsContracts
   selectedFeeOption?: FeeOption | null
   abortSignal?: AbortSignal
   checkoutOnHandlers?: Partial<CheckoutOnHandlers>
@@ -91,7 +93,7 @@ export async function attemptGaslessDeposit({
   logger.console.log("[trails-sdk] [GASLESS-FLOW] Intent entrypoint check:", {
     chainId: chain.id,
     chainName: chain.name,
-    intentEntrypoint: TRAILS_INTENT_ENTRYPOINT_ADDRESS,
+    intentEntrypoint: TRAILS_CONTRACTS.trailsIntentEntrypointAddress,
   })
 
   // NEW FLOW: Use Intent Entrypoint API with EIP-2162 permit signature support
@@ -290,7 +292,8 @@ export async function attemptGaslessDeposit({
       client: publicClient,
       token: depositTokenAddress as `0x${string}`,
       account: account.address,
-      entrypoint: TRAILS_INTENT_ENTRYPOINT_ADDRESS,
+      entrypoint:
+        TRAILS_CONTRACTS.trailsIntentEntrypointAddress as `0x${string}`,
       amount: requiredAmount, // Check if we have enough allowance for this specific transaction
     })
 
@@ -343,7 +346,8 @@ export async function attemptGaslessDeposit({
           publicClient,
           walletClient,
           signer: account.address,
-          spender: TRAILS_INTENT_ENTRYPOINT_ADDRESS,
+          spender:
+            TRAILS_CONTRACTS.trailsIntentEntrypointAddress as `0x${string}`,
           tokenAddress: depositTokenAddress as `0x${string}`,
           amount: permitAmount, // Infinite approval
           chain,
@@ -375,7 +379,8 @@ export async function attemptGaslessDeposit({
     const nonce = await getUserNonce({
       publicClient,
       userAddress: account.address,
-      intentEntrypoint: TRAILS_INTENT_ENTRYPOINT_ADDRESS,
+      intentEntrypoint:
+        TRAILS_CONTRACTS.trailsIntentEntrypointAddress as `0x${string}`,
     })
     logger.console.log("[trails-sdk] User nonce:", nonce.toString())
 
@@ -414,7 +419,8 @@ export async function attemptGaslessDeposit({
           intentAddress: depositRecipient as `0x${string}`,
           deadline: BigInt(deadline),
           chainId: originChainId,
-          contractAddress: TRAILS_INTENT_ENTRYPOINT_ADDRESS,
+          contractAddress:
+            TRAILS_CONTRACTS.trailsIntentEntrypointAddress as `0x${string}`,
           nonce,
           feeAmount: BigInt(selectedFeeOption?.amount || "0"),
           feeCollector: feeCollectorAddress,

package/src/transactionIntent/deposits/standardDeposit.ts

@@ -71,7 +71,7 @@ export async function attemptStandardDeposit({
   recipient?: string
   destinationCalldata?: string
 }): Promise<TransactionReceipt | null> {
-  console.log("IN ATTEMPT STANDARD DEPOSIT!")
+  logger.console.log("[trails-sdk] [STANDARD DEPOSIT] initiating deposit...")
   let depositUserTxnReceipt: TransactionReceipt | null = null
   const needsNativeFee = false
 

package/src/transactionIntent/execution/transactionState.ts

@@ -1,5 +1,5 @@
 import type { TransactionReceipt } from "viem"
-import type { IntentTransaction } from "@0xsequence/trails-api"
+import type { IntentTransaction } from "@0xtrails/api"
 import type {
   TransactionState,
   TransactionStateStatus,

package/src/transactionIntent/handlers/crossChain.ts

@@ -5,10 +5,10 @@ import type {
   WalletClient,
   TransactionReceipt,
 } from "viem"
-import { JsonEncode } from "@0xsequence/trails-api"
+import { JsonEncode } from "@0xtrails/api"
 import { getChainRpcClient } from "../../chains.js"
-import type { FeeOption, TrailsApi } from "@0xsequence/trails-api"
-import type { IntentTransaction } from "@0xsequence/trails-api"
+import type { FeeOption, TrailsApi } from "@0xtrails/api"
+import type { IntentTransaction } from "@0xtrails/api"
 import type { PrepareSendReturn, SendReturn } from "../types.js"
 import type { TransactionState } from "../../transactions.js"
 import type { CheckoutOnHandlers } from "../../widget/hooks/useCheckout.js"
@@ -17,13 +17,10 @@ import type {
   CommitIntentResponse,
   DepositSignature,
   ExecuteIntentResponse,
-} from "@0xsequence/trails-api"
+} from "@0xtrails/api"
 import { TradeType } from "../types.js"
 import { logger } from "../../logger.js"
-import {
-  isTestnetDebugMode,
-  getTestnetOriginTokenAddress,
-} from "../utils/testnetHelpers.js"
+import { isTestnetDebugMode } from "../utils/testnetHelpers.js"
 import { getNormalizedQuoteObject } from "../quote/normalizeQuote.js"
 import { getChainInfo, getTestnetChainInfo } from "../../chains.js"
 import { getTransactionStateFromReceipt } from "../execution/transactionState.js"
@@ -34,7 +31,7 @@ import {
   buildCrossChainDepositParams,
 } from "../../intents.js"
 import {
-  decodeTrailsTokenSweeperEvents,
+  decodeTokenSweeperEvents,
   decodeGuestModuleEvents,
 } from "../../decoders.js"
 import { updatePersistentToast } from "../../toast.js"
@@ -54,7 +51,7 @@ import {
 } from "../../transactions.js"
 import { trackPaymentCompleted, trackPaymentError } from "../../analytics.js"
 import { pollIntentReceipt } from "../../intentReceiptPoller.js"
-import type { IntentReceipt } from "@0xsequence/trails-api"
+import type { IntentReceipt } from "@0xtrails/api"
 import { POLLING_INTERVALS } from "../constants.js"
 
 /**
@@ -131,6 +128,8 @@ export async function handleCrossChain({
   sequenceProjectAccessKey,
   sequenceIndexerUrl,
   isSmartWallet,
+  trailsApiKey,
+  trailsApiUrl,
 }: {
   mainSignerAddress: string
   originChainId: number
@@ -162,7 +161,7 @@ export async function handleCrossChain({
   originNativeTokenPriceUsd?: number | null
   quoteProvider?: string | null
   fundMethod?: string
-  mode?: "pay" | "fund" | "earn" | "swap" | "receive"
+  mode?: "pay" | "fund" | "earn" | "swap"
   checkoutOnHandlers?: Partial<CheckoutOnHandlers>
   selectedFeeOption?: FeeOption | null
   walletId?: string
@@ -176,6 +175,8 @@ export async function handleCrossChain({
   sequenceProjectAccessKey?: string
   sequenceIndexerUrl?: string
   isSmartWallet?: boolean
+  trailsApiKey?: string
+  trailsApiUrl?: string
 }): Promise<PrepareSendReturn> {
   const salt = Date.now().toString()
 
@@ -203,7 +204,7 @@ export async function handleCrossChain({
     intentArgs,
   )
 
-  const { intent, gasFeeOptions } = await quoteIntent(
+  const { intent, gasFeeOptions, trailsContracts } = await quoteIntent(
     trailsClient,
     intentArgs,
     {
@@ -214,6 +215,10 @@ export async function handleCrossChain({
   )
   logger.console.log("[trails-sdk] Quote intent:", intent)
   logger.console.log("[trails-sdk] Quote intent gasFeeOptions:", gasFeeOptions)
+  logger.console.log(
+    "[trails-sdk] Quote intent trailsContracts:",
+    trailsContracts,
+  )
 
   if (!intent.originPrecondition || !intent.originCalls) {
     throw new Error("Invalid intent")
@@ -227,9 +232,17 @@ export async function handleCrossChain({
 
   // Use depositTransaction amount - this is the actual amount to deposit
   const depositAmount = intent.depositTransaction.amount?.toString()
+  if (!depositAmount) {
+    throw new Error(
+      "Invalid intent: depositTransaction.amount is missing or undefined",
+    )
+  }
 
   const quoteToAmount = intent.quote.toAmount
   const quoteToAmountMin = intent.quote.toAmountMin
+  if (!quoteToAmount) {
+    throw new Error("Invalid intent: quote.toAmount is missing or undefined")
+  }
 
   const originSendAmountFormatted = formatRawAmount(
     depositAmount,
@@ -246,9 +259,11 @@ export async function handleCrossChain({
     usdPrice: sourceTokenPriceUsd,
     originTokenSymbol,
     originSendAmountFormatted,
+    depositAmount,
+    sourceTokenDecimals,
   })
 
-  const effectiveDestinationTokenAmount = quoteToAmount
+  const effectiveDestinationTokenAmount = quoteToAmount.toString()
   const effectiveDestinationTokenAmountFormatted = formatRawAmount(
     effectiveDestinationTokenAmount,
     destinationTokenDecimals,
@@ -259,6 +274,18 @@ export async function handleCrossChain({
     usdPrice: destinationTokenPriceUsd,
   })
 
+  logger.console.log(
+    "[trails-sdk] effectiveDestinationTokenAmountUsd calculation",
+    {
+      effectiveDestinationTokenAmount,
+      effectiveDestinationTokenAmountFormatted,
+      destinationTokenDecimals,
+      destinationTokenPriceUsd,
+      effectiveDestinationTokenAmountUsd,
+      quoteToAmount,
+    },
+  )
+
   logger.console.log(
     "[trails-sdk] effectiveDestinationTokenAmountUsd",
     effectiveDestinationTokenAmountUsd,
@@ -327,6 +354,8 @@ export async function handleCrossChain({
     originDepositAddress: originIntentAddress,
     destinationDepositAddress: intent.destinationIntentAddress,
     destinationAddress: recipient,
+    trailsApiKey: trailsApiKey || "",
+    trailsApiUrl: trailsApiUrl || "",
     destinationCalldata,
     originAmount: depositAmount,
     destinationAmount: quoteToAmount.toString(),
@@ -451,9 +480,7 @@ export async function handleCrossChain({
         const effectiveOriginChain = testnet
           ? getTestnetChainInfo(chain)!
           : chain
-        const effectiveOriginTokenAddress = testnet
-          ? getTestnetOriginTokenAddress(effectiveOriginChain.id)
-          : originTokenAddress
+        const effectiveOriginTokenAddress = originTokenAddress
 
         logger.console.log("[trails-sdk] testnet", testnet)
 
@@ -523,6 +550,7 @@ export async function handleCrossChain({
             destinationTokenSymbol,
             depositAmountUsd,
             feeOptions: gasFeeOptions,
+            trailsContracts,
             checkoutOnHandlers,
             trailsClient,
             selectedFeeOption: effectiveSelectedFeeOption,
@@ -578,12 +606,12 @@ export async function handleCrossChain({
             }
 
             try {
-              transactionStates[0].decodedTrailsTokenSweeperEvents =
-                decodeTrailsTokenSweeperEvents(depositUserTxnReceipt)
+              transactionStates[0].decodedTokenSweeperEvents =
+                decodeTokenSweeperEvents(depositUserTxnReceipt)
               transactionStates[0].decodedGuestModuleEvents =
                 decodeGuestModuleEvents(depositUserTxnReceipt)
               transactionStates[0].refunded =
-                transactionStates[0].decodedTrailsTokenSweeperEvents.findIndex(
+                transactionStates[0].decodedTokenSweeperEvents.findIndex(
                   (event) =>
                     event.type === "Refund" || event.type === "RefundAndSweep",
                 ) !== -1
@@ -595,7 +623,7 @@ export async function handleCrossChain({
                     transactionStates[0].decodedGuestModuleEvents || []
                   ).filter((e: any) => e?.type === "CallFailed").length,
                   sweeperEvents: (
-                    transactionStates[0].decodedTrailsTokenSweeperEvents || []
+                    transactionStates[0].decodedTokenSweeperEvents || []
                   ).length,
                   refunded: transactionStates[0].refunded,
                 },
@@ -967,12 +995,12 @@ export async function handleCrossChain({
 
                       // Decode events for the deposit transaction
                       try {
-                        transactionStates[0].decodedTrailsTokenSweeperEvents =
-                          decodeTrailsTokenSweeperEvents(depositTxReceipt)
+                        transactionStates[0].decodedTokenSweeperEvents =
+                          decodeTokenSweeperEvents(depositTxReceipt)
                         transactionStates[0].decodedGuestModuleEvents =
                           decodeGuestModuleEvents(depositTxReceipt)
                         transactionStates[0].refunded =
-                          transactionStates[0].decodedTrailsTokenSweeperEvents.findIndex(
+                          transactionStates[0].decodedTokenSweeperEvents.findIndex(
                             (event) =>
                               event.type === "Refund" ||
                               event.type === "RefundAndSweep",
@@ -987,8 +1015,8 @@ export async function handleCrossChain({
                             ).filter((e: any) => e?.type === "CallFailed")
                               .length,
                             sweeperEvents: (
-                              transactionStates[0]
-                                .decodedTrailsTokenSweeperEvents || []
+                              transactionStates[0].decodedTokenSweeperEvents ||
+                              []
                             ).length,
                             refunded: transactionStates[0].refunded,
                           },
@@ -1082,12 +1110,12 @@ export async function handleCrossChain({
 
                   // Decode events for the origin transaction
                   try {
-                    transactionStates[1]!.decodedTrailsTokenSweeperEvents =
-                      decodeTrailsTokenSweeperEvents(originTxnReceipt)
+                    transactionStates[1]!.decodedTokenSweeperEvents =
+                      decodeTokenSweeperEvents(originTxnReceipt)
                     transactionStates[1]!.decodedGuestModuleEvents =
                       decodeGuestModuleEvents(originTxnReceipt)
                     transactionStates[1]!.refunded =
-                      transactionStates[1]!.decodedTrailsTokenSweeperEvents.findIndex(
+                      transactionStates[1]!.decodedTokenSweeperEvents.findIndex(
                         (event) =>
                           event.type === "Refund" ||
                           event.type === "RefundAndSweep",
@@ -1098,8 +1126,7 @@ export async function handleCrossChain({
                         transactionStates[1]!.decodedGuestModuleEvents || []
                       ).filter((e: any) => e?.type === "CallFailed").length,
                       sweeperEvents: (
-                        transactionStates[1]!.decodedTrailsTokenSweeperEvents ||
-                        []
+                        transactionStates[1]!.decodedTokenSweeperEvents || []
                       ).length,
                       refunded: transactionStates[1]!.refunded,
                     })
@@ -1183,17 +1210,17 @@ export async function handleCrossChain({
 
                   // Decode events for the destination transaction
                   try {
-                    transactionStates[2]!.decodedTrailsTokenSweeperEvents =
-                      decodeTrailsTokenSweeperEvents(destinationTxnReceipt)
+                    transactionStates[2]!.decodedTokenSweeperEvents =
+                      decodeTokenSweeperEvents(destinationTxnReceipt)
                     transactionStates[2]!.decodedGuestModuleEvents =
                       decodeGuestModuleEvents(destinationTxnReceipt)
                     transactionStates[2]!.refunded =
-                      transactionStates[2]!.decodedTrailsTokenSweeperEvents.findIndex(
+                      transactionStates[2]!.decodedTokenSweeperEvents.findIndex(
                         (event) =>
                           event.type === "Refund" ||
                           event.type === "RefundAndSweep",
                       ) !== -1 ||
-                      (transactionStates[2]!.decodedTrailsTokenSweeperEvents.findIndex(
+                      (transactionStates[2]!.decodedTokenSweeperEvents.findIndex(
                         (event) => event.type === "Sweep",
                       ) !== -1 &&
                         transactionStates[2]!.decodedGuestModuleEvents.findIndex(
@@ -1207,8 +1234,7 @@ export async function handleCrossChain({
                           transactionStates[2]!.decodedGuestModuleEvents || []
                         ).filter((e: any) => e?.type === "CallFailed").length,
                         sweeperEvents: (
-                          transactionStates[2]!
-                            .decodedTrailsTokenSweeperEvents || []
+                          transactionStates[2]!.decodedTokenSweeperEvents || []
                         ).length,
                         refunded: transactionStates[2]!.refunded,
                       },
@@ -1519,13 +1545,25 @@ export async function handleCrossChain({
             destinationChainId,
             mode,
             fundMethod,
-            originTokenSymbol,
             originTokenAddress,
+            originTokenSymbol,
+            originTokenAmount: depositAmount,
+            originTokenAmountFormatted: originSendAmountFormatted,
             destinationTokenAddress,
             destinationTokenSymbol,
+            depositTokenAmount: depositAmount,
+            depositTokenAmountFormatted: originSendAmountFormatted,
             depositTokenAmountUsd: depositAmountUsd?.toString(),
+            destinationTokenAmount: effectiveDestinationTokenAmount,
+            destinationTokenAmountFormatted:
+              effectiveDestinationTokenAmountFormatted,
             destinationTokenAmountUsd:
               effectiveDestinationTokenAmountUsd?.toString(),
+            originTokenDecimals: sourceTokenDecimals,
+            destinationTokenDecimals: destinationTokenDecimals,
+            tradeType: tradeType.toString(),
+            sourceTokenPriceUsd: sourceTokenPriceUsd,
+            destinationTokenPriceUsd: destinationTokenPriceUsd,
           })
 
           // Call onCheckoutComplete callback with transaction status