@chainlink/ccip-cli 0.92.1 → 0.93.0

package/dist/providers/ton.js

@@ -1,27 +1,95 @@
 import { existsSync, readFileSync } from 'node:fs';
-import { CCIPArgumentInvalidError, CCIPWalletInvalidError } from '@chainlink/ccip-sdk';
+import { CCIPArgumentInvalidError, CCIPWalletInvalidError, bytesToBuffer, } from '@chainlink/ccip-sdk';
+import HIDTransport from '@ledgerhq/hw-transport-node-hid';
 import { keyPairFromSecretKey, mnemonicToPrivateKey } from '@ton/crypto';
-import { WalletContractV4 } from '@ton/ton';
+import { Address, SendMode, WalletContractV4, internal, toNano } from '@ton/ton';
+import { TonTransport } from '@ton-community/ton-ledger';
 /**
  * Loads a TON wallet from the provided options.
+ * @param client - TON client instance
  * @param wallet - wallet options (as passed from yargs argv)
+ * @param isTestnet - whether the wallet is on the testnet
  * @returns Promise to TONWallet instance
  */
-export async function loadTonWallet({ wallet: walletOpt } = {}) {
+export async function loadTonWallet(client, { wallet: walletOpt } = {}, isTestnet) {
     if (typeof walletOpt !== 'string')
         throw new CCIPWalletInvalidError(walletOpt);
-    // Handle mnemonic phrase
-    if (walletOpt.includes(' ')) {
-        const mnemonic = walletOpt.trim().split(' ');
-        const keyPair = await mnemonicToPrivateKey(mnemonic);
+    if (walletOpt === 'ledger' || walletOpt.startsWith('ledger:')) {
+        const transport = await HIDTransport.default.create();
+        const ton = new TonTransport(transport);
+        let derivationPath = walletOpt.split(':')[1];
+        if (!derivationPath)
+            derivationPath = `44'/607'/${isTestnet ? '1' : '0'}'/0/0/0`;
+        else if (!isNaN(Number(derivationPath)))
+            derivationPath = `44'/607'/${isTestnet ? '1' : '0'}'/0/${derivationPath}/0`;
+        const match = derivationPath.match(/^(?:m\/)?(\d+)'?\/(\d+)'?\/(\d+)'?\/(\d+)'?\/(\d+)'?\/(\d+)'?$/);
+        if (!match)
+            throw new CCIPWalletInvalidError(walletOpt);
+        const path = match.slice(1).map((x) => parseInt(x));
+        const { address, publicKey } = await ton.getAddress(path, {
+            chain: 0,
+            bounceable: false,
+            testOnly: isTestnet,
+        });
+        console.info('Ledger TON:', address, ', derivationPath:', derivationPath);
         const contract = WalletContractV4.create({
             workchain: 0,
-            publicKey: keyPair.publicKey,
+            publicKey,
         });
-        return { contract, keyPair };
+        const openedWallet = client.open(contract);
+        return {
+            getAddress: () => address,
+            sendTransaction: async ({ value, body, ...args }) => {
+                const seqno = await openedWallet.getSeqno();
+                const to = Address.parse(args.to);
+                if (!value) {
+                    const { source_fees } = await client.estimateExternalMessageFee(to, {
+                        ignoreSignature: true,
+                        body,
+                        initCode: null,
+                        initData: null,
+                    });
+                    value =
+                        BigInt(source_fees.storage_fee +
+                            source_fees.gas_fee +
+                            source_fees.fwd_fee +
+                            source_fees.in_fwd_fee) + toNano('0.0001'); // buffer
+                }
+                const signed = await ton.signTransaction(path, {
+                    seqno,
+                    amount: value,
+                    sendMode: SendMode.IGNORE_ERRORS | SendMode.PAY_GAS_SEPARATELY,
+                    timeout: Math.floor(Date.now() / 1000 + 60),
+                    bounce: false,
+                    ...args,
+                    to,
+                    payload: {
+                        type: 'unsafe',
+                        message: body,
+                    },
+                });
+                await openedWallet.send(signed);
+                return seqno;
+            },
+        };
+    }
+    let keyPair;
+    if (existsSync(walletOpt)) {
+        // Handle file path
+        const content = readFileSync(walletOpt, 'utf8').trim();
+        const secretKey = bytesToBuffer(content);
+        if (secretKey.length !== 64) {
+            throw new CCIPArgumentInvalidError('wallet', 'Invalid private key in file: must be 64 bytes');
+        }
+        keyPair = keyPairFromSecretKey(secretKey);
+    }
+    else if (walletOpt.includes(' ')) {
+        // Handle mnemonic phrase
+        const mnemonic = walletOpt.trim().split(' ');
+        keyPair = await mnemonicToPrivateKey(mnemonic);
     }
-    // Handle hex private key
-    if (walletOpt.startsWith('0x')) {
+    else if (walletOpt.startsWith('0x')) {
+        // Handle hex private key
         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.');
@@ -29,26 +97,32 @@ export async function loadTonWallet({ wallet: walletOpt } = {}) {
         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 };
+        keyPair = keyPairFromSecretKey(secretKey);
     }
-    // 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);
+    if (keyPair) {
         const contract = WalletContractV4.create({
             workchain: 0,
             publicKey: keyPair.publicKey,
         });
-        return { contract, keyPair };
+        const openedWallet = client.open(contract);
+        return {
+            getAddress: () => contract.address.toString(),
+            sendTransaction: async (args) => {
+                const seqno = await openedWallet.getSeqno();
+                const signed = await openedWallet.createTransfer({
+                    ...keyPair,
+                    seqno,
+                    messages: [
+                        internal({
+                            value: toNano('0.3'), // TODO: FIXME: estimate proper value for execution costs instead of hardcoding.
+                            ...args,
+                        }),
+                    ],
+                });
+                await openedWallet.send(signed);
+                return seqno;
+            },
+        };
     }
     throw new CCIPArgumentInvalidError('wallet', 'Wallet not specified');
 }

package/dist/providers/ton.js.map

@@ -1 +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,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAA;AACnG,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,EAAE,MAAM,EAAE,SAAS,KAA2B,EAAE;IAClF,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"}
+{"version":3,"file":"ton.js","sourceRoot":"","sources":["../../src/providers/ton.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chainlink/ccip-cli",
-  "version": "0.92.1",
+  "version": "0.93.0",
   "description": "CCIP Command Line Interface, based on @chainlink/ccip-sdk",
   "author": "Chainlink devs",
   "license": "MIT",
@@ -41,21 +41,25 @@
     "prettier": "^3.7.4",
     "tsx": "4.21.0",
     "typescript": "5.9.3",
-    "typescript-eslint": "8.50.0"
+    "typescript-eslint": "8.51.0"
   },
   "dependencies": {
     "@aptos-labs/ts-sdk": "^5.2.0",
-    "@chainlink/ccip-sdk": "^0.92.1",
+    "@chainlink/ccip-sdk": "^0.93.0",
     "@coral-xyz/anchor": "^0.29.0",
     "@ethers-ext/signer-ledger": "^6.0.0-beta.1",
     "@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",
+    "@ledgerhq/hw-app-aptos": "^6.34.11",
+    "@ledgerhq/hw-app-solana": "^7.6.2",
+    "@ledgerhq/hw-transport-node-hid": "^6.29.16",
     "@solana/web3.js": "^1.98.4",
+    "@ton-community/ton-ledger": "^7.3.0",
     "bs58": "^6.0.0",
     "ethers": "6.16.0",
     "type-fest": "^5.3.1",
     "yargs": "18.0.0"
+  },
+  "overrides": {
+    "@ledgerhq/types-live": "6.90.0"
   }
 }

package/src/commands/lane-latency.ts

@@ -0,0 +1,93 @@
+import {
+  CCIPAPIClient,
+  CCIPApiClientNotAvailableError,
+  bigIntReplacer,
+  networkInfo,
+} from '@chainlink/ccip-sdk/src/index.ts'
+import type { Argv } from 'yargs'
+
+import type { GlobalOpts } from '../index.ts'
+import { type Ctx, Format } from './types.ts'
+import { formatDuration, getCtx, logParsedError, prettyTable } from './utils.ts'
+
+export const command = ['laneLatency <source> <dest>', 'lane-latency <source> <dest>']
+export const describe = 'Query real-time lane latency between source and destination chains'
+export const aliases = ['latency']
+
+/**
+ * Yargs builder for the lane-latency command.
+ * @param yargs - Yargs instance.
+ * @returns Configured yargs instance with command options.
+ */
+export const builder = (yargs: Argv) =>
+  yargs
+    .positional('source', {
+      type: 'string',
+      demandOption: true,
+      describe: 'Source network (chainId, selector, or name). Example: ethereum-mainnet',
+    })
+    .positional('dest', {
+      type: 'string',
+      demandOption: true,
+      describe: 'Destination network (chainId, selector, or name). Example: arbitrum-mainnet',
+    })
+    .option('api-url', {
+      type: 'string',
+      describe: 'Custom CCIP API URL (defaults to api.ccip.chain.link)',
+    })
+
+/**
+ * Handler for the lane-latency command.
+ * @param argv - Command line arguments.
+ */
+export async function handler(argv: Awaited<ReturnType<typeof builder>['argv']> & GlobalOpts) {
+  const [ctx, destroy] = getCtx(argv)
+  return getLaneLatencyCmd(ctx, argv)
+    .catch((err) => {
+      process.exitCode = 1
+      if (!logParsedError.call(ctx, err)) ctx.logger.error(err)
+    })
+    .finally(destroy)
+}
+
+/** Exported for testing */
+export async function getLaneLatencyCmd(ctx: Ctx, argv: Parameters<typeof handler>[0]) {
+  const { logger } = ctx
+
+  // Respect --no-api flag - this command requires API access
+  if (argv.noApi) {
+    throw new CCIPApiClientNotAvailableError({
+      context: {
+        reason:
+          'The lane-latency command requires API access. Remove --no-api flag to use this command.',
+      },
+    })
+  }
+
+  const sourceNetwork = networkInfo(argv.source)
+  const destNetwork = networkInfo(argv.dest)
+
+  const apiClient = new CCIPAPIClient(argv.apiUrl, { logger })
+
+  const result = await apiClient.getLaneLatency(
+    sourceNetwork.chainSelector,
+    destNetwork.chainSelector,
+  )
+
+  switch (argv.format) {
+    case Format.json:
+      logger.log(JSON.stringify(result, bigIntReplacer, 2))
+      break
+    case Format.log:
+      logger.log('Lane Latency:', result)
+      break
+    default: {
+      prettyTable.call(ctx, {
+        Source: `${sourceNetwork.name} [${sourceNetwork.chainSelector}]`,
+        Destination: `${destNetwork.name} [${destNetwork.chainSelector}]`,
+        'Estimated Delivery': `~${formatDuration(result.totalMs / 1000)}`,
+        'Latency (ms)': result.totalMs.toLocaleString(),
+      })
+    }
+  }
+}

package/src/commands/manual-exec.ts

@@ -1,11 +1,9 @@
 import {
   type CCIPRequest,
   type CCIPVersion,
-  type ChainStatic,
   type EVMChain,
   type ExecutionReport,
   CCIPChainFamilyUnsupportedError,
-  CCIPReceiptNotFoundError,
   ChainFamily,
   bigIntReplacer,
   calculateManualExecProof,
@@ -132,7 +130,7 @@ async function manualExec(
   // messageId not yet implemented for Solana
   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)
+  const request = await selectRequest(await source.getMessagesInTx(tx), 'to know more', argv)
 
   switch (argv.format) {
     case Format.log: {
@@ -151,13 +149,14 @@ async function manualExec(
   const dest = await getChain(request.lane.destChainSelector)
   const offRamp = await discoverOffRamp(source, dest, request.lane.onRamp, source)
   const commitStore = await dest.getCommitStoreForOffRamp(offRamp)
-  const commit = await dest.fetchCommitReport(commitStore, request, argv)
+  const commit = await dest.getCommitReport({ ...argv, commitStore, request })
 
   switch (argv.format) {
     case Format.log:
       logger.log('commit =', commit)
       break
     case Format.pretty:
+      logger.info('Commit (dest):')
       await prettyCommit.call(ctx, dest, commit, request)
       break
     case Format.json:
@@ -165,7 +164,7 @@ async function manualExec(
       break
   }
 
-  const messagesInBatch = await source.fetchAllMessagesInBatch(request, commit.report, argv)
+  const messagesInBatch = await source.getMessagesInBatch(request, commit.report, argv)
   const execReportProof = calculateManualExecProof(
     messagesInBatch,
     request.lane,
@@ -174,7 +173,7 @@ async function manualExec(
     dest,
   )
 
-  const offchainTokenData = await source.fetchOffchainTokenData(request)
+  const offchainTokenData = await source.getOffchainTokenData(request)
   const execReport: ExecutionReport = {
     ...execReportProof,
     message: request.message,
@@ -214,274 +213,26 @@ async function manualExec(
   }
 
   const [, wallet] = await loadChainWallet(dest, argv)
-  const manualExecTx = await dest.executeReport(offRamp, execReport, { ...argv, wallet })
+  const receipt = await dest.executeReport({ ...argv, offRamp, execReport, wallet })
 
-  logger.info('🚀 manualExec tx =', manualExecTx.hash, 'to offRamp =', offRamp)
-
-  let found = false
-  for (const log of manualExecTx.logs) {
-    const execReceipt = (dest.constructor as ChainStatic).decodeReceipt(log)
-    if (!execReceipt) continue
-    const timestamp = await dest.getBlockTimestamp(log.blockNumber)
-    const receipt = { receipt: execReceipt, log, timestamp }
-    switch (argv.format) {
-      case Format.log:
-        logger.log('receipt =', withDateTimestamp(receipt))
-        break
-      case Format.pretty:
-        if (!found) logger.info('Receipts (dest):')
-        prettyReceipt.call(
-          ctx,
-          receipt,
-          request,
-          receipt.log.tx?.from ??
-            (await dest.getTransaction(receipt.log.transactionHash).catch(() => null))?.from,
-        )
-        break
-      case Format.json:
-        logger.info(JSON.stringify(execReceipt, bigIntReplacer, 2))
-        break
-    }
-    found = true
-  }
-  if (!found) throw new CCIPReceiptNotFoundError(manualExecTx.hash)
-}
-
-/*
-export async function manualExecSenderQueue(
-  providers: Providers,
-  txHash: string,
-  argv: {
-    gasLimit?: number
-    tokensGasLimit?: number
-    logIndex?: number
-    execFailed?: boolean
-    format: Format
-    page: number
-    wallet?: string
-  },
-) {
-  const tx = await providers.getTxReceipt(txHash)
-  const source = tx.provider
-
-  let firstRequest
-  if (argv.logIndex != null) {
-    firstRequest = await fetchCCIPMessageInLog(tx, argv.logIndex)
-  } else {
-    firstRequest = await selectRequest(await fetchCCIPMessagesInTx(tx), 'to execute')
-  }
   switch (argv.format) {
     case Format.log:
-      console.log(`message ${firstRequest.log.index} =`, withDateTimestamp(firstRequest))
+      logger.log('receipt =', withDateTimestamp(receipt))
       break
     case Format.pretty:
-      await prettyRequest(source, firstRequest)
+      logger.info('Receipt (dest):')
+      prettyReceipt.call(
+        ctx,
+        receipt,
+        request,
+        receipt.log.tx?.from ??
+          (await dest.getTransaction(receipt.log.transactionHash).catch(() => null))?.from,
+      )
       break
     case Format.json:
-      console.info(JSON.stringify(firstRequest, bigIntReplacer, 2))
+      logger.info(JSON.stringify(receipt, bigIntReplacer, 2))
       break
   }
-
-  const dest = await providers.forChainId(chainIdFromSelector(firstRequest.lane.destChainSelector))
-
-  const requests: Omit<CCIPRequest, 'timestamp' | 'tx'>[] = []
-  for await (const request of fetchRequestsForSender(source, firstRequest)) {
-    requests.push(request)
-    if (requests.length >= MAX_QUEUE) break
-  }
-  console.info('Found', requests.length, `requests for "${firstRequest.message.sender}"`)
-  if (!requests.length) return
-
-  let startBlock = await getSomeBlockNumberBefore(dest, firstRequest.timestamp)
-  const wallet = (await getWallet(argv)).connect(dest)
-  const offRampContract = await discoverOffRamp(wallet, firstRequest.lane, {
-    fromBlock: startBlock,
-    page: argv.page,
-  })
-  const senderNonce = await offRampContract.getSenderNonce(firstRequest.message.sender)
-  const origRequestsCnt = requests.length,
-    last = requests[requests.length - 1]
-  while (requests.length && requests[0].message.header.sequenceNumber <= senderNonce) {
-    requests.shift()
-  }
-  console.info(
-    'Found',
-    requests.length,
-    `requests for "${firstRequest.message.sender}", removed `,
-    origRequestsCnt - requests.length,
-    'already executed before senderNonce =',
-    senderNonce,
-    '. Last source txHash =',
-    last.log.transactionHash,
-  )
-  if (!requests.length) return
-  let nonce = await wallet.getNonce()
-
-  let lastBatch:
-    | readonly [CCIPCommit, Omit<CCIPRequest<CCIPVersion>, 'tx' | 'timestamp'>[]]
-    | undefined
-  const txsPending = []
-  for (let i = 0; i < requests.length; ) {
-    let commit, batch
-    if (!lastBatch || requests[i].message.header.sequenceNumber > lastBatch[0].report.maxSeqNr) {
-      commit = await fetchCommitReport(dest, requests[i], {
-        startBlock,
-        page: argv.page,
-      })
-      startBlock = commit.log.blockNumber + 1
-
-      batch = await fetchAllMessagesInBatch(
-        source,
-        requests[i].lane.destChainSelector,
-        requests[i].log,
-        commit.report,
-        { page: argv.page },
-      )
-      lastBatch = [commit, batch]
-    } else {
-      ;[commit, batch] = lastBatch
-    }
-
-    const msgIdsToExec = [] as string[]
-    while (
-      i < requests.length &&
-      requests[i].message.header.sequenceNumber <= commit.report.maxSeqNr &&
-      msgIdsToExec.length < MAX_EXECS_IN_BATCH
-    ) {
-      msgIdsToExec.push(requests[i++].message.header.messageId)
-    }
-
-    const manualExecReport = calculateManualExecProof(
-      batch.map(({ message }) => message),
-      firstRequest.lane,
-      msgIdsToExec,
-      commit.report.merkleRoot,
-    )
-    const requestsToExec = manualExecReport.messages.map(
-      ({ header }) =>
-        requests.find(({ message }) => message.header.messageId === header.messageId)!,
-    )
-    const offchainTokenData = await Promise.all(
-      requestsToExec.map(async (request) => {
-        const tx = await lazyCached(`tx ${request.log.transactionHash}`, () =>
-          source.getTransactionReceipt(request.log.transactionHash).then((res) => {
-            if (!res) throw new Error(`Tx not found: ${request.log.transactionHash}`)
-            return res
-          }),
-        )
-        return fetchOffchainTokenData({ ...request, tx })
-      }),
-    )
-    const execReport = { ...manualExecReport, offchainTokenData }
-    const getGasLimitOverride = (message: { gasLimit: bigint } | { extraArgs: string }): bigint => {
-      if (argv.gasLimit != null) {
-        const argvGasLimit = BigInt(argv.gasLimit)
-        let msgGasLimit
-        if ('gasLimit' in message) {
-          msgGasLimit = message.gasLimit
-        } else {
-          const parsedArgs = parseExtraArgs(message.extraArgs, source.network.family)
-          if (!parsedArgs || !('gasLimit' in parsedArgs) || !parsedArgs.gasLimit) {
-            throw new Error(`Missing gasLimit argument`)
-          }
-          msgGasLimit = BigInt(parsedArgs.gasLimit)
-        }
-        if (argvGasLimit > msgGasLimit) {
-          return argvGasLimit
-        }
-      }
-      return 0n
-    }
-
-    let manualExecTx
-    if (firstRequest.lane.version === CCIPVersion.V1_2) {
-      const gasOverrides = manualExecReport.messages.map((message) =>
-        getGasLimitOverride(message as CCIPMessage<typeof CCIPVersion.V1_2>),
-      )
-      manualExecTx = await (
-        offRampContract as CCIPContract<typeof CCIPContractType.OffRamp, typeof CCIPVersion.V1_2>
-      ).manuallyExecute(
-        execReport as {
-          offchainTokenData: string[][]
-          messages: CCIPMessage<typeof CCIPVersion.V1_2>[]
-          proofs: string[]
-          proofFlagBits: bigint
-        },
-        gasOverrides,
-        { nonce: nonce++, gasLimit: argv.gasLimit ? argv.gasLimit : undefined },
-      )
-    } else if (firstRequest.lane.version === CCIPVersion.V1_5) {
-      const gasOverrides = manualExecReport.messages.map((message) => ({
-        receiverExecutionGasLimit: getGasLimitOverride(
-          message as CCIPMessage<typeof CCIPVersion.V1_5>,
-        ),
-        tokenGasOverrides: message.tokenAmounts.map(() => BigInt(argv.tokensGasLimit ?? 0)),
-      }))
-      manualExecTx = await (
-        offRampContract as CCIPContract<typeof CCIPContractType.OffRamp, typeof CCIPVersion.V1_5>
-      ).manuallyExecute(
-        execReport as {
-          offchainTokenData: string[][]
-          messages: CCIPMessage<typeof CCIPVersion.V1_5>[]
-          proofs: string[]
-          proofFlagBits: bigint
-        },
-        gasOverrides,
-        { nonce: nonce++, gasLimit: argv.gasLimit ? argv.gasLimit : undefined },
-      )
-    } else {
-      const gasOverrides = manualExecReport.messages.map((message) => ({
-        receiverExecutionGasLimit: getGasLimitOverride(
-          message as CCIPMessage<typeof CCIPVersion.V1_6>,
-        ),
-        tokenGasOverrides: message.tokenAmounts.map(() => BigInt(argv.tokensGasLimit ?? 0)),
-      }))
-      manualExecTx = await (
-        offRampContract as CCIPContract<typeof CCIPContractType.OffRamp, typeof CCIPVersion.V1_6>
-      ).manuallyExecute(
-        [
-          {
-            sourceChainSelector: firstRequest.lane.sourceChainSelector,
-            messages: execReport.messages as (CCIPMessage<typeof CCIPVersion.V1_6> & {
-              gasLimit: bigint
-            })[],
-            proofs: execReport.proofs,
-            proofFlagBits: execReport.proofFlagBits,
-            offchainTokenData: execReport.offchainTokenData,
-          },
-        ],
-        [gasOverrides],
-        { nonce: nonce++, gasLimit: argv.gasLimit ? argv.gasLimit : undefined },
-      )
-    }
-
-    const toExec = requests[i - 1] // log only request data for last msg in msgIdsToExec
-    console.log(
-      `🚀 [${i}/${requests.length}, ${batch.length} batch, ${msgIdsToExec.length} to exec]`,
-      'source tx =',
-      toExec.log.transactionHash,
-      'msgId =',
-      toExec.message.header.messageId,
-      'nonce =',
-      toExec.message.header.nonce,
-      'manualExec tx =',
-      manualExecTx.hash,
-      'to =',
-      manualExecTx.to,
-      'gasLimit =',
-      manualExecTx.gasLimit,
-    )
-    txsPending.push(manualExecTx)
-    if (txsPending.length >= MAX_PENDING_TXS) {
-      console.debug(
-        'awaiting',
-        txsPending.length,
-        'txs:',
-        txsPending.map((tx) => tx.hash),
-      )
-      await txsPending[txsPending.length - 1].wait()
-      txsPending.length = 0
-    }
-  }
 }
-*/
+
+// TODO: re-implement executing `sender` queue