@chainlink/ccip-cli 0.91.0 → 0.92.0

package/dist/providers/index.js

@@ -1,29 +1,22 @@
+import { existsSync, readFileSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
-import { ChainFamily, networkInfo, supportedChains, } from '@chainlink/ccip-sdk';
+import { CCIPChainFamilyUnsupportedError, CCIPNetworkFamilyUnsupportedError, CCIPRpcNotFoundError, CCIPTransactionNotFoundError, ChainFamily, networkInfo, supportedChains, } from '@chainlink/ccip-sdk';
 import { loadAptosWallet } from "./aptos.js";
 import { loadEvmWallet } from "./evm.js";
 import { loadSolanaWallet } from "./solana.js";
+import { loadSuiWallet } from "./sui.js";
+import { loadTonWallet } from "./ton.js";
 const RPCS_RE = /\b(?:http|ws)s?:\/\/[\w/\\@&?%~#.,;:=+-]+/;
-const signalToPromiseMap = new WeakMap();
-function signalToPromise(signal) {
-    let promise = signalToPromiseMap.get(signal);
-    if (!promise) {
-        signalToPromiseMap.set(signal, (promise = new Promise((_, reject) => {
-            signal.throwIfAborted();
-            signal.addEventListener('abort', () => reject(signal.reason instanceof Error
-                ? signal.reason
-                : new Error(`Aborted: ${signal.reason}`)), { once: true });
-        })));
-    }
-    return promise;
-}
-async function collectEndpoints({ rpcs, 'rpcs-file': rpcsFile, }) {
-    const endpoints = new Set(rpcs || []);
+async function collectEndpoints({ rpcs, rpcsFile }) {
+    const endpoints = new Set(rpcs
+        ?.map((s) => s.split(','))
+        .flat()
+        .map((s) => s.trim()) || []);
     for (const [env, val] of Object.entries(process.env)) {
         if (env.startsWith('RPC_') && val && RPCS_RE.test(val))
             endpoints.add(val);
     }
-    if (rpcsFile) {
+    if (rpcsFile && existsSync(rpcsFile)) {
         try {
             const fileContent = await readFile(rpcsFile, 'utf8');
             for (const line of fileContent.toString().split(/(?:\r\n|\r|\n)/g)) {
@@ -33,108 +26,148 @@ async function collectEndpoints({ rpcs, 'rpcs-file': rpcsFile, }) {
             }
         }
         catch (error) {
-            console.debug('Error reading RPCs file', error);
+            this.logger.debug('Error reading RPCs file', error);
         }
     }
     return endpoints;
 }
 /**
- * Receives a list of rpcs and/or rpcs file, and loads them all concurrently
- * Returns a ChainGetter function and optinoally a ChainTransaction promise
+ * Receives a list of rpcs and/or rpcs file, and loads them concurrently for each chain family
+ * If txHash is provided, fetches matching families first and returns [chainGetter, txPromise];
+ * Otherwise, spawns racing URLs for each family asked by `getChain` getter
  * @param ctx - Context object containing destroy$ promise and logger properties
  * @param argv - Options containing rpcs (list) and/or rpcs file
  * @param txHash - Optional txHash to fetch concurrently; causes the function to return a [ChainGetter, Promise<ChainTransaction>]
- * @returns a ChainGetter (alone if no txHash was provided), or a tuple of [ChainGetter, Promise<ChainTransaction>]
+ * @returns a ChainGetter (if txHash was provided), or a tuple of [ChainGetter, Promise<ChainTransaction>]
  */
 export function fetchChainsFromRpcs(ctx, argv, txHash) {
-    const { destroy$ } = ctx;
     const chains = {};
     const chainsCbs = {};
-    let finished = false;
-    const txs = [];
-    const init$ = collectEndpoints(argv).then((endpoints) => {
-        const pendingPromises = [];
+    const finished = {};
+    const initFamily$ = {};
+    let endpoints$;
+    let txResolve, txReject;
+    const txResult = new Promise((resolve, reject) => {
+        txResolve = resolve;
+        txReject = reject;
+    });
+    const loadChainFamily = (F, txHash) => (initFamily$[F] ??= (endpoints$ ??= collectEndpoints.call(ctx, argv)).then((endpoints) => {
+        const C = supportedChains[F];
+        if (!C)
+            throw new CCIPNetworkFamilyUnsupportedError(F);
+        ctx.logger.debug('Racing', endpoints.size, 'RPC endpoints for', F);
+        const chains$ = [];
+        const txs$ = [];
         let txFound = false;
-        for (const C of Object.values(supportedChains)) {
-            for (const url of endpoints) {
-                const chain$ = C.fromUrl(url, ctx);
-                if (txHash) {
-                    const tx$ = chain$.then((chain) => chain.getTransaction(txHash).then((tx) => [chain, tx]));
-                    void tx$.then(([chain]) => {
-                        if (txFound)
-                            return;
+        for (const url of endpoints) {
+            const chain$ = C.fromUrl(url, ctx);
+            chains$.push(chain$);
+            void chain$.then((chain) => {
+                endpoints.delete(url); // when resolved, remove from set so it isn't tried for future families
+                // on chain detected for url
+                if (chain.network.name in chains && !(chain.network.name in chainsCbs))
+                    return chain.destroy?.(); // but lost race, cleanup right away
+                // keep and schedule cleanup on shutdown
+                if (chain.destroy)
+                    void ctx.destroy$.finally(chain.destroy.bind(chain));
+                if (!(chain.network.name in chains)) {
+                    // chain won for this network, but was not "asked" by getChain (yet?): save
+                    chains[chain.network.name] = Promise.resolve(chain);
+                }
+                else if (chain.network.name in chainsCbs) {
+                    // chain detected, and there's a "pending request" by getChain: resolve
+                    const [resolve] = chainsCbs[chain.network.name];
+                    resolve(chain);
+                }
+                return chain;
+            }, () => { });
+            if (txHash) {
+                txs$.push(chain$.then(async (chain) => {
+                    const tx = await chain.getTransaction(txHash);
+                    if (!txFound) {
                         txFound = true;
-                        // in case tx is found, prefer it over any previously found chain
+                        // in case tx is first found, prefer it over any previously found chain for this network
                         chains[chain.network.name] = chain$;
                         delete chainsCbs[chain.network.name];
-                    }, () => { });
-                    txs.push(tx$);
-                }
-                pendingPromises.push(chain$.then((chain) => {
-                    if (chain.network.name in chains && !(chain.network.name in chainsCbs))
-                        return chain.destroy?.(); // lost race
-                    destroy$.addEventListener('abort', () => {
-                        void chain.destroy?.(); // cleanup
-                    });
-                    if (!(chain.network.name in chains)) {
-                        chains[chain.network.name] = Promise.resolve(chain);
-                    }
-                    else if (chain.network.name in chainsCbs) {
-                        const [resolve] = chainsCbs[chain.network.name];
-                        resolve(chain);
                     }
+                    txResolve([chain, tx]);
                 }));
             }
         }
-        const res = Promise.allSettled(pendingPromises);
-        void (destroy$ ? Promise.race([res, signalToPromise(destroy$)]) : res).finally(() => {
-            finished = true;
-            Object.entries(chainsCbs).forEach(([name, [_, reject]]) => reject(new Error(`No provider/chain found for network=${name}`)));
+        void Promise.race([Promise.allSettled(chains$), ctx.destroy$]).finally(() => {
+            if (finished[F])
+                return;
+            finished[F] = true;
+            Object.entries(chainsCbs)
+                .filter(([name]) => networkInfo(name).family === F)
+                .forEach(([name, [_, reject]]) => reject(new CCIPRpcNotFoundError(name)));
         });
-        return Promise.any(txs);
-    });
+        return Promise.any(txHash ? txs$ : chains$);
+    }));
     const chainGetter = async (idOrSelectorOrName) => {
         const network = networkInfo(idOrSelectorOrName);
         if (network.name in chains)
             return chains[network.name];
-        if (finished)
-            throw new Error(`No provider/chain found for network=${network.name}`);
+        if (finished[network.family])
+            throw new CCIPRpcNotFoundError(network.name);
         chains[network.name] = new Promise((resolve, reject) => {
             chainsCbs[network.name] = [resolve, reject];
         });
         void chains[network.name].finally(() => {
-            delete chainsCbs[network.name];
+            delete chainsCbs[network.name]; // when chain is settled, delete the callbacks
         });
+        void loadChainFamily(network.family);
         return chains[network.name];
     };
-    if (txHash) {
-        return [chainGetter, init$];
-    }
-    else {
-        void init$.catch(() => { });
+    if (!txHash)
         return chainGetter;
-    }
+    void Promise.allSettled(Object.values(supportedChains)
+        .filter((C) => C.isTxHash(txHash))
+        .map((C) => loadChainFamily(C.family, txHash))).finally(() => txReject(new CCIPTransactionNotFoundError(txHash))); // noop if txResolved
+    return [chainGetter, txResult];
 }
 /**
  * Load chain-specific wallet for given chain
  * @param chain - Chain instance to load wallet for
- * @param opts - Wallet options (as passed from yargs argv)
+ * @param argv - Wallet options (as passed from yargs argv)
  * @returns Promise to chain-specific wallet instance
  */
-export async function loadChainWallet(chain, opts) {
+export async function loadChainWallet(chain, argv) {
+    // Centralized wallet resolution: check env vars first, then rpcsFile
+    if (!argv.wallet) {
+        argv.wallet = process.env['PRIVATE_KEY'] || process.env['USER_KEY'] || process.env['OWNER_KEY'];
+    }
+    if (!argv.wallet && argv.rpcsFile && existsSync(argv.rpcsFile)) {
+        try {
+            const file = readFileSync(argv.rpcsFile, 'utf8');
+            const match = file.match(/^\s*(PRIVATE_KEY|USER_KEY|OWNER_KEY)=(\S+)/m);
+            if (match)
+                argv.wallet = match[2];
+        }
+        catch (_) {
+            // pass
+        }
+    }
     let wallet;
     switch (chain.network.family) {
         case ChainFamily.EVM:
-            wallet = await loadEvmWallet(chain.provider, opts);
+            wallet = await loadEvmWallet(chain.provider, argv);
             return [await wallet.getAddress(), wallet];
         case ChainFamily.Solana:
-            wallet = await loadSolanaWallet(opts);
+            wallet = await loadSolanaWallet(argv);
             return [wallet.publicKey.toBase58(), wallet];
         case ChainFamily.Aptos:
-            wallet = await loadAptosWallet(opts);
+            wallet = await loadAptosWallet(argv);
             return [wallet.accountAddress.toString(), wallet];
+        case ChainFamily.Sui:
+            wallet = loadSuiWallet(argv);
+            return [wallet.toSuiAddress(), wallet];
+        case ChainFamily.TON:
+            wallet = await loadTonWallet(argv);
+            return [wallet.contract.address.toString(), wallet];
         default:
-            throw new Error(`Unsupported chain family: ${chain.network.family}`);
+            // TypeScript exhaustiveness check - this should never be reached
+            throw new CCIPChainFamilyUnsupportedError(chain.network.family);
     }
 }
 //# sourceMappingURL=index.js.map

package/dist/providers/index.js.map

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

package/dist/providers/solana.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../src/providers/solana.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAC1D,OAAO,YAAY,MAAM,yBAAyB,CAAA;AAElD,OAAO,EAGL,KAAK,oBAAoB,EACzB,OAAO,EACP,SAAS,EACT,WAAW,EACZ,MAAM,iBAAiB,CAAA;AAIxB,gDAAgD;AAChD,qBAAa,kBAAkB;IAC7B,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,YAAY,CAAC,OAAO,CAAA;IAC5B,IAAI,EAAE,MAAM,CAAA;IAEZ;;;OAGG;IACH,OAAO;IAMP;;;;OAIG;WACU,MAAM,CAAC,IAAI,EAAE,MAAM;IAchC;;;;OAIG;IACG,eAAe,CAAC,CAAC,SAAS,WAAW,GAAG,oBAAoB,EAAE,EAAE,EAAE,CAAC;IAezE;;;;OAIG;IACG,mBAAmB,CAAC,CAAC,SAAS,WAAW,GAAG,oBAAoB,EAAE,GAAG,EAAE,CAAC,EAAE;IAShF,gDAAgD;IAChD,IAAI,KAAK,IAAI,OAAO,CAEnB;CACF;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,EACrC,MAAM,EAAE,SAAS,GAClB,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,OAAO,CAAC,YAAY,CAAC,CAkBnD"}
+{"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../src/providers/solana.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAC1D,OAAO,YAAY,MAAM,yBAAyB,CAAA;AAElD,OAAO,EAGL,KAAK,oBAAoB,EACzB,OAAO,EACP,SAAS,EACT,WAAW,EACZ,MAAM,iBAAiB,CAAA;AAIxB,gDAAgD;AAChD,qBAAa,kBAAkB;IAC7B,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,YAAY,CAAC,OAAO,CAAA;IAC5B,IAAI,EAAE,MAAM,CAAA;IAEZ;;;OAGG;IACH,OAAO;IAMP;;;;OAIG;WACU,MAAM,CAAC,IAAI,EAAE,MAAM;IAchC;;;;OAIG;IACG,eAAe,CAAC,CAAC,SAAS,WAAW,GAAG,oBAAoB,EAAE,EAAE,EAAE,CAAC;IAezE;;;;OAIG;IACG,mBAAmB,CAAC,CAAC,SAAS,WAAW,GAAG,oBAAoB,EAAE,GAAG,EAAE,CAAC,EAAE;IAShF,gDAAgD;IAChD,IAAI,KAAK,IAAI,OAAO,CAEnB;CACF;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,EACrC,MAAM,EAAE,SAAS,GAClB,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,OAAO,CAAC,YAAY,CAAC,CAiBnD"}

package/dist/providers/solana.js

@@ -1,5 +1,5 @@
 import { existsSync, readFileSync } from 'node:fs';
-import util from 'node:util';
+import { CCIPArgumentInvalidError, CCIPNotImplementedError } from '@chainlink/ccip-sdk';
 import { Wallet as AnchorWallet } from '@coral-xyz/anchor';
 import SolanaLedger from '@ledgerhq/hw-app-solana';
 import HIDTransport from '@ledgerhq/hw-transport-node-hid';
@@ -73,7 +73,7 @@ export class LedgerSolanaWallet {
     }
     /** Payer property - not available on Ledger. */
     get payer() {
-        throw new Error('Payer method not available on Ledger');
+        throw new CCIPNotImplementedError('payer for Ledger');
     }
 }
 /**
@@ -82,11 +82,12 @@ export class LedgerSolanaWallet {
  * @returns Promise to Anchor Wallet instance
  */
 export async function loadSolanaWallet({ wallet: walletOpt, } = {}) {
+    // Default to Solana's standard keypair location if no wallet provided
     if (!walletOpt)
-        walletOpt = process.env['USER_KEY'] || process.env['OWNER_KEY'] || '~/.config/solana/id.json';
+        walletOpt = '~/.config/solana/id.json';
     let wallet;
     if (typeof walletOpt !== 'string')
-        throw new Error(`Invalid wallet option: ${util.inspect(walletOpt)}`);
+        throw new CCIPArgumentInvalidError('wallet', String(walletOpt));
     wallet = walletOpt;
     if (walletOpt === 'ledger' || walletOpt.startsWith('ledger:')) {
         let derivationPath = walletOpt.split(':')[1];

package/dist/providers/solana.js.map

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

package/dist/providers/sui.d.ts

@@ -0,0 +1,10 @@
+import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519';
+/**
+ * Loads a Sui wallet from the provided options.
+ * @param wallet - wallet options (as passed from yargs argv)
+ * @returns Sui Keypair instance
+ */
+export declare function loadSuiWallet({ wallet: walletOpt }: {
+    wallet?: unknown;
+}): Ed25519Keypair;
+//# sourceMappingURL=sui.d.ts.map

package/dist/providers/sui.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sui.d.ts","sourceRoot":"","sources":["../../src/providers/sui.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,kBAKxE"}

package/dist/providers/sui.js

@@ -0,0 +1,15 @@
+import { CCIPArgumentInvalidError } from '@chainlink/ccip-sdk';
+import { bytesToBuffer } from '@chainlink/ccip-sdk';
+import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519';
+/**
+ * Loads a Sui wallet from the provided options.
+ * @param wallet - wallet options (as passed from yargs argv)
+ * @returns Sui Keypair instance
+ */
+export function loadSuiWallet({ wallet: walletOpt }) {
+    if (typeof walletOpt !== 'string')
+        throw new CCIPArgumentInvalidError('wallet', String(walletOpt));
+    const keyBytes = bytesToBuffer(walletOpt);
+    return Ed25519Keypair.fromSecretKey(keyBytes);
+}
+//# sourceMappingURL=sui.js.map

package/dist/providers/sui.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sui.js","sourceRoot":"","sources":["../../src/providers/sui.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAA;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,EAAE,MAAM,EAAE,SAAS,EAAwB;IACvE,IAAI,OAAO,SAAS,KAAK,QAAQ;QAAE,MAAM,IAAI,wBAAwB,CAAC,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAA;IAElG,MAAM,QAAQ,GAAG,aAAa,CAAC,SAAS,CAAC,CAAA;IACzC,OAAO,cAAc,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;AAC/C,CAAC"}

package/dist/providers/ton.d.ts

@@ -0,0 +1,10 @@
+import type { TONWallet } from '@chainlink/ccip-sdk/src/ton/types.ts';
+/**
+ * Loads a TON wallet from the provided options.
+ * @param wallet - wallet options (as passed from yargs argv)
+ * @returns Promise to TONWallet instance
+ */
+export declare function loadTonWallet({ wallet: walletOpt, }?: {
+    wallet?: unknown;
+}): Promise<TONWallet>;
+//# sourceMappingURL=ton.d.ts.map

package/dist/providers/ton.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ton.d.ts","sourceRoot":"","sources":["../../src/providers/ton.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAA;AAIrE;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,EAClC,MAAM,EAAE,SAAS,GAClB,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAkDhD"}

package/dist/providers/ton.js

@@ -0,0 +1,55 @@
+import { existsSync, readFileSync } from 'node:fs';
+import { CCIPArgumentInvalidError, CCIPWalletInvalidError, } from '@chainlink/ccip-sdk';
+import { keyPairFromSecretKey, mnemonicToPrivateKey } from '@ton/crypto';
+import { WalletContractV4 } from '@ton/ton';
+/**
+ * Loads a TON wallet from the provided options.
+ * @param wallet - wallet options (as passed from yargs argv)
+ * @returns Promise to TONWallet instance
+ */
+export async function loadTonWallet({ wallet: walletOpt, } = {}) {
+    if (typeof walletOpt !== 'string')
+        throw new CCIPWalletInvalidError(walletOpt);
+    // Handle mnemonic phrase
+    if (walletOpt.includes(' ')) {
+        const mnemonic = walletOpt.trim().split(' ');
+        const keyPair = await mnemonicToPrivateKey(mnemonic);
+        const contract = WalletContractV4.create({
+            workchain: 0,
+            publicKey: keyPair.publicKey,
+        });
+        return { contract, keyPair };
+    }
+    // Handle hex private key
+    if (walletOpt.startsWith('0x')) {
+        const secretKey = Buffer.from(walletOpt.slice(2), 'hex');
+        if (secretKey.length === 32) {
+            throw new CCIPArgumentInvalidError('wallet', '32-byte seeds not supported. Use 64-byte secret key or mnemonic.');
+        }
+        if (secretKey.length !== 64) {
+            throw new CCIPArgumentInvalidError('wallet', 'must be 64 bytes (or use mnemonic)');
+        }
+        const keyPair = keyPairFromSecretKey(secretKey);
+        const contract = WalletContractV4.create({
+            workchain: 0,
+            publicKey: keyPair.publicKey,
+        });
+        return { contract, keyPair };
+    }
+    // Handle file path
+    if (existsSync(walletOpt)) {
+        const content = readFileSync(walletOpt, 'utf8').trim();
+        const secretKey = Buffer.from(content.startsWith('0x') ? content.slice(2) : content, 'hex');
+        if (secretKey.length !== 64) {
+            throw new CCIPArgumentInvalidError('wallet', 'Invalid private key in file: must be 64 bytes');
+        }
+        const keyPair = keyPairFromSecretKey(secretKey);
+        const contract = WalletContractV4.create({
+            workchain: 0,
+            publicKey: keyPair.publicKey,
+        });
+        return { contract, keyPair };
+    }
+    throw new CCIPArgumentInvalidError('wallet', 'Wallet not specified');
+}
+//# sourceMappingURL=ton.js.map

package/dist/providers/ton.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ton.js","sourceRoot":"","sources":["../../src/providers/ton.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAElD,OAAO,EACL,wBAAwB,EACxB,sBAAsB,GACvB,MAAM,+CAA+C,CAAA;AAEtD,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE3C;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,EAClC,MAAM,EAAE,SAAS,MACO,EAAE;IAC1B,IAAI,OAAO,SAAS,KAAK,QAAQ;QAAE,MAAM,IAAI,sBAAsB,CAAC,SAAS,CAAC,CAAA;IAE9E,yBAAyB;IACzB,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5B,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC5C,MAAM,OAAO,GAAG,MAAM,oBAAoB,CAAC,QAAQ,CAAC,CAAA;QACpD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,MAAM,CAAC;YACvC,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,OAAO,CAAC,SAAS;SAC7B,CAAC,CAAA;QACF,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAA;IAC9B,CAAC;IAED,yBAAyB;IACzB,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;QACxD,IAAI,SAAS,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;YAC5B,MAAM,IAAI,wBAAwB,CAChC,QAAQ,EACR,kEAAkE,CACnE,CAAA;QACH,CAAC;QACD,IAAI,SAAS,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;YAC5B,MAAM,IAAI,wBAAwB,CAAC,QAAQ,EAAE,oCAAoC,CAAC,CAAA;QACpF,CAAC;QACD,MAAM,OAAO,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAA;QAC/C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,MAAM,CAAC;YACvC,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,OAAO,CAAC,SAAS;SAC7B,CAAC,CAAA;QACF,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAA;IAC9B,CAAC;IAED,mBAAmB;IACnB,IAAI,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC1B,MAAM,OAAO,GAAG,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAA;QACtD,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QAC3F,IAAI,SAAS,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;YAC5B,MAAM,IAAI,wBAAwB,CAAC,QAAQ,EAAE,+CAA+C,CAAC,CAAA;QAC/F,CAAC;QACD,MAAM,OAAO,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAA;QAC/C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,MAAM,CAAC;YACvC,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,OAAO,CAAC,SAAS;SAC7B,CAAC,CAAA;QACF,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAA;IAC9B,CAAC;IAED,MAAM,IAAI,wBAAwB,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAA;AACtE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chainlink/ccip-cli",
-  "version": "0.91.0",
+  "version": "0.92.0",
   "description": "CCIP Command Line Interface, based on @chainlink/ccip-sdk",
   "author": "Chainlink devs",
   "license": "MIT",
@@ -28,34 +28,34 @@
     "!**/__mocks__"
   ],
   "devDependencies": {
-    "@eslint/js": "^9.39.1",
-    "@types/node": "24.10.1",
+    "@eslint/js": "^9.39.2",
+    "@types/node": "25.0.3",
     "@types/yargs": "17.0.35",
-    "eslint": "^9.39.1",
+    "eslint": "^9.39.2",
     "eslint-config-prettier": "10.1.8",
     "eslint-import-resolver-typescript": "4.4.4",
     "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-jsdoc": "^61.4.2",
+    "eslint-plugin-jsdoc": "^61.5.0",
     "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-tsdoc": "^0.5.0",
     "prettier": "^3.7.4",
     "tsx": "4.21.0",
     "typescript": "5.9.3",
-    "typescript-eslint": "8.48.1"
+    "typescript-eslint": "8.50.0"
   },
   "dependencies": {
-    "@aptos-labs/ts-sdk": "^5.1.6",
-    "@chainlink/ccip-sdk": "^0.91.0",
+    "@aptos-labs/ts-sdk": "^5.2.0",
+    "@chainlink/ccip-sdk": "^0.92.0",
     "@coral-xyz/anchor": "^0.29.0",
     "@ethers-ext/signer-ledger": "^6.0.0-beta.1",
-    "@inquirer/prompts": "8.0.2",
-    "@ledgerhq/hw-app-aptos": "^6.34.9",
-    "@ledgerhq/hw-app-solana": "^7.6.0",
-    "@ledgerhq/hw-transport-node-hid": "^6.29.14",
+    "@inquirer/prompts": "8.1.0",
+    "@ledgerhq/hw-app-aptos": "^6.34.10",
+    "@ledgerhq/hw-app-solana": "^7.6.1",
+    "@ledgerhq/hw-transport-node-hid": "^6.29.15",
     "@solana/web3.js": "^1.98.4",
     "bs58": "^6.0.0",
     "ethers": "6.16.0",
-    "type-fest": "^5.3.0",
+    "type-fest": "^5.3.1",
     "yargs": "18.0.0"
   }
 }

package/src/commands/manual-exec.ts

@@ -4,11 +4,14 @@ import {
   type ChainStatic,
   type EVMChain,
   type ExecutionReport,
+  CCIPChainFamilyUnsupportedError,
+  CCIPReceiptNotFoundError,
   ChainFamily,
   bigIntReplacer,
   calculateManualExecProof,
   discoverOffRamp,
   estimateExecGasForRequest,
+  isSupportedTxHash,
 } from '@chainlink/ccip-sdk/src/index.ts'
 import type { Argv } from 'yargs'
 
@@ -44,6 +47,7 @@ export const builder = (yargs: Argv) =>
       demandOption: true,
       describe: 'transaction hash of the request (source) message',
     })
+    .check(({ txHash }) => isSupportedTxHash(txHash))
     .options({
       'log-index': {
         type: 'number',
@@ -84,6 +88,12 @@ export const builder = (yargs: Argv) =>
         describe:
           'Clears buffers (if a previous attempt was aborted) or any ALT owned by this sender.',
       },
+      'receiver-object-ids': {
+        type: 'array',
+        describe: 'Receiver object IDs for Sui execution (if executing on Sui destination)',
+        string: true,
+        example: '--receiver-object-ids 0xabc... 0xdef...',
+      },
       'sender-queue': {
         type: 'boolean',
         describe: 'Execute all messages in sender queue, starting with the provided tx',
@@ -102,7 +112,7 @@ export const builder = (yargs: Argv) =>
  * @param argv - Command line arguments.
  */
 export async function handler(argv: Awaited<ReturnType<typeof builder>['argv']> & GlobalOpts) {
-  const [controller, ctx] = getCtx(argv)
+  const [ctx, destroy] = getCtx(argv)
   // argv.senderQueue
   //   ? manualExecSenderQueue(providers, argv.tx_hash, argv)
   //   : manualExec(argv, destroy$)
@@ -111,7 +121,7 @@ export async function handler(argv: Awaited<ReturnType<typeof builder>['argv']>
       process.exitCode = 1
       if (!logParsedError.call(ctx, err)) ctx.logger.error(err)
     })
-    .finally(() => controller.abort('Exited'))
+    .finally(destroy)
 }
 
 async function manualExec(
@@ -159,7 +169,7 @@ async function manualExec(
   const execReportProof = calculateManualExecProof(
     messagesInBatch,
     request.lane,
-    request.message.header.messageId,
+    request.message.messageId,
     commit.report.merkleRoot,
     dest,
   )
@@ -168,7 +178,7 @@ async function manualExec(
   const execReport: ExecutionReport = {
     ...execReportProof,
     message: request.message,
-    offchainTokenData: offchainTokenData,
+    offchainTokenData,
   }
 
   if (
@@ -177,7 +187,9 @@ async function manualExec(
     'extraArgs' in request.message
   ) {
     if (dest.network.family !== ChainFamily.EVM)
-      throw new Error('Gas estimation is only supported for EVM networks for now')
+      throw new CCIPChainFamilyUnsupportedError(dest.network.family, {
+        context: { feature: 'gas estimation' },
+      })
 
     let estimated = await estimateExecGasForRequest(
       source,
@@ -232,7 +244,7 @@ async function manualExec(
     }
     found = true
   }
-  if (!found) throw new Error(`Could not find receipt in tx logs`)
+  if (!found) throw new CCIPReceiptNotFoundError(manualExecTx.hash)
 }
 
 /*