@chainlink/ccip-sdk 0.92.1 → 0.93.0

package/src/sui/discovery.ts

@@ -25,16 +25,10 @@ export const discoverCCIP = async (client: SuiClient, onramp: string): Promise<s
     transactionBlock: tx,
   })
   const returnValues = inspectResult.results?.[0]?.returnValues
-  if (!returnValues || returnValues.length === 0) {
+  if (!returnValues?.length) {
     throw new CCIPError(CCIPErrorCode.UNKNOWN, 'No return values from dev inspect')
   }
-  const [valueBytes] = returnValues[0]
-  if (!valueBytes) {
-    throw new CCIPError(
-      CCIPErrorCode.UNKNOWN,
-      'Unable to decode CCIP package id from return values',
-    )
-  }
+  const [valueBytes] = returnValues[0]!
 
   return normalizeSuiAddress(hexlify(bytesToBuffer(valueBytes)))
 }
@@ -145,7 +139,7 @@ export const discoverOfframp = async (client: SuiClient, ccip: string) => {
     .flatMap((pkg) => Object.values(pkg))
     .filter((module) => module.name === 'offramp')
 
-  if (offrampPkgs.length === 0) {
+  if (!offrampPkgs.length) {
     throw new CCIPError(
       CCIPErrorCode.UNKNOWN,
       'Could not find OffRamp package among OwnerCap packages',
@@ -159,5 +153,5 @@ export const discoverOfframp = async (client: SuiClient, ccip: string) => {
     )
   }
 
-  return normalizeSuiAddress(offrampPkgs[0].address)
+  return normalizeSuiAddress(offrampPkgs[0]!.address)
 }

package/src/sui/events.ts

@@ -35,11 +35,11 @@ async function getTransactionDigestsInTimeRange(
     order: 'ascending',
   })
 
-  if (!firstEvents.data || firstEvents.data.length === 0) {
+  if (!firstEvents.data.length) {
     return null
   }
 
-  const firstDigest = firstEvents.data[0].id.txDigest
+  const firstDigest = firstEvents.data[0]!.id.txDigest
 
   // Get last event (descending order)
   const lastEvents = await client.queryEvents({
@@ -48,7 +48,7 @@ async function getTransactionDigestsInTimeRange(
     order: 'descending',
   })
 
-  const lastDigest = lastEvents.data[0].id.txDigest
+  const lastDigest = lastEvents.data[0]!.id.txDigest
 
   return { firstDigest, lastDigest }
 }
@@ -145,7 +145,7 @@ async function getCheckpointsFromTransactions(
     if (!latestResult.data) {
       throw new CCIPDataFormatUnsupportedError('Failed to fetch latest checkpoint')
     }
-    endCheckpoint = parseInt(latestResult.data.checkpoints.nodes[0].sequenceNumber)
+    endCheckpoint = parseInt(latestResult.data.checkpoints.nodes[0]!.sequenceNumber)
   } else {
     endCheckpoint = parseInt(result.data.last.effects.checkpoint.sequenceNumber)
   }
@@ -282,10 +282,6 @@ async function fetchEventsWithCheckpointRange<T>(
 
     hasNextPage = pageInfo.hasNextPage
     cursor = pageInfo.endCursor ?? undefined
-
-    if (!hasNextPage) {
-      break
-    }
   }
 
   return allEvents

package/src/sui/index.ts

@@ -7,7 +7,7 @@ import { type BytesLike, AbiCoder, hexlify, isBytesLike } from 'ethers'
 import type { PickDeep } from 'type-fest'
 
 import { AptosChain } from '../aptos/index.ts'
-import { type LogFilter, Chain } from '../chain.ts'
+import { type ChainContext, type LogFilter, Chain } from '../chain.ts'
 import {
   CCIPContractNotRouterError,
   CCIPDataFormatUnsupportedError,
@@ -24,7 +24,7 @@ import { getSuiLeafHasher } from './hasher.ts'
 import type { LeafHasher } from '../hasher/common.ts'
 import { supportedChains } from '../supported-chains.ts'
 import {
-  type AnyMessage,
+  type CCIPExecution,
   type CCIPMessage,
   type CCIPRequest,
   type CCIPVersion,
@@ -40,6 +40,7 @@ import {
   type WithLogger,
   ChainFamily,
 } from '../types.ts'
+import { discoverCCIP, discoverOfframp } from './discovery.ts'
 import type { CCIPMessage_V1_6_Sui } from './types.ts'
 import { bytesToBuffer, decodeAddress, getDataBytes, networkInfo } from '../utils.ts'
 import { type CommitEvent, getSuiEventsInTimeRange } from './events.ts'
@@ -54,8 +55,6 @@ import {
   getOffRampStateObject,
   getReceiverModule,
 } from './objects.ts'
-import selectors from '../selectors.ts'
-import { discoverCCIP, discoverOfframp } from './discovery.ts'
 
 export const SUI_EXTRA_ARGS_V1_TAG = '21ea4ca9' as const
 
@@ -89,7 +88,7 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
    * @param client - Sui client for interacting with the Sui network.
    * @param network - Network information for this chain.
    */
-  constructor(client: SuiClient, network: NetworkInfo<typeof ChainFamily.Sui>, ctx?: WithLogger) {
+  constructor(client: SuiClient, network: NetworkInfo<typeof ChainFamily.Sui>, ctx?: ChainContext) {
     super(network, ctx)
 
     this.client = client
@@ -98,11 +97,10 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
 
     // TODO: Graphql client should come from config
     let graphqlUrl: string
-    const selector = network.chainSelector
-    if (selector === selectors['sui:1'].selector) {
+    if (this.network.name === 'sui-mainnet') {
       // Sui mainnet (sui:1)
       graphqlUrl = 'https://graphql.mainnet.sui.io/graphql'
-    } else if (selector === selectors['sui:2'].selector) {
+    } else if (this.network.name === 'sui-testnet') {
       // Sui testnet (sui:2)
       graphqlUrl = 'https://graphql.testnet.sui.io/graphql'
     } else {
@@ -120,7 +118,7 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
    * @param url - HTTP or WebSocket endpoint URL for the Sui network.
    * @returns A new SuiChain instance.
    */
-  static async fromUrl(url: string, ctx?: WithLogger): Promise<SuiChain> {
+  static async fromUrl(url: string, ctx?: ChainContext): Promise<SuiChain> {
     const client = new SuiClient({ url })
 
     // Get chain identifier from the client and map to network info format
@@ -173,13 +171,12 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
 
     // Extract events from the transaction
     const events: Log_[] = []
-    if (txResponse.events) {
-      for (let i = 0; i < txResponse.events.length; i++) {
-        const event = txResponse.events[i]
+    if (txResponse.events?.length) {
+      for (const [i, event] of txResponse.events.entries()) {
         const eventType = event.type
         const packageId = eventType.split('::')[0]
         const moduleName = eventType.split('::')[1]
-        const eventName = eventType.split('::')[2]
+        const eventName = eventType.split('::')[2]!
 
         events.push({
           address: `${packageId}::${moduleName}`,
@@ -197,7 +194,7 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
       logs: events,
       blockNumber: Number(txResponse.checkpoint || 0),
       timestamp: Number(txResponse.timestampMs || 0) / 1000,
-      from: txResponse.transaction?.data?.sender || '',
+      from: txResponse.transaction?.data.sender || '',
     }
   }
 
@@ -245,13 +242,13 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
     }
   }
 
-  /** {@inheritDoc Chain.fetchRequestsInTx} */
-  override async fetchRequestsInTx(_tx: string | ChainTransaction): Promise<CCIPRequest[]> {
-    return Promise.reject(new CCIPNotImplementedError('SuiChain.fetchRequestsInTx'))
+  /** {@inheritDoc Chain.getMessagesInTx} */
+  override async getMessagesInTx(_tx: string | ChainTransaction): Promise<CCIPRequest[]> {
+    return Promise.reject(new CCIPNotImplementedError('SuiChain.getMessagesInTx'))
   }
 
-  /** {@inheritDoc Chain.fetchAllMessagesInBatch} */
-  override async fetchAllMessagesInBatch<
+  /** {@inheritDoc Chain.getMessagesInBatch} */
+  override async getMessagesInBatch<
     R extends PickDeep<
       CCIPRequest,
       'lane' | `log.${'topics' | 'address' | 'blockNumber'}` | 'message.sequenceNumber'
@@ -261,7 +258,7 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
     _commit: Pick<CommitReport, 'minSeqNr' | 'maxSeqNr'>,
     _opts?: { page?: number },
   ): Promise<R['message'][]> {
-    return Promise.reject(new CCIPNotImplementedError('SuiChain.fetchAllMessagesInBatch'))
+    return Promise.reject(new CCIPNotImplementedError('SuiChain.getMessagesInBatch'))
   }
 
   /** {@inheritDoc Chain.typeAndVersion} */
@@ -368,7 +365,7 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
     offset += 1
 
     // OnRamp (vector<u8>)
-    const onRampLength = configBytes[offset]
+    const onRampLength = configBytes[offset]!
     offset += 1
     const onRampBytes = configBytes.slice(offset, offset + onRampLength)
 
@@ -439,7 +436,9 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
    * @param extraArgs - Encoded extra arguments bytes.
    * @returns Decoded extra arguments or undefined if unknown format.
    */
-  static decodeExtraArgs(extraArgs: BytesLike): SuiExtraArgsV1 & { _tag: 'SuiExtraArgsV1' } {
+  static decodeExtraArgs(
+    extraArgs: BytesLike,
+  ): (SuiExtraArgsV1 & { _tag: 'SuiExtraArgsV1' }) | undefined {
     const data = getDataBytes(extraArgs)
     const hexBytes = toHex(data)
     if (!hexBytes.startsWith(SUI_EXTRA_ARGS_V1_TAG)) {
@@ -581,33 +580,24 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
   }
 
   /** {@inheritDoc Chain.getFee} */
-  async getFee(_router: string, _destChainSelector: bigint, _message: AnyMessage): Promise<bigint> {
+  async getFee(_opts: Parameters<Chain['getFee']>[0]): Promise<bigint> {
     return Promise.reject(new CCIPNotImplementedError('SuiChain.getFee'))
   }
 
   /** {@inheritDoc Chain.generateUnsignedSendMessage} */
   override generateUnsignedSendMessage(
-    _sender: string,
-    _router: string,
-    _destChainSelector: bigint,
-    _message: AnyMessage & { fee?: bigint },
-    _opts?: { approveMax?: boolean },
+    _opts: Parameters<Chain['generateUnsignedSendMessage']>[0],
   ): Promise<never> {
     return Promise.reject(new CCIPNotImplementedError('SuiChain.generateUnsignedSendMessage'))
   }
 
   /** {@inheritDoc Chain.sendMessage} */
-  async sendMessage(
-    _router: string,
-    _destChainSelector: bigint,
-    _message: AnyMessage & { fee: bigint },
-    _opts?: { wallet?: unknown; approveMax?: boolean },
-  ): Promise<CCIPRequest> {
+  async sendMessage(_opts: Parameters<Chain['sendMessage']>[0]): Promise<CCIPRequest> {
     return Promise.reject(new CCIPNotImplementedError('SuiChain.sendMessage'))
   }
 
-  /** {@inheritDoc Chain.fetchOffchainTokenData} */
-  fetchOffchainTokenData(request: CCIPRequest): Promise<OffchainTokenData[]> {
+  /** {@inheritDoc Chain.getOffchainTokenData} */
+  getOffchainTokenData(request: CCIPRequest): Promise<OffchainTokenData[]> {
     if (!('receiverObjectIds' in request.message)) {
       throw new CCIPSuiMessageVersionInvalidError()
     }
@@ -617,20 +607,18 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
 
   /** {@inheritDoc Chain.generateUnsignedExecuteReport} */
   override generateUnsignedExecuteReport(
-    _payer: string,
-    _offRamp: string,
-    _execReport: ExecutionReport,
-    _opts: object,
+    _opts: Parameters<Chain['generateUnsignedExecuteReport']>[0],
   ): Promise<never> {
     return Promise.reject(new CCIPNotImplementedError('SuiChain.generateUnsignedExecuteReport'))
   }
 
   /** {@inheritDoc Chain.executeReport} */
   async executeReport(
-    _offRamp: string,
-    execReport: ExecutionReport,
-    opts: { wallet: unknown; gasLimit?: number; receiverObjectIds?: string[] },
-  ): Promise<ChainTransaction> {
+    opts: Parameters<Chain['executeReport']>[0] & {
+      receiverObjectIds?: string[]
+    },
+  ): Promise<CCIPExecution> {
+    const { execReport } = opts
     if (!this.contractsDir.offRamp || !this.contractsDir.ccip) {
       throw new CCIPContractNotRouterError(
         'OffRamp or CCIP address not set in contracts directory',
@@ -674,7 +662,7 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
     const tx = buildManualExecutionPTB(input)
 
     // Set gas budget if provided
-    if (opts?.gasLimit) {
+    if (opts.gasLimit) {
       tx.setGasBudget(opts.gasLimit)
     }
 
@@ -698,8 +686,8 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
     }
 
     // Check if transaction inmediately reverted
-    if (result.effects?.status?.status !== 'success') {
-      const errorMsg = result.effects?.status?.error || 'Unknown error'
+    if (result.effects?.status.status !== 'success') {
+      const errorMsg = result.effects?.status.error || 'Unknown error'
       throw new CCIPExecTxRevertedError(result.digest, {
         context: { error: errorMsg },
       })
@@ -716,7 +704,7 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
     })
 
     // Return the transaction as a ChainTransaction
-    return this.getTransaction(result.digest)
+    return this.getExecutionReceiptInTx(await this.getTransaction(result.digest))
   }
 
   /**

package/src/sui/manuallyExec/encoder.ts

@@ -41,10 +41,6 @@ export function serializeExecutionReport(
 ): Uint8Array {
   const { message, offchainTokenData, proofs } = executionReport
 
-  if (!message) {
-    throw new CCIPMessageInvalidError('Message is undefined in execution report')
-  }
-
   let gasLimit, tokenReceiver
   if ('receiverObjectIds' in message) {
     ;({ gasLimit, tokenReceiver } = message)

package/src/sui/manuallyExec/index.ts

@@ -81,9 +81,7 @@ export function buildManualExecutionPTB({
     }
 
     // Process each token transfer
-    for (let i = 0; i < tokenConfigs.length; i++) {
-      const tokenConfig = tokenConfigs[i]
-
+    for (const tokenConfig of tokenConfigs) {
       tx.moveCall({
         target: `${tokenConfig.tokenPoolPackageId}::${tokenConfig.tokenPoolModule}::release_or_mint`,
         typeArguments: [tokenConfig.tokenType],

package/src/sui/objects.ts

@@ -63,14 +63,14 @@ export async function getCcipObjectRef(client: SuiClient, ccipPackageId: string)
     },
   })
 
-  if (pointerResponse.data.length === 0) {
+  if (!pointerResponse.data.length) {
     throw new CCIPDataFormatUnsupportedError(
       'No CCIPObjectRefPointer found for the given packageId',
     )
   }
 
   // Get the pointer object to extract ccip_object_id
-  const pointerId = pointerResponse.data[0].data?.objectId
+  const pointerId = pointerResponse.data[0]!.data?.objectId
   if (!pointerId) {
     throw new CCIPDataFormatUnsupportedError('Pointer does not have objectId')
   }
@@ -110,13 +110,13 @@ export async function getOffRampStateObject(
     },
   })
 
-  if (offrampPointerResponse.data.length === 0) {
+  if (!offrampPointerResponse.data.length) {
     throw new CCIPDataFormatUnsupportedError(
       'No OffRampStatePointer found for the given offramp package',
     )
   }
 
-  const offrampPointerId = offrampPointerResponse.data[0].data?.objectId
+  const offrampPointerId = offrampPointerResponse.data[0]!.data?.objectId
 
   if (!offrampPointerId) {
     throw new CCIPDataFormatUnsupportedError('OffRampStatePointer does not have a valid objectId')
@@ -180,19 +180,19 @@ export async function getReceiverModule(
 
   const returnValues = result.results[0]?.returnValues
 
-  if (!returnValues || returnValues.length === 0) {
+  if (!returnValues?.length) {
     throw new CCIPDataFormatUnsupportedError('No return values from get_receiver_config')
   }
 
   // Decode the ReceiverConfig struct
   // ReceiverConfig has two fields: module_name (String) and proof_typename (ascii::String)
   // The struct is returned as a BCS-encoded byte array
-  const receiverConfigBytes = returnValues[0][0]
+  const receiverConfigBytes = returnValues[0]![0]
 
   // Parse the struct:
   // First field is module_name (String = vector<u8> with length prefix)
   let offset = 0
-  const moduleNameLength = receiverConfigBytes[offset]
+  const moduleNameLength = receiverConfigBytes[offset]!
   offset += 1
   const moduleName = new TextDecoder().decode(
     new Uint8Array(receiverConfigBytes.slice(offset, offset + moduleNameLength)),
@@ -257,14 +257,14 @@ export async function fetchTokenConfigs(
 
     const returnValues = result.results[0]?.returnValues
 
-    if (!returnValues || returnValues.length === 0) {
+    if (!returnValues?.length) {
       throw new CCIPDataFormatUnsupportedError(
         `No return values from get_token_config_struct for ${tokenAddress}`,
       )
     }
 
     // Parse the TokenConfig struct from BCS-encoded bytes
-    const configBytes = returnValues[0][0]
+    const configBytes = returnValues[0]![0]
 
     // TokenConfig structure (from token_admin_registry.go):
     // - TokenPoolPackageId (address = 32 bytes)
@@ -286,7 +286,7 @@ export async function fetchTokenConfigs(
     offset += 32
 
     // TokenPoolModule (String)
-    const moduleNameLength = configBytes[offset]
+    const moduleNameLength = configBytes[offset]!
     offset += 1
     const tokenPoolModule = new TextDecoder().decode(
       new Uint8Array(configBytes.slice(offset, offset + moduleNameLength)),
@@ -294,7 +294,7 @@ export async function fetchTokenConfigs(
     offset += moduleNameLength
 
     // TokenType (ascii::String)
-    const tokenTypeLength = configBytes[offset]
+    const tokenTypeLength = configBytes[offset]!
     offset += 1
     const tokenType = new TextDecoder().decode(
       new Uint8Array(configBytes.slice(offset, offset + tokenTypeLength)),
@@ -316,7 +316,7 @@ export async function fetchTokenConfigs(
     offset += 32
 
     // TokenPoolTypeProof (ascii::String)
-    const proofLength = configBytes[offset]
+    const proofLength = configBytes[offset]!
     offset += 1
     const tokenPoolTypeProof = new TextDecoder().decode(
       new Uint8Array(configBytes.slice(offset, offset + proofLength)),
@@ -324,7 +324,7 @@ export async function fetchTokenConfigs(
     offset += proofLength
 
     // LockOrBurnParams (vector<address>)
-    const lockOrBurnCount = configBytes[offset]
+    const lockOrBurnCount = configBytes[offset]!
     offset += 1
     const lockOrBurnParams: string[] = []
     for (let i = 0; i < lockOrBurnCount; i++) {
@@ -334,7 +334,7 @@ export async function fetchTokenConfigs(
     }
 
     // ReleaseOrMintParams (vector<address>)
-    const releaseOrMintCount = configBytes[offset]
+    const releaseOrMintCount = configBytes[offset]!
     offset += 1
     const releaseOrMintParams: string[] = []
     for (let i = 0; i < releaseOrMintCount; i++) {

package/src/ton/exec.ts

@@ -1,4 +1,4 @@
-import { beginCell } from '@ton/core'
+import { type Cell, beginCell } from '@ton/core'
 
 import type { ExecutionReport } from '../types.ts'
 import {
@@ -19,10 +19,7 @@ export function generateUnsignedExecuteReport(
   offRamp: string,
   execReport: ExecutionReport<CCIPMessage_V1_6_TON>,
   opts?: { gasLimit?: number },
-): {
-  to: string
-  body: ReturnType<typeof beginCell>['endCell'] extends () => infer R ? R : never
-} {
+): { to: string; body: Cell } {
   // Serialize the execution report
   const serializedReport = serializeExecutionReport(execReport)
 

package/src/ton/hasher.ts

@@ -8,8 +8,8 @@ import {
 import { decodeExtraArgs } from '../extra-args.ts'
 import type { LeafHasher } from '../hasher/common.ts'
 import { type CCIPMessage, type CCIPMessage_V1_6, CCIPVersion } from '../types.ts'
-import { networkInfo } from '../utils.ts'
-import { hexToBuffer, tryParseCell } from './utils.ts'
+import { bytesToBuffer, networkInfo } from '../utils.ts'
+import { tryParseCell } from './utils.ts'
 
 // TON uses 256 bits (32 bytes) of zeros as leaf domain separator
 const TON_LEAF_DOMAIN_SEPARATOR = 0n
@@ -62,7 +62,7 @@ export const hashTONMetadata = (
 ): string => {
   // Domain separator for TON messages
   const versionHash = BigInt(sha256(Buffer.from('Any2TVMMessageHashV1')))
-  const onRampBytes = hexToBuffer(onRamp)
+  const onRampBytes = bytesToBuffer(onRamp)
 
   // Build metadata cell
   const metadataCell = beginCell()
@@ -114,7 +114,7 @@ function hashV16TONMessage(message: CCIPMessage_V1_6, metadataHash: string): str
     .endCell()
 
   // Build sender cell with address bytes
-  const senderBytes = hexToBuffer(message.sender)
+  const senderBytes = bytesToBuffer(message.sender)
   const senderCell = beginCell()
     .storeUint(BigInt(senderBytes.length), 8)
     .storeBuffer(senderBytes)
@@ -155,7 +155,7 @@ function buildTokenAmountsCell(tokenAmounts: readonly TokenAmount[]): Cell {
 
   // Process each token transfer
   for (const ta of tokenAmounts) {
-    const sourcePoolBytes = hexToBuffer(ta.sourcePoolAddress)
+    const sourcePoolBytes = bytesToBuffer(ta.sourcePoolAddress)
 
     // Extract amount
     const amountSource =