0xtrails 0.8.2 → 0.8.3

package/src/transactionIntent/deposits/standardDeposit.ts

@@ -32,8 +32,6 @@ export async function attemptStandardDeposit({
   originChainId,
   chain,
   account,
-  fee,
-  dryMode,
   originIntentAddress,
   onTransactionStateChange,
   transactionStates,
@@ -53,8 +51,6 @@ export async function attemptStandardDeposit({
   originChainId: number
   chain: Chain
   account: Account
-  fee: string
-  dryMode: boolean
   sourceTokenPriceUsd?: number | null
   destinationTokenPriceUsd?: number | null
   swapAmount: string
@@ -99,7 +95,6 @@ export async function attemptStandardDeposit({
         originTokenAddress,
         originIntentAddress,
         depositAmount: depositAmount,
-        fee,
         originChainId,
         chain,
       })
@@ -112,7 +107,6 @@ export async function attemptStandardDeposit({
     isSameChainSameToken &&
     !isNativeToken(originTokenAddress) &&
     hasCustomCalldata &&
-    !dryMode &&
     recipient
   ) {
     // ERC20 custom calldata requires approval to the recipient contract
@@ -296,10 +290,6 @@ export async function attemptStandardDeposit({
     }
   }
 
-  if (dryMode) {
-    logger.console.log("[trails-sdk] dry mode, skipping send calls")
-  }
-
   if (useSendCalls) {
     logger.console.log("[trails-sdk] using sendCalls")
   } else {
@@ -307,172 +297,127 @@ export async function attemptStandardDeposit({
   }
 
   if (useSendCalls) {
-    if (!dryMode) {
-      const calls: Array<{
-        to: `0x${string}`
-        data: `0x${string}`
-        value?: `0x${string}`
-      }> = []
-      if (needsNativeFee) {
-        calls.push({
-          to: originIntentAddress as `0x${string}`,
-          data: "0x00",
-          value: `0x${BigInt(nativeFee).toString(16)}` as `0x${string}`,
-        })
-      }
-
-      // Add the origin call
+    const calls: Array<{
+      to: `0x${string}`
+      data: `0x${string}`
+      value?: `0x${string}`
+    }> = []
+    if (needsNativeFee) {
       calls.push({
-        to: originCallParams.to as `0x${string}`,
-        data: originCallParams.data as `0x${string}`,
-        value: originCallParams.value
-          ? `0x${BigInt(originCallParams.value).toString(16)}`
-          : "0x0",
+        to: originIntentAddress as `0x${string}`,
+        data: "0x00",
+        value: `0x${BigInt(nativeFee).toString(16)}` as `0x${string}`,
       })
+    }
 
-      // Update persistent toast before wallet interaction
-      updatePersistentToast(
-        "Waiting for Confirmation",
-        "Please confirm the transaction in your wallet...",
-        "info",
-      )
-
-      // Send the batched call via EIP-7702
-      const result = (await walletClient.request({
-        method: "wallet_sendCalls",
-        params: [
-          {
-            version: "2.0.0",
-            chainId: `0x${originChainId.toString(16)}`,
-            atomicRequired: true,
-            calls,
-          },
-        ],
-      })) as { requestId: `0x${string}` }
-
-      logger.console.log("[trails-sdk] sendCalls result", result)
-      const requestId = result.requestId || (result as any).id
-
-      // Poll to check if the tx has been submitted
-      let txHash: `0x${string}` | undefined
-      while (!txHash) {
-        const status = (await walletClient.request({
-          method: "wallet_getCallsStatus",
-          params: [requestId],
-        })) as {
-          status: "pending" | "submitted" | "failed"
-          transactionHash?: `0x${string}`
-          error?: string
-        }
-
-        logger.console.log("[trails-sdk] getCallsStatus result", status)
-        const receipt = (status as any)?.receipts?.[0]
-
-        if ((status as any).status === 200 && receipt?.transactionHash) {
-          txHash = receipt.transactionHash
-          break
-        } else if ((status as any).status === 500) {
-          throw new Error(`Transaction failed: ${status.error}`)
-        }
-
-        // wait a bit before polling again
-        await new Promise((r) => setTimeout(r, 2000))
+    // Add the origin call
+    calls.push({
+      to: originCallParams.to as `0x${string}`,
+      data: originCallParams.data as `0x${string}`,
+      value: originCallParams.value
+        ? `0x${BigInt(originCallParams.value).toString(16)}`
+        : "0x0",
+    })
+
+    // Update persistent toast before wallet interaction
+    updatePersistentToast(
+      "Waiting for Confirmation",
+      "Please confirm the transaction in your wallet...",
+      "info",
+    )
+
+    // Send the batched call via EIP-7702
+    const result = (await walletClient.request({
+      method: "wallet_sendCalls",
+      params: [
+        {
+          version: "2.0.0",
+          chainId: `0x${originChainId.toString(16)}`,
+          atomicRequired: true,
+          calls,
+        },
+      ],
+    })) as { requestId: `0x${string}` }
+
+    logger.console.log("[trails-sdk] sendCalls result", result)
+    const requestId = result.requestId || (result as any).id
+
+    // Poll to check if the tx has been submitted
+    let txHash: `0x${string}` | undefined
+    while (!txHash) {
+      const status = (await walletClient.request({
+        method: "wallet_getCallsStatus",
+        params: [requestId],
+      })) as {
+        status: "pending" | "submitted" | "failed"
+        transactionHash?: `0x${string}`
+        error?: string
       }
 
-      if (onOriginSend) {
-        onOriginSend()
-      }
+      logger.console.log("[trails-sdk] getCallsStatus result", status)
+      const receipt = (status as any)?.receipts?.[0]
 
-      // Update persistent toast after transaction sent
-      const chainInfo = getChainInfo(originChainId)
-      updatePersistentToast(
-        "Transaction Submitted",
-        `Waiting for confirmation on ${chainInfo?.name || "chain"}...`,
-        "info",
-      )
+      if ((status as any).status === 200 && receipt?.transactionHash) {
+        txHash = receipt.transactionHash
+        break
+      } else if ((status as any).status === 500) {
+        throw new Error(`Transaction failed: ${status.error}`)
+      }
 
-      const receipt = await publicClient.waitForTransactionReceipt({
-        hash: txHash as `0x${string}`,
-      })
-      logger.console.log("[trails-sdk] receipt", receipt)
-      depositUserTxnReceipt = receipt
+      // wait a bit before polling again
+      await new Promise((r) => setTimeout(r, 2000))
     }
-  } else {
-    if (!dryMode) {
-      if (needsNativeFee) {
-        // Trigger signature request callback before prompting wallet
-        if (checkoutOnHandlers?.triggerCheckoutSignatureRequest) {
-          checkoutOnHandlers.triggerCheckoutSignatureRequest()
-        }
-
-        try {
-          const txHashNativeFee = await sendOriginTransaction(
-            account,
-            walletClient,
-            {
-              to: originIntentAddress,
-              data: "0x00",
-              value: nativeFee,
-              chainId: originChainId,
-              chain,
-            } as any,
-            {
-              depositTokenAmountUsd: depositAmountUsd?.toString(),
-            },
-          ) // TODO: Add proper type
-          logger.console.log(
-            "[trails-sdk] origin tx native fee",
-            txHashNativeFee,
-          )
-
-          // Trigger signature confirmed callback after successful signing
-          if (checkoutOnHandlers?.triggerCheckoutSignatureConfirmed) {
-            checkoutOnHandlers.triggerCheckoutSignatureConfirmed()
-          }
-          // Wait for transaction receipt
-          const feeReceipt = await publicClient.waitForTransactionReceipt({
-            hash: txHashNativeFee,
-          })
-          logger.console.log("[trails-sdk] nativeFeeReceipt", feeReceipt)
-        } catch (error) {
-          // Check if this is a user rejection error
-          if (getIsUserRejectionError(error)) {
-            if (checkoutOnHandlers?.triggerCheckoutSignatureRejected) {
-              checkoutOnHandlers.triggerCheckoutSignatureRejected(error)
-            }
-          }
-          throw error
-        }
-      }
 
-      // Show persistent toast for checkout flow
-      updatePersistentToast(
-        "Payment Started",
-        "Waiting for wallet confirmation...",
-        "info",
-      )
+    if (onOriginSend) {
+      onOriginSend()
+    }
 
+    // Update persistent toast after transaction sent
+    const chainInfo = getChainInfo(originChainId)
+    updatePersistentToast(
+      "Transaction Submitted",
+      `Waiting for confirmation on ${chainInfo?.name || "chain"}...`,
+      "info",
+    )
+
+    const receipt = await publicClient.waitForTransactionReceipt({
+      hash: txHash as `0x${string}`,
+    })
+    logger.console.log("[trails-sdk] receipt", receipt)
+    depositUserTxnReceipt = receipt
+  } else {
+    if (needsNativeFee) {
       // Trigger signature request callback before prompting wallet
       if (checkoutOnHandlers?.triggerCheckoutSignatureRequest) {
         checkoutOnHandlers.triggerCheckoutSignatureRequest()
       }
 
-      let txHash: `0x${string}`
       try {
-        txHash = await sendOriginTransaction(
+        const txHashNativeFee = await sendOriginTransaction(
           account,
           walletClient,
-          originCallParams as any,
+          {
+            to: originIntentAddress,
+            data: "0x00",
+            value: nativeFee,
+            chainId: originChainId,
+            chain,
+          } as any,
           {
             depositTokenAmountUsd: depositAmountUsd?.toString(),
           },
         ) // TODO: Add proper type
-        logger.console.log("[trails-sdk] origin tx", txHash)
+        logger.console.log("[trails-sdk] origin tx native fee", txHashNativeFee)
 
         // Trigger signature confirmed callback after successful signing
         if (checkoutOnHandlers?.triggerCheckoutSignatureConfirmed) {
           checkoutOnHandlers.triggerCheckoutSignatureConfirmed()
         }
+        // Wait for transaction receipt
+        const feeReceipt = await publicClient.waitForTransactionReceipt({
+          hash: txHashNativeFee,
+        })
+        logger.console.log("[trails-sdk] nativeFeeReceipt", feeReceipt)
       } catch (error) {
         // Check if this is a user rejection error
         if (getIsUserRejectionError(error)) {
@@ -482,50 +427,88 @@ export async function attemptStandardDeposit({
         }
         throw error
       }
+    }
 
-      if (onOriginSend) {
-        onOriginSend()
-      }
+    // Show persistent toast for checkout flow
+    updatePersistentToast(
+      "Payment Started",
+      "Waiting for wallet confirmation...",
+      "info",
+    )
 
-      if (transactionStates[0]) {
-        transactionStates[0].state = "pending"
+    // Trigger signature request callback before prompting wallet
+    if (checkoutOnHandlers?.triggerCheckoutSignatureRequest) {
+      checkoutOnHandlers.triggerCheckoutSignatureRequest()
+    }
 
-        try {
-          onTransactionStateChange(transactionStates)
-        } catch (error) {
-          logger.console.error(
-            "[trails-sdk] Error calling onTransactionStateChange:",
-            error,
-          )
+    let txHash: `0x${string}`
+    try {
+      txHash = await sendOriginTransaction(
+        account,
+        walletClient,
+        originCallParams as any,
+        {
+          depositTokenAmountUsd: depositAmountUsd?.toString(),
+        },
+      ) // TODO: Add proper type
+      logger.console.log("[trails-sdk] origin tx", txHash)
+
+      // Trigger signature confirmed callback after successful signing
+      if (checkoutOnHandlers?.triggerCheckoutSignatureConfirmed) {
+        checkoutOnHandlers.triggerCheckoutSignatureConfirmed()
+      }
+    } catch (error) {
+      // Check if this is a user rejection error
+      if (getIsUserRejectionError(error)) {
+        if (checkoutOnHandlers?.triggerCheckoutSignatureRejected) {
+          checkoutOnHandlers.triggerCheckoutSignatureRejected(error)
         }
       }
+      throw error
+    }
 
-      // Wait for transaction receipt
-      const receipt = await publicClient.waitForTransactionReceipt({
-        hash: txHash,
-      })
+    if (onOriginSend) {
+      onOriginSend()
+    }
 
-      const chainInfo = getChainInfo(originChainId)
-      updatePersistentToast(
-        "Transfer Confirmed",
-        `Your transaction on ${chainInfo?.name || "chain"} has been confirmed`,
-        "info",
-      )
+    if (transactionStates[0]) {
+      transactionStates[0].state = "pending"
 
-      trackTransactionConfirmed({
-        transactionHash: txHash,
-        chainId: originChainId,
-        userAddress: account.address,
-        blockNumber: Number(receipt.blockNumber),
-        originIntentAddress,
-        originTokenSymbol,
-        destinationTokenSymbol,
-        depositTokenAmountUsd: depositAmountUsd?.toString(),
-      })
-
-      logger.console.log("[trails-sdk] receipt", receipt)
-      depositUserTxnReceipt = receipt
+      try {
+        onTransactionStateChange(transactionStates)
+      } catch (error) {
+        logger.console.error(
+          "[trails-sdk] Error calling onTransactionStateChange:",
+          error,
+        )
+      }
     }
+
+    // Wait for transaction receipt
+    const receipt = await publicClient.waitForTransactionReceipt({
+      hash: txHash,
+    })
+
+    const chainInfo = getChainInfo(originChainId)
+    updatePersistentToast(
+      "Transfer Confirmed",
+      `Your transaction on ${chainInfo?.name || "chain"} has been confirmed`,
+      "info",
+    )
+
+    trackTransactionConfirmed({
+      transactionHash: txHash,
+      chainId: originChainId,
+      userAddress: account.address,
+      blockNumber: Number(receipt.blockNumber),
+      originIntentAddress,
+      originTokenSymbol,
+      destinationTokenSymbol,
+      depositTokenAmountUsd: depositAmountUsd?.toString(),
+    })
+
+    logger.console.log("[trails-sdk] receipt", receipt)
+    depositUserTxnReceipt = receipt
   }
 
   return depositUserTxnReceipt

package/src/transactionIntent/handlers/crossChain.ts

@@ -35,7 +35,10 @@ import {
   decodeGuestModuleEvents,
 } from "../../decoders.js"
 import { updatePersistentToast } from "../../toast.js"
-import { formatRawAmount } from "../../tokenBalances.js"
+import {
+  formatRawAmount,
+  invalidateTokenBalancesCache,
+} from "../../tokenBalances.js"
 import { calcAmountUsdPrice } from "../../prices.js"
 import { checkAccountBalance } from "../utils/balanceChecker.js"
 import { estimateGasLimit } from "../../estimate.js"
@@ -109,8 +112,6 @@ export async function handleCrossChain({
   publicClient,
   chain,
   account,
-  fee,
-  dryMode,
   onTransactionStateChange,
   transactionStates,
   slippageTolerance,
@@ -153,11 +154,9 @@ export async function handleCrossChain({
   publicClient: PublicClient
   chain: Chain
   account: Account
-  fee: string
-  dryMode: boolean
   onTransactionStateChange: (transactionStates: TransactionState[]) => void
   transactionStates: TransactionState[]
-  slippageTolerance: string
+  slippageTolerance: string | null
   tradeType: TradeType
   originNativeTokenPriceUsd?: number | null
   swapProvider?: RouteProvider | null
@@ -319,7 +318,6 @@ export async function handleCrossChain({
     originTokenAddress,
     originIntentAddress,
     depositAmount,
-    fee,
     originChainId,
     chain,
   })
@@ -528,8 +526,6 @@ export async function handleCrossChain({
               account: account.address,
               depositAmount,
               originIntentAddress,
-              fee,
-              dryMode,
               feeOptions: gasFeeOptions,
               selectedFeeOption: effectiveSelectedFeeOption,
               selectedFeeOptionType: typeof effectiveSelectedFeeOption,
@@ -550,8 +546,6 @@ export async function handleCrossChain({
             walletClient,
             destinationTokenDecimals,
             sourceTokenDecimals,
-            fee,
-            dryMode,
             sourceTokenPriceUsd: sourceTokenPriceUsd ?? null,
             destinationTokenPriceUsd: destinationTokenPriceUsd ?? null,
             swapAmount,
@@ -1577,6 +1571,9 @@ export async function handleCrossChain({
             destinationTokenPriceUsd: destinationTokenPriceUsd,
           })
 
+          // Invalidate token balances cache after transaction (success or failure - gas was spent)
+          invalidateTokenBalancesCache(account.address)
+
           // Call onCheckoutComplete callback with transaction status
           if (checkoutOnHandlers?.triggerCheckoutComplete) {
             checkoutOnHandlers.triggerCheckoutComplete(