0xtrails 0.2.0 → 0.2.2

package/src/relayer.ts

@@ -84,11 +84,12 @@ const relayerChainIdToSlug: Record<number, string> = {
 
 const relayerLocalhostUrlMap: Record<number, string> = {
   [mainnet.id]: "http://0.0.0.0:9969",
-  [arbitrum.id]: "http://0.0.0.0:9997",
+  [katana.id]: "http://0.0.0.0:9994",
+  [apeChain.id]: "http://0.0.0.0:9995",
   [base.id]: "http://0.0.0.0:9996",
-  [polygon.id]: "http://0.0.0.0:9999",
+  [arbitrum.id]: "http://0.0.0.0:9997",
   [optimism.id]: "http://0.0.0.0:9998",
-  [apeChain.id]: "http://0.0.0.0:9995",
+  [polygon.id]: "http://0.0.0.0:9999",
 }
 
 export function getRelayerLocalhostUrl(chainId: number): string {

package/src/tokenBalances.ts

@@ -378,7 +378,14 @@ export function getTokenBalanceUsd(
   const isNative = isNativeToken(token)
   const decimals = isNative ? 18 : token.contractInfo?.decimals
   if (!decimals) {
-    throw new Error("Decimals not found")
+    logger.console.error(
+      "[trails-sdk] [getTokenBalanceUsd] Missing decimals for token:",
+      {
+        token: token,
+        isNative,
+      },
+    )
+    return 0 // Return 0 instead of throwing
   }
   const formattedBalance = formatRawAmount(token.balance, decimals)
 

package/src/trails.ts

@@ -1341,9 +1341,7 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
             (p.type === "transfer-native" || p.type === "native-balance") &&
             p.chainId === originChainId.toString(),
         )
-        const nativeMinAmount =
-          nativePrecondition?.data?.minAmount?.toString() ??
-          nativePrecondition?.data?.min?.toString()
+        const nativeMinAmount = nativePrecondition?.data?.min?.toString()
         if (nativeMinAmount === undefined) {
           throw new Error(
             "Could not find native precondition (transfer-native or native-balance) or min amount",

package/src/trailsClient.ts

@@ -30,7 +30,10 @@ export const useTrailsClient = (config?: TrailsClientConfig) => {
   const trailsClient = useMemo(() => {
     return getTrailsClient({
       hostname: config?.hostname || getTrailsApiUrl(),
-      projectAccessKey: config?.projectAccessKey || projectAccessKey,
+      projectAccessKey:
+        getSequenceProjectAccessKey() ||
+        config?.projectAccessKey ||
+        projectAccessKey,
       jwt: config?.jwt || jwt,
     })
   }, [

package/src/{balanceInjector.ts → trailsRouter.ts}

@@ -1,7 +1,7 @@
 import { encodeFunctionData, zeroAddress } from "viem"
-import { TRAILS_BALANCE_INJECTOR_ADDRESS } from "./constants.js"
+import { TRAILS_ROUTER_ADDRESS } from "./constants.js"
 
-export const TRAILS_CONTRACT_PLACEHOLDER_AMOUNT =
+export const TRAILS_ROUTER_PLACEHOLDER_AMOUNT =
   0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefn
 
 function getAmountOffset(calldata: `0x${string}`, placeholder: bigint): number {
@@ -14,7 +14,7 @@ function getAmountOffset(calldata: `0x${string}`, placeholder: bigint): number {
   return byteOffset
 }
 
-const balanceInjectorAbi = [
+const trailsRouterAbi = [
   {
     type: "function",
     name: "injectAndCall",
@@ -30,7 +30,7 @@ const balanceInjectorAbi = [
   },
 ]
 
-export function encodeBalanceInjectorCalldata({
+export function encodeTrailsRouterCalldata({
   token,
   target,
   calldata,
@@ -48,13 +48,13 @@ export function encodeBalanceInjectorCalldata({
     `0x${placeholder.toString(16).padStart(64, "0")}` as `0x${string}`
 
   return encodeFunctionData({
-    abi: balanceInjectorAbi,
+    abi: trailsRouterAbi,
     functionName: "injectAndCall",
     args: [token, target, calldata, amountOffset, placeholderBytes32],
   })
 }
 
-export function wrapCalldataWithBalanceInjectorIfNeeded({
+export function wrapCalldataWithTrailsRouterIfNeeded({
   token,
   target,
   calldata,
@@ -72,13 +72,13 @@ export function wrapCalldataWithBalanceInjectorIfNeeded({
   amount: string
   originTokenAddress: string
   destinationTokenAddress: string
-}): { encodedCalldata: `0x${string}`; balanceInjectorAddress: string } | null {
+}): { encodedCalldata: `0x${string}`; trailsRouterAddress: string } | null {
   const isSameToken =
     originTokenAddress?.toLowerCase() === destinationTokenAddress?.toLowerCase()
   const isDestinationNativeToken = destinationTokenAddress === zeroAddress
   if (originChainId === destinationChainId && isSameToken) {
     const amountHex = BigInt(amount).toString(16).padStart(64, "0") // 32-byte hex (no 0x)
-    const placeholderHex = TRAILS_CONTRACT_PLACEHOLDER_AMOUNT.toString(
+    const placeholderHex = TRAILS_ROUTER_PLACEHOLDER_AMOUNT.toString(
       16,
     ).padStart(64, "0")
 
@@ -89,31 +89,31 @@ export function wrapCalldataWithBalanceInjectorIfNeeded({
     const calldataWithAmount = calldata.replace(placeholderHex, amountHex)
     return {
       encodedCalldata: calldataWithAmount as `0x${string}`,
-      balanceInjectorAddress: target,
+      trailsRouterAddress: target,
     }
   }
 
-  const balanceInjectorAddress = TRAILS_BALANCE_INJECTOR_ADDRESS
+  const trailsRouterAddress = TRAILS_ROUTER_ADDRESS
 
   const amountOffset = isDestinationNativeToken
     ? 0
-    : getAmountOffset(calldata, BigInt(TRAILS_CONTRACT_PLACEHOLDER_AMOUNT))
+    : getAmountOffset(calldata, BigInt(TRAILS_ROUTER_PLACEHOLDER_AMOUNT))
   if (amountOffset === -1) {
     return null
   }
 
-  const encodedCalldata = encodeBalanceInjectorCalldata({
+  const encodedCalldata = encodeTrailsRouterCalldata({
     token,
     target,
     calldata,
     amountOffset,
     placeholder: isDestinationNativeToken
       ? BigInt(0)
-      : TRAILS_CONTRACT_PLACEHOLDER_AMOUNT,
+      : TRAILS_ROUTER_PLACEHOLDER_AMOUNT,
   })
 
   return {
     encodedCalldata,
-    balanceInjectorAddress,
+    trailsRouterAddress,
   }
 }

package/src/transactions.ts

@@ -1,32 +1,14 @@
 import { createPublicClient, http } from "viem"
 import { useQuery } from "@tanstack/react-query"
 import { getChainInfo } from "./chains.js"
-import { getSequenceProjectAccessKey, getSequenceEnv } from "./config.js"
+import { getSequenceProjectAccessKey } from "./config.js"
 import { getTrailsClient } from "./trailsClient.js"
 import type { GuestModuleEvent, TrailsTokenSweeperEvent } from "./decoders.js"
-import {
-  arbitrum,
-  base,
-  baseSepolia,
-  optimism,
-  polygon,
-  mainnet,
-  apeChain,
-  arbitrumNova,
-  avalanche,
-  b3,
-  blast,
-  gnosis,
-  soneium,
-  xai,
-  bsc,
-  etherlink,
-  katana,
-} from "viem/chains"
 import { logger } from "./logger.js"
 import { bigintReplacer } from "./utils.js"
 import { getExplorerUrl } from "./explorer.js"
 import { SortOrder } from "@0xsequence/trails-api"
+import { getChainIndexerUrl } from "./indexerClient.js"
 
 export type TransactionStateStatus =
   | "pending"
@@ -202,43 +184,12 @@ export async function getTxTimeDiff(
   }
 }
 
-export function getIndexerUrlFromChainSlug(chainSlug: string) {
-  const env = getSequenceEnv()
-  let envPrefix = ""
-
-  if (env === "dev") {
-    envPrefix = "dev-"
-  }
-
-  return `https://${envPrefix}${chainSlug}-indexer.sequence.app`
-}
-
-const chainIdToIndexerUrl = {
-  [arbitrum.id]: getIndexerUrlFromChainSlug("arbitrum"),
-  [base.id]: getIndexerUrlFromChainSlug("base"),
-  [baseSepolia.id]: getIndexerUrlFromChainSlug("base-sepolia"),
-  [optimism.id]: getIndexerUrlFromChainSlug("optimism"),
-  [polygon.id]: getIndexerUrlFromChainSlug("polygon"),
-  [mainnet.id]: getIndexerUrlFromChainSlug("mainnet"),
-  [apeChain.id]: getIndexerUrlFromChainSlug("apechain"),
-  [arbitrumNova.id]: getIndexerUrlFromChainSlug("arbitrum-nova"),
-  [avalanche.id]: getIndexerUrlFromChainSlug("avalanche"),
-  [b3.id]: getIndexerUrlFromChainSlug("b3"),
-  [blast.id]: getIndexerUrlFromChainSlug("blast"),
-  [gnosis.id]: getIndexerUrlFromChainSlug("gnosis"),
-  [soneium.id]: getIndexerUrlFromChainSlug("soneium"),
-  [xai.id]: getIndexerUrlFromChainSlug("xai"),
-  [bsc.id]: getIndexerUrlFromChainSlug("bsc"),
-  421613: getIndexerUrlFromChainSlug("arbitrum-nova-sepolia"),
-  [etherlink.id]: getIndexerUrlFromChainSlug("etherlink"),
-  [katana.id]: getIndexerUrlFromChainSlug("katana"),
-}
-
 export async function getAccountTransactionHistory({
   chainId,
   accountAddress,
   pageSize = 10,
   page = 1,
+
   includeMetadata = true,
 }: GetAccountTransactionHistoryParams): Promise<TransactionHistoryResponse> {
   const accessKey = getSequenceProjectAccessKey()
@@ -248,8 +199,7 @@ export async function getAccountTransactionHistory({
   }
 
   // Get the chain-specific indexer URL
-  const chainIndexerUrl =
-    chainIdToIndexerUrl[chainId as keyof typeof chainIdToIndexerUrl]
+  const chainIndexerUrl = getChainIndexerUrl(chainId)
   if (!chainIndexerUrl) {
     throw new Error(`Unsupported chain ID: ${chainId}`)
   }