@chainlink/ccip-sdk 0.96.0 → 0.97.0

package/src/solana/index.ts

@@ -73,14 +73,14 @@ import SELECTORS from '../selectors.ts'
 import { supportedChains } from '../supported-chains.ts'
 import {
   type AnyMessage,
-  type CCIPCommit,
   type CCIPExecution,
   type CCIPMessage,
   type CCIPRequest,
+  type CCIPVerifications,
   type ChainTransaction,
   type CommitReport,
+  type ExecutionInput,
   type ExecutionReceipt,
-  type ExecutionReport,
   type Lane,
   type Log_,
   type MergeArrayElements,
@@ -96,6 +96,7 @@ import {
   createRateLimitedFetch,
   decodeAddress,
   decodeOnRampAddress,
+  getAddressBytes,
   getDataBytes,
   leToBigInt,
   networkInfo,
@@ -126,7 +127,7 @@ import {
 } from './utils.ts'
 import { buildMessageForDest, getMessagesInBatch } from '../requests.ts'
 import { patchBorsh } from './patchBorsh.ts'
-import { DEFAULT_GAS_LIMIT } from '../evm/const.ts'
+import { DEFAULT_GAS_LIMIT } from '../shared/constants.ts'
 export type { UnsignedSolanaTx }
 
 const routerCoder = new BorshCoder(CCIP_ROUTER_IDL)
@@ -171,6 +172,29 @@ export type SolanaTransaction = MergeArrayElements<
 
 /**
  * Solana chain implementation supporting Solana networks.
+ *
+ * Provides methods for sending CCIP cross-chain messages, querying message
+ * status, fetching fee quotes, and manually executing pending messages on
+ * Solana networks.
+ *
+ * @remarks
+ * Solana uses CCIP v1.6+ protocol only.
+ *
+ * @example Create from RPC URL
+ * ```typescript
+ * import { SolanaChain } from '@chainlink/ccip-sdk'
+ *
+ * const chain = await SolanaChain.fromUrl('https://api.devnet.solana.com')
+ * console.log(`Connected to: ${chain.network.name}`)
+ * ```
+ *
+ * @example Query messages in a transaction
+ * ```typescript
+ * const requests = await chain.getMessagesInTx('5abc123...')
+ * for (const req of requests) {
+ *   console.log(`Message ID: ${req.message.messageId}`)
+ * }
+ * ```
  */
 export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
   static {
@@ -284,9 +308,20 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
 
   /**
    * Creates a SolanaChain instance from an RPC URL.
-   * @param url - RPC endpoint URL.
-   * @param ctx - context containing logger.
-   * @returns A new SolanaChain instance.
+   *
+   * @param url - RPC endpoint URL (https://, http://, wss://, or ws://).
+   * @param ctx - Optional context containing logger and API client configuration.
+   * @returns A new SolanaChain instance connected to the specified network.
+   * @throws {@link CCIPChainNotFoundError} if chain cannot be identified from genesis hash
+   *
+   * @example
+   * ```typescript
+   * // Create from devnet URL
+   * const chain = await SolanaChain.fromUrl('https://api.devnet.solana.com')
+   *
+   * // With custom logger
+   * const chain = await SolanaChain.fromUrl(url, { logger: customLogger })
+   * ```
    */
   static async fromUrl(url: string, ctx?: ChainContext): Promise<SolanaChain> {
     const connection = this._getConnection(url, ctx)
@@ -442,15 +477,15 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
   }
 
   /** {@inheritDoc Chain.getMessagesInBatch} */
-  async 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 },
+    range: Pick<CommitReport, 'minSeqNr' | 'maxSeqNr'>,
+    opts?: Pick<LogFilter, 'page'>,
   ): Promise<R['message'][]> {
     const [destChainStatePda] = PublicKey.findProgramAddressSync(
       [Buffer.from('dest_chain_state'), toLeArray(request.lane.destChainSelector, 8)],
@@ -463,7 +498,7 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
       programs: [request.log.address],
       address: destChainStatePda.toBase58(),
     }
-    return getMessagesInBatch(this, request, commit, opts_)
+    return getMessagesInBatch(this, request, range, opts_)
   }
 
   /** {@inheritDoc Chain.typeAndVersion} */
@@ -548,8 +583,8 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
     return Promise.resolve(router) // solana's Router is also the OnRamp
   }
 
-  /** {@inheritDoc Chain.getOnRampForOffRamp} */
-  async getOnRampForOffRamp(offRamp: string, sourceChainSelector: bigint): Promise<string> {
+  /** {@inheritDoc Chain.getOnRampsForOffRamp} */
+  async getOnRampsForOffRamp(offRamp: string, sourceChainSelector: bigint): Promise<string[]> {
     const program = new Program(CCIP_OFFRAMP_IDL, new PublicKey(offRamp), {
       connection: this.connection,
     })
@@ -563,15 +598,12 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
     const {
       config: { onRamp },
     } = await program.account.sourceChain.fetch(statePda)
-    return decodeAddress(
-      new Uint8Array(onRamp.bytes.slice(0, onRamp.len)),
-      networkInfo(sourceChainSelector).family,
-    )
-  }
-
-  /** {@inheritDoc Chain.getCommitStoreForOffRamp} */
-  getCommitStoreForOffRamp(offRamp: string): Promise<string> {
-    return Promise.resolve(offRamp) // Solana supports only CCIP>=1.6, for which OffRamp and CommitStore are the same
+    return [
+      decodeAddress(
+        getAddressBytes(onRamp.bytes).subarray(0, onRamp.len),
+        networkInfo(sourceChainSelector).family,
+      ),
+    ]
   }
 
   /**
@@ -1081,7 +1113,7 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
   }
 
   /**
-   * {@inheritDoc Chain.generateUnsignedExecuteReport}
+   * {@inheritDoc Chain.generateUnsignedExecute}
    * @returns instructions - array of instructions to execute the report
    *   lookupTables - array of lookup tables for `manuallyExecute` call
    *   mainIndex - index of the `manuallyExecute` instruction in the array; last unless
@@ -1089,15 +1121,14 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
    *   second to last
    * @throws {@link CCIPExecutionReportChainMismatchError} if message is not a Solana message
    */
-  async generateUnsignedExecuteReport({
+  async generateUnsignedExecute({
     payer,
-    offRamp,
-    execReport,
     ...opts
-  }: Parameters<Chain['generateUnsignedExecuteReport']>[0]): Promise<UnsignedSolanaTx> {
-    if (!('computeUnits' in execReport.message))
+  }: Parameters<Chain['generateUnsignedExecute']>[0]): Promise<UnsignedSolanaTx> {
+    if (!('input' in opts) || !('message' in opts.input) || !('computeUnits' in opts.input.message))
       throw new CCIPExecutionReportChainMismatchError('Solana')
-    const execReport_ = execReport as ExecutionReport<CCIPMessage_V1_6_Solana>
+    const { offRamp, input } = opts
+    const execReport_ = input as ExecutionInput<CCIPMessage_V1_6_Solana>
     return generateUnsignedExecuteReport(
       this,
       new PublicKey(payer),
@@ -1108,11 +1139,11 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
   }
 
   /**
-   * {@inheritDoc Chain.executeReport}
+   * {@inheritDoc Chain.execute}
    * @throws {@link CCIPWalletInvalidError} if wallet is not a valid Solana wallet
    */
-  async executeReport(
-    opts: Parameters<Chain['executeReport']>[0] & {
+  async execute(
+    opts: Parameters<Chain['execute']>[0] & {
       // when cleaning leftover LookUp Tables, wait deactivation grace period (~513 slots) then close ALT
       waitDeactivation?: boolean
     },
@@ -1123,7 +1154,7 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
     let hash
     do {
       try {
-        const unsigned = await this.generateUnsignedExecuteReport({
+        const unsigned = await this.generateUnsignedExecute({
           ...opts,
           payer: wallet.publicKey.toBase58(),
         })
@@ -1199,39 +1230,36 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
   /**
    * Solana specialization: use getProgramAccounts to fetch commit reports from PDAs
    */
-  override async getCommitReport(
-    opts: Parameters<Chain['getCommitReport']>[0],
-  ): Promise<CCIPCommit> {
-    const { commitStore, request } = opts
-    const commitsAroundSeqNum = await this.connection.getProgramAccounts(
-      new PublicKey(commitStore),
-      {
-        filters: [
-          {
-            // commit report account discriminator filter
-            memcmp: {
-              offset: 0,
-              bytes: encodeBase58(BorshAccountsCoder.accountDiscriminator('CommitReport')),
-            },
+  override async getVerifications(
+    opts: Parameters<Chain['getVerifications']>[0],
+  ): Promise<CCIPVerifications> {
+    const { offRamp, request } = opts
+    const commitsAroundSeqNum = await this.connection.getProgramAccounts(new PublicKey(offRamp), {
+      filters: [
+        {
+          // commit report account discriminator filter
+          memcmp: {
+            offset: 0,
+            bytes: encodeBase58(BorshAccountsCoder.accountDiscriminator('CommitReport')),
           },
-          {
-            // sourceChainSelector filter
-            memcmp: {
-              offset: 8 + 1,
-              bytes: encodeBase58(toLeArray(request.lane.sourceChainSelector, 8)),
-            },
+        },
+        {
+          // sourceChainSelector filter
+          memcmp: {
+            offset: 8 + 1,
+            bytes: encodeBase58(toLeArray(request.lane.sourceChainSelector, 8)),
           },
-          // memcmp report.min with msg.sequenceNumber's without least-significant byte;
-          // this should be ~256 around seqNum, i.e. big chance of a match; requires PDAs not to have been closed
-          {
-            memcmp: {
-              offset: 8 + 1 + 8 + 32 + 8 + /*skip byte*/ 1,
-              bytes: encodeBase58(toLeArray(request.message.sequenceNumber, 8).slice(1)),
-            },
+        },
+        // memcmp report.min with msg.sequenceNumber's without least-significant byte;
+        // this should be ~256 around seqNum, i.e. big chance of a match; requires PDAs not to have been closed
+        {
+          memcmp: {
+            offset: 8 + 1 + 8 + 32 + 8 + /*skip byte*/ 1,
+            bytes: encodeBase58(toLeArray(request.message.sequenceNumber, 8).slice(1)),
           },
-        ],
-      },
-    )
+        },
+      ],
+    })
     for (const acc of commitsAroundSeqNum) {
       // const merkleRoot = acc.account.data.subarray(8 + 1 + 8, 8 + 1 + 8 + 32)
       const minSeqNr = acc.account.data.readBigUInt64LE(8 + 1 + 8 + 32 + 8)
@@ -1241,7 +1269,7 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
       // we have all the commit report info, but we also need log details (txHash, etc)
       for await (const log of this.getLogs({
         startTime: 1, // just to force getting the oldest log first
-        programs: [commitStore],
+        programs: [offRamp],
         address: acc.pubkey.toBase58(),
         topics: ['CommitReportAccepted'],
       })) {
@@ -1254,23 +1282,23 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
       }
     }
     // in case we can't find it, fallback to generic iterating txs
-    return super.getCommitReport(opts)
+    return super.getVerifications(opts)
   }
 
   /** {@inheritDoc Chain.getExecutionReceipts} */
   override async *getExecutionReceipts(
     opts: Parameters<Chain['getExecutionReceipts']>[0],
   ): AsyncIterableIterator<CCIPExecution> {
-    const { offRamp, sourceChainSelector, commit } = opts
+    const { offRamp, sourceChainSelector, verifications } = opts
     let opts_: Parameters<Chain['getExecutionReceipts']>[0] &
       Parameters<SolanaChain['getLogs']>[0] = opts
-    if (commit && sourceChainSelector) {
+    if (sourceChainSelector && verifications && 'report' in verifications) {
       // if we know of commit, use `commit_report` PDA as more specialized address
       const [commitReportPda] = PublicKey.findProgramAddressSync(
         [
           Buffer.from('commit_report'),
           toLeArray(sourceChainSelector, 8),
-          bytesToBuffer(commit.report.merkleRoot),
+          bytesToBuffer(verifications.report.merkleRoot),
         ],
         new PublicKey(offRamp),
       )
@@ -1559,7 +1587,11 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
   }
 
   /**
-   * {@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
    * @throws {@link CCIPArgumentInvalidError} if tokenReceiver missing when sending tokens with data
    */
   static override buildMessageForDest(

package/src/sui/hasher.ts

@@ -1,11 +1,11 @@
 import { concat, id, keccak256, zeroPadValue } from 'ethers'
 
-import { encodeNumber, encodeRawBytes } from '../aptos/utils.ts'
 import { CCIPExtraArgsInvalidError, CCIPSuiHasherVersionUnsupportedError } from '../errors/index.ts'
 import { decodeExtraArgs } from '../extra-args.ts'
 import { type LeafHasher, LEAF_DOMAIN_SEPARATOR } from '../hasher/common.ts'
 import { type CCIPMessage, type CCIPMessage_V1_6, CCIPVersion } from '../types.ts'
 import type { CCIPMessage_V1_6_Sui } from './types.ts'
+import { encodeNumber, encodeRawBytes } from '../shared/bcs-codecs.ts'
 
 /**
  * Creates a leaf hasher for Sui CCIP messages.

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,24 +14,33 @@ 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,
@@ -41,8 +49,8 @@ import {
   type CCIPVersion,
   type ChainTransaction,
   type CommitReport,
+  type ExecutionInput,
   type ExecutionReceipt,
-  type ExecutionReport,
   type ExecutionState,
   type Lane,
   type Log_,
@@ -59,20 +67,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
@@ -246,10 +245,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 +317,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 +389,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)]
   }
 
   /**
@@ -608,7 +602,7 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
     | (EVMExtraArgsV2 & { _tag: 'EVMExtraArgsV2' })
     | (SVMExtraArgsV1 & { _tag: 'SVMExtraArgsV1' })
     | undefined {
-    return AptosChain.decodeExtraArgs(extraArgs)
+    return decodeMoveExtraArgs(extraArgs)
   }
 
   /**
@@ -696,7 +690,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)
   }
 
   /**
@@ -740,24 +734,27 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
     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 +766,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 +791,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 +815,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 +878,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,6 +1,6 @@
 import { type Cell, beginCell } from '@ton/core'
 
-import type { ExecutionReport } from '../types.ts'
+import type { ExecutionInput } from '../types.ts'
 import {
   type CCIPMessage_V1_6_TON,
   MANUALLY_EXECUTE_OPCODE,
@@ -17,7 +17,7 @@ import {
  */
 export function generateUnsignedExecuteReport(
   offRamp: string,
-  execReport: ExecutionReport<CCIPMessage_V1_6_TON>,
+  execReport: ExecutionInput<CCIPMessage_V1_6_TON>,
   opts?: { gasLimit?: number },
 ): { to: string; body: Cell } {
   // Serialize the execution report