0xtrails 0.13.1 → 0.13.2

package/src/transactionIntent/handlers/intentHandler.ts

@@ -78,7 +78,10 @@ import {
   updateTransactionStateWithDecodedEvents,
 } from "../helpers/transactionStateHelpers.js"
 import { isSameChain, isSameToken } from "../validators.js"
-import { isSyntheticTransactionHash } from "../../transactions.js"
+import {
+  isSyntheticTransactionHash,
+  isDisplayableTransactionHash,
+} from "../../transactions.js"
 
 /**
  * Parameters for the unified intent handler.
@@ -588,20 +591,25 @@ async function executeIntent(
   // Set up transaction state tracking
   publishTransactionStates(localTransactionStates)
 
-  if (!intent.intentProtocolVersion) {
+  const rawIntentProtocol = (intent as { intentProtocol?: string })
+    .intentProtocol
+
+  if (!rawIntentProtocol) {
     logger.console.log(
       "[trails-sdk] [intent-protocol] Intent protocol version not found in response, defaulting to v1",
     )
   }
-  const intentProtocolVersion =
-    intent.intentProtocolVersion ?? IntentProtocolVersion.v1
+  const intentProtocol =
+    rawIntentProtocol === "v1.5"
+      ? IntentProtocolVersion.v1_5
+      : IntentProtocolVersion.v1
 
   logger.console.log(
     "[trails-sdk] [intent-protocol] === Intent Protocol Version ===",
     {
-      version: intentProtocolVersion,
-      isV1: intentProtocolVersion === IntentProtocolVersion.v1,
-      isV1_5: intentProtocolVersion === IntentProtocolVersion.v1_5,
+      version: intentProtocol,
+      isV1: intentProtocol === IntentProtocolVersion.v1,
+      isV1_5: intentProtocol === IntentProtocolVersion.v1_5,
       intentId: intent.intentId,
       fundMethod,
     },
@@ -718,7 +726,7 @@ async function executeIntent(
       isSameChainSameToken,
       destinationCalldata,
       depositTransaction: intent.depositTransaction,
-      intentProtocolVersion,
+      intentProtocol,
     })
 
     // Update state and call executeIntent
@@ -788,11 +796,17 @@ async function executeIntent(
                 )
 
                 if (receipt.depositTransaction?.status === "SUCCEEDED") {
+                  const existingHash = localTransactionStates[0].transactionHash
+                  const existingExplorerUrl =
+                    localTransactionStates[0].explorerUrl
+                  const hasClientSideHash =
+                    isDisplayableTransactionHash(existingHash)
+
                   localTransactionStates[0] = {
                     ...localTransactionStates[0],
                     state: "confirmed",
-                    transactionHash: "",
-                    explorerUrl: "",
+                    transactionHash: hasClientSideHash ? existingHash : "",
+                    explorerUrl: hasClientSideHash ? existingExplorerUrl : "",
                     txnMinedAt:
                       receipt.depositTransaction?.txnMinedAt || undefined,
                   }
@@ -1406,7 +1420,10 @@ export async function handleIntent(
           tokenAddress: originTokenAddress,
           depositAmount: depositAmount,
           publicClient: effectivePublicClient,
-          knownBalance: originTokenBalance,
+          knownBalance:
+            originTokenBalance && originTokenBalance !== "0"
+              ? originTokenBalance
+              : undefined,
           decimals: originTokenDecimals,
         })
       : Promise.resolve({ hasEnoughBalance: true }),

package/src/transactionIntent/helpers/transactionStateHelpers.ts

@@ -233,13 +233,16 @@ export function applyIntentReceiptToTransactionStates(params: {
       return
     }
 
-    const displayableHash = isDisplayableTransactionHash(txnHash) ? txnHash : ""
+    const hasNewDisplayableHash = isDisplayableTransactionHash(txnHash)
+    const displayableHash = hasNewDisplayableHash
+      ? txnHash
+      : targetState.transactionHash || ""
     const nextExplorerUrl = displayableHash
       ? getExplorerUrl({
           txHash: displayableHash,
           chainId: targetState.chainId,
         })
-      : ""
+      : targetState.explorerUrl || ""
 
     const stateChanged =
       targetState.state !== mappedState ||

package/src/transactionIntent/quote/normalizeQuote.ts

@@ -405,18 +405,24 @@ export async function getNormalizedQuoteObject({
         totalProviderFeesUsdDisplay: "$0.00",
       }
 
-  if (!intent?.intentProtocolVersion) {
+  const rawIntentProtocol = (
+    intent as { intentProtocol?: string } | null | undefined
+  )?.intentProtocol
+
+  if (!rawIntentProtocol) {
     logger.console.log(
       "[trails-sdk] [intent-protocol] Intent protocol version not in API response, defaulting to v1",
     )
   }
-  const intentProtocolVersion =
-    intent?.intentProtocolVersion ?? IntentProtocolVersion.v1
+  const intentProtocol =
+    rawIntentProtocol === "v1.5"
+      ? IntentProtocolVersion.v1_5
+      : IntentProtocolVersion.v1
 
   logger.console.log(
     "[trails-sdk] [intent-protocol] Quote normalized with version",
     {
-      intentProtocolVersion,
+      intentProtocol,
       intentId: intent?.intentId,
     },
   )
@@ -430,7 +436,7 @@ export async function getNormalizedQuoteObject({
   })
 
   return {
-    intentProtocolVersion,
+    intentProtocol,
     originDepositAddress: originDepositAddress || "",
     destinationDepositAddress: destinationDepositAddress || "",
     destinationAddress: destinationAddress || "",

package/src/transactionIntent/types.ts

@@ -130,7 +130,7 @@ export type PrepareSendFees = {
 }
 
 export type PrepareSendQuote = {
-  intentProtocolVersion: IntentProtocolVersion
+  intentProtocol: IntentProtocolVersion
   originDepositAddress: string
   destinationDepositAddress: string
   destinationAddress: string

package/src/transactions.ts

@@ -307,6 +307,9 @@ export type IntentTransaction = {
   depositTransactionStatus?: string // Deposit transaction status from API
   originTransactionStatus?: string // Origin transaction status from API
   destinationTransactionStatus?: string // Destination transaction status from API
+  refundTransactionHash?: string // Refund transaction hash from API
+  refundTransactionStatus?: string // Refund transaction status from API
+  refundTransactionChainId?: number // Refund transaction chain ID from API
   // Enriched token information
   originToken?: {
     symbol: string

package/src/walletUtils.ts

@@ -1,4 +1,5 @@
 import type { Connector } from "wagmi"
+import type { WalletConnector } from "./wallets.js"
 import {
   BaseError,
   formatTransactionRequest,
@@ -202,7 +203,7 @@ export function isSequenceWalletById(walletId: string | undefined): boolean {
 }
 
 export function isWalletConnectConnector(
-  connector: Connector | undefined,
+  connector: Connector | Pick<WalletConnector, "id" | "name"> | undefined,
 ): boolean {
   if (!connector) return false
   const connectorName = connector.name?.toLowerCase() || ""