@chainlink/ccip-sdk 0.96.0 → 1.0.0

package/src/evm/const.ts

@@ -1,3 +1,4 @@
+import { parseAbi } from 'abitype'
 import { type EventFragment, AbiCoder, Interface } from 'ethers'
 
 import Token_ABI from './abi/BurnMintERC677Token.ts'
@@ -10,24 +11,26 @@ import TokenPool_1_6_ABI from './abi/LockReleaseTokenPool_1_6_1.ts'
 import EVM2EVMOffRamp_1_2_ABI from './abi/OffRamp_1_2.ts'
 import EVM2EVMOffRamp_1_5_ABI from './abi/OffRamp_1_5.ts'
 import OffRamp_1_6_ABI from './abi/OffRamp_1_6.ts'
+import OffRamp_2_0_ABI from './abi/OffRamp_2_0.ts'
 import EVM2EVMOnRamp_1_2_ABI from './abi/OnRamp_1_2.ts'
 import EVM2EVMOnRamp_1_5_ABI from './abi/OnRamp_1_5.ts'
 import OnRamp_1_6_ABI from './abi/OnRamp_1_6.ts'
+import OnRamp_2_0_ABI from './abi/OnRamp_2_0.ts'
 import PriceRegistry_1_2_ABI from './abi/PriceRegistry_1_2.ts'
 import Router_ABI from './abi/Router.ts'
 import TokenAdminRegistry_ABI from './abi/TokenAdminRegistry_1_5.ts'
 
 export const defaultAbiCoder = AbiCoder.defaultAbiCoder()
 
-export const DEFAULT_GAS_LIMIT = 200_000n
-export const DEFAULT_APPROVE_GAS_LIMIT = 120_000n
-
 const customErrors = [
   'error NoContract()',
   'error NoGasForCallExactCheck()',
   'error NotEnoughGasForCall()',
+  'error InvalidChain(uint64 chainSelector)',
 ] as const
 
+export const VersionedContractABI = parseAbi(['function typeAndVersion() view returns (string)'])
+
 export const interfaces = {
   Router: new Interface(Router_ABI),
   Token: new Interface(Token_ABI),
@@ -38,9 +41,11 @@ export const interfaces = {
   TokenPool_v1_6: new Interface(TokenPool_1_6_ABI),
   CommitStore_v1_5: new Interface(CommitStore_1_5_ABI),
   CommitStore_v1_2: new Interface(CommitStore_1_2_ABI),
+  OffRamp_v2_0: new Interface(OffRamp_2_0_ABI),
   OffRamp_v1_6: new Interface(OffRamp_1_6_ABI),
   EVM2EVMOffRamp_v1_5: new Interface(EVM2EVMOffRamp_1_5_ABI),
   EVM2EVMOffRamp_v1_2: new Interface(EVM2EVMOffRamp_1_2_ABI),
+  OnRamp_v2_0: new Interface(OnRamp_2_0_ABI),
   OnRamp_v1_6: new Interface(OnRamp_1_6_ABI),
   EVM2EVMOnRamp_v1_5: new Interface(EVM2EVMOnRamp_1_5_ABI),
   EVM2EVMOnRamp_v1_2: new Interface(EVM2EVMOnRamp_1_2_ABI),
@@ -74,3 +79,5 @@ export const commitsFragments = getAllFragmentsMatchingEvents([
   'CommitReportAccepted',
 ])
 export const receiptsFragments = getAllFragmentsMatchingEvents(['ExecutionStateChanged'])
+
+export const CCV_INDEXER_URL = 'https://chainlink-ccv-indexer.ccip.stage.external.griddle.sh/all'

package/src/evm/errors.ts

@@ -118,7 +118,7 @@ export function parseWithFragment(
 
 // join truthy property names, separated by a dot
 function j(...args: string[]): string {
-  return args.filter(Boolean).join('.')
+  return args.reduce((acc, v) => (!v ? acc : acc ? acc + (v.match(/^\w/) ? '.' : '') + v : v), '')
 }
 
 /**
@@ -137,7 +137,11 @@ export function recursiveParseError(
     if (data.length === 0) return key ? [[key, data.toArray()]] : []
     let kv: ReturnType<typeof recursiveParseError>
     try {
-      kv = Object.entries(data.toObject()).map(([k, v]) => [j(key, k), v])
+      const obj = data.toObject()
+      const keys = Object.keys(obj)
+      // eslint-disable-next-line no-restricted-syntax
+      if (keys.length > 0 && keys.every((k) => k.startsWith('_'))) throw new Error('not an obj')
+      kv = Object.entries(obj).map(([k, v]) => [j(key, k), v])
     } catch (_) {
       kv = data.toArray().map((v, i) => [j(key, `[${i}]`), v])
     }

package/src/evm/extra-args.ts

@@ -1,6 +1,5 @@
 import {
   type BytesLike,
-  Result,
   concat,
   dataSlice,
   encodeBase58,
@@ -25,8 +24,10 @@ import {
   SVMExtraArgsV1Tag,
   SuiExtraArgsV1Tag,
 } from '../extra-args.ts'
+import { DEFAULT_GAS_LIMIT } from '../shared/constants.ts'
 import { getAddressBytes, getDataBytes } from '../utils.ts'
-import { DEFAULT_GAS_LIMIT, defaultAbiCoder } from './const.ts'
+import { defaultAbiCoder } from './const.ts'
+import { resultToObject } from './types.ts'
 
 // ABI type strings for extra args encoding
 const EVMExtraArgsV1ABI = 'tuple(uint256 gasLimit)'
@@ -36,29 +37,11 @@ const SVMExtraArgsV1ABI =
 const SuiExtraArgsV1ABI =
   'tuple(uint256 gasLimit, bool allowOutOfOrderExecution, bytes32 tokenReceiver, bytes32[] receiverObjectIds)'
 
-/**
- * Converts an ethers Result to a plain object.
- * @internal
- */
-function resultToObject<T>(o: T): T {
-  if (o instanceof Promise) return o.then(resultToObject) as T
-  if (!(o instanceof Result)) return o
-  if (o.length === 0) return o.toArray() as T
-  try {
-    const obj = o.toObject()
-    if (!Object.keys(obj).every((k) => /^_+\d*$/.test(k)))
-      return Object.fromEntries(Object.entries(obj).map(([k, v]) => [k, resultToObject(v)])) as T
-  } catch (_) {
-    // fallthrough
-  }
-  return o.toArray().map(resultToObject) as T
-}
-
 /**
  * Encodes GenericExtraArgsV3 using tightly packed binary format.
  *
  * Binary format:
- * - tag (4 bytes): 0x302326cb
+ * - tag (4 bytes): 0xa69dd4aa
  * - gasLimit (4 bytes): uint32 big-endian
  * - blockConfirmations (2 bytes): uint16 big-endian
  * - ccvsLength (1 byte): uint8

package/src/evm/hasher.ts

@@ -102,24 +102,39 @@ export function getV16LeafHasher(
   onRamp: string,
   { logger = console }: WithLogger = {},
 ): LeafHasher<typeof CCIPVersion.V1_6> {
+  const onRampBytes = getAddressBytes(onRamp)
+  // Addresses ≤32 bytes (EVM 20B, Aptos/Solana/Sui 32B) are zero-padded to 32 bytes;
+  // Addresses >32 bytes (e.g., TON 36B) are used as raw bytes without padding
+  const onRampForHash = onRampBytes.length <= 32 ? zeroPadValue(onRampBytes, 32) : onRampBytes
+
   const metadataInput = concat([
     ANY_2_EVM_MESSAGE_HASH,
     toBeHex(sourceChainSelector, 32),
     toBeHex(destChainSelector, 32),
-    keccak256(zeroPadValue(getAddressBytes(onRamp), 32)),
+    keccak256(onRampForHash),
   ])
 
   return (message: ReadonlyDeep<CCIPMessage<typeof CCIPVersion.V1_6>>): string => {
     logger.debug('Message', message)
-    const parsedArgs = decodeExtraArgs(
-      message.extraArgs,
-      networkInfo(message.sourceChainSelector).family,
-    )
-    if (
-      !parsedArgs ||
-      (parsedArgs._tag !== 'EVMExtraArgsV1' && parsedArgs._tag !== 'EVMExtraArgsV2')
-    )
-      throw new CCIPExtraArgsInvalidError('EVM', message.extraArgs)
+
+    // Non-EVM sources (e.g., TON) embed gasLimit on the message during parsing,
+    // since their extraArgs format differs. EVM sources decode from extraArgs.
+    let gasLimit: bigint
+    if ('gasLimit' in message) {
+      gasLimit = message.gasLimit
+    } else {
+      const parsedArgs = decodeExtraArgs(
+        message.extraArgs,
+        networkInfo(message.sourceChainSelector).family,
+      )
+      if (
+        !parsedArgs ||
+        (parsedArgs._tag !== 'EVMExtraArgsV1' && parsedArgs._tag !== 'EVMExtraArgsV2')
+      )
+        throw new CCIPExtraArgsInvalidError('EVM', message.extraArgs)
+      gasLimit = parsedArgs.gasLimit
+    }
+
     const tokenAmounts = message.tokenAmounts.map((ta) => ({
       ...ta,
       sourcePoolAddress: zeroPadValue(getAddressBytes(ta.sourcePoolAddress), 32),
@@ -140,16 +155,13 @@ export function getV16LeafHasher(
         'uint256 gasLimit',
         'uint64 nonce',
       ],
-      [
-        message.messageId,
-        message.receiver,
-        message.sequenceNumber,
-        parsedArgs.gasLimit,
-        message.nonce,
-      ],
+      [message.messageId, message.receiver, message.sequenceNumber, gasLimit, message.nonce],
     )
 
-    const sender = zeroPadValue(getAddressBytes(message.sender), 32)
+    const senderBytes = getAddressBytes(message.sender)
+    // Addresses ≤32 bytes (EVM 20B, Aptos/Solana/Sui 32B) are zero-padded to 32 bytes;
+    // Addresses >32 bytes (e.g., TON 36B) are used as raw bytes without padding
+    const sender = senderBytes.length <= 32 ? zeroPadValue(senderBytes, 32) : senderBytes
 
     const packedValues = defaultAbiCoder.encode(
       [