@chainlink/ccip-cli 0.90.2 → 0.91.1

package/dist/providers/evm.js.map

@@ -1 +1 @@
-{"version":3,"file":"evm.js","sourceRoot":"","sources":["../../src/providers/evm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,IAAI,MAAM,MAAM,CAAA;AAEvB,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAA;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,YAAY,MAAM,iCAAiC,CAAA;AAC1D,OAAO,EAA8B,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAEnF,sFAAsF;AACtF,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,SAAS,EAAE;IACpC,OAAO,EAAE,UAA8B,QAA0B;QAC/D,OAAO,IAAI,YAAY,CAAC,YAAY,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;IAC5D,CAAC;CACF,CAAC,CAAA;AAEF;;;;;GAKG;AACH,QAAQ,CAAC,SAAS,GAAG,KAAK,UAAU,aAAa,CAC/C,QAAkB,EAClB,EAAE,MAAM,EAAE,SAAS,EAAwB;IAE3C,IAAI,CAAC,SAAS;QAAE,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;IAC/E,IAAI,OAAO,SAAS,KAAK,QAAQ;QAC/B,MAAM,IAAI,KAAK,CAAC,0BAA0B,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;IACtE,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC3C,IAAI,cAAc,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QAC5C,IAAI,cAAc,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;YAClD,cAAc,GAAG,aAAa,cAAc,OAAO,CAAA;QACrD,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC,YAAY,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAA;QACvE,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,MAAM,MAAM,CAAC,UAAU,EAAE,EAAE,mBAAmB,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;QAC9F,OAAO,MAAM,CAAA;IACf,CAAC;IACD,IAAI,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC1B,IAAI,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;QACzC,IAAI,CAAC,EAAE;YAAE,EAAE,GAAG,MAAM,QAAQ,CAAC,EAAE,OAAO,EAAE,gCAAgC,EAAE,CAAC,CAAA;QAC3E,OAAO,CAAC,MAAM,MAAM,CAAC,iBAAiB,CAAC,MAAM,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAClG,CAAC;IACD,OAAO,IAAI,UAAU,CACnB,IAAI,UAAU,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,EACpE,QAAQ,CACT,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"evm.js","sourceRoot":"","sources":["../../src/providers/evm.ts"],"names":[],"mappings":"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"}

package/dist/providers/index.d.ts

@@ -1,13 +1,20 @@
-import { type ChainGetter, type ChainTransaction } from '@chainlink/ccip-sdk/src/index.ts';
-import './aptos.ts';
-import './evm.ts';
-import './solana.ts';
-export declare function fetchChainsFromRpcs(argv: {
+import { type Chain, type ChainGetter, type ChainTransaction } from '@chainlink/ccip-sdk/src/index.ts';
+import type { Ctx } from '../commands/index.ts';
+export declare function fetchChainsFromRpcs(ctx: Ctx, argv: {
     rpcs?: string[];
     'rpcs-file'?: string;
-}, txHash?: undefined, destroy?: Promise<unknown>): ChainGetter;
-export declare function fetchChainsFromRpcs(argv: {
+}): ChainGetter;
+export declare function fetchChainsFromRpcs(ctx: Ctx, argv: {
     rpcs?: string[];
     'rpcs-file'?: string;
-}, txHash: string, destroy?: Promise<unknown>): [ChainGetter, Promise<ChainTransaction>];
+}, txHash: string): [ChainGetter, Promise<[Chain, ChainTransaction]>];
+/**
+ * Load chain-specific wallet for given chain
+ * @param chain - Chain instance to load wallet for
+ * @param opts - Wallet options (as passed from yargs argv)
+ * @returns Promise to chain-specific wallet instance
+ */
+export declare function loadChainWallet(chain: Chain, opts: {
+    wallet?: unknown;
+}): Promise<readonly [string, import("ethers").Signer] | readonly [string, import("@coral-xyz/anchor").Wallet] | readonly [`0x${string}`, import("./aptos.ts").AptosLedgerSigner | import("@aptos-labs/ts-sdk").Ed25519Account]>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,gBAAgB,EAGtB,MAAM,kCAAkC,CAAA;AAEzC,OAAO,YAAY,CAAA;AACnB,OAAO,UAAU,CAAA;AACjB,OAAO,aAAa,CAAA;AA6BpB,wBAAgB,mBAAmB,CACjC,IAAI,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,EAC/C,MAAM,CAAC,EAAE,SAAS,EAClB,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GACzB,WAAW,CAAA;AACd,wBAAgB,mBAAmB,CACjC,IAAI,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,EAC/C,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GACzB,CAAC,WAAW,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,KAAK,EACV,KAAK,WAAW,EAChB,KAAK,gBAAgB,EAKtB,MAAM,kCAAkC,CAAA;AAKzC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAqD/C,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,GAAG,EACR,IAAI,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,GAC9C,WAAW,CAAA;AACd,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,GAAG,EACR,IAAI,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,EAC/C,MAAM,EAAE,MAAM,GACb,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAA;AA+FpD;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,gOAe7E"}

package/dist/providers/index.js

@@ -1,9 +1,22 @@
 import { readFile } from 'node:fs/promises';
-import { networkInfo, supportedChains, } from '@chainlink/ccip-sdk';
-import "./aptos.js";
-import "./evm.js";
-import "./solana.js";
+import { ChainFamily, networkInfo, supportedChains, } from '@chainlink/ccip-sdk';
+import { loadAptosWallet } from "./aptos.js";
+import { loadEvmWallet } from "./evm.js";
+import { loadSolanaWallet } from "./solana.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 || []);
     for (const [env, val] of Object.entries(process.env)) {
@@ -28,12 +41,13 @@ async function collectEndpoints({ rpcs, 'rpcs-file': rpcsFile, }) {
 /**
  * Receives a list of rpcs and/or rpcs file, and loads them all concurrently
  * Returns a ChainGetter function and optinoally a ChainTransaction promise
+ * @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>]
- * @param destroy - A promise to signal when to stop fetching chains
  * @returns a ChainGetter (alone if no txHash was provided), or a tuple of [ChainGetter, Promise<ChainTransaction>]
  */
-export function fetchChainsFromRpcs(argv, txHash, destroy) {
+export function fetchChainsFromRpcs(ctx, argv, txHash) {
+    const { destroy$ } = ctx;
     const chains = {};
     const chainsCbs = {};
     let finished = false;
@@ -43,10 +57,10 @@ export function fetchChainsFromRpcs(argv, txHash, destroy) {
         let txFound = false;
         for (const C of Object.values(supportedChains)) {
             for (const url of endpoints) {
-                const chain$ = C.fromUrl(url);
+                const chain$ = C.fromUrl(url, ctx);
                 if (txHash) {
-                    const tx$ = chain$.then((chain) => chain.getTransaction(txHash));
-                    void tx$.then(({ chain }) => {
+                    const tx$ = chain$.then((chain) => chain.getTransaction(txHash).then((tx) => [chain, tx]));
+                    void tx$.then(([chain]) => {
                         if (txFound)
                             return;
                         txFound = true;
@@ -59,7 +73,7 @@ export function fetchChainsFromRpcs(argv, txHash, destroy) {
                 pendingPromises.push(chain$.then((chain) => {
                     if (chain.network.name in chains && !(chain.network.name in chainsCbs))
                         return chain.destroy?.(); // lost race
-                    void destroy?.finally(() => {
+                    destroy$.addEventListener('abort', () => {
                         void chain.destroy?.(); // cleanup
                     });
                     if (!(chain.network.name in chains)) {
@@ -73,7 +87,7 @@ export function fetchChainsFromRpcs(argv, txHash, destroy) {
             }
         }
         const res = Promise.allSettled(pendingPromises);
-        void (destroy ? Promise.race([res, destroy]) : res).finally(() => {
+        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}`)));
         });
@@ -101,4 +115,26 @@ export function fetchChainsFromRpcs(argv, txHash, destroy) {
         return chainGetter;
     }
 }
+/**
+ * Load chain-specific wallet for given chain
+ * @param chain - Chain instance to load wallet for
+ * @param opts - Wallet options (as passed from yargs argv)
+ * @returns Promise to chain-specific wallet instance
+ */
+export async function loadChainWallet(chain, opts) {
+    let wallet;
+    switch (chain.network.family) {
+        case ChainFamily.EVM:
+            wallet = await loadEvmWallet(chain.provider, opts);
+            return [await wallet.getAddress(), wallet];
+        case ChainFamily.Solana:
+            wallet = await loadSolanaWallet(opts);
+            return [wallet.publicKey.toBase58(), wallet];
+        case ChainFamily.Aptos:
+            wallet = await loadAptosWallet(opts);
+            return [wallet.accountAddress.toString(), wallet];
+        default:
+            throw new Error(`Unsupported chain family: ${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

@@ -1,13 +1,43 @@
+import { Wallet as AnchorWallet } from '@coral-xyz/anchor';
 import SolanaLedger from '@ledgerhq/hw-app-solana';
 import { type VersionedTransaction, Keypair, PublicKey, Transaction } from '@solana/web3.js';
+/** Ledger hardware wallet signer for Solana. */
 export declare class LedgerSolanaWallet {
     publicKey: PublicKey;
     wallet: SolanaLedger.default;
     path: string;
+    /**
+     * Private constructor - use static `create` method instead.
+     * @internal
+     */
     private constructor();
+    /**
+     * Creates a new LedgerSolanaWallet instance.
+     * @param path - BIP44 derivation path.
+     * @returns A new LedgerSolanaWallet instance.
+     */
     static create(path: string): Promise<LedgerSolanaWallet>;
+    /**
+     * Signs a transaction with the Ledger device.
+     * @param tx - Transaction to sign.
+     * @returns Signed transaction.
+     */
     signTransaction<T extends Transaction | VersionedTransaction>(tx: T): Promise<T>;
+    /**
+     * Signs multiple transactions with the Ledger device.
+     * @param txs - Transactions to sign.
+     * @returns Signed transactions.
+     */
     signAllTransactions<T extends Transaction | VersionedTransaction>(txs: T[]): Promise<T[]>;
+    /** Payer property - not available on Ledger. */
     get payer(): Keypair;
 }
+/**
+ * Loads a Solana wallet from a file or Ledger device.
+ * @param wallet - wallet options (as passed to yargs argv)
+ * @returns Promise to Anchor Wallet instance
+ */
+export declare function loadSolanaWallet({ wallet: walletOpt, }?: {
+    wallet?: unknown;
+}): Promise<AnchorWallet>;
 //# sourceMappingURL=solana.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../src/providers/solana.ts"],"names":[],"mappings":"AAKA,OAAO,YAAY,MAAM,yBAAyB,CAAA;AAElD,OAAO,EAGL,KAAK,oBAAoB,EACzB,OAAO,EACP,SAAS,EACT,WAAW,EACZ,MAAM,iBAAiB,CAAA;AAIxB,qBAAa,kBAAkB;IAC7B,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,YAAY,CAAC,OAAO,CAAA;IAC5B,IAAI,EAAE,MAAM,CAAA;IAEZ,OAAO;WAMM,MAAM,CAAC,IAAI,EAAE,MAAM;IAc1B,eAAe,CAAC,CAAC,SAAS,WAAW,GAAG,oBAAoB,EAAE,EAAE,EAAE,CAAC;IAenE,mBAAmB,CAAC,CAAC,SAAS,WAAW,GAAG,oBAAoB,EAAE,GAAG,EAAE,CAAC,EAAE;IAShF,IAAI,KAAK,IAAI,OAAO,CAEnB;CACF"}
+{"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"}

package/dist/providers/solana.js

@@ -1,21 +1,30 @@
 import { existsSync, readFileSync } from 'node:fs';
 import util from 'node:util';
-import { SolanaChain } from '@chainlink/ccip-sdk';
-import { Wallet as SolanaWallet } from '@coral-xyz/anchor';
+import { Wallet as AnchorWallet } from '@coral-xyz/anchor';
 import SolanaLedger from '@ledgerhq/hw-app-solana';
 import HIDTransport from '@ledgerhq/hw-transport-node-hid';
 import { Keypair, PublicKey, Transaction, } from '@solana/web3.js';
 import bs58 from 'bs58';
 import { getBytes, hexlify } from 'ethers';
+/** Ledger hardware wallet signer for Solana. */
 export class LedgerSolanaWallet {
     publicKey;
     wallet;
     path;
+    /**
+     * Private constructor - use static `create` method instead.
+     * @internal
+     */
     constructor(solanaLW, pubKey, path) {
         this.wallet = solanaLW;
         this.publicKey = pubKey;
         this.path = path;
     }
+    /**
+     * Creates a new LedgerSolanaWallet instance.
+     * @param path - BIP44 derivation path.
+     * @returns A new LedgerSolanaWallet instance.
+     */
     static async create(path) {
         try {
             const transport = await HIDTransport.default.create();
@@ -30,6 +39,11 @@ export class LedgerSolanaWallet {
             throw e;
         }
     }
+    /**
+     * Signs a transaction with the Ledger device.
+     * @param tx - Transaction to sign.
+     * @returns Signed transaction.
+     */
     async signTransaction(tx) {
         console.debug('Ledger: Request to sign message from', this.publicKey.toBase58());
         // serializeMessage on v0, serialize on v1
@@ -44,6 +58,11 @@ export class LedgerSolanaWallet {
         tx.addSignature(this.publicKey, signature);
         return tx;
     }
+    /**
+     * Signs multiple transactions with the Ledger device.
+     * @param txs - Transactions to sign.
+     * @returns Signed transactions.
+     */
     async signAllTransactions(txs) {
         console.info('Signing multiple transactions with Ledger');
         const signedTxs = [];
@@ -52,11 +71,17 @@ export class LedgerSolanaWallet {
         }
         return signedTxs;
     }
+    /** Payer property - not available on Ledger. */
     get payer() {
         throw new Error('Payer method not available on Ledger');
     }
 }
-SolanaChain.getWallet = async function loadSolanaWallet({ wallet: walletOpt, } = {}) {
+/**
+ * Loads a Solana wallet from a file or Ledger device.
+ * @param wallet - wallet options (as passed to yargs argv)
+ * @returns Promise to Anchor Wallet instance
+ */
+export async function loadSolanaWallet({ wallet: walletOpt, } = {}) {
     if (!walletOpt)
         walletOpt = process.env['USER_KEY'] || process.env['OWNER_KEY'] || '~/.config/solana/id.json';
     let wallet;
@@ -74,6 +99,6 @@ SolanaChain.getWallet = async function loadSolanaWallet({ wallet: walletOpt, } =
     else if (existsSync(walletOpt)) {
         wallet = hexlify(new Uint8Array(JSON.parse(readFileSync(walletOpt, 'utf8'))));
     }
-    return new SolanaWallet(Keypair.fromSecretKey(wallet.startsWith('0x') ? getBytes(wallet) : bs58.decode(wallet)));
-};
+    return new AnchorWallet(Keypair.fromSecretKey(wallet.startsWith('0x') ? getBytes(wallet) : bs58.decode(wallet)));
+}
 //# sourceMappingURL=solana.js.map

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chainlink/ccip-cli",
-  "version": "0.90.2",
+  "version": "0.91.1",
   "description": "CCIP Command Line Interface, based on @chainlink/ccip-sdk",
   "author": "Chainlink devs",
   "license": "MIT",
@@ -35,24 +35,27 @@
     "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-prettier": "^5.5.4",
-    "prettier": "^3.7.1",
-    "tsx": "4.20.6",
+    "eslint-plugin-tsdoc": "^0.5.0",
+    "prettier": "^3.7.4",
+    "tsx": "4.21.0",
     "typescript": "5.9.3",
-    "typescript-eslint": "8.47.0"
+    "typescript-eslint": "8.48.1"
   },
   "dependencies": {
-    "@aptos-labs/ts-sdk": "^5.1.5",
-    "@chainlink/ccip-sdk": "^0.90.0",
+    "@aptos-labs/ts-sdk": "^5.1.6",
+    "@chainlink/ccip-sdk": "^0.91.0",
     "@coral-xyz/anchor": "^0.29.0",
     "@ethers-ext/signer-ledger": "^6.0.0-beta.1",
-    "@inquirer/prompts": "8.0.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",
     "@solana/web3.js": "^1.98.4",
     "bs58": "^6.0.0",
-    "ethers": "6.15.0",
+    "ethers": "6.16.0",
+    "type-fest": "^5.3.0",
     "yargs": "18.0.0"
   }
 }

package/src/commands/index.ts

@@ -1 +1,2 @@
-export { Format } from './types.ts'
+export { type Ctx, Format } from './types.ts'
+export { getCtx } from './utils.ts'

package/src/commands/manual-exec.ts

@@ -9,14 +9,13 @@ import {
   calculateManualExecProof,
   discoverOffRamp,
   estimateExecGasForRequest,
-  fetchAllMessagesInBatch,
-  fetchCCIPRequestsInTx,
 } from '@chainlink/ccip-sdk/src/index.ts'
 import type { Argv } from 'yargs'
 
 import type { GlobalOpts } from '../index.ts'
-import { Format } from './types.ts'
+import { type Ctx, Format } from './types.ts'
 import {
+  getCtx,
   logParsedError,
   prettyCommit,
   prettyReceipt,
@@ -24,7 +23,7 @@ import {
   selectRequest,
   withDateTimestamp,
 } from './utils.ts'
-import { fetchChainsFromRpcs } from '../providers/index.ts'
+import { fetchChainsFromRpcs, loadChainWallet } from '../providers/index.ts'
 
 // const MAX_QUEUE = 1000
 // const MAX_EXECS_IN_BATCH = 1
@@ -33,6 +32,11 @@ import { fetchChainsFromRpcs } from '../providers/index.ts'
 export const command = 'manualExec <tx-hash>'
 export const describe = 'Execute manually pending or failed messages'
 
+/**
+ * Yargs builder for the manual-exec command.
+ * @param yargs - Yargs instance.
+ * @returns Configured yargs instance with command options.
+ */
 export const builder = (yargs: Argv) =>
   yargs
     .positional('tx-hash', {
@@ -93,70 +97,71 @@ export const builder = (yargs: Argv) =>
       },
     })
 
+/**
+ * Handler for the manual-exec command.
+ * @param argv - Command line arguments.
+ */
 export async function handler(argv: Awaited<ReturnType<typeof builder>['argv']> & GlobalOpts) {
-  if (!argv.wallet) argv.wallet = process.env['USER_KEY'] || process.env['OWNER_KEY']
-  let destroy
-  const destroy$ = new Promise((resolve) => {
-    destroy = resolve
-  })
+  const [controller, ctx] = getCtx(argv)
   // argv.senderQueue
   //   ? manualExecSenderQueue(providers, argv.tx_hash, argv)
   //   : manualExec(argv, destroy$)
-  return manualExec(argv, destroy$)
+  return manualExec(ctx, argv)
     .catch((err) => {
       process.exitCode = 1
-      if (!logParsedError(err)) console.error(err)
+      if (!logParsedError.call(ctx, err)) ctx.logger.error(err)
     })
-    .finally(destroy)
+    .finally(() => controller.abort('Exited'))
 }
 
 async function manualExec(
+  ctx: Ctx,
   argv: Awaited<ReturnType<typeof builder>['argv']> & GlobalOpts,
-  destroy: Promise<unknown>,
 ) {
+  const { logger } = ctx
   // messageId not yet implemented for Solana
-  const [getChain, tx$] = fetchChainsFromRpcs(argv, argv.txHash, destroy)
-  const tx = await tx$
-  const source = tx.chain
-  const request = await selectRequest(await fetchCCIPRequestsInTx(tx), 'to know more', argv)
+  const [getChain, tx$] = fetchChainsFromRpcs(ctx, argv, argv.txHash)
+  const [source, tx] = await tx$
+  const request = await selectRequest(await source.fetchRequestsInTx(tx), 'to know more', argv)
 
   switch (argv.format) {
     case Format.log: {
       const logPrefix = 'log' in request ? `message ${request.log.index} = ` : 'message = '
-      console.log(logPrefix, withDateTimestamp(request))
+      logger.log(logPrefix, withDateTimestamp(request))
       break
     }
     case Format.pretty:
-      await prettyRequest(source, request)
+      await prettyRequest.call(ctx, source, request)
       break
     case Format.json:
-      console.info(JSON.stringify(request, bigIntReplacer, 2))
+      logger.info(JSON.stringify(request, bigIntReplacer, 2))
       break
   }
 
   const dest = await getChain(request.lane.destChainSelector)
-  const offRamp = await discoverOffRamp(source, dest, request.lane.onRamp)
+  const offRamp = await discoverOffRamp(source, dest, request.lane.onRamp, source)
   const commitStore = await dest.getCommitStoreForOffRamp(offRamp)
   const commit = await dest.fetchCommitReport(commitStore, request, argv)
 
   switch (argv.format) {
     case Format.log:
-      console.log('commit =', commit)
+      logger.log('commit =', commit)
       break
     case Format.pretty:
-      await prettyCommit(dest, commit, request)
+      await prettyCommit.call(ctx, dest, commit, request)
       break
     case Format.json:
-      console.info(JSON.stringify(commit, bigIntReplacer, 2))
+      logger.info(JSON.stringify(commit, bigIntReplacer, 2))
       break
   }
 
-  const messagesInBatch = await fetchAllMessagesInBatch(source, request, commit.report, argv)
+  const messagesInBatch = await source.fetchAllMessagesInBatch(request, commit.report, argv)
   const execReportProof = calculateManualExecProof(
     messagesInBatch,
     request.lane,
     request.message.header.messageId,
     commit.report.merkleRoot,
+    dest,
   )
 
   const offchainTokenData = await source.fetchOffchainTokenData(request)
@@ -179,10 +184,10 @@ async function manualExec(
       dest as unknown as EVMChain,
       request as CCIPRequest<typeof CCIPVersion.V1_5 | typeof CCIPVersion.V1_6>,
     )
-    console.info('Estimated gasLimit override:', estimated)
+    logger.info('Estimated gasLimit override:', estimated)
     estimated += Math.ceil((estimated * argv.estimateGasLimit) / 100)
     if (request.message.gasLimit >= estimated) {
-      console.warn(
+      logger.warn(
         'Estimated +',
         argv.estimateGasLimit,
         '% margin =',
@@ -196,9 +201,10 @@ async function manualExec(
     }
   }
 
-  const manualExecTx = await dest.executeReport(offRamp, execReport, argv)
+  const [, wallet] = await loadChainWallet(dest, argv)
+  const manualExecTx = await dest.executeReport(offRamp, execReport, { ...argv, wallet })
 
-  console.log('🚀 manualExec tx =', manualExecTx.hash, 'to offRamp =', offRamp)
+  logger.info('🚀 manualExec tx =', manualExecTx.hash, 'to offRamp =', offRamp)
 
   let found = false
   for (const log of manualExecTx.logs) {
@@ -208,11 +214,12 @@ async function manualExec(
     const receipt = { receipt: execReceipt, log, timestamp }
     switch (argv.format) {
       case Format.log:
-        console.log('receipt =', withDateTimestamp(receipt))
+        logger.log('receipt =', withDateTimestamp(receipt))
         break
       case Format.pretty:
-        if (!found) console.info('Receipts (dest):')
-        prettyReceipt(
+        if (!found) logger.info('Receipts (dest):')
+        prettyReceipt.call(
+          ctx,
           receipt,
           request,
           receipt.log.tx?.from ??
@@ -220,7 +227,7 @@ async function manualExec(
         )
         break
       case Format.json:
-        console.info(JSON.stringify(execReceipt, bigIntReplacer, 2))
+        logger.info(JSON.stringify(execReceipt, bigIntReplacer, 2))
         break
     }
     found = true

package/src/commands/parse.ts

@@ -2,13 +2,18 @@ import { bigIntReplacer, supportedChains } from '@chainlink/ccip-sdk/src/index.t
 import type { Argv } from 'yargs'
 
 import type { GlobalOpts } from '../index.ts'
-import { Format } from './types.ts'
-import { prettyTable } from './utils.ts'
+import { type Ctx, Format } from './types.ts'
+import { getCtx, prettyTable } from './utils.ts'
 
 export const command = ['parse <data>', 'parseBytes <data>', 'parseData <data>']
 export const describe =
   'Try to parse and print errors, revert reasons or function call or event data'
 
+/**
+ * Yargs builder for the parse command.
+ * @param yargs - Yargs instance.
+ * @returns Configured yargs instance with command options.
+ */
 export const builder = (yargs: Argv) =>
   yargs.positional('data', {
     type: 'string',
@@ -16,16 +21,22 @@ export const builder = (yargs: Argv) =>
     describe: 'router contract address on source',
   })
 
+/**
+ * Handler for the parse command.
+ * @param argv - Command line arguments.
+ */
 export function handler(argv: Awaited<ReturnType<typeof builder>['argv']> & GlobalOpts) {
+  const [, ctx] = getCtx(argv)
   try {
-    parseBytes(argv)
+    parseBytes(ctx, argv)
   } catch (err) {
     process.exitCode = 1
-    console.error(err)
+    ctx.logger.error(err)
   }
 }
 
-function parseBytes(argv: Parameters<typeof handler>[0]) {
+function parseBytes(ctx: Ctx, argv: Parameters<typeof handler>[0]) {
+  const { logger } = ctx
   let parsed
   for (const chain of Object.values(supportedChains)) {
     try {
@@ -39,14 +50,14 @@ function parseBytes(argv: Parameters<typeof handler>[0]) {
 
   switch (argv.format) {
     case Format.log: {
-      console.log(`parsed =`, parsed)
+      logger.log(`parsed =`, parsed)
       break
     }
     case Format.pretty:
-      prettyTable(parsed)
+      prettyTable.call(ctx, parsed)
       break
     case Format.json:
-      console.info(JSON.stringify(parsed, bigIntReplacer, 2))
+      logger.info(JSON.stringify(parsed, bigIntReplacer, 2))
       break
   }
 }