@chainlink/ccip-sdk 0.96.0 → 1.0.0

package/src/sui/index.ts

@@ -7,7 +7,6 @@ import { isValidSuiAddress, isValidTransactionDigest, normalizeSuiAddress } from
 import { type BytesLike, dataLength, hexlify, isBytesLike, isHexString } from 'ethers'
 import type { PickDeep, SetOptional } from 'type-fest'
 
-import { AptosChain } from '../aptos/index.ts'
 import {
   type ChainContext,
   type ChainStatic,
@@ -15,39 +14,47 @@ import {
   type LogFilter,
   Chain,
 } from '../chain.ts'
+import { getCcipStateAddress, getOffRampForCcip } from './discovery.ts'
+import { type CommitEvent, streamSuiLogs } from './events.ts'
+import { getSuiLeafHasher } from './hasher.ts'
+import {
+  deriveObjectID,
+  fetchTokenConfigs,
+  getLatestPackageId,
+  getObjectRef,
+  getReceiverModule,
+} from './objects.ts'
 import {
   CCIPContractNotRouterError,
   CCIPDataFormatUnsupportedError,
   CCIPError,
   CCIPErrorCode,
   CCIPExecTxRevertedError,
-  CCIPNotImplementedError,
-} from '../errors/index.ts'
-import {
+  CCIPExecutionReportChainMismatchError,
   CCIPLogsAddressRequiredError,
+  CCIPNotImplementedError,
   CCIPSuiLogInvalidError,
   CCIPTopicsInvalidError,
-} from '../errors/specialized.ts'
+} from '../errors/index.ts'
 import type { EVMExtraArgsV2, ExtraArgs, SVMExtraArgsV1, SuiExtraArgsV1 } from '../extra-args.ts'
 import type { LeafHasher } from '../hasher/common.ts'
 import { decodeMessage, getMessagesInBatch } from '../requests.ts'
+import { decodeMoveExtraArgs, getMoveAddress } from '../shared/bcs-codecs.ts'
 import { supportedChains } from '../supported-chains.ts'
-import { getSuiLeafHasher } from './hasher.ts'
 import {
   type AnyMessage,
   type CCIPExecution,
   type CCIPMessage,
   type CCIPRequest,
   type CCIPVersion,
+  type ChainLog,
   type ChainTransaction,
   type CommitReport,
+  type ExecutionInput,
   type ExecutionReceipt,
-  type ExecutionReport,
   type ExecutionState,
   type Lane,
-  type Log_,
   type NetworkInfo,
-  type OffchainTokenData,
   type WithLogger,
   ChainFamily,
 } from '../types.ts'
@@ -59,20 +66,11 @@ import {
   parseTypeAndVersion,
   util,
 } from '../utils.ts'
-import { getCcipStateAddress, getOffRampForCcip } from './discovery.ts'
-import { type CommitEvent, streamSuiLogs } from './events.ts'
 import {
   type SuiManuallyExecuteInput,
   type TokenConfig,
   buildManualExecutionPTB,
 } from './manuallyExec/index.ts'
-import {
-  deriveObjectID,
-  fetchTokenConfigs,
-  getLatestPackageId,
-  getObjectRef,
-  getReceiverModule,
-} from './objects.ts'
 import type { CCIPMessage_V1_6_Sui } from './types.ts'
 
 const DEFAULT_GAS_LIMIT = 1000000n
@@ -182,7 +180,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
@@ -246,10 +244,10 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
     >,
   >(
     request: R,
-    commit: Pick<CommitReport, 'minSeqNr' | 'maxSeqNr'>,
-    opts?: { page?: number },
+    range: Pick<CommitReport, 'minSeqNr' | 'maxSeqNr'>,
+    opts?: Pick<LogFilter, 'page'>,
   ): Promise<R['message'][]> {
-    return getMessagesInBatch(this, request, commit, opts)
+    return getMessagesInBatch(this, request, range, opts)
   }
 
   /**
@@ -318,10 +316,10 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
   }
 
   /**
-   * {@inheritDoc Chain.getOnRampForOffRamp}
+   * {@inheritDoc Chain.getOnRampsForOffRamp}
    * @throws {@link CCIPDataFormatUnsupportedError} if view call fails
    */
-  async getOnRampForOffRamp(offRamp: string, sourceChainSelector: bigint): Promise<string> {
+  async getOnRampsForOffRamp(offRamp: string, sourceChainSelector: bigint): Promise<string[]> {
     offRamp = await getLatestPackageId(offRamp, this.client)
     const functionName = 'get_source_chain_config'
     // Preserve module suffix if present, otherwise add it
@@ -390,12 +388,7 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
     const onRampBytes = configBytes.slice(offset, offset + onRampLength)
 
     // Decode the address from the onRamp bytes
-    return decodeAddress(onRampBytes, networkInfo(sourceChainSelector).family)
-  }
-
-  /** {@inheritDoc Chain.getCommitStoreForOffRamp} */
-  getCommitStoreForOffRamp(offRamp: string): Promise<string> {
-    return Promise.resolve(offRamp)
+    return [decodeAddress(onRampBytes, networkInfo(sourceChainSelector).family)]
   }
 
   /**
@@ -582,7 +575,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('{')) &&
@@ -608,7 +601,7 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
     | (EVMExtraArgsV2 & { _tag: 'EVMExtraArgsV2' })
     | (SVMExtraArgsV1 & { _tag: 'SVMExtraArgsV1' })
     | undefined {
-    return AptosChain.decodeExtraArgs(extraArgs)
+    return decodeMoveExtraArgs(extraArgs)
   }
 
   /**
@@ -628,7 +621,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
@@ -664,7 +657,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
 
@@ -696,7 +689,7 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
    * @returns Sui address.
    */
   static getAddress(bytes: BytesLike | readonly number[]): string {
-    return AptosChain.getAddress(bytes)
+    return getMoveAddress(bytes)
   }
 
   /**
@@ -734,30 +727,27 @@ 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.generateUnsignedExecuteReport} */
-  override generateUnsignedExecuteReport(
-    _opts: Parameters<Chain['generateUnsignedExecuteReport']>[0],
+  /** {@inheritDoc Chain.generateUnsignedExecute} */
+  override generateUnsignedExecute(
+    _opts: Parameters<Chain['generateUnsignedExecute']>[0],
   ): Promise<never> {
-    return Promise.reject(new CCIPNotImplementedError('SuiChain.generateUnsignedExecuteReport'))
+    return Promise.reject(new CCIPNotImplementedError('SuiChain.generateUnsignedExecute'))
   }
 
   /**
-   * {@inheritDoc Chain.executeReport}
+   * {@inheritDoc Chain.execute}
    * @throws {@link CCIPError} if transaction submission fails
    * @throws {@link CCIPExecTxRevertedError} if transaction reverts
    */
-  async executeReport(
-    opts: Parameters<Chain['executeReport']>[0] & {
+  async execute(
+    opts: Parameters<Chain['execute']>[0] & {
       receiverObjectIds?: string[]
     },
   ): Promise<CCIPExecution> {
-    const { execReport, offRamp } = opts
+    if (!('input' in opts && 'message' in opts.input)) {
+      throw new CCIPExecutionReportChainMismatchError('Sui')
+    }
+    const { input, offRamp } = opts
     const wallet = opts.wallet as Keypair
 
     // Discover the CCIP package from the offramp
@@ -769,20 +759,20 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
       this.client,
       ccip,
       ccipObjectRef,
-      execReport.message.receiver,
+      input.message.receiver,
     )
     let tokenConfigs: TokenConfig[] = []
-    if (execReport.message.tokenAmounts.length !== 0) {
+    if (input.message.tokenAmounts.length !== 0) {
       tokenConfigs = await fetchTokenConfigs(
         this.client,
         ccip,
         ccipObjectRef,
-        execReport.message.tokenAmounts as CCIPMessage<typeof CCIPVersion.V1_6>['tokenAmounts'],
+        input.message.tokenAmounts as CCIPMessage<typeof CCIPVersion.V1_6>['tokenAmounts'],
       )
     }
 
-    const input: SuiManuallyExecuteInput = {
-      executionReport: execReport as ExecutionReport<CCIPMessage_V1_6_Sui>,
+    const suiInput: SuiManuallyExecuteInput = {
+      executionReport: input as ExecutionInput<CCIPMessage_V1_6_Sui>,
       offrampAddress: offRamp,
       ccipAddress: ccip,
       ccipObjectRef,
@@ -794,16 +784,16 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
       this.logger.info(
         `Overriding Sui Manual Execution receiverObjectIds with: ${opts.receiverObjectIds.join(', ')}`,
       )
-      input.overrideReceiverObjectIds = opts.receiverObjectIds
+      suiInput.overrideReceiverObjectIds = opts.receiverObjectIds
     }
-    const tx = buildManualExecutionPTB(input)
+    const tx = buildManualExecutionPTB(suiInput)
 
     // Set gas budget if provided
     if (opts.gasLimit) {
       tx.setGasBudget(opts.gasLimit)
     }
 
-    this.logger.info(`Executing Sui CCIP executeReport transaction...`)
+    this.logger.info(`Executing Sui CCIP execute transaction...`)
     // Sign and execute the transaction
     let result: SuiTransactionBlockResponse
     try {
@@ -818,7 +808,7 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
     } catch (e) {
       throw new CCIPError(
         CCIPErrorCode.TRANSACTION_NOT_FINALIZED,
-        `Failed to send Sui executeReport transaction: ${(e as Error).message}`,
+        `Failed to send Sui execute transaction: ${(e as Error).message}`,
       )
     }
 
@@ -881,7 +871,13 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
     return Promise.reject(new CCIPNotImplementedError('SuiChain.getFeeTokens'))
   }
 
-  /** {@inheritDoc ChainStatic.buildMessageForDest} */
+  /**
+   * Returns a copy of a message, populating missing fields like `extraArgs` with defaults.
+   * It's expected to return a message suitable at least for basic token transfers.
+   *
+   * @param message - AnyMessage (from source), containing at least `receiver`
+   * @returns A message suitable for `sendMessage` to this destination chain family
+   */
   static override buildMessageForDest(
     message: Parameters<ChainStatic['buildMessageForDest']>[0],
   ): AnyMessage & { extraArgs: SuiExtraArgsV1 } {

package/src/sui/manuallyExec/encoder.ts

@@ -5,7 +5,7 @@ import type { BytesLike } from 'ethers'
 
 import { CCIPMessageInvalidError } from '../../errors/specialized.ts'
 import { decodeExtraArgs } from '../../extra-args.ts'
-import type { CCIPMessage, CCIPVersion, ExecutionReport } from '../../types.ts'
+import type { CCIPMessage, CCIPVersion, ExecutionInput } from '../../types.ts'
 import { bytesToBuffer, getAddressBytes, getDataBytes, networkInfo } from '../../utils.ts'
 
 const Any2SuiTokenTransferBCS = bcs.struct('Any2SuiTokenTransfer', {
@@ -39,7 +39,7 @@ const ExecutionReportBCS = bcs.struct('ExecutionReport', {
  * @returns Serialized execution report as Uint8Array.
  */
 export function serializeExecutionReport(
-  executionReport: ExecutionReport<CCIPMessage<typeof CCIPVersion.V1_6>>,
+  executionReport: ExecutionInput<CCIPMessage<typeof CCIPVersion.V1_6>>,
 ): Uint8Array {
   const { message, offchainTokenData, proofs } = executionReport
 

package/src/sui/manuallyExec/index.ts

@@ -5,7 +5,7 @@ import { Transaction } from '@mysten/sui/transactions'
 import { serializeExecutionReport } from './encoder.ts'
 import { CCIPMessageInvalidError } from '../../errors/specialized.ts'
 import { decodeExtraArgs } from '../../extra-args.ts'
-import type { ExecutionReport } from '../../types.ts'
+import type { ExecutionInput } from '../../types.ts'
 import { networkInfo } from '../../utils.ts'
 import type { CCIPMessage_V1_6_Sui } from '../types.ts'
 
@@ -30,7 +30,7 @@ export type TokenConfig = {
 /** Input parameters for building a Sui manual execution transaction. */
 export type SuiManuallyExecuteInput = {
   offrampAddress: string
-  executionReport: ExecutionReport<CCIPMessage_V1_6_Sui>
+  executionReport: ExecutionInput<CCIPMessage_V1_6_Sui>
   ccipAddress: string
   ccipObjectRef: string
   offrampStateObject: string

package/src/ton/exec.ts

@@ -1,11 +1,8 @@
 import { type Cell, beginCell } from '@ton/core'
 
-import type { ExecutionReport } from '../types.ts'
-import {
-  type CCIPMessage_V1_6_TON,
-  MANUALLY_EXECUTE_OPCODE,
-  serializeExecutionReport,
-} from './types.ts'
+import type { ExecutionInput } 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: ExecutionReport<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

@@ -12,6 +12,7 @@ import { generateUnsignedCcipSend, getFee as getFeeImpl } from './send.ts'
 import { type ChainContext, type GetBalanceOpts, type LogFilter, Chain } from '../chain.ts'
 import {
   CCIPArgumentInvalidError,
+  CCIPExecutionReportChainMismatchError,
   CCIPExtraArgsInvalidError,
   CCIPHttpError,
   CCIPNotImplementedError,
@@ -20,22 +21,21 @@ import {
   CCIPTopicsInvalidError,
   CCIPTransactionNotFoundError,
   CCIPWalletInvalidError,
-} from '../errors/specialized.ts'
+} from '../errors/index.ts'
 import { type EVMExtraArgsV2, type ExtraArgs, EVMExtraArgsV2Tag } from '../extra-args.ts'
 import type { LeafHasher } from '../hasher/common.ts'
-import { buildMessageForDest } from '../requests.ts'
+import { buildMessageForDest, getMessagesInBatch } from '../requests.ts'
 import { supportedChains } from '../supported-chains.ts'
 import {
   type CCIPExecution,
   type CCIPRequest,
+  type ChainLog,
   type ChainTransaction,
   type CommitReport,
+  type ExecutionInput,
   type ExecutionReceipt,
-  type ExecutionReport,
   type Lane,
-  type Log_,
   type NetworkInfo,
-  type OffchainTokenData,
   type WithLogger,
   CCIPVersion,
   ChainFamily,
@@ -49,10 +49,11 @@ import {
   parseTypeAndVersion,
   sleep,
 } from '../utils.ts'
-import { generateUnsignedExecuteReport as generateUnsignedExecuteReportImpl } from './exec.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'
 
 /**
@@ -307,13 +308,13 @@ 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 = []
@@ -349,7 +350,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'))
@@ -370,21 +371,18 @@ export class TONChain extends Chain<typeof ChainFamily.TON> {
     }
   }
 
-  /**
-   * {@inheritDoc Chain.getMessagesInBatch}
-   * @throws {@link CCIPNotImplementedError} always (not implemented for TON)
-   */
+  /** {@inheritDoc Chain.getMessagesInBatch} */
   override async getMessagesInBatch<
     R extends PickDeep<
       CCIPRequest,
       'lane' | `log.${'topics' | 'address' | 'blockNumber'}` | 'message.sequenceNumber'
     >,
   >(
-    _request: R,
-    _commit: Pick<CommitReport, 'minSeqNr' | 'maxSeqNr'>,
-    _opts?: { page?: number },
+    request: R,
+    range: Pick<CommitReport, 'minSeqNr' | 'maxSeqNr'>,
+    opts?: Pick<LogFilter, 'page'>,
   ): Promise<R['message'][]> {
-    return Promise.reject(new CCIPNotImplementedError('getMessagesInBatch'))
+    return getMessagesInBatch(this, request, range, opts)
   }
 
   /** {@inheritDoc Chain.typeAndVersion} */
@@ -462,10 +460,10 @@ export class TONChain extends Chain<typeof ChainFamily.TON> {
   }
 
   /**
-   * {@inheritDoc Chain.getOnRampForOffRamp}
+   * {@inheritDoc Chain.getOnRampsForOffRamp}
    * @throws {@link CCIPSourceChainUnsupportedError} if source chain is not configured
    */
-  async getOnRampForOffRamp(offRamp: string, sourceChainSelector: bigint): Promise<string> {
+  async getOnRampsForOffRamp(offRamp: string, sourceChainSelector: bigint): Promise<string[]> {
     try {
       const offRampContract = this.provider.provider(Address.parse(offRamp))
 
@@ -493,7 +491,7 @@ export class TONChain extends Chain<typeof ChainFamily.TON> {
         const onRampLength = onRampSlice.loadUint(8)
         onRamp = onRampSlice.loadBuffer(onRampLength)
       }
-      return decodeAddress(onRamp, networkInfo(sourceChainSelector).family)
+      return [decodeAddress(onRamp, networkInfo(sourceChainSelector).family)]
     } catch (error) {
       if (isTvmError(error) && error.exitCode === 266) {
         throw new CCIPSourceChainUnsupportedError(sourceChainSelector, {
@@ -504,12 +502,6 @@ export class TONChain extends Chain<typeof ChainFamily.TON> {
     }
   }
 
-  /** {@inheritDoc Chain.getCommitStoreForOffRamp} */
-  async getCommitStoreForOffRamp(offRamp: string): Promise<string> {
-    // TODO: FIXME: check assumption
-    return Promise.resolve(offRamp)
-  }
-
   /**
    * {@inheritDoc Chain.getTokenForTokenPool}
    * @throws {@link CCIPNotImplementedError} always (not implemented for TON)
@@ -595,7 +587,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
 
@@ -617,7 +609,7 @@ export class TONChain extends Chain<typeof ChainFamily.TON> {
       }
 
       // Load sender address
-      const sender = slice.loadAddress().toString()
+      const sender = slice.loadAddress().toRawString()
 
       // Load body cell ref
       const bodyCell = slice.loadRef()
@@ -664,14 +656,11 @@ export class TONChain extends Chain<typeof ChainFamily.TON> {
       const allowOutOfOrderExecution = extraArgsSlice.loadBit()
 
       // Build extraArgs as raw hex matching reference format
-      const tagHex = extraArgsTag.toString(16).padStart(8, '0')
-      const gasLimitHex = (hasGasLimit ? '8' : '0') + gasLimit.toString(16).padStart(63, '0')
-      const oooByte = allowOutOfOrderExecution ? '40' : '00'
-      const extraArgs = '0x' + tagHex + gasLimitHex + oooByte
+      const extraArgs = '0x' + extraArgsCell.toBoc().toString('hex')
 
       // 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() ?? ''
@@ -832,7 +821,7 @@ export class TONChain extends Chain<typeof ChainFamily.TON> {
    * - sourceChainSelector: uint64 (8 bytes)
    * - sequenceNumber: uint64 (8 bytes)
    * - messageId: uint256 (32 bytes)
-   * - state: uint8 (1 byte) - Untouched=0, InProgress=1, Success=2, Failure=3
+   * - state: uint8 (1 byte) - InProgress=1, Success=2, Failed=3
    *
    * @param log - Log with data field (base64-encoded BOC).
    * @returns ExecutionReceipt or undefined if not valid.
@@ -1110,27 +1099,28 @@ 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.generateUnsignedExecuteReport}
+   * {@inheritDoc Chain.generateUnsignedExecute}
    * @throws {@link CCIPExtraArgsInvalidError} if extra args are not EVMExtraArgsV2 format
    */
-  generateUnsignedExecuteReport({
-    offRamp,
-    execReport,
-    ...opts
-  }: Parameters<Chain['generateUnsignedExecuteReport']>[0]): Promise<UnsignedTONTx> {
-    if (!('allowOutOfOrderExecution' in execReport.message && 'gasLimit' in execReport.message)) {
+  generateUnsignedExecute(
+    opts: Parameters<Chain['generateUnsignedExecute']>[0],
+  ): Promise<UnsignedTONTx> {
+    if (
+      !(
+        'input' in opts &&
+        'message' in opts.input &&
+        'allowOutOfOrderExecution' in opts.input.message &&
+        'gasLimit' in opts.input.message
+      )
+    ) {
       throw new CCIPExtraArgsInvalidError('TON')
     }
+    const { offRamp, input } = opts
 
-    const unsigned = generateUnsignedExecuteReportImpl(
+    const unsigned = generateUnsignedExecuteReport(
       offRamp,
-      execReport as ExecutionReport<CCIPMessage_V1_6_TON>,
+      input as ExecutionInput<CCIPMessage_V1_6_EVM>,
       opts,
     )
 
@@ -1141,18 +1131,20 @@ export class TONChain extends Chain<typeof ChainFamily.TON> {
   }
 
   /**
-   * {@inheritDoc Chain.executeReport}
+   * {@inheritDoc Chain.execute}
    * @throws {@link CCIPWalletInvalidError} if wallet is not a valid TON wallet
    * @throws {@link CCIPReceiptNotFoundError} if execution receipt not found within timeout
    */
-  async executeReport(opts: Parameters<Chain['executeReport']>[0]): Promise<CCIPExecution> {
+  async execute(opts: Parameters<Chain['execute']>[0]): Promise<CCIPExecution> {
+    if (!('input' in opts && 'message' in opts.input))
+      throw new CCIPExecutionReportChainMismatchError('TON')
     const { offRamp, wallet } = opts
     if (!isTONWallet(wallet)) {
       throw new CCIPWalletInvalidError(wallet)
     }
     const payer = await wallet.getAddress()
 
-    const { family: _, ...unsigned } = await this.generateUnsignedExecuteReport({
+    const { family: _, ...unsigned } = await this.generateUnsignedExecute({
       ...opts,
       payer,
     })
@@ -1164,7 +1156,7 @@ export class TONChain extends Chain<typeof ChainFamily.TON> {
       ...unsigned,
     })
 
-    const message = opts.execReport.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, ChainFamily, ExecutionReport } from '../types.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: ExecutionReport<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)