@chainlink/ccip-sdk 0.95.0 → 0.96.0

package/dist/evm/extra-args.js

@@ -0,0 +1,328 @@
+import { Result, concat, dataSlice, encodeBase58, getAddress, hexlify, toBeHex, toBigInt, toNumber, zeroPadValue, } from 'ethers';
+import { EVMExtraArgsV1Tag, EVMExtraArgsV2Tag, GenericExtraArgsV3Tag, SVMExtraArgsV1Tag, SuiExtraArgsV1Tag, } from "../extra-args.js";
+import { getAddressBytes, getDataBytes } from "../utils.js";
+import { DEFAULT_GAS_LIMIT, defaultAbiCoder } from "./const.js";
+// ABI type strings for extra args encoding
+const EVMExtraArgsV1ABI = 'tuple(uint256 gasLimit)';
+const EVMExtraArgsV2ABI = 'tuple(uint256 gasLimit, bool allowOutOfOrderExecution)';
+const SVMExtraArgsV1ABI = 'tuple(uint32 computeUnits, uint64 accountIsWritableBitmap, bool allowOutOfOrderExecution, bytes32 tokenReceiver, bytes32[] accounts)';
+const SuiExtraArgsV1ABI = 'tuple(uint256 gasLimit, bool allowOutOfOrderExecution, bytes32 tokenReceiver, bytes32[] receiverObjectIds)';
+/**
+ * Converts an ethers Result to a plain object.
+ * @internal
+ */
+function resultToObject(o) {
+    if (o instanceof Promise)
+        return o.then(resultToObject);
+    if (!(o instanceof Result))
+        return o;
+    if (o.length === 0)
+        return o.toArray();
+    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)]));
+    }
+    catch (_) {
+        // fallthrough
+    }
+    return o.toArray().map(resultToObject);
+}
+/**
+ * Encodes GenericExtraArgsV3 using tightly packed binary format.
+ *
+ * Binary format:
+ * - tag (4 bytes): 0x302326cb
+ * - gasLimit (4 bytes): uint32 big-endian
+ * - blockConfirmations (2 bytes): uint16 big-endian
+ * - ccvsLength (1 byte): uint8
+ * - For each CCV:
+ *   - ccvAddressLength (1 byte): 0 or 20
+ *   - ccvAddress (0 or 20 bytes)
+ *   - ccvArgsLength (2 bytes): uint16 big-endian
+ *   - ccvArgs (variable)
+ * - executorLength (1 byte): 0 or 20
+ * - executor (0 or 20 bytes)
+ * - executorArgsLength (2 bytes): uint16 big-endian
+ * - executorArgs (variable)
+ * - tokenReceiverLength (1 byte): uint8
+ * - tokenReceiver (variable)
+ * - tokenArgsLength (2 bytes): uint16 big-endian
+ * - tokenArgs (variable)
+ */
+function encodeExtraArgsV3(args) {
+    const parts = [];
+    // Tag (4 bytes)
+    parts.push(getDataBytes(GenericExtraArgsV3Tag));
+    // gasLimit (4 bytes, uint32 big-endian)
+    parts.push(getDataBytes(toBeHex(args.gasLimit, 4)));
+    // blockConfirmations (2 bytes, uint16 big-endian)
+    parts.push(getDataBytes(toBeHex(args.blockConfirmations, 2)));
+    // ccvsLength (1 byte)
+    parts.push(new Uint8Array([args.ccvs.length]));
+    // For each CCV
+    for (let i = 0; i < args.ccvs.length; i++) {
+        const ccvAddress = args.ccvs[i];
+        const ccvArgsBytes = getDataBytes(args.ccvArgs[i] ?? '0x');
+        if (ccvAddress && ccvAddress !== '' && ccvAddress !== '0x') {
+            // ccvAddressLength = 20
+            parts.push(new Uint8Array([20]));
+            // ccvAddress (20 bytes)
+            parts.push(getDataBytes(ccvAddress));
+        }
+        else {
+            // ccvAddressLength = 0
+            parts.push(new Uint8Array([0]));
+        }
+        // ccvArgsLength (2 bytes, uint16 big-endian)
+        parts.push(getDataBytes(toBeHex(ccvArgsBytes.length, 2)));
+        // ccvArgs (variable)
+        if (ccvArgsBytes.length > 0) {
+            parts.push(ccvArgsBytes);
+        }
+    }
+    // executorLength (1 byte)
+    if (args.executor && args.executor !== '' && args.executor !== '0x') {
+        parts.push(new Uint8Array([20]));
+        parts.push(getDataBytes(args.executor));
+    }
+    else {
+        parts.push(new Uint8Array([0]));
+    }
+    // Convert BytesLike fields to Uint8Array
+    const executorArgsBytes = getDataBytes(args.executorArgs);
+    const tokenReceiverBytes = getDataBytes(args.tokenReceiver);
+    const tokenArgsBytes = getDataBytes(args.tokenArgs);
+    // executorArgsLength (2 bytes, uint16 big-endian)
+    parts.push(getDataBytes(toBeHex(executorArgsBytes.length, 2)));
+    // executorArgs (variable)
+    if (executorArgsBytes.length > 0) {
+        parts.push(executorArgsBytes);
+    }
+    // tokenReceiverLength (1 byte)
+    parts.push(new Uint8Array([tokenReceiverBytes.length]));
+    // tokenReceiver (variable)
+    if (tokenReceiverBytes.length > 0) {
+        parts.push(tokenReceiverBytes);
+    }
+    // tokenArgsLength (2 bytes, uint16 big-endian)
+    parts.push(getDataBytes(toBeHex(tokenArgsBytes.length, 2)));
+    // tokenArgs (variable)
+    if (tokenArgsBytes.length > 0) {
+        parts.push(tokenArgsBytes);
+    }
+    return hexlify(concat(parts));
+}
+/**
+ * Decodes GenericExtraArgsV3 from tightly packed binary format.
+ * @param data - Bytes to decode (without the tag prefix).
+ * @returns Decoded GenericExtraArgsV3 or undefined if parsing fails.
+ */
+function decodeExtraArgsV3(data) {
+    let offset = 0;
+    // gasLimit (4 bytes, uint32 big-endian)
+    if (offset + 4 > data.length)
+        return undefined;
+    const gasLimit = toBigInt(data.subarray(offset, offset + 4));
+    offset += 4;
+    // blockConfirmations (2 bytes, uint16 big-endian)
+    if (offset + 2 > data.length)
+        return undefined;
+    const blockConfirmations = toNumber(data.subarray(offset, offset + 2));
+    offset += 2;
+    // ccvsLength (1 byte)
+    if (offset + 1 > data.length)
+        return undefined;
+    const ccvsLength = data[offset];
+    offset += 1;
+    const ccvs = [];
+    const ccvArgs = [];
+    // For each CCV
+    for (let i = 0; i < ccvsLength; i++) {
+        // ccvAddressLength (1 byte)
+        if (offset + 1 > data.length)
+            return undefined;
+        const ccvAddrLen = data[offset];
+        offset += 1;
+        // ccvAddress (0 or 20 bytes)
+        if (ccvAddrLen === 20) {
+            if (offset + 20 > data.length)
+                return undefined;
+            ccvs.push(getAddress(hexlify(data.slice(offset, offset + 20))));
+            offset += 20;
+        }
+        else if (ccvAddrLen === 0) {
+            ccvs.push('');
+        }
+        else {
+            return undefined; // Invalid address length
+        }
+        // ccvArgsLength (2 bytes, uint16 big-endian)
+        if (offset + 2 > data.length)
+            return undefined;
+        const ccvArgsLen = toNumber(data.subarray(offset, offset + 2));
+        offset += 2;
+        // ccvArgs (variable)
+        if (offset + ccvArgsLen > data.length)
+            return undefined;
+        ccvArgs.push(hexlify(data.slice(offset, offset + ccvArgsLen)));
+        offset += ccvArgsLen;
+    }
+    // executorLength (1 byte)
+    if (offset + 1 > data.length)
+        return undefined;
+    const executorLen = data[offset];
+    offset += 1;
+    // executor (0 or 20 bytes)
+    let executor = '';
+    if (executorLen === 20) {
+        if (offset + 20 > data.length)
+            return undefined;
+        executor = getAddress(hexlify(data.slice(offset, offset + 20)));
+        offset += 20;
+    }
+    else if (executorLen !== 0) {
+        return undefined; // Invalid executor length
+    }
+    // executorArgsLength (2 bytes, uint16 big-endian)
+    if (offset + 2 > data.length)
+        return undefined;
+    const executorArgsLen = toNumber(data.subarray(offset, offset + 2));
+    offset += 2;
+    // executorArgs (variable)
+    if (offset + executorArgsLen > data.length)
+        return undefined;
+    const executorArgs = hexlify(data.slice(offset, offset + executorArgsLen));
+    offset += executorArgsLen;
+    // tokenReceiverLength (1 byte)
+    if (offset + 1 > data.length)
+        return undefined;
+    const tokenReceiverLen = data[offset];
+    offset += 1;
+    // tokenReceiver (variable)
+    if (offset + tokenReceiverLen > data.length)
+        return undefined;
+    const tokenReceiverBytes = data.slice(offset, offset + tokenReceiverLen);
+    offset += tokenReceiverLen;
+    // Convert tokenReceiver bytes to string
+    let tokenReceiver;
+    if (tokenReceiverLen === 0) {
+        tokenReceiver = '';
+    }
+    else if (tokenReceiverLen === 20) {
+        // 20 bytes = EVM address, return checksummed
+        tokenReceiver = getAddress(hexlify(tokenReceiverBytes));
+    }
+    else {
+        // Other lengths: return as hex string
+        tokenReceiver = hexlify(tokenReceiverBytes);
+    }
+    // tokenArgsLength (2 bytes, uint16 big-endian)
+    if (offset + 2 > data.length)
+        return undefined;
+    const tokenArgsLen = toNumber(data.subarray(offset, offset + 2));
+    offset += 2;
+    // tokenArgs (variable)
+    if (offset + tokenArgsLen > data.length)
+        return undefined;
+    const tokenArgs = hexlify(data.slice(offset, offset + tokenArgsLen));
+    offset += tokenArgsLen;
+    return {
+        gasLimit,
+        blockConfirmations,
+        ccvs,
+        ccvArgs,
+        executor,
+        executorArgs,
+        tokenReceiver,
+        tokenArgs,
+    };
+}
+/**
+ * Decodes extra arguments from a CCIP message.
+ * @param extraArgs - Encoded extra arguments bytes.
+ * @returns Decoded extra arguments with tag, or undefined if unknown format.
+ */
+export function decodeExtraArgs(extraArgs) {
+    const data = getDataBytes(extraArgs), tag = dataSlice(data, 0, 4);
+    switch (tag) {
+        case EVMExtraArgsV1Tag: {
+            const args = defaultAbiCoder.decode([EVMExtraArgsV1ABI], dataSlice(data, 4));
+            return { ...resultToObject(args[0]), _tag: 'EVMExtraArgsV1' };
+        }
+        case EVMExtraArgsV2Tag: {
+            const args = defaultAbiCoder.decode([EVMExtraArgsV2ABI], dataSlice(data, 4));
+            return { ...resultToObject(args[0]), _tag: 'EVMExtraArgsV2' };
+        }
+        case GenericExtraArgsV3Tag: {
+            const parsed = decodeExtraArgsV3(data.slice(4));
+            if (!parsed)
+                return undefined;
+            return { ...parsed, _tag: 'GenericExtraArgsV3' };
+        }
+        case SVMExtraArgsV1Tag: {
+            const args = defaultAbiCoder.decode([SVMExtraArgsV1ABI], dataSlice(data, 4));
+            const parsed = resultToObject(args[0]);
+            parsed.tokenReceiver = encodeBase58(parsed.tokenReceiver);
+            parsed.accounts = parsed.accounts.map((a) => encodeBase58(a));
+            return { ...parsed, _tag: 'SVMExtraArgsV1' };
+        }
+        case SuiExtraArgsV1Tag: {
+            const args = defaultAbiCoder.decode([SuiExtraArgsV1ABI], dataSlice(data, 4));
+            const parsed = resultToObject(args[0]);
+            return {
+                ...parsed,
+                _tag: 'SuiExtraArgsV1',
+            };
+        }
+        default:
+            return undefined;
+    }
+}
+/**
+ * Encodes extra arguments for a CCIP message.
+ * @param args - Extra arguments to encode.
+ * @returns Encoded extra arguments as hex string.
+ */
+export function encodeExtraArgs(args) {
+    if (!args)
+        return '0x';
+    if ('blockConfirmations' in args) {
+        // GenericExtraArgsV3 - tightly packed binary encoding
+        return encodeExtraArgsV3(args);
+    }
+    else if ('computeUnits' in args) {
+        return concat([
+            SVMExtraArgsV1Tag,
+            defaultAbiCoder.encode([SVMExtraArgsV1ABI], [
+                {
+                    ...args,
+                    tokenReceiver: getAddressBytes(args.tokenReceiver),
+                    accounts: args.accounts.map((a) => getAddressBytes(a)),
+                },
+            ]),
+        ]);
+    }
+    else if ('receiverObjectIds' in args) {
+        return concat([
+            SuiExtraArgsV1Tag,
+            defaultAbiCoder.encode([SuiExtraArgsV1ABI], [
+                {
+                    ...args,
+                    tokenReceiver: zeroPadValue(getAddressBytes(args.tokenReceiver), 32),
+                    receiverObjectIds: args.receiverObjectIds.map((a) => getDataBytes(a)),
+                },
+            ]),
+        ]);
+    }
+    else if ('allowOutOfOrderExecution' in args) {
+        if (args.gasLimit == null)
+            args.gasLimit = DEFAULT_GAS_LIMIT;
+        return concat([EVMExtraArgsV2Tag, defaultAbiCoder.encode([EVMExtraArgsV2ABI], [args])]);
+    }
+    else if (args.gasLimit != null) {
+        return concat([EVMExtraArgsV1Tag, defaultAbiCoder.encode([EVMExtraArgsV1ABI], [args])]);
+    }
+    return '0x';
+}
+//# sourceMappingURL=extra-args.js.map

package/dist/evm/extra-args.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"extra-args.js","sourceRoot":"","sources":["../../src/evm/extra-args.ts"],"names":[],"mappings":"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"}

package/dist/evm/gas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gas.d.ts","sourceRoot":"","sources":["../../src/evm/gas.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAWxB,MAAM,QAAQ,CAAA;AAIf,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AA8DxC,KAAK,mBAAmB,GAAG,IAAI,CAC7B,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAC7D,SAAS,GAAG,UAAU,CACvB,GAAG;IAEF,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,EACpC,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,OAAO,GACR,EAAE,mBAAmB,mBAmDrB"}
+{"version":3,"file":"gas.d.ts","sourceRoot":"","sources":["../../src/evm/gas.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAWxB,MAAM,QAAQ,CAAA;AAIf,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AA+DxC,KAAK,mBAAmB,GAAG,IAAI,CAC7B,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAC7D,SAAS,GAAG,UAAU,CACvB,GAAG;IAEF,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,EACpC,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,OAAO,GACR,EAAE,mBAAmB,mBAmDrB"}

package/dist/evm/gas.js

@@ -11,30 +11,25 @@ const ccipReceive = FunctionFragment.from({
     inputs: RouterABI.find((v) => v.type === 'function' && v.name === 'routeMessage').inputs.slice(0, 1),
     outputs: [],
 });
-const transferFragment = interfaces.Token.getFunction('transfer');
 /**
  * Finds suitable token balance slot by simulating a fake transfer between 2 non-existent accounts,
  * with state overrides for the holders' balance, which reverts if override slot is wrong
  */
-const findBalancesSlot = memoize(async function findBalancesSlot_(token, provider) {
-    const fakeHolder = getAddress(hexlify(randomBytes(20)));
-    const fakeRecipient = getAddress(hexlify(randomBytes(20)));
-    const fakeAmount = 1e7;
-    const calldata = concat([
-        transferFragment.selector,
-        defaultAbiCoder.encode(transferFragment.inputs, [fakeRecipient, fakeAmount]),
-    ]);
+const findBalancesSlot = memoize(async function findBalancesSlot_(token, provider, holder = getAddress(hexlify(randomBytes(20))), recipient = getAddress(hexlify(randomBytes(20)))) {
+    const contract = new Contract(token, interfaces.Token, provider);
+    const fakeAmount = (await contract.totalSupply()) + 1n;
+    const calldata = interfaces.Token.encodeFunctionData('transfer', [recipient, fakeAmount]);
     let firstErr;
     // try range(0..15), but start with most probable 0 (common ERC20) and 9 (USDC)
     for (const slot of [0, 9, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15]) {
         try {
             await provider.send('eth_estimateGas', [
-                { from: fakeHolder, to: token, data: calldata },
+                { from: holder, to: token, data: calldata },
                 'latest',
                 {
                     [token]: {
                         stateDiff: {
-                            [solidityPackedKeccak256(['uint256', 'uint256'], [fakeHolder, slot])]: toBeHex(fakeAmount, 32),
+                            [solidityPackedKeccak256(['uint256', 'uint256'], [holder, slot])]: toBeHex(fakeAmount, 32),
                         },
                     },
                 },
@@ -64,7 +59,7 @@ export async function estimateExecGas({ provider, router, receiver, message, })
             destAmounts[token] = currentBalance;
         }
         destAmounts[token] += amount;
-        const balancesSlot = await findBalancesSlot(token, provider);
+        const balancesSlot = await findBalancesSlot(token, provider, receiver, router);
         stateOverrides[token] = {
             stateDiff: {
                 [solidityPackedKeccak256(['uint256', 'uint256'], [receiver, balancesSlot])]: toBeHex(destAmounts[token], 32),

package/dist/evm/gas.js.map

@@ -1 +1 @@
-{"version":3,"file":"gas.js","sourceRoot":"","sources":["../../src/evm/gas.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gas.js","sourceRoot":"","sources":["../../src/evm/gas.ts"],"names":[],"mappings":"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"}

package/dist/evm/index.d.ts

@@ -1,15 +1,11 @@
 import { type BytesLike, type JsonRpcApiProvider, type Log, type TransactionReceipt } from 'ethers';
 import type { PickDeep } from 'type-fest';
 import { type ChainContext, type GetBalanceOpts, type LogFilter, type TokenPoolRemote, Chain } from '../chain.ts';
-import { type EVMExtraArgsV1, type EVMExtraArgsV2, type ExtraArgs, type SVMExtraArgsV1, type SuiExtraArgsV1 } from '../extra-args.ts';
+import type { ExtraArgs } from '../extra-args.ts';
 import type { LeafHasher } from '../hasher/common.ts';
 import { type CCIPExecution, type CCIPMessage, type CCIPRequest, type ChainTransaction, type CommitReport, type ExecutionReceipt, type Lane, type NetworkInfo, type OffchainTokenData, type WithLogger, ChainFamily } from '../types.ts';
 import type { UnsignedEVMTx } from './types.ts';
 export type { UnsignedEVMTx };
-declare const EVMExtraArgsV1 = "tuple(uint256 gasLimit)";
-declare const EVMExtraArgsV2 = "tuple(uint256 gasLimit, bool allowOutOfOrderExecution)";
-declare const SVMExtraArgsV1 = "tuple(uint32 computeUnits, uint64 accountIsWritableBitmap, bool allowOutOfOrderExecution, bytes32 tokenReceiver, bytes32[] accounts)";
-declare const SuiExtraArgsV1 = "tuple(uint256 gasLimit, bool allowOutOfOrderExecution, bytes32 tokenReceiver, bytes32[] receiverObjectIds)";
 /**
  * EVM chain implementation supporting Ethereum-compatible networks.
  */
@@ -66,6 +62,8 @@ export declare class EVMChain extends Chain<typeof ChainFamily.EVM> {
      * Decodes a CCIP message from a log event.
      * @param log - Log event with topics and data.
      * @returns Decoded CCIPMessage or undefined if not a valid CCIP message.
+     * @throws {@link CCIPLogDataInvalidError} if log data is not valid bytes
+     * @throws {@link CCIPMessageDecodeError} if message cannot be decoded
      */
     static decodeMessage(log: {
         topics?: readonly string[];
@@ -76,6 +74,8 @@ export declare class EVMChain extends Chain<typeof ChainFamily.EVM> {
      * @param log - Log event with topics and data.
      * @param lane - Lane info (required for CCIP v1.5 and earlier).
      * @returns Array of CommitReport or undefined if not a valid commit event.
+     * @throws {@link CCIPLogDataInvalidError} if log data is not valid bytes
+     * @throws {@link CCIPVersionRequiresLaneError} if CCIP v1.5 event but no lane provided
      */
     static decodeCommits(log: {
         topics?: readonly string[];
@@ -85,6 +85,7 @@ export declare class EVMChain extends Chain<typeof ChainFamily.EVM> {
      * Decodes an execution receipt from a log event.
      * @param log - Log event with topics and data.
      * @returns ExecutionReceipt or undefined if not a valid execution event.
+     * @throws {@link CCIPLogDataInvalidError} if log data is not valid bytes
      */
     static decodeReceipt(log: {
         topics?: readonly string[];
@@ -95,14 +96,23 @@ export declare class EVMChain extends Chain<typeof ChainFamily.EVM> {
      * @param extraArgs - Encoded extra arguments bytes.
      * @returns Decoded extra arguments with tag, or undefined if unknown format.
      */
-    static decodeExtraArgs(extraArgs: BytesLike): (EVMExtraArgsV1 & {
-        _tag: 'EVMExtraArgsV1';
-    }) | (EVMExtraArgsV2 & {
-        _tag: 'EVMExtraArgsV2';
-    }) | (SVMExtraArgsV1 & {
-        _tag: 'SVMExtraArgsV1';
-    }) | (SuiExtraArgsV1 & {
-        _tag: 'SuiExtraArgsV1';
+    static decodeExtraArgs(extraArgs: BytesLike): (import("../extra-args.ts").EVMExtraArgsV1 & {
+        _tag: "EVMExtraArgsV1";
+    }) | (import("../extra-args.ts").EVMExtraArgsV1 & {
+        allowOutOfOrderExecution: boolean;
+    } & {
+        _tag: "EVMExtraArgsV2";
+    }) | (import("../extra-args.ts").GenericExtraArgsV3 & {
+        _tag: "GenericExtraArgsV3";
+    }) | (import("../extra-args.ts").SVMExtraArgsV1 & {
+        _tag: "SVMExtraArgsV1";
+    }) | (import("../extra-args.ts").EVMExtraArgsV1 & {
+        allowOutOfOrderExecution: boolean;
+    } & {
+        tokenReceiver: string;
+        receiverObjectIds: string[];
+    } & {
+        _tag: "SuiExtraArgsV1";
     }) | undefined;
     /**
      * Encodes extra arguments for a CCIP message.
@@ -114,6 +124,7 @@ export declare class EVMChain extends Chain<typeof ChainFamily.EVM> {
      * Converts bytes to a checksummed EVM address.
      * @param bytes - Bytes to convert (must be 20 bytes or 32 bytes with leading zeros).
      * @returns Checksummed EVM address.
+     * @throws {@link CCIPAddressInvalidEvmError} if bytes cannot be converted to a valid EVM address
      */
     static getAddress(bytes: BytesLike): string;
     /**
@@ -124,11 +135,18 @@ export declare class EVMChain extends Chain<typeof ChainFamily.EVM> {
      * Gets lane configuration from an OnRamp contract.
      * @param onRamp - OnRamp contract address.
      * @returns Lane configuration.
+     * @throws {@link CCIPContractTypeInvalidError} if contract doesn't have destChainSelector
      */
     getLaneForOnRamp(onRamp: string): Promise<Lane>;
-    /** {@inheritDoc Chain.getRouterForOnRamp} */
+    /**
+     * {@inheritDoc Chain.getRouterForOnRamp}
+     * @throws {@link CCIPVersionUnsupportedError} if OnRamp version is not supported
+     */
     getRouterForOnRamp(onRamp: string, destChainSelector: bigint): Promise<string>;
-    /** {@inheritDoc Chain.getRouterForOffRamp} */
+    /**
+     * {@inheritDoc Chain.getRouterForOffRamp}
+     * @throws {@link CCIPVersionUnsupportedError} if OffRamp version is not supported
+     */
     getRouterForOffRamp(offRamp: string, sourceChainSelector: bigint): Promise<string>;
     /** {@inheritDoc Chain.getNativeTokenForRouter} */
     getNativeTokenForRouter(router: string): Promise<string>;
@@ -136,9 +154,15 @@ export declare class EVMChain extends Chain<typeof ChainFamily.EVM> {
     getOffRampsForRouter(router: string, sourceChainSelector: bigint): Promise<string[]>;
     /** {@inheritDoc Chain.getOnRampForRouter} */
     getOnRampForRouter(router: string, destChainSelector: bigint): Promise<string>;
-    /** {@inheritDoc Chain.getOnRampForOffRamp} */
+    /**
+     * {@inheritDoc Chain.getOnRampForOffRamp}
+     * @throws {@link CCIPVersionUnsupportedError} if OffRamp version is not supported
+     */
     getOnRampForOffRamp(offRamp: string, sourceChainSelector: bigint): Promise<string>;
-    /** {@inheritDoc Chain.getCommitStoreForOffRamp} */
+    /**
+     * {@inheritDoc Chain.getCommitStoreForOffRamp}
+     * @throws {@link CCIPVersionUnsupportedError} if OffRamp version is not supported
+     */
     getCommitStoreForOffRamp(offRamp: string): Promise<string>;
     /** {@inheritDoc Chain.getTokenForTokenPool} */
     getTokenForTokenPool(tokenPool: string): Promise<string>;
@@ -155,6 +179,8 @@ export declare class EVMChain extends Chain<typeof ChainFamily.EVM> {
      * @param lane - Lane configuration.
      * @param ctx - Context object containing logger.
      * @returns Leaf hasher function.
+     * @throws {@link CCIPSourceChainUnsupportedError} if source chain is not EVM for v1.2/v1.5
+     * @throws {@link CCIPHasherVersionUnsupportedError} if lane version is not supported
      */
     static getDestLeafHasher({ sourceChainSelector, destChainSelector, onRamp, version }: Lane, ctx?: WithLogger): LeafHasher;
     /**
@@ -163,13 +189,18 @@ export declare class EVMChain extends Chain<typeof ChainFamily.EVM> {
      * @returns OnRamp contract address.
      */
     _getSomeOnRampFor(router: string): Promise<string>;
-    /** {@inheritDoc Chain.getTokenAdminRegistryFor} */
+    /**
+     * {@inheritDoc Chain.getTokenAdminRegistryFor}
+     * @throws {@link CCIPContractNotRouterError} if address is not a Router, OnRamp, or OffRamp
+     */
     getTokenAdminRegistryFor(address: string): Promise<string>;
     /**
      * Gets the FeeQuoter contract address for a given Router or Ramp.
      * @internal
      * @param address - Router or Ramp contract address.
      * @returns FeeQuoter contract address.
+     * @throws {@link CCIPContractNotRouterError} if address is not a Router, OnRamp, or OffRamp
+     * @throws {@link CCIPVersionFeatureUnavailableError} if contract version is below v1.6
      */
     getFeeQuoterFor(address: string): Promise<string>;
     /** {@inheritDoc Chain.getFee} */
@@ -180,16 +211,25 @@ export declare class EVMChain extends Chain<typeof ChainFamily.EVM> {
      *   generation), followed by a ccipSend TransactionRequest
      */
     generateUnsignedSendMessage(opts: Parameters<Chain['generateUnsignedSendMessage']>[0]): Promise<UnsignedEVMTx>;
-    /** {@inheritDoc Chain.sendMessage} */
+    /**
+     * {@inheritDoc Chain.sendMessage}
+     * @throws {@link CCIPWalletInvalidError} if wallet is not a valid Signer
+     */
     sendMessage(opts: Parameters<Chain['sendMessage']>[0]): Promise<CCIPRequest>;
     /** {@inheritDoc Chain.getOffchainTokenData} */
     getOffchainTokenData(request: CCIPRequest): Promise<OffchainTokenData[]>;
     /**
      * {@inheritDoc Chain.generateUnsignedExecuteReport}
      * @returns array containing one unsigned `manuallyExecute` TransactionRequest object
+     * @throws {@link CCIPVersionUnsupportedError} if OffRamp version is not supported
      */
     generateUnsignedExecuteReport({ offRamp, execReport, ...opts }: Parameters<Chain['generateUnsignedExecuteReport']>[0]): Promise<UnsignedEVMTx>;
-    /** {@inheritDoc Chain.executeReport} */
+    /**
+     * {@inheritDoc Chain.executeReport}
+     * @throws {@link CCIPWalletInvalidError} if wallet is not a valid Signer
+     * @throws {@link CCIPExecTxNotConfirmedError} if execution transaction fails to confirm
+     * @throws {@link CCIPExecTxRevertedError} if execution transaction reverts
+     */
     executeReport(opts: Parameters<Chain['executeReport']>[0]): Promise<CCIPExecution>;
     /**
      * Parses raw data into typed structures.
@@ -206,21 +246,27 @@ export declare class EVMChain extends Chain<typeof ChainFamily.EVM> {
     getSupportedTokens(registry: string, opts?: {
         page?: number;
     }): Promise<string[]>;
-    /** {@inheritDoc Chain.getRegistryTokenConfig} */
+    /**
+     * {@inheritDoc Chain.getRegistryTokenConfig}
+     * @throws {@link CCIPTokenNotConfiguredError} if token is not configured in registry
+     */
     getRegistryTokenConfig(registry: string, token: string): Promise<{
         administrator: string;
         pendingAdministrator?: string;
         tokenPool?: string;
     }>;
-    /** {@inheritDoc Chain.getTokenPoolConfigs} */
-    getTokenPoolConfigs(tokenPool: string): Promise<{
+    /** {@inheritDoc Chain.getTokenPoolConfig} */
+    getTokenPoolConfig(tokenPool: string): Promise<{
         token: string;
         router: string;
         typeAndVersion: string;
     }>;
     /** {@inheritDoc Chain.getTokenPoolRemotes} */
     getTokenPoolRemotes(tokenPool: string, remoteChainSelector?: bigint): Promise<Record<string, TokenPoolRemote>>;
-    /** {@inheritDoc Chain.getFeeTokens} */
+    /**
+     * {@inheritDoc Chain.getFeeTokens}
+     * @throws {@link CCIPVersionUnsupportedError} if OnRamp version is not supported
+     */
     getFeeTokens(router: string): Promise<{
         [k: string]: {
             decimals: number;