@chainlink/ccip-sdk 0.97.0 → 1.1.0

package/src/solana/index.ts

@@ -77,15 +77,14 @@ import {
   type CCIPMessage,
   type CCIPRequest,
   type CCIPVerifications,
+  type ChainLog,
   type ChainTransaction,
   type CommitReport,
   type ExecutionInput,
   type ExecutionReceipt,
   type Lane,
-  type Log_,
   type MergeArrayElements,
   type NetworkInfo,
-  type OffchainTokenData,
   type WithLogger,
   CCIPVersion,
   ChainFamily,
@@ -113,7 +112,6 @@ import { IDL as CCIP_CCTP_TOKEN_POOL } from './idl/1.6.0/CCIP_CCTP_TOKEN_POOL.ts
 import { IDL as CCIP_OFFRAMP_IDL } from './idl/1.6.0/CCIP_OFFRAMP.ts'
 import { IDL as CCIP_ROUTER_IDL } from './idl/1.6.0/CCIP_ROUTER.ts'
 import { getTransactionsForAddress } from './logs.ts'
-import { fetchSolanaOffchainTokenData } from './offchain.ts'
 import { generateUnsignedCcipSend, getFee } from './send.ts'
 import { type CCIPMessage_V1_6_Solana, type UnsignedSolanaTx, isWallet } from './types.ts'
 import {
@@ -160,7 +158,7 @@ const unknownTokens: { [mint: string]: string } = {
 }
 
 /** Solana-specific log structure with transaction reference and log level. */
-export type SolanaLog = Log_ & { tx: SolanaTransaction; data: string; level: number }
+export type SolanaLog = ChainLog & { tx: SolanaTransaction; data: string; level: number }
 /** Solana-specific transaction structure with versioned transaction response. */
 export type SolanaTransaction = MergeArrayElements<
   ChainTransaction,
@@ -430,13 +428,13 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
    *   - `watch`: Watch for new logs
    *   - `programs`: Special option to allow querying by address of interest, but yielding matching
    *     logs from specific (string address) program or any (true)
-   * @returns AsyncIterableIterator of parsed Log_ objects.
+   * @returns AsyncIterableIterator of parsed ChainLog objects.
    * @throws {@link CCIPLogsAddressRequiredError} if address is not provided
    * @throws {@link CCIPTopicsInvalidError} if topics contain invalid values
    */
   async *getLogs(
     opts: LogFilter & { programs?: string[] | true },
-  ): AsyncGenerator<Log_ & { tx: SolanaTransaction }> {
+  ): AsyncGenerator<ChainLog & { tx: SolanaTransaction }> {
     let programs: true | string[]
     if (!opts.address) {
       throw new CCIPLogsAddressRequiredError()
@@ -895,7 +893,7 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
    * @throws {@link CCIPLogDataMissingError} if log data is missing
    */
   static decodeCommits(
-    log: Pick<Log_, 'data'>,
+    log: Pick<ChainLog, 'data'>,
     lane?: Omit<Lane, 'destChainSelector'>,
   ): CommitReport[] | undefined {
     // Check if this is a CommitReportAccepted event by looking at the discriminant
@@ -950,7 +948,7 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
    * @throws {@link CCIPLogDataMissingError} if log data is missing
    * @throws {@link CCIPExecutionStateInvalidError} if execution state is invalid
    */
-  static decodeReceipt(log: Pick<Log_, 'data' | 'tx' | 'index'>): ExecutionReceipt | undefined {
+  static decodeReceipt(log: Pick<ChainLog, 'data' | 'tx' | 'index'>): ExecutionReceipt | undefined {
     // Check if this is a ExecutionStateChanged event by looking at the discriminant
     if (!log.data || typeof log.data !== 'string') {
       throw new CCIPLogDataMissingError()
@@ -983,7 +981,7 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
     } else throw new CCIPExecutionStateInvalidError(util.inspect(decoded.data.state))
 
     let returnData
-    if (log.tx) {
+    if (log.tx?.logs) {
       // use only last receipt per tx+message (i.e. skip intermediary InProgress=1 states for Solana)
       const laterReceiptLog = log.tx.logs
         .filter((l) => l.index > log.index)
@@ -1107,11 +1105,6 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
     return (await this.getMessagesInTx(await this.getTransaction(hash)))[0]!
   }
 
-  /** {@inheritDoc Chain.getOffchainTokenData} */
-  async getOffchainTokenData(request: CCIPRequest): Promise<OffchainTokenData[]> {
-    return fetchSolanaOffchainTokenData(request, this)
-  }
-
   /**
    * {@inheritDoc Chain.generateUnsignedExecute}
    * @returns instructions - array of instructions to execute the report
@@ -1209,13 +1202,13 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
       if (Array.isArray(data)) {
         if (data.every((e) => typeof e === 'string')) return getErrorFromLogs(data)
         else if (data.every((e) => typeof e === 'object' && 'data' in e && 'address' in e))
-          return getErrorFromLogs(data as Log_[])
+          return getErrorFromLogs(data as ChainLog[])
       } else if (typeof data === 'object') {
         if ('transactionLogs' in data && 'transactionMessage' in data) {
-          const parsed = getErrorFromLogs(data.transactionLogs as Log_[] | string[])
+          const parsed = getErrorFromLogs(data.transactionLogs as ChainLog[] | string[])
           if (parsed) return { message: data.transactionMessage, ...parsed }
         }
-        if ('logs' in data) return getErrorFromLogs(data.logs as Log_[] | string[])
+        if ('logs' in data) return getErrorFromLogs(data.logs as ChainLog[] | string[])
       } else if (typeof data === 'string') {
         const parsedExtraArgs = this.decodeExtraArgs(getDataBytes(data))
         if (parsedExtraArgs) return parsedExtraArgs
@@ -1597,6 +1590,23 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
   static override buildMessageForDest(
     message: Parameters<ChainStatic['buildMessageForDest']>[0],
   ): AnyMessage & { extraArgs: SVMExtraArgsV1 } {
+    /** Valid field names for SVMExtraArgsV1, including recognised aliases. */
+    const SVM_EXTRA_ARGS_FIELDS = new Set([
+      'computeUnits',
+      'gasLimit', // alias for computeUnits
+      'allowOutOfOrderExecution',
+      'tokenReceiver',
+      'accounts',
+      'accountIsWritableBitmap',
+    ])
+    if (message.extraArgs) {
+      const unknown = Object.keys(message.extraArgs).filter((k) => !SVM_EXTRA_ARGS_FIELDS.has(k))
+      if (unknown.length)
+        throw new CCIPArgumentInvalidError(
+          'extraArgs',
+          `unknown field(s) for SVMExtraArgsV1: ${unknown.map((k) => JSON.stringify(k)).join(', ')}`,
+        )
+    }
     if (
       !(
         message.extraArgs &&

package/src/solana/offchain.ts

@@ -1,29 +1,10 @@
-import { type BN, BorshCoder } from '@coral-xyz/anchor'
-import type { PublicKey } from '@solana/web3.js'
+import { BorshCoder } from '@coral-xyz/anchor'
 import { hexlify } from 'ethers'
 
-import {
-  CCIPCctpDecodeError,
-  CCIPCctpMultipleEventsError,
-  CCIPDataFormatUnsupportedError,
-} from '../errors/index.ts'
-import { getUsdcAttestation } from '../offchain.ts'
-import type { CCIPMessage, CCIPRequest, OffchainTokenData, WithLogger } from '../types.ts'
-import { bytesToBuffer, networkInfo, util } from '../utils.ts'
+import type { OffchainTokenData } from '../types.ts'
+import { bytesToBuffer } from '../utils.ts'
 import { IDL as BASE_TOKEN_POOL } from './idl/1.6.0/BASE_TOKEN_POOL.ts'
 import { IDL as CCTP_TOKEN_POOL } from './idl/1.6.0/CCIP_CCTP_TOKEN_POOL.ts'
-import type { SolanaLog, SolanaTransaction } from './index.ts'
-import { hexDiscriminator } from './utils.ts'
-
-interface CcipCctpMessageSentEvent {
-  originalSender: PublicKey
-  remoteChainSelector: BN
-  msgTotalNonce: BN
-  eventAddress: PublicKey
-  sourceDomain: number
-  cctpNonce: BN
-  messageSentBytes: Uint8Array
-}
 
 interface CcipCctpMessageAndAttestation {
   message: {
@@ -38,84 +19,6 @@ const cctpTokenPoolCoder = new BorshCoder({
   errors: [...BASE_TOKEN_POOL.errors, ...CCTP_TOKEN_POOL.errors],
 })
 
-/**
- * Analyzes a Solana transaction to extract CcipCctpMessageSentEvent, fetch Circle attestation,
- * and encode the data in the format required by the destination chain.
- * @param request - CCIP request containing transaction data and chain routing info.
- * @param logger - Logger instance for logging messages.
- * @returns Array of encoded offchain token data (only one supported for Solana right now).
- * @throws Error if transaction hash is missing or CcipCctpMessageSentEvent parsing fails.
- */
-export async function fetchSolanaOffchainTokenData(
-  request: Pick<CCIPRequest, 'tx' | 'lane'> & {
-    message: CCIPMessage
-    log: Pick<CCIPRequest['log'], 'topics' | 'index' | 'transactionHash' | 'address'>
-  },
-  { logger = console }: WithLogger = {},
-): Promise<OffchainTokenData[]> {
-  if (!request.message.tokenAmounts.length) {
-    return []
-  }
-
-  if (request.message.tokenAmounts.length > 1) {
-    throw new CCIPDataFormatUnsupportedError(
-      `Expected at most 1 token transfer, found ${request.message.tokenAmounts.length}`,
-    )
-  }
-
-  const { networkType } = networkInfo(request.lane.sourceChainSelector)
-  const txSignature = request.log.transactionHash
-
-  // Parse Solana transaction to find CCTP event
-  const tx = request.tx as SolanaTransaction
-  const log = request.log as SolanaLog
-  const logMessages = tx.tx.meta!.logMessages!
-  // there may have multiple ccipSend calls in same tx;
-  // use `invoke [level]` to filter only logs inside this call
-  const requestInvokeIdx = logMessages.findLastIndex(
-    (l, i) => i < log.index && l === `Program ${request.log.address} invoke [${log.level}]`,
-  )
-  const cctpEvents = []
-  for (const l of tx.logs) {
-    if (requestInvokeIdx >= l.index || l.index >= log.index) continue
-    if (l.topics[0] !== hexDiscriminator('CcipCctpMessageSentEvent')) continue
-    const decoded = cctpTokenPoolCoder.events.decode(l.data)
-    if (!decoded) throw new CCIPCctpDecodeError(util.inspect(l))
-    cctpEvents.push(decoded.data as unknown as CcipCctpMessageSentEvent)
-  }
-  const offchainTokenData: OffchainTokenData[] = request.message.tokenAmounts.map(() => undefined)
-
-  // If no CcipCctpMessageSentEvent found, return defaults so we don't block execution
-  if (cctpEvents.length === 0) {
-    logger.debug('No USDC/CCTP events found')
-    return offchainTokenData
-  }
-
-  // Currently, we only support ONE token per transfer
-  if (cctpEvents.length > 1) {
-    throw new CCIPCctpMultipleEventsError(cctpEvents.length, txSignature)
-  }
-
-  // NOTE: assuming USDC token is the first (and only) token in the CCIP message, we will process the CCTP event.
-  // If later multi-token transfers support is added, we need to add more info in order to match each token with it's event and offchainTokenData.
-  const cctpEvent = cctpEvents[0]
-  if (cctpEvent) {
-    const message = hexlify(cctpEvent.messageSentBytes)
-    try {
-      // Extract message bytes to fetch circle's attestation and then encode offchainTokenData.
-      const attestation = await getUsdcAttestation(message, networkType)
-
-      offchainTokenData[0] = { _tag: 'usdc', message, attestation }
-    } catch (error) {
-      logger.warn(`❌ Solana CCTP: Failed to fetch attestation for ${txSignature}:`, message, error)
-    }
-  }
-
-  logger.debug('Got Solana offchain token data', offchainTokenData)
-
-  return offchainTokenData
-}
-
 /**
  * Encodes CCTP message and attestation
  *

package/src/solana/utils.ts

@@ -26,7 +26,7 @@ import {
   CCIPTokenMintNotFoundError,
   CCIPTransactionNotFinalizedError,
 } from '../errors/index.ts'
-import type { Log_, WithLogger } from '../types.ts'
+import type { ChainLog, WithLogger } from '../types.ts'
 import { getDataBytes, 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'
@@ -143,7 +143,7 @@ export function camelToSnakeCase(str: string): string {
     .replace(/^_/, '')
 }
 
-type ParsedLog = Pick<Log_, 'topics' | 'index' | 'address' | 'data'> & {
+type ParsedLog = Pick<ChainLog, 'topics' | 'index' | 'address' | 'data'> & {
   data: string
   level: number
 }
@@ -160,7 +160,7 @@ type ParsedLog = Pick<Log_, 'topics' | 'index' | 'address' | 'data'> & {
  * This function:
  * 1. Tracks the program call stack to determine which program emitted each log
  * 2. Extracts the first 8 bytes from base64 "Program data:" logs as topics (event discriminants)
- * 3. Converts logs to EVM-compatible Log_ format for CCIP compatibility
+ * 3. Converts logs to EVM-compatible ChainLog format for CCIP compatibility
  * 4. Returns ALL logs from the transaction - filtering should be done by the caller
  *
  * @param logs - Array of logMessages from Solana transaction
@@ -215,7 +215,10 @@ export function parseSolanaLogs(logs: readonly string[]): ParsedLog[] {
  * @returns Parsed error info with program and error details.
  */
 export function getErrorFromLogs(
-  logs_: readonly string[] | readonly Pick<Log_, 'address' | 'index' | 'data' | 'topics'>[] | null,
+  logs_:
+    | readonly string[]
+    | readonly Pick<ChainLog, 'address' | 'index' | 'data' | 'topics'>[]
+    | null,
 ): { program: string; [k: string]: string } | undefined {
   if (!logs_?.length) return
   let logs
@@ -229,7 +232,7 @@ export function getErrorFromLogs(
       (acc, l) =>
         // if acc is empty (i.e. on last log), or it is emitted by the same program and not a Program data:
         !acc.length || (l.address === acc[0]!.address && !l.topics.length) ? [l, ...acc] : acc,
-      [] as Pick<Log_, 'address' | 'index' | 'data'>[],
+      [] as Pick<ChainLog, 'address' | 'index' | 'data'>[],
     )
     .map(({ data }) => data as string)
     .reduceRight(

package/src/sui/index.ts

@@ -25,6 +25,7 @@ import {
   getReceiverModule,
 } from './objects.ts'
 import {
+  CCIPArgumentInvalidError,
   CCIPContractNotRouterError,
   CCIPDataFormatUnsupportedError,
   CCIPError,
@@ -47,15 +48,14 @@ import {
   type CCIPMessage,
   type CCIPRequest,
   type CCIPVersion,
+  type ChainLog,
   type ChainTransaction,
   type CommitReport,
   type ExecutionInput,
   type ExecutionReceipt,
   type ExecutionState,
   type Lane,
-  type Log_,
   type NetworkInfo,
-  type OffchainTokenData,
   type WithLogger,
   ChainFamily,
 } from '../types.ts'
@@ -181,7 +181,7 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
     })
 
     // Extract events from the transaction
-    const events: Log_[] = []
+    const events: ChainLog[] = []
     if (txResponse.events?.length) {
       for (const [i, event] of txResponse.events.entries()) {
         const eventType = event.type
@@ -576,7 +576,7 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
    * @returns Decoded CCIPMessage or undefined if not valid.
    * @throws {@link CCIPSuiLogInvalidError} if log data format is invalid
    */
-  static decodeMessage(log: Log_): CCIPMessage | undefined {
+  static decodeMessage(log: ChainLog): CCIPMessage | undefined {
     const { data } = log
     if (
       (typeof data !== 'string' || !data.startsWith('{')) &&
@@ -622,7 +622,7 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
    * @returns Array of decoded commit reports or undefined.
    */
   static decodeCommits(
-    { data, topics }: SetOptional<Pick<Log_, 'data' | 'topics'>, 'topics'>,
+    { data, topics }: SetOptional<Pick<ChainLog, 'data' | 'topics'>, 'topics'>,
     lane?: Lane,
   ): CommitReport[] | undefined {
     // Check if this is an CommitReportAccepted event
@@ -658,7 +658,7 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
   static decodeReceipt({
     data,
     topics,
-  }: SetOptional<Pick<Log_, 'data' | 'topics'>, 'topics'>): ExecutionReceipt | undefined {
+  }: SetOptional<Pick<ChainLog, 'data' | 'topics'>, 'topics'>): ExecutionReceipt | undefined {
     // Check if this is an ExecutionStateChanged event
     if (topics?.[0] && topics[0] !== 'ExecutionStateChanged') return
 
@@ -728,12 +728,6 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
     return Promise.reject(new CCIPNotImplementedError('SuiChain.sendMessage'))
   }
 
-  /** {@inheritDoc Chain.getOffchainTokenData} */
-  getOffchainTokenData(request: CCIPRequest): Promise<OffchainTokenData[]> {
-    // default offchain token data
-    return Promise.resolve(request.message.tokenAmounts.map(() => undefined))
-  }
-
   /** {@inheritDoc Chain.generateUnsignedExecute} */
   override generateUnsignedExecute(
     _opts: Parameters<Chain['generateUnsignedExecute']>[0],
@@ -888,6 +882,22 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
   static override buildMessageForDest(
     message: Parameters<ChainStatic['buildMessageForDest']>[0],
   ): AnyMessage & { extraArgs: SuiExtraArgsV1 } {
+    /** Valid field names for SuiExtraArgsV1, including recognised aliases. */
+    const SUI_EXTRA_ARGS_FIELDS = new Set([
+      'gasLimit',
+      'allowOutOfOrderExecution',
+      'tokenReceiver',
+      'receiverObjectIds',
+      'accounts', // alias for receiverObjectIds
+    ])
+    if (message.extraArgs) {
+      const unknown = Object.keys(message.extraArgs).filter((k) => !SUI_EXTRA_ARGS_FIELDS.has(k))
+      if (unknown.length)
+        throw new CCIPArgumentInvalidError(
+          'extraArgs',
+          `unknown field(s) for SuiExtraArgsV1: ${unknown.map((k) => JSON.stringify(k)).join(', ')}`,
+        )
+    }
     const gasLimit =
       message.extraArgs && 'gasLimit' in message.extraArgs && message.extraArgs.gasLimit != null
         ? message.extraArgs.gasLimit

package/src/ton/exec.ts

@@ -1,11 +1,8 @@
 import { type Cell, beginCell } from '@ton/core'
 
 import type { ExecutionInput } from '../types.ts'
-import {
-  type CCIPMessage_V1_6_TON,
-  MANUALLY_EXECUTE_OPCODE,
-  serializeExecutionReport,
-} from './types.ts'
+import { MANUALLY_EXECUTE_OPCODE, serializeExecutionReport } from './types.ts'
+import type { CCIPMessage_V1_6_EVM } from '../evm/messages.ts'
 
 /**
  * Generates an unsigned execute report payload for the TON OffRamp contract.
@@ -17,7 +14,7 @@ import {
  */
 export function generateUnsignedExecuteReport(
   offRamp: string,
-  execReport: ExecutionInput<CCIPMessage_V1_6_TON>,
+  execReport: ExecutionInput<CCIPMessage_V1_6_EVM>,
   opts?: { gasLimit?: number },
 ): { to: string; body: Cell } {
   // Serialize the execution report

package/src/ton/index.ts

@@ -29,14 +29,13 @@ import { supportedChains } from '../supported-chains.ts'
 import {
   type CCIPExecution,
   type CCIPRequest,
+  type ChainLog,
   type ChainTransaction,
   type CommitReport,
   type ExecutionInput,
   type ExecutionReceipt,
   type Lane,
-  type Log_,
   type NetworkInfo,
-  type OffchainTokenData,
   type WithLogger,
   CCIPVersion,
   ChainFamily,
@@ -52,8 +51,9 @@ import {
 } from '../utils.ts'
 import { generateUnsignedExecuteReport } from './exec.ts'
 import { getTONLeafHasher } from './hasher.ts'
-import { type CCIPMessage_V1_6_TON, type UnsignedTONTx, isTONWallet } from './types.ts'
+import { type UnsignedTONTx, isTONWallet } from './types.ts'
 import { crc32, lookupTxByRawHash, parseJettonContent } from './utils.ts'
+import type { CCIPMessage_V1_6_EVM } from '../evm/messages.ts'
 export type { TONWallet, UnsignedTONTx } from './types.ts'
 
 /**
@@ -308,18 +308,22 @@ export class TONChain extends Chain<typeof ChainFamily.TON> {
     const compositeHash = `${address.toRawString()}:${tx.lt}:${tx.hash().toString('hex')}`
     const res = {
       hash: compositeHash,
-      logs: [] as Log_[],
+      logs: [] as ChainLog[],
       blockNumber: Number(tx.lt), // Note: This is lt (logical time), not block seqno
       timestamp: tx.now,
       from: address.toRawString(),
       tx,
     }
-    const logs: Log_[] = []
+    const logs: ChainLog[] = []
     for (const [index, msg] of tx.outMessages) {
       if (msg.info.type !== 'external-out') continue
       const topics = []
       // logs are external messages where dest "address" is the uint32 topic (e.g. crc32("ExecutionStateChanged"))
-      if (msg.info.dest && msg.info.dest.value > 0n && msg.info.dest.value < 2n ** 32n)
+      if (
+        msg.info.dest &&
+        msg.info.dest.value > 0n &&
+        msg.info.dest.value < BigInt(2) ** BigInt(32)
+      )
         topics.push(toBeHex(msg.info.dest.value, 4))
       let data = ''
       try {
@@ -350,7 +354,7 @@ export class TONChain extends Chain<typeof ChainFamily.TON> {
    * @param opts - Log filter options (startBlock/endBlock are interpreted as lt values)
    * @throws {@link CCIPTopicsInvalidError} if topics format is invalid
    */
-  async *getLogs(opts: LogFilter): AsyncIterableIterator<Log_> {
+  async *getLogs(opts: LogFilter): AsyncIterableIterator<ChainLog> {
     let topics
     if (opts.topics?.length) {
       if (!opts.topics.every((topic) => typeof topic === 'string'))
@@ -587,7 +591,7 @@ export class TONChain extends Chain<typeof ChainFamily.TON> {
   }: {
     data: unknown
     topics?: readonly string[]
-  }): CCIPMessage_V1_6_TON | undefined {
+  }): CCIPMessage_V1_6_EVM | undefined {
     if (!data || typeof data !== 'string') return
     if (topics?.length && topics[0] !== crc32('CCIPMessageSent')) return
 
@@ -660,7 +664,7 @@ export class TONChain extends Chain<typeof ChainFamily.TON> {
 
       // Load tokenAmounts from ref 3
       const _tokenAmountsCell = bodySlice.loadRef()
-      const tokenAmounts: CCIPMessage_V1_6_TON['tokenAmounts'] = [] // TODO: FIXME: parse when implemented
+      const tokenAmounts: CCIPMessage_V1_6_EVM['tokenAmounts'] = [] // TODO: FIXME: parse when implemented
 
       // Load feeToken (inline address in body)
       const feeToken = bodySlice.loadMaybeAddress()?.toString() ?? ''
@@ -1099,11 +1103,6 @@ export class TONChain extends Chain<typeof ChainFamily.TON> {
     throw new CCIPTransactionNotFoundError(seqno.toString())
   }
 
-  /** {@inheritDoc Chain.getOffchainTokenData} */
-  getOffchainTokenData(request: CCIPRequest): Promise<OffchainTokenData[]> {
-    return Promise.resolve(request.message.tokenAmounts.map(() => undefined))
-  }
-
   /**
    * {@inheritDoc Chain.generateUnsignedExecute}
    * @throws {@link CCIPExtraArgsInvalidError} if extra args are not EVMExtraArgsV2 format
@@ -1125,7 +1124,7 @@ export class TONChain extends Chain<typeof ChainFamily.TON> {
 
     const unsigned = generateUnsignedExecuteReport(
       offRamp,
-      input as ExecutionInput<CCIPMessage_V1_6_TON>,
+      input as ExecutionInput<CCIPMessage_V1_6_EVM>,
       opts,
     )
 
@@ -1161,7 +1160,7 @@ export class TONChain extends Chain<typeof ChainFamily.TON> {
       ...unsigned,
     })
 
-    const message = opts.input.message as CCIPMessage_V1_6_TON
+    const message = opts.input.message as CCIPMessage_V1_6_EVM
     for await (const exec of this.getExecutionReceipts({
       offRamp,
       messageId: message.messageId,

package/src/ton/types.ts

@@ -2,13 +2,10 @@ import { type Builder, Address, Cell, beginCell } from '@ton/core'
 import { toBigInt } from 'ethers'
 
 import { CCIPDataFormatUnsupportedError } from '../errors/specialized.ts'
-import type { EVMExtraArgsV2 } from '../extra-args.ts'
+import type { CCIPMessage_V1_6_EVM } from '../evm/messages.ts'
 import type { CCIPMessage_V1_6, ChainFamily, ExecutionInput } from '../types.ts'
 import { bytesToBuffer } from '../utils.ts'
 
-/** TON-specific CCIP v1.6 message type with EVMExtraArgsV2 (GenericExtraArgsV2) */
-export type CCIPMessage_V1_6_TON = CCIPMessage_V1_6 & EVMExtraArgsV2
-
 /** Opcode for OffRamp_ManuallyExecute message on TON */
 export const MANUALLY_EXECUTE_OPCODE = 0xa00785cf
 
@@ -83,7 +80,7 @@ function asSnakeData<T>(array: T[], builderFn: (item: T) => Builder): Cell {
  * @returns BOC-serialized Cell containing the execution report.
  */
 export function serializeExecutionReport(
-  execReport: ExecutionInput<CCIPMessage_V1_6_TON>,
+  execReport: ExecutionInput<CCIPMessage_V1_6_EVM>,
 ): Builder {
   return beginCell()
     .storeUint(execReport.message.sourceChainSelector, 64)
@@ -97,7 +94,7 @@ export function serializeExecutionReport(
     .storeUint(execReport.proofFlagBits, 256)
 }
 
-function serializeMessage(message: CCIPMessage_V1_6_TON): Builder {
+function serializeMessage(message: CCIPMessage_V1_6_EVM): Builder {
   return beginCell()
     .storeUint(BigInt(message.messageId), 256)
     .storeUint(message.sourceChainSelector, 64)

package/src/types.ts

@@ -1,5 +1,6 @@
 import type { AbiParametersToPrimitiveTypes, ExtractAbiEvent } from 'abitype'
-import type { BytesLike, Log } from 'ethers'
+import type { BytesLike, Log as EVMLog } from 'ethers'
+import type { SetOptional } from 'type-fest'
 
 import type { APICCIPRequestMetadata } from './api/types.ts'
 import type OffRamp_1_6_ABI from './evm/abi/OffRamp_1_6.ts'
@@ -7,7 +8,6 @@ import type { CCIPMessage_EVM, CCIPMessage_V1_6_EVM, CCIPMessage_V2_0 } from './
 import type { ExtraArgs } from './extra-args.ts'
 import type { CCIPMessage_V1_6_Solana } from './solana/types.ts'
 import type { CCIPMessage_V1_6_Sui } from './sui/types.ts'
-import type { CCIPMessage_V1_6_TON } from './ton/types.ts'
 // v1.6 Base type from EVM contains the intersection of all other CCIPMessage v1.6 types
 export type { CCIPMessage_V1_6 } from './evm/messages.ts'
 
@@ -157,17 +157,20 @@ export interface Lane<V extends CCIPVersion = CCIPVersion> {
 export type CCIPMessage<V extends CCIPVersion = CCIPVersion> = V extends typeof CCIPVersion.V2_0
   ? CCIPMessage_V2_0
   : V extends typeof CCIPVersion.V1_6
-    ? CCIPMessage_V1_6_EVM | CCIPMessage_V1_6_Solana | CCIPMessage_V1_6_Sui | CCIPMessage_V1_6_TON
+    ? CCIPMessage_V1_6_EVM | CCIPMessage_V1_6_Solana | CCIPMessage_V1_6_Sui
     : CCIPMessage_EVM<V>
 
 /**
  * Generic log structure compatible across chain families.
  */
-export type Log_ = Pick<Log, 'topics' | 'index' | 'address' | 'blockNumber' | 'transactionHash'> & {
+export type ChainLog = Pick<
+  EVMLog,
+  'topics' | 'index' | 'address' | 'blockNumber' | 'transactionHash'
+> & {
   /** Log data as bytes or parsed object. */
   data: BytesLike | Record<string, unknown>
   /** Optional reference to the containing transaction. */
-  tx?: ChainTransaction
+  tx?: SetOptional<ChainTransaction, 'logs'>
 }
 
 /**
@@ -188,7 +191,7 @@ export type ChainTransaction = {
   /** Transaction hash. */
   hash: string
   /** Logs emitted by this transaction. */
-  logs: readonly Log_[]
+  logs: readonly ChainLog[]
   /** Block number containing this transaction. */
   blockNumber: number
   /** Unix timestamp of the block. */
@@ -206,9 +209,9 @@ export interface CCIPRequest<V extends CCIPVersion = CCIPVersion> {
   /** Lane configuration for this request. */
   lane: Lane<V>
   message: CCIPMessage<V>
-  log: Log_
+  log: ChainLog
   /** Transaction that emitted the request. */
-  tx: Pick<ChainTransaction, 'hash' | 'logs' | 'blockNumber' | 'timestamp' | 'from' | 'error'>
+  tx: Omit<ChainTransaction, 'logs'>
 
   /**
    * API-enriched metadata. Present only when fetched via CCIP API.
@@ -263,7 +266,7 @@ export type CCIPVerifications =
       /** The commit report data. */
       report: CommitReport
       /** Log event from the commit. */
-      log: Log_
+      log: ChainLog
     }
   | {
       /** Policy for this request */
@@ -373,7 +376,7 @@ export interface CCIPExecution {
   /** Execution receipt data. */
   receipt: ExecutionReceipt
   /** Log event from the execution. */
-  log: Log_
+  log: ChainLog
   /** Unix timestamp of the execution. */
   timestamp: number
 }