@chainlink/ccip-sdk 1.0.0 → 1.1.0

package/src/evm/messages.ts

@@ -3,25 +3,16 @@ import type {
   AbiParametersToPrimitiveTypes,
   ExtractAbiEvent,
 } from 'abitype'
-import {
-  type Addressable,
-  type BytesLike,
-  type Result,
-  dataSlice,
-  hexlify,
-  toBigInt,
-  toNumber,
-} from 'ethers'
+import type { Addressable, Result } from 'ethers'
 import type { Simplify } from 'type-fest'
 
-import { CCIPMessageDecodeError } from '../errors/index.ts'
 import type { EVMExtraArgsV2 } from '../extra-args.ts'
-import type { CCIPVersion, ChainFamily, MergeArrayElements } from '../types.ts'
-import { decodeAddress, getDataBytes, networkInfo } from '../utils.ts'
+import type { CCIPVersion, MergeArrayElements } from '../types.ts'
 import type EVM2EVMOnRamp_1_5_ABI from './abi/OnRamp_1_5.ts'
 import type OnRamp_1_6_ABI from './abi/OnRamp_1_6.ts'
 import type OnRamp_2_0_ABI from './abi/OnRamp_2_0.ts'
 import { defaultAbiCoder } from './const.ts'
+import type { MessageV1 } from '../messages.ts'
 
 /** Utility type that cleans up address types to just `string`. */
 export type CleanAddressable<T> = T extends string | Addressable
@@ -32,279 +23,6 @@ export type CleanAddressable<T> = T extends string | Addressable
       ? { readonly [K in keyof T]: CleanAddressable<T[K]> }
       : T
 
-/** Token transfer in MessageV1 format. */
-export type TokenTransferV1 = {
-  amount: bigint
-  sourcePoolAddress: string
-  sourceTokenAddress: string
-  destTokenAddress: string
-  tokenReceiver: string
-  extraData: string
-}
-
-/** MessageV1 struct matching the Solidity MessageV1Codec format. */
-export type MessageV1 = {
-  sourceChainSelector: bigint
-  destChainSelector: bigint
-  messageNumber: bigint
-  executionGasLimit: number
-  ccipReceiveGasLimit: number
-  finality: number
-  ccvAndExecutorHash: string
-  onRampAddress: string
-  offRampAddress: string
-  sender: string
-  receiver: string
-  destBlob: string
-  tokenTransfer: readonly TokenTransferV1[]
-  data: string
-}
-
-/**
- * Decodes a TokenTransferV1 from bytes.
- * @param encoded - The encoded bytes.
- * @param offset - The starting offset.
- * @param sourceFamily - The source chain family for source addresses.
- * @param destFamily - The destination chain family for dest addresses.
- * @returns The decoded token transfer and the new offset.
- */
-function decodeTokenTransferV1(
-  encoded: Uint8Array,
-  offset: number,
-  sourceFamily: ChainFamily,
-  destFamily: ChainFamily,
-): { tokenTransfer: TokenTransferV1; newOffset: number } {
-  // version (1 byte)
-  if (offset >= encoded.length) throw new CCIPMessageDecodeError('TOKEN_TRANSFER_VERSION')
-  const version = encoded[offset++]!
-  if (version !== 1) throw new CCIPMessageDecodeError(`Invalid encoding version: ${version}`)
-
-  // amount (32 bytes)
-  if (offset + 32 > encoded.length) throw new CCIPMessageDecodeError('TOKEN_TRANSFER_AMOUNT')
-  const amount = toBigInt(dataSlice(encoded, offset, offset + 32))
-  offset += 32
-
-  // sourcePoolAddressLength and sourcePoolAddress
-  if (offset >= encoded.length) {
-    throw new CCIPMessageDecodeError('TOKEN_TRANSFER_SOURCE_POOL_LENGTH')
-  }
-  const sourcePoolAddressLength = encoded[offset++]!
-  if (offset + sourcePoolAddressLength > encoded.length) {
-    throw new CCIPMessageDecodeError('TOKEN_TRANSFER_SOURCE_POOL_CONTENT')
-  }
-  const sourcePoolAddress = decodeAddress(
-    dataSlice(encoded, offset, offset + sourcePoolAddressLength),
-    sourceFamily,
-  )
-  offset += sourcePoolAddressLength
-
-  // sourceTokenAddressLength and sourceTokenAddress
-  if (offset >= encoded.length) {
-    throw new CCIPMessageDecodeError('TOKEN_TRANSFER_SOURCE_TOKEN_LENGTH')
-  }
-  const sourceTokenAddressLength = encoded[offset++]!
-  if (offset + sourceTokenAddressLength > encoded.length) {
-    throw new CCIPMessageDecodeError('TOKEN_TRANSFER_SOURCE_TOKEN_CONTENT')
-  }
-  const sourceTokenAddress = decodeAddress(
-    dataSlice(encoded, offset, offset + sourceTokenAddressLength),
-    sourceFamily,
-  )
-  offset += sourceTokenAddressLength
-
-  // destTokenAddressLength and destTokenAddress
-  if (offset >= encoded.length) {
-    throw new CCIPMessageDecodeError('TOKEN_TRANSFER_DEST_TOKEN_LENGTH')
-  }
-  const destTokenAddressLength = encoded[offset++]!
-  if (offset + destTokenAddressLength > encoded.length) {
-    throw new CCIPMessageDecodeError('TOKEN_TRANSFER_DEST_TOKEN_CONTENT')
-  }
-  const destTokenAddress = decodeAddress(
-    dataSlice(encoded, offset, offset + destTokenAddressLength),
-    destFamily,
-  )
-  offset += destTokenAddressLength
-
-  // tokenReceiverLength and tokenReceiver
-  if (offset >= encoded.length) {
-    throw new CCIPMessageDecodeError('TOKEN_TRANSFER_TOKEN_RECEIVER_LENGTH')
-  }
-  const tokenReceiverLength = encoded[offset++]!
-  if (offset + tokenReceiverLength > encoded.length) {
-    throw new CCIPMessageDecodeError('TOKEN_TRANSFER_TOKEN_RECEIVER_CONTENT')
-  }
-  const tokenReceiver = decodeAddress(
-    dataSlice(encoded, offset, offset + tokenReceiverLength),
-    destFamily,
-  )
-  offset += tokenReceiverLength
-
-  // extraDataLength and extraData
-  if (offset + 2 > encoded.length) {
-    throw new CCIPMessageDecodeError('TOKEN_TRANSFER_EXTRA_DATA_LENGTH')
-  }
-  const extraDataLength = toNumber(dataSlice(encoded, offset, offset + 2))
-  offset += 2
-  if (offset + extraDataLength > encoded.length) {
-    throw new CCIPMessageDecodeError('TOKEN_TRANSFER_EXTRA_DATA_CONTENT')
-  }
-  const extraData = hexlify(dataSlice(encoded, offset, offset + extraDataLength))
-  offset += extraDataLength
-
-  return {
-    tokenTransfer: {
-      amount,
-      sourcePoolAddress,
-      sourceTokenAddress,
-      destTokenAddress,
-      tokenReceiver,
-      extraData,
-    },
-    newOffset: offset,
-  }
-}
-
-/**
- * Decodes a MessageV1 from bytes following the v1 protocol format.
- * @param encodedMessage - The encoded message bytes to decode.
- * @returns The decoded MessageV1 struct.
- */
-export function decodeMessageV1(encodedMessage: BytesLike): MessageV1 {
-  const MESSAGE_V1_BASE_SIZE = 77
-  const encoded = getDataBytes(encodedMessage)
-
-  if (encoded.length < MESSAGE_V1_BASE_SIZE) throw new CCIPMessageDecodeError('MESSAGE_MIN_SIZE')
-
-  const version = encoded[0]!
-  if (version !== 1) throw new CCIPMessageDecodeError(`Invalid encoding version: ${version}`)
-
-  // sourceChainSelector (8 bytes, big endian)
-  const sourceChainSelector = toBigInt(dataSlice(encoded, 1, 9))
-
-  // destChainSelector (8 bytes, big endian)
-  const destChainSelector = toBigInt(dataSlice(encoded, 9, 17))
-
-  // Get chain families for address decoding
-  const sourceNetworkInfo = networkInfo(sourceChainSelector)
-  const destNetworkInfo = networkInfo(destChainSelector)
-  const sourceFamily = sourceNetworkInfo.family
-  const destFamily = destNetworkInfo.family
-
-  // messageNumber (8 bytes, big endian)
-  const messageNumber = toBigInt(dataSlice(encoded, 17, 25))
-
-  // executionGasLimit (4 bytes, big endian)
-  const executionGasLimit = toNumber(dataSlice(encoded, 25, 29))
-
-  // ccipReceiveGasLimit (4 bytes, big endian)
-  const ccipReceiveGasLimit = toNumber(dataSlice(encoded, 29, 33))
-
-  // finality (2 bytes, big endian)
-  const finality = toNumber(dataSlice(encoded, 33, 35))
-
-  // ccvAndExecutorHash (32 bytes)
-  const ccvAndExecutorHash = hexlify(dataSlice(encoded, 35, 67))
-
-  // onRampAddressLength and onRampAddress
-  let offset = 67
-  if (offset >= encoded.length) throw new CCIPMessageDecodeError('MESSAGE_ONRAMP_ADDRESS_LENGTH')
-  const onRampAddressLength = encoded[offset++]!
-  if (offset + onRampAddressLength > encoded.length) {
-    throw new CCIPMessageDecodeError('MESSAGE_ONRAMP_ADDRESS_CONTENT')
-  }
-  const onRampAddress = decodeAddress(
-    dataSlice(encoded, offset, offset + onRampAddressLength),
-    sourceFamily,
-  )
-  offset += onRampAddressLength
-
-  // offRampAddressLength and offRampAddress
-  if (offset >= encoded.length) throw new CCIPMessageDecodeError('MESSAGE_OFFRAMP_ADDRESS_LENGTH')
-  const offRampAddressLength = encoded[offset++]!
-  if (offset + offRampAddressLength > encoded.length) {
-    throw new CCIPMessageDecodeError('MESSAGE_OFFRAMP_ADDRESS_CONTENT')
-  }
-  const offRampAddress = decodeAddress(
-    dataSlice(encoded, offset, offset + offRampAddressLength),
-    destFamily,
-  )
-  offset += offRampAddressLength
-
-  // senderLength and sender
-  if (offset >= encoded.length) throw new CCIPMessageDecodeError('MESSAGE_SENDER_LENGTH')
-  const senderLength = encoded[offset++]!
-  if (offset + senderLength > encoded.length) {
-    throw new CCIPMessageDecodeError('MESSAGE_SENDER_CONTENT')
-  }
-  const sender = decodeAddress(dataSlice(encoded, offset, offset + senderLength), sourceFamily)
-  offset += senderLength
-
-  // receiverLength and receiver
-  if (offset >= encoded.length) throw new CCIPMessageDecodeError('MESSAGE_RECEIVER_LENGTH')
-  const receiverLength = encoded[offset++]!
-  if (offset + receiverLength > encoded.length) {
-    throw new CCIPMessageDecodeError('MESSAGE_RECEIVER_CONTENT')
-  }
-  const receiver = decodeAddress(dataSlice(encoded, offset, offset + receiverLength), destFamily)
-  offset += receiverLength
-
-  // destBlobLength and destBlob
-  if (offset + 2 > encoded.length) throw new CCIPMessageDecodeError('MESSAGE_DEST_BLOB_LENGTH')
-  const destBlobLength = toNumber(dataSlice(encoded, offset, offset + 2))
-  offset += 2
-  if (offset + destBlobLength > encoded.length) {
-    throw new CCIPMessageDecodeError('MESSAGE_DEST_BLOB_CONTENT')
-  }
-  const destBlob = hexlify(dataSlice(encoded, offset, offset + destBlobLength))
-  offset += destBlobLength
-
-  // tokenTransferLength and tokenTransfer
-  if (offset + 2 > encoded.length) throw new CCIPMessageDecodeError('MESSAGE_TOKEN_TRANSFER_LENGTH')
-  const tokenTransferLength = toNumber(dataSlice(encoded, offset, offset + 2))
-  offset += 2
-
-  // Decode token transfer, which is either 0 or 1
-  const tokenTransfer: TokenTransferV1[] = []
-  if (tokenTransferLength > 0) {
-    const expectedEnd = offset + tokenTransferLength
-    const result = decodeTokenTransferV1(encoded, offset, sourceFamily, destFamily)
-    tokenTransfer.push(result.tokenTransfer)
-    offset = result.newOffset
-    if (offset !== expectedEnd) throw new CCIPMessageDecodeError('MESSAGE_TOKEN_TRANSFER_CONTENT')
-  }
-
-  // dataLength and data
-  if (offset + 2 > encoded.length) throw new CCIPMessageDecodeError('MESSAGE_DATA_LENGTH')
-  const dataLength = toNumber(dataSlice(encoded, offset, offset + 2))
-  offset += 2
-  if (offset + dataLength > encoded.length) {
-    throw new CCIPMessageDecodeError('MESSAGE_DATA_CONTENT')
-  }
-  const data = hexlify(dataSlice(encoded, offset, offset + dataLength))
-  offset += dataLength
-
-  // Ensure we've consumed all bytes
-  if (offset !== encoded.length) throw new CCIPMessageDecodeError('MESSAGE_FINAL_OFFSET')
-
-  return {
-    sourceChainSelector,
-    destChainSelector,
-    messageNumber,
-    executionGasLimit,
-    ccipReceiveGasLimit,
-    finality,
-    ccvAndExecutorHash,
-    onRampAddress,
-    offRampAddress,
-    sender,
-    receiver,
-    destBlob,
-    tokenTransfer,
-    data,
-  }
-}
-
 // v1.2-v1.5 Message ()
 type EVM2AnyMessageRequested = CleanAddressable<
   AbiParametersToPrimitiveTypes<

package/src/gas.ts

@@ -20,6 +20,10 @@ export type EstimateMessageInput = {
   messageId?: string
   /** optional sender: zero address will be used if omitted */
   sender?: string
+  /** optional onRampAddress */
+  onRampAddress?: string
+  /** optional offRampAddress */
+  offRampAddress?: string
   /** optional data: zero bytes will be used if omitted */
   data?: BytesLike
   /**
@@ -89,26 +93,29 @@ export async function estimateReceiveExecution({
   if (!dest.estimateReceiveExecution)
     throw new CCIPMethodUnsupportedError(dest.constructor.name, 'estimateReceiveExecution')
 
-  let onRamp, offRamp: string
-  try {
-    const tnv = await source.typeAndVersion(routerOrRamp)
-    if (!tnv[0].includes('OnRamp'))
-      onRamp = await source.getOnRampForRouter(routerOrRamp, dest.network.chainSelector)
-    else onRamp = routerOrRamp
-    offRamp = await discoverOffRamp(source, dest, onRamp, source)
-  } catch (sourceErr) {
+  let onRamp: string, offRamp: string
+  if (message.onRampAddress) onRamp = message.onRampAddress
+  if (message.offRampAddress) offRamp = message.offRampAddress
+  if (!onRamp! || !offRamp!)
     try {
-      const tnv = await dest.typeAndVersion(routerOrRamp)
-      if (!tnv[0].includes('OffRamp'))
-        throw new CCIPContractTypeInvalidError(routerOrRamp, tnv[2], ['OffRamp'])
-      offRamp = routerOrRamp
-      const onRamps = await dest.getOnRampsForOffRamp(offRamp, source.network.chainSelector)
-      if (!onRamps.length) throw new CCIPOnRampRequiredError()
-      onRamp = onRamps[onRamps.length - 1]!
-    } catch {
-      throw sourceErr // re-throw original error
+      const tnv = await source.typeAndVersion(routerOrRamp)
+      if (!tnv[0].includes('OnRamp'))
+        onRamp = await source.getOnRampForRouter(routerOrRamp, dest.network.chainSelector)
+      else onRamp = routerOrRamp
+      offRamp = await discoverOffRamp(source, dest, onRamp, source)
+    } catch (sourceErr) {
+      try {
+        const tnv = await dest.typeAndVersion(routerOrRamp)
+        if (!tnv[0].includes('OffRamp'))
+          throw new CCIPContractTypeInvalidError(routerOrRamp, tnv[2], ['OffRamp'])
+        offRamp = routerOrRamp
+        const onRamps = await dest.getOnRampsForOffRamp(offRamp, source.network.chainSelector)
+        if (!onRamps.length) throw new CCIPOnRampRequiredError()
+        onRamp = onRamps[onRamps.length - 1]!
+      } catch {
+        throw sourceErr // re-throw original error
+      }
     }
-  }
 
   const destTokenAmounts = await Promise.all(
     (message.tokenAmounts ?? []).map(async (ta) => {
@@ -127,7 +134,8 @@ export async function estimateReceiveExecution({
         dest.getTokenInfo(tokenAmount.destTokenAddress),
       ])
       const destAmount =
-        (tokenAmount.amount * 10n ** BigInt(destDecimals)) / 10n ** BigInt(sourceDecimals)
+        (tokenAmount.amount * BigInt(10) ** BigInt(destDecimals)) /
+        BigInt(10) ** BigInt(sourceDecimals)
       if (destAmount === 0n)
         throw new CCIPTokenDecimalsInsufficientError(
           tokenAmount.destTokenAddress,

package/src/index.ts

@@ -27,6 +27,7 @@ export type {
   ChainGetter,
   ChainStatic,
   GetBalanceOpts,
+  LaneFeatures,
   LogFilter,
   RateLimiterState,
   RegistryTokenConfig,
@@ -34,7 +35,7 @@ export type {
   TokenPoolConfig,
   TokenPoolRemote,
 } from './chain.ts'
-export { DEFAULT_API_RETRY_CONFIG } from './chain.ts'
+export { DEFAULT_API_RETRY_CONFIG, LaneFeature } from './chain.ts'
 export { calculateManualExecProof, discoverOffRamp } from './execution.ts'
 export {
   type EVMExtraArgsV1,

package/src/messages.ts

@@ -0,0 +1,278 @@
+import { type BytesLike, dataSlice, hexlify, toBigInt, toNumber } from 'ethers'
+
+import { CCIPMessageDecodeError } from './errors/index.ts'
+import type { ChainFamily } from './types.ts'
+import { decodeAddress, getDataBytes, networkInfo } from './utils.ts'
+
+/** Token transfer in MessageV1 format. */
+export type TokenTransferV1 = {
+  amount: bigint
+  sourcePoolAddress: string
+  sourceTokenAddress: string
+  destTokenAddress: string
+  tokenReceiver: string
+  extraData: string
+}
+
+/** MessageV1 struct matching the Solidity MessageV1Codec format. */
+export type MessageV1 = {
+  sourceChainSelector: bigint
+  destChainSelector: bigint
+  messageNumber: bigint
+  executionGasLimit: number
+  ccipReceiveGasLimit: number
+  finality: number
+  ccvAndExecutorHash: string
+  onRampAddress: string
+  offRampAddress: string
+  sender: string
+  receiver: string
+  destBlob: string
+  tokenTransfer: readonly TokenTransferV1[]
+  data: string
+}
+
+/**
+ * Decodes a TokenTransferV1 from bytes.
+ * @param encoded - The encoded bytes.
+ * @param offset - The starting offset.
+ * @param sourceFamily - The source chain family for source addresses.
+ * @param destFamily - The destination chain family for dest addresses.
+ * @returns The decoded token transfer and the new offset.
+ */
+function decodeTokenTransferV1(
+  encoded: Uint8Array,
+  offset: number,
+  sourceFamily: ChainFamily,
+  destFamily: ChainFamily,
+): { tokenTransfer: TokenTransferV1; newOffset: number } {
+  // version (1 byte)
+  if (offset >= encoded.length) throw new CCIPMessageDecodeError('TOKEN_TRANSFER_VERSION')
+  const version = encoded[offset++]!
+  if (version !== 1) throw new CCIPMessageDecodeError(`Invalid encoding version: ${version}`)
+
+  // amount (32 bytes)
+  if (offset + 32 > encoded.length) throw new CCIPMessageDecodeError('TOKEN_TRANSFER_AMOUNT')
+  const amount = toBigInt(dataSlice(encoded, offset, offset + 32))
+  offset += 32
+
+  // sourcePoolAddressLength and sourcePoolAddress
+  if (offset >= encoded.length) {
+    throw new CCIPMessageDecodeError('TOKEN_TRANSFER_SOURCE_POOL_LENGTH')
+  }
+  const sourcePoolAddressLength = encoded[offset++]!
+  if (offset + sourcePoolAddressLength > encoded.length) {
+    throw new CCIPMessageDecodeError('TOKEN_TRANSFER_SOURCE_POOL_CONTENT')
+  }
+  const sourcePoolAddress = decodeAddress(
+    dataSlice(encoded, offset, offset + sourcePoolAddressLength),
+    sourceFamily,
+  )
+  offset += sourcePoolAddressLength
+
+  // sourceTokenAddressLength and sourceTokenAddress
+  if (offset >= encoded.length) {
+    throw new CCIPMessageDecodeError('TOKEN_TRANSFER_SOURCE_TOKEN_LENGTH')
+  }
+  const sourceTokenAddressLength = encoded[offset++]!
+  if (offset + sourceTokenAddressLength > encoded.length) {
+    throw new CCIPMessageDecodeError('TOKEN_TRANSFER_SOURCE_TOKEN_CONTENT')
+  }
+  const sourceTokenAddress = decodeAddress(
+    dataSlice(encoded, offset, offset + sourceTokenAddressLength),
+    sourceFamily,
+  )
+  offset += sourceTokenAddressLength
+
+  // destTokenAddressLength and destTokenAddress
+  if (offset >= encoded.length) {
+    throw new CCIPMessageDecodeError('TOKEN_TRANSFER_DEST_TOKEN_LENGTH')
+  }
+  const destTokenAddressLength = encoded[offset++]!
+  if (offset + destTokenAddressLength > encoded.length) {
+    throw new CCIPMessageDecodeError('TOKEN_TRANSFER_DEST_TOKEN_CONTENT')
+  }
+  const destTokenAddress = decodeAddress(
+    dataSlice(encoded, offset, offset + destTokenAddressLength),
+    destFamily,
+  )
+  offset += destTokenAddressLength
+
+  // tokenReceiverLength and tokenReceiver
+  if (offset >= encoded.length) {
+    throw new CCIPMessageDecodeError('TOKEN_TRANSFER_TOKEN_RECEIVER_LENGTH')
+  }
+  const tokenReceiverLength = encoded[offset++]!
+  if (offset + tokenReceiverLength > encoded.length) {
+    throw new CCIPMessageDecodeError('TOKEN_TRANSFER_TOKEN_RECEIVER_CONTENT')
+  }
+  const tokenReceiver = decodeAddress(
+    dataSlice(encoded, offset, offset + tokenReceiverLength),
+    destFamily,
+  )
+  offset += tokenReceiverLength
+
+  // extraDataLength and extraData
+  if (offset + 2 > encoded.length) {
+    throw new CCIPMessageDecodeError('TOKEN_TRANSFER_EXTRA_DATA_LENGTH')
+  }
+  const extraDataLength = toNumber(dataSlice(encoded, offset, offset + 2))
+  offset += 2
+  if (offset + extraDataLength > encoded.length) {
+    throw new CCIPMessageDecodeError('TOKEN_TRANSFER_EXTRA_DATA_CONTENT')
+  }
+  const extraData = hexlify(dataSlice(encoded, offset, offset + extraDataLength))
+  offset += extraDataLength
+
+  return {
+    tokenTransfer: {
+      amount,
+      sourcePoolAddress,
+      sourceTokenAddress,
+      destTokenAddress,
+      tokenReceiver,
+      extraData,
+    },
+    newOffset: offset,
+  }
+}
+
+/**
+ * Decodes a MessageV1 from bytes following the v1 protocol format.
+ * @param encodedMessage - The encoded message bytes to decode.
+ * @returns The decoded MessageV1 struct.
+ */
+export function decodeMessageV1(encodedMessage: BytesLike): MessageV1 {
+  const MESSAGE_V1_BASE_SIZE = 77
+  const encoded = getDataBytes(encodedMessage)
+
+  if (encoded.length < MESSAGE_V1_BASE_SIZE) throw new CCIPMessageDecodeError('MESSAGE_MIN_SIZE')
+
+  const version = encoded[0]!
+  if (version !== 1) throw new CCIPMessageDecodeError(`Invalid encoding version: ${version}`)
+
+  // sourceChainSelector (8 bytes, big endian)
+  const sourceChainSelector = toBigInt(dataSlice(encoded, 1, 9))
+
+  // destChainSelector (8 bytes, big endian)
+  const destChainSelector = toBigInt(dataSlice(encoded, 9, 17))
+
+  // Get chain families for address decoding
+  const sourceNetworkInfo = networkInfo(sourceChainSelector)
+  const destNetworkInfo = networkInfo(destChainSelector)
+  const sourceFamily = sourceNetworkInfo.family
+  const destFamily = destNetworkInfo.family
+
+  // messageNumber (8 bytes, big endian)
+  const messageNumber = toBigInt(dataSlice(encoded, 17, 25))
+
+  // executionGasLimit (4 bytes, big endian)
+  const executionGasLimit = toNumber(dataSlice(encoded, 25, 29))
+
+  // ccipReceiveGasLimit (4 bytes, big endian)
+  const ccipReceiveGasLimit = toNumber(dataSlice(encoded, 29, 33))
+
+  // finality (2 bytes, big endian)
+  const finality = toNumber(dataSlice(encoded, 33, 35))
+
+  // ccvAndExecutorHash (32 bytes)
+  const ccvAndExecutorHash = hexlify(dataSlice(encoded, 35, 67))
+
+  // onRampAddressLength and onRampAddress
+  let offset = 67
+  if (offset >= encoded.length) throw new CCIPMessageDecodeError('MESSAGE_ONRAMP_ADDRESS_LENGTH')
+  const onRampAddressLength = encoded[offset++]!
+  if (offset + onRampAddressLength > encoded.length) {
+    throw new CCIPMessageDecodeError('MESSAGE_ONRAMP_ADDRESS_CONTENT')
+  }
+  const onRampAddress = decodeAddress(
+    dataSlice(encoded, offset, offset + onRampAddressLength),
+    sourceFamily,
+  )
+  offset += onRampAddressLength
+
+  // offRampAddressLength and offRampAddress
+  if (offset >= encoded.length) throw new CCIPMessageDecodeError('MESSAGE_OFFRAMP_ADDRESS_LENGTH')
+  const offRampAddressLength = encoded[offset++]!
+  if (offset + offRampAddressLength > encoded.length) {
+    throw new CCIPMessageDecodeError('MESSAGE_OFFRAMP_ADDRESS_CONTENT')
+  }
+  const offRampAddress = decodeAddress(
+    dataSlice(encoded, offset, offset + offRampAddressLength),
+    destFamily,
+  )
+  offset += offRampAddressLength
+
+  // senderLength and sender
+  if (offset >= encoded.length) throw new CCIPMessageDecodeError('MESSAGE_SENDER_LENGTH')
+  const senderLength = encoded[offset++]!
+  if (offset + senderLength > encoded.length) {
+    throw new CCIPMessageDecodeError('MESSAGE_SENDER_CONTENT')
+  }
+  const sender = decodeAddress(dataSlice(encoded, offset, offset + senderLength), sourceFamily)
+  offset += senderLength
+
+  // receiverLength and receiver
+  if (offset >= encoded.length) throw new CCIPMessageDecodeError('MESSAGE_RECEIVER_LENGTH')
+  const receiverLength = encoded[offset++]!
+  if (offset + receiverLength > encoded.length) {
+    throw new CCIPMessageDecodeError('MESSAGE_RECEIVER_CONTENT')
+  }
+  const receiver = decodeAddress(dataSlice(encoded, offset, offset + receiverLength), destFamily)
+  offset += receiverLength
+
+  // destBlobLength and destBlob
+  if (offset + 2 > encoded.length) throw new CCIPMessageDecodeError('MESSAGE_DEST_BLOB_LENGTH')
+  const destBlobLength = toNumber(dataSlice(encoded, offset, offset + 2))
+  offset += 2
+  if (offset + destBlobLength > encoded.length) {
+    throw new CCIPMessageDecodeError('MESSAGE_DEST_BLOB_CONTENT')
+  }
+  const destBlob = hexlify(dataSlice(encoded, offset, offset + destBlobLength))
+  offset += destBlobLength
+
+  // tokenTransferLength and tokenTransfer
+  if (offset + 2 > encoded.length) throw new CCIPMessageDecodeError('MESSAGE_TOKEN_TRANSFER_LENGTH')
+  const tokenTransferLength = toNumber(dataSlice(encoded, offset, offset + 2))
+  offset += 2
+
+  // Decode token transfer, which is either 0 or 1
+  const tokenTransfer: TokenTransferV1[] = []
+  if (tokenTransferLength > 0) {
+    const expectedEnd = offset + tokenTransferLength
+    const result = decodeTokenTransferV1(encoded, offset, sourceFamily, destFamily)
+    tokenTransfer.push(result.tokenTransfer)
+    offset = result.newOffset
+    if (offset !== expectedEnd) throw new CCIPMessageDecodeError('MESSAGE_TOKEN_TRANSFER_CONTENT')
+  }
+
+  // dataLength and data
+  if (offset + 2 > encoded.length) throw new CCIPMessageDecodeError('MESSAGE_DATA_LENGTH')
+  const dataLength = toNumber(dataSlice(encoded, offset, offset + 2))
+  offset += 2
+  if (offset + dataLength > encoded.length) {
+    throw new CCIPMessageDecodeError('MESSAGE_DATA_CONTENT')
+  }
+  const data = hexlify(dataSlice(encoded, offset, offset + dataLength))
+  offset += dataLength
+
+  // Ensure we've consumed all bytes
+  if (offset !== encoded.length) throw new CCIPMessageDecodeError('MESSAGE_FINAL_OFFSET')
+
+  return {
+    sourceChainSelector,
+    destChainSelector,
+    messageNumber,
+    executionGasLimit,
+    ccipReceiveGasLimit,
+    finality,
+    ccvAndExecutorHash,
+    onRampAddress,
+    offRampAddress,
+    sender,
+    receiver,
+    destBlob,
+    tokenTransfer,
+    data,
+  }
+}

package/src/solana/cleanup.ts

@@ -93,7 +93,7 @@ export async function cleanUpBuffers(
       } catch (err) {
         const info = await connection.getAddressLookupTable(lookupTable)
         if (!info.value) break
-        else if (info.value.state.deactivationSlot < 2n ** 63n)
+        else if (info.value.state.deactivationSlot < BigInt(2) ** BigInt(63))
           deactivationSlot = Number(info.value.state.deactivationSlot)
         logger.warn('Failed to close lookup table', altAddr, err)
       }
@@ -196,7 +196,7 @@ export async function cleanUpBuffers(
             'not owned by us, but by',
             info.value.state.authority?.toBase58(),
           )
-        } else if (info.value.state.deactivationSlot < 2n ** 63n) {
+        } else if (info.value.state.deactivationSlot < BigInt(2) ** BigInt(63)) {
           // non-deactivated have deactivationSlot=MAX_UINT64
           pendingPromises.push(closeAlt(lookupTable, Number(info.value.state.deactivationSlot)))
         } else if (