0xtrails 0.5.0 → 0.6.0

package/src/intents.ts

@@ -3,44 +3,25 @@ import type {
   CommitIntentResponse,
   Intent,
   IntentCalls,
-  TransactionPrecondition,
   TrailsApi,
   ExecuteIntentRequest,
   GasFeeOptions,
   DepositSignature,
 } from "@0xsequence/trails-api"
+import { JsonEncode } from "@0xsequence/trails-api"
 import type { TrailsClient } from "./trailsClient.js"
 import { logger } from "./logger.js"
-import { bigintReplacer } from "./utils.js"
-
-export type {
-  IntentCalls,
-  TransactionPrecondition,
-} from "@0xsequence/trails-api"
 
 import { Config, type Context, Payload } from "@0xsequence/wallet-primitives"
-import {
-  AbiParameters,
-  Address,
-  Bytes,
-  ContractAddress,
-  Hash,
-  type Hex,
-} from "ox"
+import { Address, Bytes, ContractAddress, Hash, type Hex } from "ox"
 import {
   type Account,
   type Chain,
   isAddressEqual,
   type WalletClient,
-  http,
-  createPublicClient,
 } from "viem"
-import {
-  ATTESATION_SIGNER_ADDRESS,
-  SEQUENCE_V3_CONTRACT_ADDRESSES,
-} from "./constants.js"
-import { findPreconditionAddresses } from "./preconditions.js"
-import { getChainInfo } from "./chains.js"
+import { getChainInfo, getPublicRpcClient } from "./chains.js"
+import { SEQUENCE_V3_CONTRACT_ADDRESSES } from "./constants.js"
 import {
   trackTransactionStarted,
   trackTransactionSubmitted,
@@ -55,7 +36,7 @@ import {
 import { getFullErrorMessage } from "./error.js"
 import { GAS_BUFFER, getFeeData } from "./estimate.js"
 import { getERC20TransferData } from "./encoders.js"
-import { zeroAddress } from "viem"
+import { isNativeToken } from "./utils.js"
 
 export type IntentRequestParams = {
   userAddress: string
@@ -160,17 +141,9 @@ export async function quoteIntent(
 
     const result = response.intent
 
-    // Extract precondition amounts
-    const originChainId = args.originChainId || 0
-    const destinationChainId = args.destinationChainId || 0
-    const originPrecondition = result.preconditions?.find(
-      (p: TransactionPrecondition) =>
-        Number(p.chainId) === Number(originChainId),
-    )
-    const destinationPrecondition = result.preconditions?.find(
-      (p: TransactionPrecondition) =>
-        Number(p.chainId) === Number(destinationChainId),
-    )
+    // Extract precondition amounts from origin and destination preconditions
+    const originPrecondition = result.originPrecondition
+    const destinationPrecondition = result.destinationPrecondition
 
     // Track successful intent quote received
     trackIntentQuoteReceived({
@@ -229,7 +202,7 @@ export function calculateIntentAddress(
 ): `0x${string}` {
   logger.console.log("[trails-sdk] calculateIntentAddress inputs:", {
     mainSigner,
-    calls: JSON.stringify(calls, bigintReplacer, 2),
+    calls,
   })
 
   const context = SEQUENCE_V3_CONTRACT_ADDRESSES
@@ -334,23 +307,33 @@ export async function commitIntent(
   intent: Intent,
   additionalTrackingProps: Record<string, string> = {},
 ): Promise<CommitIntentResponse> {
+  // Build arrays for logging
+  const originIntentCalls = intent.originCalls
+  const destinationIntentCalls = intent.destinationCalls
+  const calls = []
+  if (originIntentCalls) calls.push(originIntentCalls)
+  if (destinationIntentCalls) calls.push(destinationIntentCalls)
+
+  const originPre = intent.originPrecondition
+  const destinationPre = intent.destinationPrecondition
+  const preconditions = []
+  if (originPre) preconditions.push(originPre)
+  if (destinationPre) preconditions.push(destinationPre)
+
   logger.console.log("[trails-sdk] commitIntent inputs:", {
     intentId: intent.intentId,
     ownerAddress: intent.ownerAddress,
     originIntentAddress: intent.originIntentAddress,
     destinationIntentAddress: intent.destinationIntentAddress,
-    calls: JSON.stringify(intent.calls, bigintReplacer, 2),
-    preconditions: JSON.stringify(intent.preconditions, bigintReplacer, 2),
+    calls,
+    preconditions,
   })
 
   // Additional detailed precondition logging
-  logger.console.log(
-    "[trails-sdk] Detailed preconditions:",
-    intent.preconditions,
-  )
+  logger.console.log("[trails-sdk] Detailed preconditions:", preconditions)
 
   // Log each precondition individually for easier reading
-  intent.preconditions.forEach((precondition, index) => {
+  preconditions.forEach((precondition, index) => {
     logger.console.log(`[trails-sdk] Precondition ${index}:`, {
       type: precondition.type,
       chainId: precondition.chainId,
@@ -369,18 +352,12 @@ export async function commitIntent(
     intent.destinationIntentAddress,
   )
 
-  const originChainIdStr = intent.calls[0]?.chainId
-  const destinationChainIdStr = intent.calls[1]?.chainId
+  const originChainIdStr = intent.quoteRequest.originChainId.toString()
+  const destinationChainIdStr =
+    intent.quoteRequest.destinationChainId.toString()
 
-  // The executionInfos could be empty, so we need to handle the undefined case.
-  const { originAddress: receivedAddress } =
-    originChainIdStr && destinationChainIdStr
-      ? findPreconditionAddresses(
-          intent.preconditions,
-          Number(originChainIdStr),
-          Number(destinationChainIdStr),
-        )
-      : { originAddress: undefined }
+  // Get the origin precondition owner address directly
+  const receivedAddress = originPre?.ownerAddress
 
   logger.console.log("[trails-sdk] Address comparison:", {
     receivedAddress,
@@ -500,10 +477,11 @@ export async function sendOriginTransaction(
     ...additionalTrackingProps,
   })
 
-  const publicClient = createPublicClient({
-    chain: getChainInfo(originParams.chain.id)!,
-    transport: http(),
-  })
+  const chainInfo = getChainInfo(originParams.chain.id)
+  if (!chainInfo) {
+    throw new Error(`Chain ${originParams.chain.id} not found`)
+  }
+  const publicClient = getPublicRpcClient(chainInfo)
 
   // Use provided gasLimit if available, otherwise estimate
   let gasLimit: bigint
@@ -628,137 +606,6 @@ export async function sendOriginTransaction(
   }
 }
 
-export interface OriginTokenParam {
-  address: Address.Address
-  chainId: bigint
-}
-
-export interface DestinationTokenParam {
-  address: Address.Address
-  chainId: bigint
-  amount: bigint
-}
-
-export function hashIntentParams({
-  userAddress,
-  nonce,
-  originTokens,
-  destinationCalls,
-  destinationTokens,
-}: {
-  userAddress: Address.Address
-  nonce: bigint
-  originTokens: OriginTokenParam[]
-  destinationCalls: Array<IntentCalls>
-  destinationTokens: DestinationTokenParam[]
-}): string {
-  if (
-    !userAddress ||
-    userAddress === "0x0000000000000000000000000000000000000000"
-  )
-    throw new Error("UserAddress is zero")
-  if (typeof nonce !== "bigint") throw new Error("Nonce is not a bigint")
-  if (!originTokens || originTokens.length === 0)
-    throw new Error("OriginTokens is empty")
-  if (!destinationCalls || destinationCalls.length === 0)
-    throw new Error("DestinationCalls is empty")
-  if (!destinationTokens || destinationTokens.length === 0)
-    throw new Error("DestinationTokens is empty")
-  for (let i = 0; i < destinationCalls.length; i++) {
-    const currentCall = destinationCalls[i]
-    if (!currentCall) throw new Error(`DestinationCalls[${i}] is nil`)
-    if (!currentCall.calls || currentCall.calls.length === 0) {
-      throw new Error(`DestinationCalls[${i}] has no calls`)
-    }
-  }
-
-  const originTokensForAbi = originTokens.map((token) => ({
-    address: token.address,
-    chainId: token.chainId,
-  }))
-
-  let cumulativeCallsHashBytes: Bytes.Bytes = Bytes.from(new Uint8Array(32))
-
-  for (let i = 0; i < destinationCalls.length; i++) {
-    const callPayload = destinationCalls[i]
-    if (!callPayload) throw new Error(`DestinationCalls[${i}] is nil`)
-
-    const currentDestCallPayloadHashBytes = Payload.hash(
-      ATTESATION_SIGNER_ADDRESS,
-      Number(callPayload.chainId),
-      {
-        type: "call",
-        space: callPayload.space ? BigInt(callPayload.space) : 0n,
-        nonce: callPayload.nonce ? BigInt(callPayload.nonce) : 0n,
-        calls: callPayload.calls.map((call) => ({
-          type: "call",
-          to: call.to as `0x${string}`,
-          value: BigInt(call.value?.toString() || "0"),
-          data: Bytes.toHex(Bytes.from((call.data as Hex.Hex) || "0x")),
-          gasLimit: BigInt(call.gasLimit?.toString() || "0"),
-          delegateCall: !!call.delegateCall,
-          onlyFallback: !!call.onlyFallback,
-          behaviorOnError:
-            call.behaviorOnError === 0
-              ? "ignore"
-              : call.behaviorOnError === 1
-                ? "revert"
-                : "abort",
-        })),
-      },
-    )
-
-    cumulativeCallsHashBytes = Hash.keccak256(
-      Bytes.concat(cumulativeCallsHashBytes, currentDestCallPayloadHashBytes),
-      {
-        as: "Bytes",
-      },
-    )
-  }
-  const cumulativeCallsHashHex = Bytes.toHex(cumulativeCallsHashBytes)
-
-  const destinationTokensForAbi = destinationTokens.map((token) => ({
-    address: token.address,
-    chainId: token.chainId,
-    amount: token.amount,
-  }))
-
-  const abiSchema = [
-    { type: "address" },
-    { type: "uint256" },
-    {
-      type: "tuple[]",
-      components: [
-        { name: "address", type: "address" },
-        { name: "chainId", type: "uint256" },
-      ],
-    },
-    {
-      type: "tuple[]",
-      components: [
-        { name: "address", type: "address" },
-        { name: "chainId", type: "uint256" },
-        { name: "amount", type: "uint256" },
-      ],
-    },
-    { type: "bytes32" },
-  ]
-
-  const encodedHex = AbiParameters.encode(abiSchema, [
-    userAddress,
-    nonce,
-    originTokensForAbi,
-    destinationTokensForAbi,
-    cumulativeCallsHashHex,
-  ]) as Hex.Hex
-
-  const encodedBytes = Bytes.fromHex(encodedHex)
-  const hashBytes = Hash.keccak256(encodedBytes)
-  const hashHex = Bytes.toHex(hashBytes)
-
-  return hashHex
-}
-
 export function calculateIntentConfigurationAddress(
   mainSigner: Address.Address,
   calls: Array<IntentCalls>,
@@ -851,7 +698,7 @@ function createIntentConfiguration(
   // Print the topology
   logger.console.log(
     "[trails-sdk] Topology:",
-    JSON.stringify([mainSignerLeaf, secondaryTopologyNode], bigintReplacer, 2),
+    JsonEncode([mainSignerLeaf, secondaryTopologyNode]),
   )
 
   return {
@@ -914,19 +761,20 @@ export function buildSameChainSameTokenTransactionParams({
   return {
     to: hasCustomCalldata
       ? recipient
-      : effectiveOriginTokenAddress === zeroAddress
+      : isNativeToken(effectiveOriginTokenAddress)
         ? recipient
         : effectiveOriginTokenAddress,
     data: hasCustomCalldata
       ? destinationCalldata || "0x"
-      : effectiveOriginTokenAddress === zeroAddress
+      : isNativeToken(effectiveOriginTokenAddress)
         ? "0x"
         : getERC20TransferData({
             recipient,
             amount: BigInt(swapAmount),
           }),
-    value:
-      effectiveOriginTokenAddress === zeroAddress ? BigInt(swapAmount) : "0",
+    value: isNativeToken(effectiveOriginTokenAddress)
+      ? BigInt(swapAmount)
+      : "0",
     chainId: effectiveOriginChainId,
     chain: effectiveOriginChain,
   }
@@ -954,18 +802,16 @@ export function buildCrossChainDepositParams({
   const totalAmount = BigInt(depositAmount) + BigInt(fee)
 
   return {
-    to:
-      originTokenAddress === zeroAddress
-        ? originIntentAddress
-        : originTokenAddress,
-    data:
-      originTokenAddress === zeroAddress
-        ? "0x"
-        : getERC20TransferData({
-            recipient: originIntentAddress,
-            amount: totalAmount,
-          }),
-    value: originTokenAddress === zeroAddress ? totalAmount : "0",
+    to: isNativeToken(originTokenAddress)
+      ? originIntentAddress
+      : originTokenAddress,
+    data: isNativeToken(originTokenAddress)
+      ? "0x"
+      : getERC20TransferData({
+          recipient: originIntentAddress,
+          amount: totalAmount,
+        }),
+    value: isNativeToken(originTokenAddress) ? totalAmount : "0",
     chainId: originChainId,
     chain,
   }

package/src/mutations.ts

@@ -28,8 +28,9 @@ export function useCommitIntent() {
         originIntentAddress: intent.originIntentAddress,
       })
 
-      const originChainIdStr = intent.calls[0]?.chainId
-      const destinationChainIdStr = intent.calls[1]?.chainId
+      const originChainIdStr = intent.quoteRequest.originChainId.toString()
+      const destinationChainIdStr =
+        intent.quoteRequest.destinationChainId.toString()
 
       try {
         // Track intent commit start

package/src/paymasterSend.ts

@@ -1,6 +1,5 @@
 import type { Account, Chain, PublicClient, WalletClient } from "viem"
 import {
-  createPublicClient,
   encodeFunctionData,
   encodePacked,
   http,
@@ -11,6 +10,7 @@ import {
   toHex,
   zeroAddress,
 } from "viem"
+import { getPublicRpcClient } from "./chains.js"
 import type { UserOperation } from "viem/account-abstraction"
 import {
   createBundlerClient,
@@ -194,10 +194,7 @@ export async function getPaymasterGaslessTransaction({
   delegatorSmartAccount: ToSimpleSmartAccountReturnType
 }): Promise<{ to: string; data: string; value: string }[]> {
   // Initialize clients
-  const publicClient = createPublicClient({
-    chain,
-    transport: http(),
-  })
+  const publicClient = getPublicRpcClient(chain)
 
   if (!walletClient.account) {
     throw new Error("No account found")

package/src/prepareSend.ts

@@ -1,7 +1,7 @@
 import { abortControllerRegistry } from "./abortController.js"
-import { createPublicClient, http, zeroAddress } from "viem"
 import { trackPaymentError, trackPaymentStarted } from "./analytics.js"
 import { getSlippageToleranceValue } from "./widget/components/SlippageToleranceSettings.js"
+import { isNativeToken } from "./utils.js"
 import { getERC20TransferData } from "./encoders.js"
 import { getTokenPrice } from "./prices.js"
 import {
@@ -11,7 +11,7 @@ import {
 import type { TransactionState } from "./transactions.js"
 import { logger } from "./logger.js"
 import { getIsCustomCalldata } from "./contractUtils.js"
-import { getChainInfo } from "./chains.js"
+import { getChainInfo, getPublicRpcClient } from "./chains.js"
 
 // Import from transactionIntent module
 import {
@@ -33,7 +33,6 @@ export type {
   PrepareSendQuote,
   PrepareSendReturn,
   SendReturn,
-  SelectedFeeToken,
 } from "./transactionIntent/index.js"
 
 // Re-export validators for backward compatibility
@@ -79,7 +78,7 @@ export async function prepareSend(
     fundMethod,
     mode,
     checkoutOnHandlers,
-    selectedFeeToken,
+    selectedFeeOption,
     walletId,
     abortSignal,
     commitIntentFn,
@@ -107,7 +106,7 @@ export async function prepareSend(
   const transactionStates: TransactionState[] = []
 
   // Validate recipient is not zero address
-  if (recipient === zeroAddress) {
+  if (isNativeToken(recipient)) {
     throw new Error("Recipient address cannot be zero address")
   }
 
@@ -124,7 +123,7 @@ export async function prepareSend(
   if (
     !hasCustomCalldata &&
     tradeType === TradeType.EXACT_INPUT &&
-    destinationTokenAddress !== zeroAddress
+    !isNativeToken(destinationTokenAddress)
   ) {
     // we need to set custom calldata for the cctp transfer in order to have destination intent adddress execution needed for metatxn tracking
     effectiveDestinationCalldata = getERC20TransferData({
@@ -268,10 +267,7 @@ export async function prepareSend(
   logger.console.log("[trails-sdk] isToSameChain", isToSameChain)
   logger.console.log("[trails-sdk] isToSameToken", isToSameToken)
 
-  const publicClient = createPublicClient({
-    chain,
-    transport: http(),
-  })
+  const publicClient = getPublicRpcClient(chain)
 
   // origin tx
   transactionStates.push({
@@ -376,7 +372,6 @@ export async function prepareSend(
       checkoutOnHandlers,
       paymasterUrl,
       quoteProvider,
-      selectedFeeToken,
       walletId,
       trailsClient,
       mode,
@@ -384,6 +379,8 @@ export async function prepareSend(
       abortSignal,
       commitIntentFn,
       executeIntentFn,
+      sequenceProjectAccessKey,
+      sequenceIndexerUrl,
     })
   }
 
@@ -420,7 +417,7 @@ export async function prepareSend(
     fundMethod,
     mode,
     checkoutOnHandlers,
-    selectedFeeToken,
+    selectedFeeOption,
     walletId,
     abortSignal,
     commitIntentFn,

package/src/sendUserOp.ts

@@ -2,19 +2,18 @@ import {
   type Address,
   type Chain,
   concat,
-  createPublicClient,
   createWalletClient,
   encodeAbiParameters,
   encodeFunctionData,
   getAddress,
   type Hex,
-  http,
   keccak256,
   pad,
   size,
   slice,
   toHex,
 } from "viem"
+import { getHttpTransport, getPublicRpcClient } from "./chains.js"
 import { privateKeyToAccount } from "viem/accounts"
 import { logger } from "./logger.js"
 
@@ -187,14 +186,11 @@ export async function sendUserOperationDirectly({
 
   const walletClient = createWalletClient({
     chain: chain,
-    transport: http(),
+    transport: getHttpTransport(chain.id),
     account: relayerAccount,
   })
 
-  const publicClient = createPublicClient({
-    chain: chain,
-    transport: http(),
-  })
+  const publicClient = getPublicRpcClient(chain)
 
   const packedOp = toPackedUserOperation(userOp) // converts to PackedUserOperation
 
@@ -467,63 +463,6 @@ export const packUserOps = (userOps: UserOperation[]) => {
   return packedUserOps as PackedUserOperation[]
 }
 
-export type UnpackedUserOperation = {
-  sender: Address
-  nonce: bigint
-  callData: Hex
-  callGasLimit: bigint
-  factory: Address | null
-  factoryData: Hex | null
-  verificationGasLimit: bigint
-  preVerificationGas: bigint
-  maxFeePerGas: bigint
-  maxPriorityFeePerGas: bigint
-  paymaster: Address | null
-  paymasterVerificationGasLimit: bigint | null
-  paymasterPostOpGasLimit: bigint | null
-  paymasterData: Hex | null
-  signature: Hex
-}
-
-export function toUnpackedUserOperation(
-  packedUserOperation: PackedUserOperation,
-): UnpackedUserOperation {
-  const { factory, factoryData } = unPackInitCode(packedUserOperation.initCode)
-
-  const { callGasLimit, verificationGasLimit } = unpackAccountGasLimits(
-    packedUserOperation.accountGasLimits,
-  )
-
-  const { maxFeePerGas, maxPriorityFeePerGas } = unpackGasLimits(
-    packedUserOperation.gasFees,
-  )
-
-  const {
-    paymaster,
-    paymasterVerificationGasLimit,
-    paymasterPostOpGasLimit,
-    paymasterData,
-  } = unpackPaymasterAndData(packedUserOperation.paymasterAndData)
-
-  return {
-    sender: packedUserOperation.sender,
-    nonce: packedUserOperation.nonce,
-    factory: factory,
-    factoryData: factoryData,
-    callData: packedUserOperation.callData,
-    callGasLimit: callGasLimit,
-    verificationGasLimit: verificationGasLimit,
-    preVerificationGas: packedUserOperation.preVerificationGas,
-    maxFeePerGas: maxFeePerGas,
-    maxPriorityFeePerGas: maxPriorityFeePerGas,
-    paymaster: paymaster,
-    paymasterVerificationGasLimit: paymasterVerificationGasLimit,
-    paymasterPostOpGasLimit: paymasterPostOpGasLimit,
-    paymasterData: paymasterData,
-    signature: packedUserOperation.signature,
-  }
-}
-
 export function unPackInitCode(initCode: Hex) {
   if (initCode === "0x") {
     return {

package/src/tokenBalances.ts

@@ -17,7 +17,7 @@ import { useIndexerGatewayClient } from "./indexerClient.js"
 import { getTokenPrices, useTokenPrices } from "./prices.js"
 import { logger } from "./logger.js"
 import { getChainInfo } from "./chains.js"
-import { getTokenImageUrl } from "./tokens.js"
+import { useGetTokenImageUrl, getTokenImageUrl } from "./tokens.js"
 import type { TrailsClient } from "./trailsClient.js"
 import { useTrailsClient } from "./trailsClient.js"
 import { getFullErrorMessage } from "./error.js"
@@ -183,6 +183,7 @@ export function useTokenBalances(
   // Always call hooks unconditionally to fix React rules violation
   const hookIndexerClient = useIndexerGatewayClient()
   const hookTrailsClient = useTrailsClient()
+  const { getTokenImageUrl } = useGetTokenImageUrl()
 
   // Use passed parameters if available, otherwise use hook results
   const indexerClient = indexerGatewayClient ?? hookIndexerClient