0xtrails 0.6.0 → 0.6.2

package/src/prepareSend.ts

@@ -11,7 +11,7 @@ import {
 import type { TransactionState } from "./transactions.js"
 import { logger } from "./logger.js"
 import { getIsCustomCalldata } from "./contractUtils.js"
-import { getChainInfo, getPublicRpcClient } from "./chains.js"
+import { getChainInfo, getChainRpcClient } from "./chains.js"
 
 // Import from transactionIntent module
 import {
@@ -88,6 +88,34 @@ export async function prepareSend(
   } = options
   let { sourceTokenPriceUsd, destinationTokenPriceUsd } = options
 
+  if (!originChainId) {
+    throw new Error("Origin chain ID is required")
+  }
+
+  if (!destinationChainId) {
+    throw new Error("Destination chain ID is required")
+  }
+
+  // Sanity check: verify originPublicClient chain ID matches originChainId
+  if (options.originPublicClient) {
+    const clientChainId = options.originPublicClient?.chain?.id
+    if (clientChainId !== originChainId) {
+      throw new Error(
+        `Origin public client chain ID mismatch: expected ${originChainId}, got ${clientChainId}`,
+      )
+    }
+  }
+
+  // Sanity check: verify destinationPublicClient chain ID matches destinationChainId
+  if (options.destinationPublicClient) {
+    const clientChainId = options.destinationPublicClient?.chain?.id
+    if (clientChainId !== destinationChainId) {
+      throw new Error(
+        `Destination public client chain ID mismatch: expected ${destinationChainId}, got ${clientChainId}`,
+      )
+    }
+  }
+
   // Use slippage from options, or get from localStorage with config default fallback
   // The config default (slippageToleranceFromOptions) comes from React component context
   const slippageTolerance = getSlippageToleranceValue(
@@ -261,13 +289,16 @@ export async function prepareSend(
     })
     throw new Error(`Chain ${originChainId} not found`)
   }
+  const isToSelf =
+    account.address.toLowerCase() === effectiveDestinationAddress.toLowerCase()
   const isToSameChain = isSameChain(originChainId, destinationChainId)
   const isToSameToken = isSameToken(originTokenAddress, destinationTokenAddress)
 
   logger.console.log("[trails-sdk] isToSameChain", isToSameChain)
   logger.console.log("[trails-sdk] isToSameToken", isToSameToken)
 
-  const publicClient = getPublicRpcClient(chain)
+  const publicClient =
+    options.originPublicClient ?? getChainRpcClient(originChainId)
 
   // origin tx
   transactionStates.push({
@@ -311,7 +342,7 @@ export async function prepareSend(
       explorerUrl: "",
       chainId: destinationChainId,
       state: "pending",
-      label: hasCustomCalldata ? "Execute" : "Receive",
+      label: hasCustomCalldata ? "Execute" : isToSelf ? "Receive" : "Send",
     })
   }
 

package/src/sendUserOp.ts

@@ -13,7 +13,7 @@ import {
   slice,
   toHex,
 } from "viem"
-import { getHttpTransport, getPublicRpcClient } from "./chains.js"
+import { getHttpTransport, getChainRpcClient } from "./chains.js"
 import { privateKeyToAccount } from "viem/accounts"
 import { logger } from "./logger.js"
 
@@ -190,7 +190,7 @@ export async function sendUserOperationDirectly({
     account: relayerAccount,
   })
 
-  const publicClient = getPublicRpcClient(chain)
+  const publicClient = getChainRpcClient(chain.id)
 
   const packedOp = toPackedUserOperation(userOp) // converts to PackedUserOperation
 

package/src/tokens.ts

@@ -3,7 +3,7 @@ import { zeroAddress, erc20Abi } from "viem"
 import {
   getChainInfo,
   getSupportedChains,
-  getPublicRpcClient,
+  getChainRpcClient,
 } from "./chains.js"
 import {
   arbitrum,
@@ -492,7 +492,7 @@ export async function getTokenInfo(
     }
 
     // Create a public client for the specific chain
-    const publicClient = getPublicRpcClient(chainInfo)
+    const publicClient = getChainRpcClient(chainId)
 
     // Read token data on-chain
     const [name, symbol, decimals] = await Promise.all([

package/src/transactionIntent/deposits/gaslessDeposit.ts

@@ -27,7 +27,7 @@ import {
   validateGaslessSignature,
 } from "../../gasless.js"
 import { getIsUserRejectionError } from "../../error.js"
-import { getPublicRpcClient } from "../../chains.js"
+import { getChainRpcClient } from "../../chains.js"
 
 export async function attemptGaslessDeposit({
   paymasterUrl,
@@ -86,7 +86,7 @@ export async function attemptGaslessDeposit({
     },
   )
 
-  const publicClient = getPublicRpcClient(chain)
+  const publicClient = getChainRpcClient(chain.id)
 
   logger.console.log("[trails-sdk] [GASLESS-FLOW] Intent entrypoint check:", {
     chainId: chain.id,

package/src/transactionIntent/handlers/crossChain.ts

@@ -6,7 +6,7 @@ import type {
   TransactionReceipt,
 } from "viem"
 import { JsonEncode } from "@0xsequence/trails-api"
-import { getPublicRpcClient } from "../../chains.js"
+import { getChainRpcClient } from "../../chains.js"
 import type { FeeOption, TrailsApi } from "@0xsequence/trails-api"
 import type { IntentTransaction } from "@0xsequence/trails-api"
 import type { PrepareSendReturn, SendReturn } from "../types.js"
@@ -458,7 +458,9 @@ export async function handleCrossChain({
         if (!destinationChainInfo) {
           throw new Error(`Chain ${destinationChainId} not found`)
         }
-        const destinationPublicClient = getPublicRpcClient(destinationChainInfo)
+        const destinationPublicClient = getChainRpcClient(
+          destinationChainInfo.id,
+        )
 
         const depositPromise = async () => {
           logger.console.log(
@@ -695,6 +697,53 @@ export async function handleCrossChain({
                     hash: tx.txnHash as `0x${string}`,
                   })
 
+                // Validate that the deposit amount is sufficient before proceeding
+                logger.console.log(
+                  "[trails-sdk] Checking if deposit amount is sufficient (cross-chain)",
+                  {
+                    depositAddress: originIntentAddress,
+                    requiredAmount: quote.originAmount,
+                    tokenAddress: originTokenAddress,
+                  },
+                )
+
+                const balanceCheck = await checkAccountBalance({
+                  account: {
+                    address: originIntentAddress as `0x${string}`,
+                  } as Account,
+                  tokenAddress: originTokenAddress,
+                  depositAmount: quote.originAmount,
+                  publicClient: publicClient,
+                })
+
+                if (!balanceCheck.hasEnoughBalance) {
+                  logger.console.warn(
+                    "[trails-sdk] Deposit amount is insufficient, continuing to poll (cross-chain)",
+                    {
+                      balance: balanceCheck.balanceFormatted,
+                      required: balanceCheck.requiredAmountFormatted,
+                      percentComplete: (
+                        (Number(balanceCheck.balance) /
+                          Number(balanceCheck.requiredAmount)) *
+                        100
+                      ).toFixed(2),
+                    },
+                  )
+                  // Continue polling - don't break out of the loop yet
+                  await new Promise((resolve) =>
+                    setTimeout(resolve, POLLING_INTERVALS.TRANSACTION_HISTORY),
+                  )
+                  continue
+                }
+
+                logger.console.log(
+                  "[trails-sdk] Deposit amount is sufficient, proceeding (cross-chain)",
+                  {
+                    balance: balanceCheck.balanceFormatted,
+                    required: balanceCheck.requiredAmountFormatted,
+                  },
+                )
+
                 depositUserTxnReceipt = originDepositTxReceipt
 
                 transactionStates[0] = getTransactionStateFromReceipt(

package/src/transactionIntent/handlers/sameChainSameToken.ts

@@ -1,6 +1,6 @@
 import type { Account, Chain, WalletClient, TransactionReceipt } from "viem"
 import { formatUnits } from "viem"
-import { getPublicRpcClient } from "../../chains.js"
+import { getChainRpcClient } from "../../chains.js"
 import type { FeeOption, TrailsApi } from "@0xsequence/trails-api"
 import type { PrepareSendReturn, SendReturn } from "../types.js"
 import type { IntentTransaction } from "@0xsequence/trails-api"
@@ -116,7 +116,7 @@ export async function handleSameChainSameToken({
   const effectiveOriginTokenAddress = testnet
     ? getTestnetOriginTokenAddress(effectiveOriginChainId)
     : originTokenAddress
-  const effectivePublicClient = getPublicRpcClient(effectiveOriginChain)
+  const effectivePublicClient = getChainRpcClient(effectiveOriginChain.id)
 
   let noSufficientBalance = false
 
@@ -503,6 +503,56 @@ export async function handleSameChainSameToken({
                         hash: tx.txnHash as `0x${string}`,
                       })
 
+                    // Validate that the deposit amount is sufficient before proceeding
+                    logger.console.log(
+                      "[trails-sdk] Checking if deposit amount is sufficient",
+                      {
+                        depositAddress: intent.originIntentAddress,
+                        requiredAmount: quote.originAmount,
+                        tokenAddress: effectiveOriginTokenAddress,
+                      },
+                    )
+
+                    const balanceCheck = await checkAccountBalance({
+                      account: {
+                        address: intent.originIntentAddress as `0x${string}`,
+                      } as Account,
+                      tokenAddress: effectiveOriginTokenAddress,
+                      depositAmount: quote.originAmount,
+                      publicClient: effectivePublicClient,
+                    })
+
+                    if (!balanceCheck.hasEnoughBalance) {
+                      logger.console.warn(
+                        "[trails-sdk] Deposit amount is insufficient, continuing to poll",
+                        {
+                          balance: balanceCheck.balanceFormatted,
+                          required: balanceCheck.requiredAmountFormatted,
+                          percentComplete: (
+                            (Number(balanceCheck.balance) /
+                              Number(balanceCheck.requiredAmount)) *
+                            100
+                          ).toFixed(2),
+                        },
+                      )
+                      // Continue polling - don't break out of the loop yet
+                      await new Promise((resolve) =>
+                        setTimeout(
+                          resolve,
+                          POLLING_INTERVALS.TRANSACTION_HISTORY,
+                        ),
+                      )
+                      continue
+                    }
+
+                    logger.console.log(
+                      "[trails-sdk] Deposit amount is sufficient, proceeding",
+                      {
+                        balance: balanceCheck.balanceFormatted,
+                        required: balanceCheck.requiredAmountFormatted,
+                      },
+                    )
+
                     depositUserTxnReceipt = depositTxReceipt
 
                     localTransactionStates[0] = getTransactionStateFromReceipt(

package/src/transactionIntent/quote/normalizeQuote.ts

@@ -5,7 +5,7 @@ import type { QuoteProviderInfo } from "../../widget/hooks/useQuote.js"
 import { formatUnits } from "viem"
 import { mainnet } from "viem/chains"
 import { getTokenInfo } from "../../tokens.js"
-import { getChainInfo, getPublicRpcClient } from "../../chains.js"
+import { getChainInfo, getChainRpcClient } from "../../chains.js"
 import { logger } from "../../logger.js"
 import {
   formatRawAmount,
@@ -186,7 +186,7 @@ export async function getNormalizedQuoteObject({
 
   const hasCustomCalldata = getIsCustomCalldata(destinationCalldata)
 
-  const publicClient = getPublicRpcClient(originChain)
+  const publicClient = getChainRpcClient(originChain.id)
 
   let gasCostUsd: number = 0
   let gasCostUsdDisplay: string = "0"

package/src/transactionIntent/types.ts

@@ -1,4 +1,10 @@
-import type { Account, Chain, TransactionReceipt, WalletClient } from "viem"
+import type {
+  Account,
+  Chain,
+  PublicClient,
+  TransactionReceipt,
+  WalletClient,
+} from "viem"
 import type {
   TrailsApi,
   Intent,
@@ -51,6 +57,8 @@ export type PrepareSendOptions = {
   quoteProvider?: string | null
   fundMethod?: string
   mode?: "pay" | "fund" | "earn" | "swap" | "receive"
+  originPublicClient?: PublicClient
+  destinationPublicClient?: PublicClient
   checkoutOnHandlers?: Partial<CheckoutOnHandlers>
   refundAddress?: string
   selectedFeeOption?: FeeOption | null