@chainlink/ccip-cli 0.93.0 → 0.95.0

package/README.md

@@ -44,8 +44,8 @@ alias ccip-cli="$PWD/ccip-cli/ccip-cli"  # optional, to run from local repo dire
 All commands require a list of RPCs endpoints for the networks of interest (source and destination).
 Both `http[s]` and `ws[s]` (websocket) URLs are supported.
 
-This list can be passed in the command line, through the `-r/--rpcs` option; it may be passed
-multiple times, e.g. `-r <source_rpc> -r <dest_rpc>`, and are merged with those fetched from the
+This list can be passed in the command line, through the `--rpc/--rpcs` option; it may be passed
+multiple times, e.g. `--rpc <source_rpc> --rpc <dest_rpc>`, and are merged with those fetched from the
 rpcs file (`--rpcs-file`, default=`./.env`), which may contain multiple endpoints, one per line,
 with any prefix or suffix (only URLs are parsed).
 
@@ -112,7 +112,10 @@ don't support large ranges)
 ### `send`
 
 ```sh
-ccip-cli send 11155111 0x0BF3dE8c5D3e8A2B34D2BEeB17ABfCeBaf363A59 ethereum-testnet-sepolia-arbitrum-1 \
+ccip-cli send \
+    --source ethereum-testnet-sepolia \
+    --dest ethereum-testnet-sepolia-arbitrum-1 \
+    --router 0x0BF3dE8c5D3e8A2B34D2BEeB17ABfCeBaf363A59 \
     --receiver 0xAB4f961939BFE6A93567cC57C59eEd7084CE2131 \
     --data 'hello world' \
     --gas-limit 300000 \
@@ -120,37 +123,49 @@ ccip-cli send 11155111 0x0BF3dE8c5D3e8A2B34D2BEeB17ABfCeBaf363A59 ethereum-testn
     --transfer-tokens 0xFd57b4ddBf88a4e07fF4e34C487b99af2Fe82a05=0.1
 ```
 
-Sends a message from router on source network, to dest; positional parameters are:
+Sends a CCIP message from source to destination chain.
 
-1. `source`: chainId or name
-2. `router`: address on source
-3. `dest`: chainId or name
+**Required options:**
 
-If `--receiver` is omitted, sends to self (sender, see [Wallet](#wallet) section above) address on
-dest, if to same chain family (e.g. EVM-to-EVM). If not same chain family, it is mandatory.
+| Option | Alias | Description |
+|--------|-------|-------------|
+| `--source` | `-s` | Source chain (chainId, selector, or name) |
+| `--dest` | `-d` | Destination chain (chainId, selector, or name) |
+| `--router` | `-r` | Router contract address on source |
 
-If `--data` is not a hex-string, it will be UTF-8 encoded.
+**Message options:**
 
-If `--gas-limit` is omitted, ramp default config (usually 200k) is used.
-It can be `0` to disable execution on receiver.
-`--estimate-gas-limit` can be provided instead, to estimate the gas limit for the message execution.
-It receives a percentage margin (e.g. `--estimate-gas-limit=10` for +10% margin), which is added to
-the estimation before sending the message.
-`--only-estimate` prints gas estimation then exits.
+| Option | Alias | Description |
+|--------|-------|-------------|
+| `--receiver` | `--to` | Receiver address; defaults to sender if same chain family |
+| `--data` | | Data payload (non-hex = UTF-8 encoded) |
+| `--gas-limit` | `-L` | Gas limit for receiver callback (default: ramp config) |
+| `--estimate-gas-limit` | | Auto-estimate with % margin; conflicts with `--gas-limit` |
+| `--allow-out-of-order-exec` | `--ooo` | Skip sender nonce enforcement (v1.5+ lanes) |
 
-If `--fee-token` is not provided, CCIP fee will be paid in native token.
-`--only-get-fee` prints CCIP fee then exits.
+**Token options:**
 
-`--transfer-tokens` can receive multiple pairs of `0xTokenAddr=amount` (source token addresses,
-separated by spaces, terminated with `--` if needed). `amount` will be converted using token
-decimals (e.g. 0.1 = 10^5 of the smallest unit for USDC, which is 6 decimals).
+| Option | Alias | Description |
+|--------|-------|-------------|
+| `--fee-token` | | Pay fee in ERC20 (default: native token) |
+| `--transfer-tokens` | `-t` | Token transfers as `token=amount` (e.g., `0xToken=0.1`) |
+| `--approve-max` | | Approve max allowance instead of exact |
 
-`--allow-out-of-order-exec` (`--ooo`) is only available on v1.5+ lanes, and opt-out of _sender_
-`nonce` order enforcement. It's useful for destinations where execution can't be guaranteed
-(e.g. zkOverflow), and required for many destinations. You can read about this config [here](https://docs.chain.link/ccip/tutorials/svm/source/token-transfers#understanding-the-configuration-fields).
+**Utility options:**
 
-`--approve-max` will approve the maximum possible amount of tokens, if approval is needed for
-either transfer or fee tokens. Default behavior is to approve the strictly needed allowance.
+| Option | Alias | Description |
+|--------|-------|-------------|
+| `--only-get-fee` | | Print fee and exit |
+| `--only-estimate` | | Print gas estimate and exit (requires `--estimate-gas-limit`) |
+| `--wait` | | Wait for execution on destination |
+| `--wallet` | `-w` | Wallet (ledger[:index] or private key) |
+
+**Solana/Sui options:**
+
+| Option | Description |
+|--------|-------------|
+| `--token-receiver` | Solana token receiver if different from program |
+| `--account` | Solana accounts (append `=rw` for writable) or Sui object IDs |
 
 ### `show` (default command)
 
@@ -231,28 +246,35 @@ It'll recursively try to decode `returnData` and `error` arguments.
 ### `getSupportedTokens`
 
 ```sh
-ccip-cli getSupportedTokens <source> <router>  # lists supported tokens
-ccip-cli getSupportedTokens <source> <router> [token]  # show token and pool details for this token
-ccip-cli getSupportedTokens <source> <tokenPool>  # same as above, for the pool directly
+ccip-cli getSupportedTokens --network <network> --address <address> [--token <token>]
 ```
 
-Source is the network to be queried, as chainID or name.
-If a CCIP `router` address is provided as second parameter, lists all the tokens and its information
-supported in that lane. Type to filter the list.  
+List supported tokens in a given Router/OnRamp/TokenAdminRegistry, or show info about a specific token/pool.
 
-If `token` address is supported as 3rd parameter, pre-selects the token in the list.
+**Required options:**
 
-If `tokenPool` address is provided as 2nd parameter, uses it the same as if having provided
-router + token addresses.
+| Option | Alias | Description |
+|--------|-------|-------------|
+| `--network` | `-n` | Source network: chainId or name |
+| `--address` | `-a` | Router/OnRamp/TokenAdminRegistry/TokenPool contract address |
 
-In any case, details of the TokenPool and Token will be printed, including all connected remote
-chains and its rate limits state.
+**Optional:**
 
-#### Example
+| Option | Alias | Description |
+|--------|-------|-------------|
+| `--token` | `-t` | Token address to query (pre-selects from list if address is a registry) |
+
+#### Examples
 
 ```sh
-# Check tokens supported for transfer from Ethereum to Polygon
-ccip-cli getSupportedTokens ethereum-mainnet 0x80226fc0Ee2b096224EeAc085Bb9a8cba1146f7D
+# List all supported tokens from a router
+ccip-cli getSupportedTokens -n ethereum-mainnet -a 0x80226fc0Ee2b096224EeAc085Bb9a8cba1146f7D
+
+# Get details for a specific token
+ccip-cli getSupportedTokens -n ethereum-mainnet -a 0x80226fc0Ee2b096224EeAc085Bb9a8cba1146f7D -t 0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48
+
+# Query a token pool directly
+ccip-cli getSupportedTokens -n ethereum-mainnet -a 0xTokenPoolAddress
 ```
 
 #### Output Format Options
@@ -260,3 +282,37 @@ ccip-cli getSupportedTokens ethereum-mainnet 0x80226fc0Ee2b096224EeAc085Bb9a8cba
 - `--format pretty` (default): Human-readable output
 - `--format log`: Basic console logging
 - `--format json`: Machine-readable JSON
+
+### `token`
+
+```sh
+ccip-cli token --network <network> --holder <address> [--token <token>]
+```
+
+Query native or token balance for an address.
+
+**Required options:**
+
+| Option | Alias | Description |
+|--------|-------|-------------|
+| `--network` | `-n` | Network: chainId or name (e.g., ethereum-mainnet, solana-devnet) |
+| `--holder` | `-H` | Wallet address to query balance for |
+
+**Optional:**
+
+| Option | Alias | Description |
+|--------|-------|-------------|
+| `--token` | `-t` | Token address (omit for native token balance) |
+
+#### Examples
+
+```sh
+# Native ETH balance
+ccip-cli token -n ethereum-mainnet -H 0x1234...abcd
+
+# ERC-20 token balance
+ccip-cli token -n ethereum-mainnet -H 0x1234...abcd -t 0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48
+
+# Solana native SOL balance
+ccip-cli token -n solana-devnet -H EPUjBP3Xf76K1VKsDSc6GupBWE8uykNksCLJgXZn87CB
+```

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":"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"}
+{"version":3,"file":"manual-exec.d.ts","sourceRoot":"","sources":["../../src/commands/manual-exec.ts"],"names":[],"mappings":"AAQA,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, ChainFamily, bigIntReplacer, calculateManualExecProof, discoverOffRamp, estimateExecGasForRequest, isSupportedTxHash, } from '@chainlink/ccip-sdk';
+import { bigIntReplacer, calculateManualExecProof, discoverOffRamp, estimateReceiveExecution, 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";
@@ -133,18 +133,18 @@ async function manualExec(ctx, argv) {
         message: request.message,
         offchainTokenData,
     };
-    if (argv.estimateGasLimit != null &&
-        'gasLimit' in request.message &&
-        'extraArgs' in request.message) {
-        if (dest.network.family !== ChainFamily.EVM)
-            throw new CCIPChainFamilyUnsupportedError(dest.network.family, {
-                context: { feature: 'gas estimation' },
-            });
-        let estimated = await estimateExecGasForRequest(source, dest, request);
+    if (argv.estimateGasLimit != null) {
+        let estimated = await estimateReceiveExecution({
+            source,
+            dest,
+            routerOrRamp: offRamp,
+            message: request.message,
+        });
         logger.info('Estimated gasLimit override:', estimated);
         estimated += Math.ceil((estimated * argv.estimateGasLimit) / 100);
-        if (request.message.gasLimit >= estimated) {
-            logger.warn('Estimated +', argv.estimateGasLimit, '% margin =', estimated, '< original gasLimit =', request.message.gasLimit, '. Leaving unchanged.');
+        const origLimit = Number('gasLimit' in request.message ? request.message.gasLimit : request.message.computeUnits);
+        if (origLimit >= estimated) {
+            logger.warn('Estimated +', argv.estimateGasLimit, '% =', estimated, '< original gasLimit =', origLimit, '. Leaving unchanged.');
         }
         else {
             argv.gasLimit = estimated;

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":"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"}

package/dist/commands/send.d.ts

@@ -1,7 +1,7 @@
 import type { Argv } from 'yargs';
 import type { GlobalOpts } from '../index.ts';
-export declare const command = "send <source> <router> <dest>";
-export declare const describe = "Send a CCIP message from router on source to dest";
+export declare const command = "send";
+export declare const describe = "Send a CCIP message from source to destination chain";
 /**
  * Yargs builder for the send command.
  * @param yargs - Yargs instance.
@@ -9,10 +9,10 @@ export declare const describe = "Send a CCIP message from router on source to de
  */
 export declare const builder: (yargs: Argv) => Argv<import("yargs").Omit<{
     source: string;
-} & {
-    router: string;
 } & {
     dest: string;
+} & {
+    router: string;
 }, "data" | "wallet" | "receiver" | "account" | "gas-limit" | "estimate-gas-limit" | "wait" | "allow-out-of-order-exec" | "fee-token" | "transfer-tokens" | "token-receiver" | "only-get-fee" | "only-estimate" | "approve-max"> & import("yargs").InferredOptionTypes<{
     receiver: {
         alias: string;
@@ -20,21 +20,17 @@ export declare const builder: (yargs: Argv) => Argv<import("yargs").Omit<{
         describe: string;
     };
     data: {
-        alias: string;
         type: "string";
         describe: string;
-        example: string;
     };
     'gas-limit': {
         alias: string[];
         type: "number";
         describe: string;
-        default: number;
     };
     'estimate-gas-limit': {
         type: "number";
         describe: string;
-        example: string;
         conflicts: string;
     };
     'allow-out-of-order-exec': {
@@ -51,7 +47,6 @@ export declare const builder: (yargs: Argv) => Argv<import("yargs").Omit<{
         type: "array";
         string: true;
         describe: string;
-        example: string;
     };
     wallet: {
         alias: string;
@@ -63,10 +58,10 @@ export declare const builder: (yargs: Argv) => Argv<import("yargs").Omit<{
         describe: string;
     };
     account: {
+        alias: string;
         type: "array";
         string: true;
         describe: string;
-        example: string;
     };
     'only-get-fee': {
         type: "boolean";
@@ -75,6 +70,7 @@ export declare const builder: (yargs: Argv) => Argv<import("yargs").Omit<{
     'only-estimate': {
         type: "boolean";
         describe: string;
+        implies: string;
     };
     'approve-max': {
         type: "boolean";

package/dist/commands/send.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../src/commands/send.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAM7C,eAAO,MAAM,OAAO,kCAAkC,CAAA;AACtD,eAAO,MAAM,QAAQ,sDAAsD,CAAA;AAE3E;;;;GAIG;AACH,eAAO,MAAM,OAAO,GAAI,OAAO,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuG9B,CAAA;AAEL;;;GAGG;AACH,wBAAsB,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,iBAQ3F"}
+{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../src/commands/send.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAM7C,eAAO,MAAM,OAAO,SAAS,CAAA;AAC7B,eAAO,MAAM,QAAQ,yDAAyD,CAAA;AAE9E;;;;GAIG;AACH,eAAO,MAAM,OAAO,GAAI,OAAO,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsG7B,CAAA;AAEN;;;GAGG;AACH,wBAAsB,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,iBAQ3F"}

package/dist/commands/send.js

@@ -1,107 +1,114 @@
-import { CCIPArgumentInvalidError, CCIPChainFamilyUnsupportedError, CCIPTokenNotFoundError, ChainFamily, estimateExecGasForRequest, getDataBytes, networkInfo, sourceToDestTokenAmounts, } from '@chainlink/ccip-sdk';
-import { dataLength, formatUnits, toUtf8Bytes } from 'ethers';
+import { CCIPArgumentInvalidError, CCIPTokenNotFoundError, ChainFamily, estimateReceiveExecution, getDataBytes, networkInfo, } from '@chainlink/ccip-sdk';
+import { formatUnits, toUtf8Bytes } from 'ethers';
 import { showRequests } from "./show.js";
 import { getCtx, logParsedError, parseTokenAmounts } from "./utils.js";
 import { fetchChainsFromRpcs, loadChainWallet } from "../providers/index.js";
-export const command = 'send <source> <router> <dest>';
-export const describe = 'Send a CCIP message from router on source to dest';
+export const command = 'send';
+export const describe = 'Send a CCIP message from source to destination chain';
 /**
  * Yargs builder for the send command.
  * @param yargs - Yargs instance.
  * @returns Configured yargs instance with command options.
  */
 export const builder = (yargs) => yargs
-    .positional('source', {
+    .option('source', {
+    alias: 's',
     type: 'string',
     demandOption: true,
-    describe: 'source network, chainId or name',
-    example: 'ethereum-testnet-sepolia',
+    describe: 'Source chain: chainId, selector, or name',
 })
-    .positional('router', {
+    .option('dest', {
+    alias: 'd',
     type: 'string',
     demandOption: true,
-    describe: 'router contract address on source',
+    describe: 'Destination chain: chainId, selector, or name',
 })
-    .positional('dest', {
+    .option('router', {
+    alias: 'r',
     type: 'string',
     demandOption: true,
-    describe: 'destination network, chainId or name',
-    example: 'ethereum-testnet-sepolia-arbitrum-1',
+    describe: 'Router contract address on source',
 })
     .options({
     receiver: {
-        alias: 'R',
+        alias: 'to',
         type: 'string',
-        describe: 'Receiver of the message; defaults to the sender wallet address if same network family',
+        describe: 'Receiver address on destination; defaults to sender if same chain family',
     },
     data: {
-        alias: 'd',
         type: 'string',
-        describe: 'Data to send in the message (non-hex will be utf-8 encoded)',
-        example: '0x1234',
+        describe: 'Data payload to send (non-hex will be UTF-8 encoded)',
     },
     'gas-limit': {
         alias: ['L', 'compute-units'],
         type: 'number',
-        describe: 'Gas limit for receiver callback execution; defaults to default configured on ramps',
-        default: 0,
+        describe: 'Gas limit for receiver callback; defaults to ramp config',
     },
     'estimate-gas-limit': {
         type: 'number',
-        describe: 'Estimate gas limit for receiver callback execution; argument is a % margin to add to the estimate',
-        example: '10',
+        describe: 'Estimate gas limit with % margin (e.g., 10 for +10%)',
         conflicts: 'gas-limit',
     },
     'allow-out-of-order-exec': {
         alias: 'ooo',
         type: 'boolean',
-        describe: 'Allow execution of messages out of order (i.e. sender nonce not enforced, only v1.5+ lanes, mandatory for some dests)',
+        describe: 'Allow out-of-order execution (v1.5+ lanes)',
     },
     'fee-token': {
         type: 'string',
-        describe: 'Address or symbol of the fee token (e.g. LINK address on source); if not provided, will pay in native',
+        describe: 'Fee token address or symbol (default: native)',
     },
     'transfer-tokens': {
         alias: 't',
         type: 'array',
         string: true,
-        describe: 'List of token amounts (on source) to transfer to the receiver',
-        example: '0xtoken=0.1',
+        describe: 'Token amounts to transfer: token=amount',
     },
     wallet: {
         alias: 'w',
         type: 'string',
-        describe: 'Wallet to send transactions with; pass `ledger[:index_or_derivation]` to use Ledger USB hardware wallet, or private key in `USER_KEY` environment variable',
+        describe: 'Wallet: ledger[:index] or private key',
     },
     'token-receiver': {
         type: 'string',
-        describe: "Address of the Solana tokenReceiver (if different than program's receiver)",
+        describe: 'Solana token receiver (if different from program 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',
-        example: 'requiredPdaAddress=rw',
+        describe: 'Solana accounts (append =rw for writable) or Sui object IDs',
     },
     'only-get-fee': {
         type: 'boolean',
-        describe: 'Fetch and print the fee for the transaction, then exit',
+        describe: 'Print fee and exit',
     },
     'only-estimate': {
         type: 'boolean',
-        describe: 'Only estimate dest exec gasLimit',
+        describe: 'Print gas estimate and exit',
+        implies: 'estimate-gas-limit',
     },
     'approve-max': {
         type: 'boolean',
-        describe: "Approve the maximum amount of tokens to transfer; default=false approves only what's needed",
+        describe: 'Approve max token amount instead of exact',
     },
     wait: {
         type: 'boolean',
         default: false,
-        describe: 'Wait for execution',
+        describe: 'Wait for execution on destination',
     },
 })
-    .check(({ 'transfer-tokens': transferTokens }) => !transferTokens || transferTokens.every((t) => /^[^=]+=\d+(\.\d+)?$/.test(t)));
+    .check(({ 'transfer-tokens': transferTokens }) => !transferTokens || transferTokens.every((t) => /^[^=]+=\d+(\.\d+)?$/.test(t)))
+    .example([
+    [
+        'ccip-cli send -s ethereum-testnet-sepolia -d arbitrum-sepolia -r 0x0BF3dE8c5D3e8A2B34D2BEeB17ABfCeBaf363A59 --only-get-fee',
+        'Get fee estimate',
+    ],
+    [
+        'ccip-cli send -s ethereum-testnet-sepolia -d arbitrum-sepolia -r 0x0BF3... --to 0xABC... --data "Hello"',
+        'Send message with data',
+    ],
+]);
 /**
  * Handler for the send command.
  * @param argv - Command line arguments.
@@ -131,30 +138,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 +154,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) {
@@ -178,46 +164,45 @@ async function sendMessage(ctx, argv) {
     }
     if (argv.estimateGasLimit != null || argv.onlyEstimate) {
         // TODO: implement for all chain families
-        if (destNetwork.family !== ChainFamily.EVM)
-            throw new CCIPChainFamilyUnsupportedError(destNetwork.family, {
-                context: { feature: 'gas estimation' },
-            });
-        const dest = (await getChain(destNetwork.chainSelector));
-        const onRamp = await source.getOnRampForRouter(argv.router, destNetwork.chainSelector);
-        const lane = {
-            sourceChainSelector: source.network.chainSelector,
-            destChainSelector: destNetwork.chainSelector,
-            onRamp,
-            version: (await source.typeAndVersion(onRamp))[1],
-        };
-        const destTokenAmounts = await sourceToDestTokenAmounts(source, destNetwork.chainSelector, onRamp, tokenAmounts);
-        if (!walletAddress)
-            [walletAddress, wallet] = await loadChainWallet(source, argv);
-        const estimated = await estimateExecGasForRequest(source, dest, {
-            lane,
+        const dest = await getChain(destNetwork.chainSelector);
+        if (!walletAddress) {
+            try {
+                ;
+                [walletAddress, wallet] = await loadChainWallet(source, argv);
+            }
+            catch {
+                // pass undefined sender for default
+            }
+        }
+        const estimated = await estimateReceiveExecution({
+            source,
+            dest,
+            routerOrRamp: argv.router,
             message: {
                 sender: walletAddress,
                 receiver,
                 data,
-                tokenAmounts: destTokenAmounts,
+                tokenAmounts,
             },
         });
-        logger.log('Estimated gasLimit:', estimated);
         argv.gasLimit = Math.ceil(estimated * (1 + (argv.estimateGasLimit ?? 0) / 100));
+        logger.log('Estimated gasLimit for sender =', walletAddress, ':', estimated, ...(argv.estimateGasLimit ? ['+', argv.estimateGasLimit, '% =', argv.gasLimit] : []));
         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) {
@@ -269,9 +254,7 @@ async function sendMessage(ctx, argv) {
         message: { ...message, fee },
         wallet,
     });
-    logger.info('🚀 Sending message to', tokenReceiver && tokenReceiver !== '11111111111111111111111111111111'
-        ? tokenReceiver
-        : receiver, '@', destNetwork.name, ', tx =>', request.tx.hash, ', messageId =>', request.message.messageId);
+    logger.info('🚀 Sending message to', receiver, '@', destNetwork.name, ', tx =>', request.tx.hash, ', messageId =>', request.message.messageId);
     await showRequests(ctx, {
         ...argv,
         txHash: request.tx.hash,