@chainlink/ccip-sdk 0.91.1 → 0.92.0

package/src/solana/exec.ts

@@ -13,12 +13,12 @@ import {
 import BN from 'bn.js'
 import { hexlify } from 'ethers'
 
+import { CCIPSolanaLookupTableNotFoundError } from '../errors/index.ts'
 import { type ExecutionReport, type WithLogger, ChainFamily } from '../types.ts'
 import { IDL as CCIP_OFFRAMP_IDL } from './idl/1.6.0/CCIP_OFFRAMP.ts'
 import { encodeSolanaOffchainTokenData } from './offchain.ts'
 import type { CCIPMessage_V1_6_Solana, UnsignedSolanaTx } from './types.ts'
-import { getDataBytes, toLeArray } from '../utils.ts'
-import { bytesToBuffer } from './utils.ts'
+import { bytesToBuffer, getDataBytes, toLeArray } from '../utils.ts'
 
 type ExecAlt = {
   initialIxs: TransactionInstruction[]
@@ -51,7 +51,7 @@ export async function generateUnsignedExecuteReport(
   let bufferId
   if (opts?.forceBuffer) {
     // Use messageId for bufferId. This is arbitrary, but easy to track.
-    bufferId = bytesToBuffer(execReport.message.header.messageId)
+    bufferId = bytesToBuffer(execReport.message.messageId)
   }
 
   const {
@@ -72,7 +72,7 @@ export async function generateUnsignedExecuteReport(
       const lookupTableAccountInfo = await connection.getAddressLookupTable(acc)
 
       if (!lookupTableAccountInfo.value) {
-        throw new Error(`Lookup table account not found: ${acc.toBase58()}`)
+        throw new CCIPSolanaLookupTableNotFoundError(acc.toBase58())
       }
 
       return lookupTableAccountInfo.value
@@ -155,8 +155,8 @@ async function buildLookupTableIxs(
   logger.info('Using Address Lookup Table', altAddr.toBase58())
 
   if (addresses.length > 256) {
-    throw new Error(
-      `The number of addresses (${addresses.length}) exceeds the maximum limit imposed by Solana of 256 for Address Lookup Tables`,
+    throw new CCIPSolanaLookupTableNotFoundError(
+      `addresses count ${addresses.length} exceeds Solana limit of 256 for Address Lookup Tables`,
     )
   }
 
@@ -324,7 +324,7 @@ async function getManuallyExecuteInputs({
     originalSender: bytesToBuffer(execReport.message.sender),
     payer,
     messagingAccounts,
-    sourceChainSelector: execReport.message.header.sourceChainSelector,
+    sourceChainSelector: execReport.message.sourceChainSelector,
     tokenTransferAndOffchainData,
     merkleRoot: bytesToBuffer(execReport.merkleRoot),
     bufferId,
@@ -348,14 +348,14 @@ function prepareExecutionReport({
   typeof CCIP_OFFRAMP_IDL
 >['ExecutionReportSingleChain'] {
   return {
-    sourceChainSelector: new BN(message.header.sourceChainSelector.toString()),
+    sourceChainSelector: new BN(message.sourceChainSelector.toString()),
     message: {
       header: {
-        messageId: Array.from(getDataBytes(message.header.messageId)),
-        sourceChainSelector: new BN(message.header.sourceChainSelector),
-        destChainSelector: new BN(message.header.destChainSelector),
-        sequenceNumber: new BN(message.header.sequenceNumber),
-        nonce: new BN(message.header.nonce),
+        messageId: Array.from(getDataBytes(message.messageId)),
+        sourceChainSelector: new BN(message.sourceChainSelector),
+        destChainSelector: new BN(message.destChainSelector),
+        sequenceNumber: new BN(message.sequenceNumber),
+        nonce: new BN(message.nonce),
       },
       sender: bytesToBuffer(message.sender),
       data: bytesToBuffer(message.data),

package/src/solana/hasher.ts

@@ -12,6 +12,10 @@ import {
 } from 'ethers'
 import type { ReadonlyDeep } from 'type-fest'
 
+import {
+  CCIPExtraArgsInvalidError,
+  CCIPSolanaLaneVersionUnsupportedError,
+} from '../errors/index.ts'
 import { decodeExtraArgs } from '../extra-args.ts'
 import type { LeafHasher } from '../hasher/index.ts'
 import { type CCIPMessage, type Lane, type WithLogger, CCIPVersion } from '../types.ts'
@@ -48,7 +52,7 @@ export function getV16SolanaLeafHasher(
   { logger = console }: WithLogger = {},
 ): LeafHasher<typeof CCIPVersion.V1_6> {
   if (lane.version !== CCIPVersion.V1_6)
-    throw new Error(`Unsupported lane version: ${lane.version}`)
+    throw new CCIPSolanaLaneVersionUnsupportedError(lane.version)
 
   return (message: ReadonlyDeep<CCIPMessage<typeof CCIPVersion.V1_6>>): string => {
     let parsedArgs
@@ -62,7 +66,7 @@ export function getV16SolanaLeafHasher(
     } else {
       parsedArgs = decodeExtraArgs(message.extraArgs, networkInfo(lane.sourceChainSelector).family)
       if (!parsedArgs || parsedArgs._tag !== 'SVMExtraArgsV1')
-        throw new Error('Invalid extraArgs, not SVMExtraArgsV1')
+        throw new CCIPExtraArgsInvalidError('SVM', message.extraArgs)
     }
 
     const any2SVMExtraArgsBorshEncoded = borshSerialize(SvmExtraArgsSchema, parsedArgs, true)
@@ -91,11 +95,11 @@ export function getV16SolanaLeafHasher(
       toBeHex(lane.destChainSelector, 8),
       toBeHex(dataLength(onRampBytes), 2),
       onRampBytes,
-      message.header.messageId,
+      message.messageId,
       tokenReceiver,
-      toBeHex(message.header.sequenceNumber, 8),
+      toBeHex(message.sequenceNumber, 8),
       any2SVMExtraArgsBorshEncoded,
-      toBeHex(message.header.nonce, 8),
+      toBeHex(message.nonce, 8),
       toBeHex(dataLength(sender), 2),
       sender,
       toBeHex(dataLength(dataBytes), 2),