@chainlink/ccip-sdk 1.2.1 → 1.3.1

package/src/evm/index.ts

@@ -34,6 +34,9 @@ import {
   type LogFilter,
   type RateLimiterState,
   type TokenPoolRemote,
+  type TokenTransferFeeConfig,
+  type TokenTransferFeeOpts,
+  type TotalFeesEstimate,
   Chain,
   LaneFeature,
 } from '../chain.ts'
@@ -60,6 +63,7 @@ import {
 } from '../errors/index.ts'
 import type { ExtraArgs } from '../extra-args.ts'
 import type { LeafHasher } from '../hasher/common.ts'
+import { CCTP_FINALITY_FAST, getUsdcBurnFees } from '../offchain.ts'
 import { supportedChains } from '../supported-chains.ts'
 import {
   type CCIPExecution,
@@ -87,6 +91,7 @@ import {
   parseTypeAndVersion,
 } from '../utils.ts'
 import type Token_ABI from './abi/BurnMintERC677Token.ts'
+import type CCTPVerifier_2_0_ABI from './abi/CCTPVerifier_2_0.ts'
 import type FeeQuoter_ABI from './abi/FeeQuoter_1_6.ts'
 import type TokenPool_1_5_ABI from './abi/LockReleaseTokenPool_1_5.ts'
 import type TokenPool_ABI from './abi/LockReleaseTokenPool_1_6_1.ts'
@@ -101,6 +106,8 @@ import type OnRamp_2_0_ABI from './abi/OnRamp_2_0.ts'
 import type Router_ABI from './abi/Router.ts'
 import type TokenAdminRegistry_1_5_ABI from './abi/TokenAdminRegistry_1_5.ts'
 import type TokenPool_2_0_ABI from './abi/TokenPool_2_0.ts'
+import type USDCTokenPoolProxy_2_0_ABI from './abi/USDCTokenPoolProxy_2_0.ts'
+import type VersionedVerifierResolver_2_0_ABI from './abi/VersionedVerifierResolver_2_0.ts'
 import {
   CCV_INDEXER_URL,
   VersionedContractABI,
@@ -241,6 +248,8 @@ export class EVMChain extends Chain<typeof ChainFamily.EVM> {
       maxArgs: 1,
     })
     this.getFeeTokens = memoize(this.getFeeTokens.bind(this), { async: true, maxArgs: 1 })
+    this.detectUsdcDomains = memoize(this.detectUsdcDomains.bind(this))
+    this.resolveVerifier = memoize(this.resolveVerifier.bind(this))
   }
 
   /**
@@ -1018,6 +1027,210 @@ export class EVMChain extends Chain<typeof ChainFamily.EVM> {
     })
   }
 
+  /**
+   * Detect whether a token pool is a USDC/CCTP pool via typeAndVersion, then resolve
+   * the CCTPVerifier address and fetch source/dest CCTP domain IDs.
+   *
+   * @param tokenPool - The token pool address to check.
+   * @param destChainSelector - Destination chain selector for getDomain().
+   * @param ccvs - Cross-chain verifier addresses from extraArgs (fallback for verifier discovery).
+   * @returns Source and dest CCTP domain IDs, or undefined if not a USDC pool.
+   */
+  private async detectUsdcDomains(
+    tokenPool: string,
+    destChainSelector: bigint,
+    ccvs: string[] = [],
+  ): Promise<{ sourceDomain: number; destDomain: number } | undefined> {
+    // 1. Check if pool is USDCTokenPoolProxy
+    let poolType: string
+    try {
+      ;[poolType] = await this.typeAndVersion(tokenPool)
+    } catch {
+      return undefined
+    }
+    if (poolType !== 'USDCTokenPoolProxy') return undefined
+
+    // 2. Find CCTPVerifier address
+    let verifierAddress: string | undefined
+
+    // 2a. Try pool's getStaticConfig (returns resolver/verifier address)
+    try {
+      const proxy = new Contract(
+        tokenPool,
+        interfaces.USDCTokenPoolProxy_v2_0,
+        this.provider,
+      ) as unknown as TypedContract<typeof USDCTokenPoolProxy_2_0_ABI>
+      const [, , cctpVerifier] = await proxy.getStaticConfig()
+      const candidate = cctpVerifier as string
+      if (candidate && candidate !== ZeroAddress) {
+        verifierAddress = await this.resolveVerifier(candidate, destChainSelector)
+      }
+    } catch {
+      /* proxy may not be initialized */
+    }
+
+    // 2b. Fall back to scanning ccvs from extraArgs
+    if (!verifierAddress) {
+      for (const ccv of ccvs) {
+        if (!ccv) continue
+        try {
+          const resolved = await this.resolveVerifier(ccv, destChainSelector)
+          if (resolved) {
+            verifierAddress = resolved
+            break
+          }
+        } catch {
+          /* not a valid contract */
+        }
+      }
+    }
+
+    if (!verifierAddress) return undefined
+
+    // 3. Fetch source and dest CCTP domain IDs from verifier
+    try {
+      const verifier = new Contract(
+        verifierAddress,
+        interfaces.CCTPVerifier_v2_0,
+        this.provider,
+      ) as unknown as TypedContract<typeof CCTPVerifier_2_0_ABI>
+      const [staticConfig, domainResult] = await Promise.all([
+        verifier.getStaticConfig(),
+        verifier.getDomain(destChainSelector),
+      ])
+      return {
+        sourceDomain: Number(staticConfig[3]), // localDomainIdentifier
+        destDomain: Number(domainResult.domainIdentifier),
+      }
+    } catch (err) {
+      if (isError(err, 'CALL_EXCEPTION')) return undefined
+      throw CCIPError.from(err)
+    }
+  }
+
+  /**
+   * Given a candidate address, check if it's a CCTPVerifier or VersionedVerifierResolver
+   * and return the actual verifier address (resolving through the resolver if needed).
+   */
+  private async resolveVerifier(
+    candidate: string,
+    destChainSelector: bigint,
+  ): Promise<string | undefined> {
+    try {
+      const [candidateType] = await this.typeAndVersion(candidate)
+      if (candidateType === 'VersionedVerifierResolver') {
+        const resolver = new Contract(
+          candidate,
+          interfaces.VersionedVerifierResolver_v2_0,
+          this.provider,
+        ) as unknown as TypedContract<typeof VersionedVerifierResolver_2_0_ABI>
+        return (await resolver.getOutboundImplementation(destChainSelector, '0x')) as string
+      }
+      if (candidateType === 'CCTPVerifier') return candidate
+    } catch {
+      /* not a valid versioned contract */
+    }
+    return undefined
+  }
+
+  /** {@inheritDoc Chain.getTotalFeesEstimate} */
+  override async getTotalFeesEstimate(
+    opts: Parameters<Chain['getTotalFeesEstimate']>[0],
+  ): Promise<TotalFeesEstimate> {
+    const tokenAmounts = opts.message.tokenAmounts
+    const ccipFee$ = this.getFee(opts)
+
+    if (!tokenAmounts?.length) {
+      return { ccipFee: await ccipFee$ }
+    }
+
+    const { token, amount } = tokenAmounts[0]!
+
+    // Determine blockConfirmations and tokenArgs from extraArgs
+    const extraArgs = opts.message.extraArgs
+    let blockConfirmations = 0
+    let tokenArgs: string = '0x'
+    if (extraArgs && 'blockConfirmations' in extraArgs) {
+      blockConfirmations = extraArgs.blockConfirmations as number
+      tokenArgs = hexlify(extraArgs.tokenArgs as BytesLike)
+    }
+
+    // Skip pool-level fee lookup for pre-v2.0 lanes
+    const onRamp = await this.getOnRampForRouter(opts.router, opts.destChainSelector)
+    const [, version] = await this.typeAndVersion(onRamp)
+    if (version < CCIPVersion.V2_0) {
+      return { ccipFee: await ccipFee$ }
+    }
+
+    const onRampContract = new Contract(
+      onRamp,
+      interfaces.OnRamp_v2_0,
+      this.provider,
+    ) as unknown as TypedContract<typeof OnRamp_2_0_ABI>
+
+    const poolAddress = (await onRampContract.getPoolBySourceToken(
+      opts.destChainSelector,
+      token,
+    )) as string
+
+    const [ccipFee, { tokenTransferFeeConfig }, usdcDomains] = await Promise.all([
+      ccipFee$,
+      this.getTokenPoolConfig(poolAddress, {
+        destChainSelector: opts.destChainSelector,
+        blockConfirmationsRequested: blockConfirmations,
+        tokenArgs,
+      }),
+      this.detectUsdcDomains(
+        poolAddress,
+        opts.destChainSelector,
+        extraArgs && 'ccvs' in extraArgs ? extraArgs.ccvs : [],
+      ),
+    ])
+
+    // USDC path: use Circle CCTP burn fees
+    if (usdcDomains) {
+      const burnFees = await getUsdcBurnFees(
+        usdcDomains.sourceDomain,
+        usdcDomains.destDomain,
+        this.network.networkType,
+      )
+      const fast = blockConfirmations > 0
+      // Tiers are sorted ascending by finalityThreshold; findLast for fast ensures
+      // we pick the highest tier still within the fast threshold.
+      const tier = fast
+        ? burnFees.findLast((t) => t.finalityThreshold <= CCTP_FINALITY_FAST)
+        : burnFees.find((t) => t.finalityThreshold > CCTP_FINALITY_FAST)
+      if (tier && tier.minimumFee > 0) {
+        return {
+          ccipFee,
+          tokenTransferFee: {
+            feeDeducted: (BigInt(amount) * BigInt(tier.minimumFee)) / 10_000n,
+            bps: tier.minimumFee,
+          },
+        }
+      }
+      return { ccipFee }
+    }
+
+    // Non-USDC path: use on-chain tokenTransferFeeConfig
+    if (!tokenTransferFeeConfig || !tokenTransferFeeConfig.isEnabled) {
+      return { ccipFee }
+    }
+
+    const useCustom = blockConfirmations > 0
+    const bps = useCustom
+      ? tokenTransferFeeConfig.customBlockConfirmationsTransferFeeBps
+      : tokenTransferFeeConfig.defaultBlockConfirmationsTransferFeeBps
+
+    return {
+      ccipFee,
+      tokenTransferFee: {
+        feeDeducted: (BigInt(amount) * BigInt(bps)) / 10_000n,
+        bps,
+      },
+    }
+  }
+
   /**
    * Generates unsigned EVM transactions for sending a CCIP message.
    *
@@ -1426,44 +1639,84 @@ export class EVMChain extends Chain<typeof ChainFamily.EVM> {
    * Fetches the token pool configuration for an EVM token pool contract.
    *
    * @param tokenPool - Token pool contract address.
-   * @returns Token pool config containing token, router, typeAndVersion, and optionally minBlockConfirmations.
+   * @param feeOpts - Optional parameters to also fetch token transfer fee config.
+   * @returns Token pool config containing token, router, typeAndVersion, and optionally
+   *          minBlockConfirmations and tokenTransferFeeConfig.
    *
    * @remarks
    * For pools with version \>= 2.0, also returns `minBlockConfirmations` for
    * Faster-Than-Finality (FTF) support. Pre-2.0 pools omit this field.
+   * When `feeOpts` is provided and the pool is v2.0+, also fetches token transfer fee config.
    */
-  async getTokenPoolConfig(tokenPool: string): Promise<{
+  async getTokenPoolConfig(
+    tokenPool: string,
+    feeOpts?: TokenTransferFeeOpts,
+  ): Promise<{
     token: string
     router: string
     typeAndVersion: string
     minBlockConfirmations?: number
+    tokenTransferFeeConfig?: TokenTransferFeeConfig
   }> {
     const [_, version, typeAndVersion] = await this.typeAndVersion(tokenPool)
 
-    let contract, router, minBlockConfirmations
+    let token, router, minBlockConfirmations, tokenTransferFeeConfig
     if (version < CCIPVersion.V2_0) {
-      contract = new Contract(
+      const contract = new Contract(
         tokenPool,
         interfaces.TokenPool_v1_6,
         this.provider,
       ) as unknown as TypedContract<typeof TokenPool_ABI>
+      token = contract.getToken()
       router = contract.getRouter()
     } else {
-      contract = new Contract(
+      const contract = new Contract(
         tokenPool,
         interfaces.TokenPool_v2_0,
         this.provider,
       ) as unknown as TypedContract<typeof TokenPool_2_0_ABI>
+      token = contract.getToken()
       router = contract.getDynamicConfig().then(([router]) => router)
       minBlockConfirmations = contract.getMinBlockConfirmations().catch((err) => {
         if (isError(err, 'CALL_EXCEPTION')) return 0
         throw CCIPError.from(err)
       })
+      if (feeOpts) {
+        tokenTransferFeeConfig = token.then((tokenAddr) =>
+          contract
+            .getTokenTransferFeeConfig(
+              tokenAddr as string,
+              feeOpts.destChainSelector,
+              BigInt(feeOpts.blockConfirmationsRequested),
+              feeOpts.tokenArgs,
+            )
+            .then((result) => ({
+              destGasOverhead: Number(result.destGasOverhead),
+              destBytesOverhead: Number(result.destBytesOverhead),
+              defaultBlockConfirmationsFeeUSDCents: Number(
+                result.defaultBlockConfirmationsFeeUSDCents,
+              ),
+              customBlockConfirmationsFeeUSDCents: Number(
+                result.customBlockConfirmationsFeeUSDCents,
+              ),
+              defaultBlockConfirmationsTransferFeeBps: Number(
+                result.defaultBlockConfirmationsTransferFeeBps,
+              ),
+              customBlockConfirmationsTransferFeeBps: Number(
+                result.customBlockConfirmationsTransferFeeBps,
+              ),
+              isEnabled: result.isEnabled,
+            }))
+            .catch((err) => {
+              if (isError(err, 'CALL_EXCEPTION')) return undefined
+              throw CCIPError.from(err, 'UNKNOWN')
+            }),
+        )
+      }
     }
-    const token = contract.getToken()
 
-    return Promise.all([token, router, minBlockConfirmations]).then(
-      ([token, router, minBlockConfirmations]) => {
+    return Promise.all([token, router, minBlockConfirmations, tokenTransferFeeConfig]).then(
+      ([token, router, minBlockConfirmations, tokenTransferFeeConfig]) => {
         return {
           token: token as CleanAddressable<typeof token>,
           router: router as CleanAddressable<typeof router>,
@@ -1471,6 +1724,7 @@ export class EVMChain extends Chain<typeof ChainFamily.EVM> {
           ...(minBlockConfirmations != null && {
             minBlockConfirmations: Number(minBlockConfirmations),
           }),
+          ...(tokenTransferFeeConfig != null && { tokenTransferFeeConfig }),
         }
       },
     )

package/src/index.ts

@@ -37,6 +37,10 @@ export type {
   TokenInfo,
   TokenPoolConfig,
   TokenPoolRemote,
+  TokenTransferFee,
+  TokenTransferFeeConfig,
+  TokenTransferFeeOpts,
+  TotalFeesEstimate,
 } from './chain.ts'
 export { DEFAULT_API_RETRY_CONFIG, LaneFeature } from './chain.ts'
 export { calculateManualExecProof, discoverOffRamp } from './execution.ts'
@@ -51,8 +55,8 @@ export {
   encodeExtraArgs,
 } from './extra-args.ts'
 export { estimateReceiveExecution } from './gas.ts'
-export { getOffchainTokenData } from './offchain.ts'
-export { decodeMessage, getMessagesForSender, sourceToDestTokenAddresses } from './requests.ts'
+export { CCTP_FINALITY_FAST, CCTP_FINALITY_STANDARD, getOffchainTokenData } from './offchain.ts'
+export { decodeMessage, sourceToDestTokenAddresses } from './requests.ts'
 export {
   type CCIPExecution,
   type CCIPMessage,

package/src/offchain.ts

@@ -5,10 +5,11 @@ import {
   CCIPLbtcAttestationNotApprovedError,
   CCIPLbtcAttestationNotFoundError,
   CCIPUsdcAttestationError,
+  CCIPUsdcBurnFeesError,
 } from './errors/index.ts'
 import { parseSourceTokenData } from './evm/messages.ts'
 import { type CCIPRequest, type OffchainTokenData, type WithLogger, NetworkType } from './types.ts'
-import { getDataBytes, networkInfo } from './utils.ts'
+import { fetchWithTimeout, getDataBytes, networkInfo } from './utils.ts'
 
 const CIRCLE_API_URL = {
   mainnet: 'https://iris-api.circle.com',
@@ -60,6 +61,57 @@ export async function getUsdcAttestation(
   return att
 }
 
+/**
+ * CCTP V2 finality tier identifiers returned by Circle's burn-fees API.
+ *
+ * These are **opaque tier IDs**, not block counts or durations.
+ * The CCTP V2 whitepaper (Section 8, Table 2) defines exactly two tiers today;
+ * additional tiers may be added in the future (the wide spacing between values
+ * is intentional to leave room).
+ *
+ * @see https://developers.circle.com/cctp/concepts/fees
+ * @see CCTP V2 Whitepaper, Section 8 — "Finality Levels"
+ */
+
+/** Fast / pre-finality tier: attested seconds after soft confirmation. */
+export const CCTP_FINALITY_FAST = 1000
+
+/** Standard / finalized tier: attested after full on-chain finality. */
+export const CCTP_FINALITY_STANDARD = 2000
+
+/**
+ * Fetches USDC burn fee tiers from Circle's CCTP API.
+ *
+ * @param sourceDomain - CCTP source domain identifier
+ * @param destDomain - CCTP destination domain identifier
+ * @param networkType - network type (mainnet or testnet)
+ * @returns Array of fee tiers with finality thresholds and BPS fees
+ */
+export async function getUsdcBurnFees(
+  sourceDomain: number,
+  destDomain: number,
+  networkType: NetworkType,
+): Promise<{ finalityThreshold: number; minimumFee: number }[]> {
+  const baseUrl =
+    networkType === NetworkType.Mainnet ? CIRCLE_API_URL.mainnet : CIRCLE_API_URL.testnet
+  const url = `${baseUrl}/v2/burn/USDC/fees/${sourceDomain}/${destDomain}`
+  const res = await fetchWithTimeout(url, 'getUsdcBurnFees')
+  if (!res.ok) {
+    throw new CCIPUsdcBurnFeesError(sourceDomain, destDomain, res.status)
+  }
+  const json: unknown = await res.json()
+  if (!Array.isArray(json)) {
+    throw new CCIPUsdcBurnFeesError(sourceDomain, destDomain, res.status)
+  }
+  for (const tier of json) {
+    const t = tier as Record<string, unknown>
+    if (typeof t.finalityThreshold !== 'number' || typeof t.minimumFee !== 'number') {
+      throw new CCIPUsdcBurnFeesError(sourceDomain, destDomain, res.status)
+    }
+  }
+  return json as { finalityThreshold: number; minimumFee: number }[]
+}
+
 const LOMBARD_API_URL = {
   mainnet: 'https://mainnet.prod.lombard.finance',
   testnet: 'https://gastald-testnet.prod.lombard.finance',

package/src/requests.ts

@@ -1,7 +1,7 @@
 import { type BytesLike, hexlify, isBytesLike, toBigInt } from 'ethers'
 import type { PickDeep } from 'type-fest'
 
-import { type ChainStatic, type LogFilter, Chain } from './chain.ts'
+import { type ChainStatic, Chain } from './chain.ts'
 import {
   CCIPChainFamilyUnsupportedError,
   CCIPMessageBatchIncompleteError,
@@ -393,64 +393,6 @@ export async function getMessagesInBatch<
   return messages
 }
 
-/**
- * Fetches CCIP requests originated by a specific sender.
- * @param source - Source chain instance.
- * @param sender - Sender address.
- * @param filter - Log filter options.
- * @returns Async generator of CCIP requests.
- * @throws {@link CCIPChainFamilyUnsupportedError} if chain family not supported for legacy messages
- *
- * @example
- * ```typescript
- * import { getMessagesForSender, EVMChain } from '@chainlink/ccip-sdk'
- *
- * const chain = await EVMChain.fromUrl('https://rpc.sepolia.org')
- *
- * for await (const request of getMessagesForSender(chain, '0xSenderAddress', {})) {
- *   console.log('Message ID:', request.message.messageId)
- *   console.log('Destination:', request.lane.destChainSelector)
- * }
- * ```
- *
- * @see {@link getMessagesInTx} - Fetch from specific transaction
- * @see {@link getMessageById} - Search by messageId
- */
-export async function* getMessagesForSender(
-  source: Chain,
-  sender: string,
-  filter: Pick<LogFilter, 'address' | 'startBlock' | 'startTime' | 'endBlock'>,
-): AsyncGenerator<Omit<CCIPRequest, 'tx' | 'timestamp'>, void, unknown> {
-  const filterWithSender = {
-    ...filter,
-    sender, // some chain families may use this to look for account lookup/narrow down the search
-    topics: ['CCIPSendRequested', 'CCIPMessageSent'],
-  }
-  for await (const log of source.getLogs(filterWithSender)) {
-    const message = (source.constructor as ChainStatic).decodeMessage(log)
-    if (message?.sender !== sender) continue
-    let destChainSelector, version
-    if ('destChainSelector' in message) {
-      destChainSelector = message.destChainSelector
-      ;[, version] = await source.typeAndVersion(log.address)
-    } else if (source.network.family === ChainFamily.EVM) {
-      ;({ destChainSelector, version } = await (source as EVMChain).getLaneForOnRamp(log.address))
-    } else {
-      throw new CCIPChainFamilyUnsupportedError(source.network.family)
-    }
-    yield {
-      lane: {
-        sourceChainSelector: source.network.chainSelector,
-        destChainSelector,
-        onRamp: log.address,
-        version: version as CCIPVersion,
-      },
-      message,
-      log,
-    }
-  }
-}
-
 /**
  * Map source token to its pool address and destination token address.
  *

package/src/solana/index.ts

@@ -35,6 +35,7 @@ import {
   type LogFilter,
   type TokenInfo,
   type TokenPoolRemote,
+  type TokenTransferFeeOpts,
   Chain,
 } from '../chain.ts'
 import {
@@ -1366,7 +1367,10 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
    * {@inheritDoc Chain.getTokenPoolConfig}
    * @throws {@link CCIPTokenPoolStateNotFoundError} if token pool state not found
    */
-  async getTokenPoolConfig(tokenPool: string): Promise<{
+  async getTokenPoolConfig(
+    tokenPool: string,
+    _feeOpts?: TokenTransferFeeOpts,
+  ): Promise<{
     token: string
     router: string
     tokenPoolProgram: string
@@ -1641,15 +1645,12 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
       message.extraArgs.allowOutOfOrderExecution != null
         ? message.extraArgs.allowOutOfOrderExecution
         : true
-    const tokenReceiver =
-      message.extraArgs &&
-      'tokenReceiver' in message.extraArgs &&
-      message.extraArgs.tokenReceiver != null &&
-      typeof message.extraArgs.tokenReceiver === 'string'
-        ? message.extraArgs.tokenReceiver
+    const [tokenReceiver, receiver] =
+      message.extraArgs && 'tokenReceiver' in message.extraArgs && !!message.extraArgs.tokenReceiver
+        ? [message.extraArgs.tokenReceiver, message.receiver] // explicit tokenReceiver, keep both
         : message.tokenAmounts?.length
-          ? this.getAddress(message.receiver)
-          : PublicKey.default.toBase58()
+          ? [this.getAddress(message.receiver), PublicKey.default.toBase58()] // if sending tokens without tokenReceiver, set receiver to default and tokenReceiver to message.receiver
+          : [PublicKey.default.toBase58(), message.receiver] // otherwise, tokenReceiver is default and receiver is message.receiver
     const accounts =
       message.extraArgs && 'accounts' in message.extraArgs && message.extraArgs.accounts != null
         ? message.extraArgs.accounts
@@ -1671,9 +1672,8 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
 
     return {
       ...message,
+      receiver,
       extraArgs,
-      // if tokenReceiver, then message.receiver can (must?) be default
-      ...(!!message.tokenAmounts?.length && { receiver: PublicKey.default.toBase58() }),
     }
   }
 }

package/src/solana/utils.ts

@@ -27,7 +27,7 @@ import {
   CCIPTransactionNotFinalizedError,
 } from '../errors/index.ts'
 import type { ChainLog, WithLogger } from '../types.ts'
-import { bigIntReplacer, getDataBytes, sleep } from '../utils.ts'
+import { bigIntReplacer, getDataBytes, isBase64, sleep } from '../utils.ts'
 import type { IDL as BASE_TOKEN_POOL_IDL } from './idl/1.6.0/BASE_TOKEN_POOL.ts'
 import type { UnsignedSolanaTx, Wallet } from './types.ts'
 import type { RateLimiterState } from '../chain.ts'
@@ -217,7 +217,7 @@ export function parseSolanaLogs(logs: readonly string[]): ParsedLog[] {
 export function getErrorFromLogs(
   logs_:
     | readonly string[]
-    | readonly Pick<ChainLog, 'address' | 'index' | 'data' | 'topics'>[]
+    | readonly Pick<ChainLog, 'address' | 'index' | 'data' | 'topics' | 'tx'>[]
     | null,
 ): { program: string; [k: string]: string } | undefined {
   if (!logs_?.length) return
@@ -234,12 +234,13 @@ export function getErrorFromLogs(
         !acc.length || (l.address === acc[0]!.address && !l.topics.length) ? [l, ...acc] : acc,
       [] as Pick<ChainLog, 'address' | 'index' | 'data'>[],
     )
+    .filter(({ data }) => !isBase64(data))
     .map(({ data }) => data as string)
     .reduceRight(
       (acc, l) =>
         l.endsWith(':') && acc.length
           ? [`${l} ${acc[0]}`, ...acc.slice(1)]
-          : l.split(': ').length > 1 && l.split('. ').length > 1
+          : l.indexOf(': ') >= 0 && l.indexOf('. ') >= 0
             ? [...l.replace(/\.$/, '').split('. '), ...acc]
             : [l, ...acc],
       [] as string[],
@@ -261,22 +262,28 @@ export function getErrorFromLogs(
         return l
       }
     })
-  if (lastProgramLogs.every((l) => l.indexOf(': ') >= 0)) {
-    return {
-      program: lastLog.address,
-      ...Object.fromEntries(
-        lastProgramLogs.map((l) => [
-          l.substring(0, l.indexOf(': ')),
-          l.substring(l.indexOf(': ') + 2),
-        ]),
-      ),
-    }
+
+  const res: { program: string; [k: string]: string } = {
+    program: lastLog.address,
+  }
+  if (lastProgramLogs.every((l) => l.indexOf(': ') >= 0 || l.indexOf(' in ') >= 0)) {
+    Object.assign(
+      res,
+      Object.fromEntries(lastProgramLogs.map((l) => l.split(/: | in /, 2) as [string, string])),
+    )
   } else {
-    return {
-      program: lastLog.address,
-      error: lastProgramLogs.join('\n'),
-    }
+    res['error'] = lastProgramLogs.join('\n')
   }
+  if (!!logs[0] && 'tx' in logs[0] && !!logs[0].tx?.error)
+    Object.assign(
+      res,
+      Object.fromEntries(
+        Object.entries(logs[0].tx.error as Record<string, [number, string]>).map(
+          ([k, [i, e]]) => [`${k}[${i}]`, e] as const,
+        ),
+      ),
+    )
+  return res
 }
 
 /**

package/src/sui/index.ts

@@ -12,6 +12,7 @@ import {
   type ChainStatic,
   type GetBalanceOpts,
   type LogFilter,
+  type TokenTransferFeeOpts,
   Chain,
 } from '../chain.ts'
 import { getCcipStateAddress, getOffRampForCcip } from './discovery.ts'
@@ -793,7 +794,7 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
   }
 
   /** {@inheritDoc Chain.getTokenPoolConfig} */
-  async getTokenPoolConfig(_tokenPool: string): Promise<never> {
+  async getTokenPoolConfig(_tokenPool: string, _feeOpts?: TokenTransferFeeOpts): Promise<never> {
     return Promise.reject(new CCIPNotImplementedError('SuiChain.getTokenPoolConfig'))
   }