@chainlink/ccip-cli 0.92.1 → 0.94.0

package/dist/commands/lane-latency.d.ts

@@ -0,0 +1,26 @@
+import type { Argv } from 'yargs';
+import type { GlobalOpts } from '../index.ts';
+import { type Ctx } from './types.ts';
+export declare const command: string[];
+export declare const describe = "Query real-time lane latency between source and destination chains";
+export declare const aliases: string[];
+/**
+ * Yargs builder for the lane-latency command.
+ * @param yargs - Yargs instance.
+ * @returns Configured yargs instance with command options.
+ */
+export declare const builder: (yargs: Argv) => Argv<{
+    source: string;
+} & {
+    dest: string;
+} & {
+    "api-url": string | undefined;
+}>;
+/**
+ * Handler for the lane-latency command.
+ * @param argv - Command line arguments.
+ */
+export declare function handler(argv: Awaited<ReturnType<typeof builder>['argv']> & GlobalOpts): Promise<void>;
+/** Exported for testing */
+export declare function getLaneLatencyCmd(ctx: Ctx, argv: Parameters<typeof handler>[0]): Promise<void>;
+//# sourceMappingURL=lane-latency.d.ts.map

package/dist/commands/lane-latency.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lane-latency.d.ts","sourceRoot":"","sources":["../../src/commands/lane-latency.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,KAAK,GAAG,EAAU,MAAM,YAAY,CAAA;AAG7C,eAAO,MAAM,OAAO,UAAkE,CAAA;AACtF,eAAO,MAAM,QAAQ,uEAAuE,CAAA;AAC5F,eAAO,MAAM,OAAO,UAAc,CAAA;AAElC;;;;GAIG;AACH,eAAO,MAAM,OAAO,GAAI,OAAO,IAAI;;;;;;EAe7B,CAAA;AAEN;;;GAGG;AACH,wBAAsB,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,iBAQ3F;AAED,2BAA2B;AAC3B,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC,iBAuCpF"}

package/dist/commands/lane-latency.js

@@ -0,0 +1,73 @@
+import { CCIPAPIClient, CCIPApiClientNotAvailableError, bigIntReplacer, networkInfo, } from '@chainlink/ccip-sdk';
+import { Format } from "./types.js";
+import { formatDuration, getCtx, logParsedError, prettyTable } from "./utils.js";
+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) => 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) {
+    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, argv) {
+    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(),
+            });
+        }
+    }
+}
+//# sourceMappingURL=lane-latency.js.map

package/dist/commands/lane-latency.js.map

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

package/dist/commands/manual-exec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manual-exec.d.ts","sourceRoot":"","sources":["../../src/commands/manual-exec.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAiB7C,eAAO,MAAM,OAAO,yBAAyB,CAAA;AAC7C,eAAO,MAAM,QAAQ,gDAAgD,CAAA;AAErE;;;;GAIG;AACH,eAAO,MAAM,OAAO,GAAI,OAAO,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiE7B,CAAA;AAEN;;;GAGG;AACH,wBAAsB,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,iBAW3F"}
+{"version":3,"file":"manual-exec.d.ts","sourceRoot":"","sources":["../../src/commands/manual-exec.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAiB7C,eAAO,MAAM,OAAO,yBAAyB,CAAA;AAC7C,eAAO,MAAM,QAAQ,gDAAgD,CAAA;AAErE;;;;GAIG;AACH,eAAO,MAAM,OAAO,GAAI,OAAO,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiE7B,CAAA;AAEN;;;GAGG;AACH,wBAAsB,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,iBAW3F"}

package/dist/commands/manual-exec.js

@@ -1,4 +1,4 @@
-import { CCIPChainFamilyUnsupportedError, CCIPReceiptNotFoundError, ChainFamily, bigIntReplacer, calculateManualExecProof, discoverOffRamp, estimateExecGasForRequest, isSupportedTxHash, } from '@chainlink/ccip-sdk';
+import { CCIPChainFamilyUnsupportedError, ChainFamily, bigIntReplacer, calculateManualExecProof, discoverOffRamp, estimateExecGasForRequest, isSupportedTxHash, } from '@chainlink/ccip-sdk';
 import { Format } from "./types.js";
 import { getCtx, logParsedError, prettyCommit, prettyReceipt, prettyRequest, selectRequest, withDateTimestamp, } from "./utils.js";
 import { fetchChainsFromRpcs, loadChainWallet } from "../providers/index.js";
@@ -95,7 +95,7 @@ async function manualExec(ctx, argv) {
     // 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: {
             const logPrefix = 'log' in request ? `message ${request.log.index} = ` : 'message = ';
@@ -112,21 +112,22 @@ async function manualExec(ctx, argv) {
     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:
             logger.info(JSON.stringify(commit, bigIntReplacer, 2));
             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, request.message.messageId, commit.report.merkleRoot, dest);
-    const offchainTokenData = await source.fetchOffchainTokenData(request);
+    const offchainTokenData = await source.getOffchainTokenData(request);
     const execReport = {
         ...execReportProof,
         message: request.message,
@@ -150,270 +151,20 @@ async function manualExec(ctx, argv) {
         }
     }
     const [, wallet] = await loadChainWallet(dest, argv);
-    const manualExecTx = await dest.executeReport(offRamp, execReport, { ...argv, wallet });
-    logger.info('🚀 manualExec tx =', manualExecTx.hash, 'to offRamp =', offRamp);
-    let found = false;
-    for (const log of manualExecTx.logs) {
-        const execReceipt = dest.constructor.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))
-      break
-    case Format.pretty:
-      await prettyRequest(source, firstRequest)
-      break
-    case Format.json:
-      console.info(JSON.stringify(firstRequest, 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
+    const receipt = await dest.executeReport({ ...argv, offRamp, execReport, wallet });
+    switch (argv.format) {
+        case Format.log:
+            logger.log('receipt =', withDateTimestamp(receipt));
+            break;
+        case Format.pretty:
+            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:
+            logger.info(JSON.stringify(receipt, bigIntReplacer, 2));
+            break;
     }
-  }
 }
-*/
+// TODO: re-implement executing `sender` queue
 //# sourceMappingURL=manual-exec.js.map

package/dist/commands/manual-exec.js.map

@@ -1 +1 @@
-{"version":3,"file":"manual-exec.js","sourceRoot":"","sources":["../../src/commands/manual-exec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"manual-exec.js","sourceRoot":"","sources":["../../src/commands/manual-exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,+BAA+B,EAC/B,WAAW,EACX,cAAc,EACd,wBAAwB,EACxB,eAAe,EACf,yBAAyB,EACzB,iBAAiB,GAClB,MAAM,kCAAkC,CAAA;AAIzC,OAAO,EAAY,MAAM,EAAE,MAAM,YAAY,CAAA;AAC7C,OAAO,EACL,MAAM,EACN,cAAc,EACd,YAAY,EACZ,aAAa,EACb,aAAa,EACb,aAAa,EACb,iBAAiB,GAClB,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAE5E,yBAAyB;AACzB,+BAA+B;AAC/B,6BAA6B;AAE7B,MAAM,CAAC,MAAM,OAAO,GAAG,sBAAsB,CAAA;AAC7C,MAAM,CAAC,MAAM,QAAQ,GAAG,6CAA6C,CAAA;AAErE;;;;GAIG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,KAAW,EAAE,EAAE,CACrC,KAAK;KACF,UAAU,CAAC,SAAS,EAAE;IACrB,IAAI,EAAE,QAAQ;IACd,YAAY,EAAE,IAAI;IAClB,QAAQ,EAAE,kDAAkD;CAC7D,CAAC;KACD,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;KAChD,OAAO,CAAC;IACP,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,kEAAkE;KAC7E;IACD,WAAW,EAAE;QACX,KAAK,EAAE,CAAC,GAAG,EAAE,eAAe,CAAC;QAC7B,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,+EAA+E;KAC1F;IACD,kBAAkB,EAAE;QAClB,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,sEAAsE;KACjF;IACD,oBAAoB,EAAE;QACpB,IAAI,EAAE,QAAQ;QACd,QAAQ,EACN,0FAA0F;QAC5F,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,WAAW;KACvB;IACD,MAAM,EAAE;QACN,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,QAAQ;QACd,QAAQ,EACN,4JAA4J;KAC/J;IACD,cAAc,EAAE;QACd,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,qDAAqD;KAChE;IACD,oBAAoB,EAAE;QACpB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,6EAA6E;KACxF;IACD,yBAAyB,EAAE;QACzB,IAAI,EAAE,SAAS;QACf,QAAQ,EACN,qFAAqF;KACxF;IACD,qBAAqB,EAAE;QACrB,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,yEAAyE;QACnF,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,yCAAyC;KACnD;IACD,cAAc,EAAE;QACd,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,qEAAqE;QAC/E,OAAO,EAAE,KAAK;KACf;IACD,aAAa,EAAE;QACb,IAAI,EAAE,SAAS;QACf,QAAQ,EACN,sFAAsF;QACxF,OAAO,EAAE,cAAc;KACxB;CACF,CAAC,CAAA;AAEN;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAA8D;IAC1F,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAA;IACnC,mBAAmB;IACnB,2DAA2D;IAC3D,iCAAiC;IACjC,OAAO,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC;SACzB,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAA;QACpB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC;YAAE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC3D,CAAC,CAAC;SACD,OAAO,CAAC,OAAO,CAAC,CAAA;AACrB,CAAC;AAED,KAAK,UAAU,UAAU,CACvB,GAAQ,EACR,IAA8D;IAE9D,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAA;IACtB,2CAA2C;IAC3C,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,GAAG,mBAAmB,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IACnE,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,MAAM,GAAG,CAAA;IAC9B,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,MAAM,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE,cAAc,EAAE,IAAI,CAAC,CAAA;IAE3F,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC;QACpB,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YAChB,MAAM,SAAS,GAAG,KAAK,IAAI,OAAO,CAAC,CAAC,CAAC,WAAW,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,YAAY,CAAA;YACrF,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAA;YACjD,MAAK;QACP,CAAC;QACD,KAAK,MAAM,CAAC,MAAM;YAChB,MAAM,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;YAC9C,MAAK;QACP,KAAK,MAAM,CAAC,IAAI;YACd,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,CAAA;YACvD,MAAK;IACT,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;IAC3D,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAA;IAChE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,GAAG,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CAAA;IAE5E,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC;QACpB,KAAK,MAAM,CAAC,GAAG;YACb,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;YAC9B,MAAK;QACP,KAAK,MAAM,CAAC,MAAM;YAChB,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;YAC7B,MAAM,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;YACnD,MAAK;QACP,KAAK,MAAM,CAAC,IAAI;YACd,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,CAAA;YACtD,MAAK;IACT,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACrF,MAAM,eAAe,GAAG,wBAAwB,CAC9C,eAAe,EACf,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,OAAO,CAAC,SAAS,EACzB,MAAM,CAAC,MAAM,CAAC,UAAU,EACxB,IAAI,CACL,CAAA;IAED,MAAM,iBAAiB,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAA;IACpE,MAAM,UAAU,GAAoB;QAClC,GAAG,eAAe;QAClB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,iBAAiB;KAClB,CAAA;IAED,IACE,IAAI,CAAC,gBAAgB,IAAI,IAAI;QAC7B,UAAU,IAAI,OAAO,CAAC,OAAO;QAC7B,WAAW,IAAI,OAAO,CAAC,OAAO,EAC9B,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,WAAW,CAAC,GAAG;YACzC,MAAM,IAAI,+BAA+B,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;gBAC7D,OAAO,EAAE,EAAE,OAAO,EAAE,gBAAgB,EAAE;aACvC,CAAC,CAAA;QAEJ,IAAI,SAAS,GAAG,MAAM,yBAAyB,CAC7C,MAAM,EACN,IAA2B,EAC3B,OAAyE,CAC1E,CAAA;QACD,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE,SAAS,CAAC,CAAA;QACtD,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,GAAG,CAAC,CAAA;QACjE,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,IAAI,SAAS,EAAE,CAAC;YAC1C,MAAM,CAAC,IAAI,CACT,aAAa,EACb,IAAI,CAAC,gBAAgB,EACrB,YAAY,EACZ,SAAS,EACT,uBAAuB,EACvB,OAAO,CAAC,OAAO,CAAC,QAAQ,EACxB,sBAAsB,CACvB,CAAA;QACH,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAA;QAC3B,CAAC;IACH,CAAC;IAED,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IACpD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAA;IAElF,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC;QACpB,KAAK,MAAM,CAAC,GAAG;YACb,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAA;YACnD,MAAK;QACP,KAAK,MAAM,CAAC,MAAM;YAChB,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;YAC9B,aAAa,CAAC,IAAI,CAChB,GAAG,EACH,OAAO,EACP,OAAO,EACP,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI;gBAClB,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CACnF,CAAA;YACD,MAAK;QACP,KAAK,MAAM,CAAC,IAAI;YACd,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,CAAA;YACvD,MAAK;IACT,CAAC;AACH,CAAC;AAED,8CAA8C"}

package/dist/commands/send.d.ts

@@ -29,7 +29,6 @@ export declare const builder: (yargs: Argv) => Argv<import("yargs").Omit<{
         alias: string[];
         type: "number";
         describe: string;
-        default: number;
     };
     'estimate-gas-limit': {
         type: "number";
@@ -63,6 +62,7 @@ export declare const builder: (yargs: Argv) => Argv<import("yargs").Omit<{
         describe: string;
     };
     account: {
+        alias: string;
         type: "array";
         string: true;
         describe: string;

package/dist/commands/send.js

@@ -1,5 +1,5 @@
 import { CCIPArgumentInvalidError, CCIPChainFamilyUnsupportedError, CCIPTokenNotFoundError, ChainFamily, estimateExecGasForRequest, getDataBytes, networkInfo, sourceToDestTokenAmounts, } from '@chainlink/ccip-sdk';
-import { dataLength, formatUnits, toUtf8Bytes } from 'ethers';
+import { formatUnits, toUtf8Bytes } from 'ethers';
 import { showRequests } from "./show.js";
 import { getCtx, logParsedError, parseTokenAmounts } from "./utils.js";
 import { fetchChainsFromRpcs, loadChainWallet } from "../providers/index.js";
@@ -44,7 +44,6 @@ export const builder = (yargs) => yargs
         alias: ['L', 'compute-units'],
         type: 'number',
         describe: 'Gas limit for receiver callback execution; defaults to default configured on ramps',
-        default: 0,
     },
     'estimate-gas-limit': {
         type: 'number',
@@ -78,9 +77,10 @@ export const builder = (yargs) => yargs
         describe: "Address of the Solana tokenReceiver (if different than program's receiver)",
     },
     account: {
+        alias: 'receiver-object-id',
         type: 'array',
         string: true,
-        describe: 'List of accounts needed by Solana receiver program; append `=rw` to specify account as writable; can be specified multiple times',
+        describe: 'List of accounts needed by Solana receiver program, or receiverObjectIds needed by Sui; On Solana, append `=rw` to specify account as writable; can be specified multiple times',
         example: 'requiredPdaAddress=rw',
     },
     'only-get-fee': {
@@ -131,30 +131,14 @@ async function sendMessage(ctx, argv) {
             data = toUtf8Bytes(argv.data);
         }
     }
-    else {
-        data = '0x';
-    }
     const tokenAmounts = argv.transferTokens?.length
         ? await parseTokenAmounts(source, argv.transferTokens)
         : [];
     let receiver = argv.receiver;
-    let tokenReceiver;
     let accounts, accountIsWritableBitmap = 0n;
     if (destNetwork.family === ChainFamily.Solana) {
-        if (argv.tokenReceiver)
-            tokenReceiver = argv.tokenReceiver;
-        else if (!tokenAmounts.length) {
-            tokenReceiver = '11111111111111111111111111111111';
-        }
-        else if (!dataLength(data)) {
-            // sending tokens without data, i.e. not for a receiver contract
-            tokenReceiver = receiver;
-            receiver = '11111111111111111111111111111111';
-        }
-        else {
-            throw new CCIPArgumentInvalidError('token-receiver', 'required when sending tokens with data to Solana');
-        }
-        if (argv.account) {
+        // parse accounts with or without `=rw` suffix
+        if (argv.account?.length) {
             accounts = argv.account.map((account, i) => {
                 if (account.endsWith('=rw')) {
                     accountIsWritableBitmap |= 1n << BigInt(i);
@@ -163,11 +147,6 @@ async function sendMessage(ctx, argv) {
                 return account;
             });
         }
-        else
-            accounts = [];
-    }
-    else if (argv.tokenReceiver || argv.account?.length) {
-        throw new CCIPArgumentInvalidError('token-receiver/account', 'only valid for Solana destination');
     }
     let walletAddress, wallet;
     if (!receiver) {
@@ -198,7 +177,7 @@ async function sendMessage(ctx, argv) {
             message: {
                 sender: walletAddress,
                 receiver,
-                data,
+                data: data || '0x',
                 tokenAmounts: destTokenAmounts,
             },
         });
@@ -207,17 +186,19 @@ async function sendMessage(ctx, argv) {
         if (argv.onlyEstimate)
             return;
     }
-    // `--allow-out-of-order-exec` forces EVMExtraArgsV2, which shouldn't work on v1.2 lanes;
-    // otherwise, fallsback to EVMExtraArgsV1 (compatible with v1.2 & v1.5)
+    // builds a catch-all extraArgs object, which can be massaged by
+    // [[Chain.buildMessageForDest]] to create suitable extraArgs with defaults if needed
     const extraArgs = {
-        ...(argv.allowOutOfOrderExec != null || destNetwork.family !== ChainFamily.EVM
-            ? { allowOutOfOrderExecution: !!argv.allowOutOfOrderExec }
-            : {}),
-        ...(destNetwork.family === ChainFamily.Solana
-            ? { computeUnits: BigInt(argv.gasLimit) }
-            : { gasLimit: BigInt(argv.gasLimit) }),
-        ...(tokenReceiver ? { tokenReceiver } : {}),
-        ...(accounts ? { accounts, accountIsWritableBitmap } : {}),
+        ...(argv.allowOutOfOrderExec != null && {
+            allowOutOfOrderExecution: !!argv.allowOutOfOrderExec,
+        }),
+        ...(argv.gasLimit == null
+            ? {}
+            : destNetwork.family === ChainFamily.Solana
+                ? { computeUnits: BigInt(argv.gasLimit) }
+                : { gasLimit: BigInt(argv.gasLimit) }),
+        ...(!!argv.tokenReceiver && { tokenReceiver: argv.tokenReceiver }),
+        ...(!!accounts && { accounts, accountIsWritableBitmap }), // accounts also used as Sui receiverObjectIds
     };
     let feeToken, feeTokenInfo;
     if (argv.feeToken) {
@@ -251,7 +232,11 @@ async function sendMessage(ctx, argv) {
         tokenAmounts,
     };
     // calculate fee
-    const fee = await source.getFee(argv.router, destNetwork.chainSelector, message);
+    const fee = await source.getFee({
+        ...argv,
+        destChainSelector: destNetwork.chainSelector,
+        message,
+    });
     logger.info('Fee:', fee, '=', formatUnits(fee, feeTokenInfo.decimals), !argv.feeToken && feeTokenInfo.symbol.startsWith('W')
         ? feeTokenInfo.symbol.substring(1)
         : feeTokenInfo.symbol);
@@ -259,10 +244,13 @@ async function sendMessage(ctx, argv) {
         return;
     if (!walletAddress)
         [walletAddress, wallet] = await loadChainWallet(source, argv);
-    const request = await source.sendMessage(argv.router, destNetwork.chainSelector, { ...message, fee }, { ...argv, wallet });
-    logger.info('🚀 Sending message to', tokenReceiver && tokenReceiver !== '11111111111111111111111111111111'
-        ? tokenReceiver
-        : receiver, '@', destNetwork.name, ', tx =>', request.tx.hash, ', messageId =>', request.message.messageId);
+    const request = await source.sendMessage({
+        ...argv,
+        destChainSelector: destNetwork.chainSelector,
+        message: { ...message, fee },
+        wallet,
+    });
+    logger.info('🚀 Sending message to', receiver, '@', destNetwork.name, ', tx =>', request.tx.hash, ', messageId =>', request.message.messageId);
     await showRequests(ctx, {
         ...argv,
         txHash: request.tx.hash,