Add support for SUI, Hedera, and FQ 2.0

README.md

@@ -45,9 +45,10 @@ const fee = await source.getFee({ router, destChainSelector, message: {
 | Chain Family | Networks                                                     | Status         |
 | ------------ | ------------------------------------------------------------ | -------------- |
 | EVM          | Ethereum, Arbitrum, Optimism, Polygon, Avalanche, Base, etc. | Supported      |
+| EVM (Hedera) | Mainnet, Testnet                                             | Supported (native HBAR fee) |
 | Solana       | Mainnet, Devnet                                              | Supported      |
 | Aptos        | Mainnet, Testnet                                             | Supported      |
-| Sui          | Mainnet, Testnet                                             | Partial (manual exec) |
+| Sui          | Mainnet, Testnet                                             | Partial (no token pool queries) |
 | TON          | Mainnet, Testnet                                             | Partial (no token pool/registry queries) |
 
 ## Documentation

ccip-cli/src/commands/send.ts

@@ -32,7 +32,7 @@ import {
   getDataBytes,
   networkInfo,
 } from '@chainlink/ccip-sdk/src/index.ts'
-import { type BytesLike, AbiCoder, formatUnits, toUtf8Bytes } from 'ethers'
+import { type BytesLike, AbiCoder, ZeroAddress, formatUnits, toUtf8Bytes } from 'ethers'
 import type { Argv } from 'yargs'
 
 import type { GlobalOpts } from '../index.ts'
@@ -318,7 +318,14 @@ async function sendMessage(
   }
 
   let feeToken, feeTokenInfo
-  if (argv.feeToken) {
+  const feeTokenArg = (argv.feeToken ?? '').toLowerCase()
+  if (feeTokenArg === 'native' || feeTokenArg === 'hbar') {
+    // CCIP Directory lists native HBAR as a fee token on Hedera; use ZeroAddress so EVM sends msg.value
+    feeToken = ZeroAddress
+    const wrappedNative = await source.getNativeTokenForRouter(argv.router)
+    feeTokenInfo = await source.getTokenInfo(wrappedNative)
+    feeTokenInfo = { ...feeTokenInfo, symbol: feeTokenInfo.symbol.replace(/^W/, '') || 'HBAR' }
+  } else if (argv.feeToken) {
     try {
       feeToken = (source.constructor as ChainStatic).getAddress(argv.feeToken)
       feeTokenInfo = await source.getTokenInfo(feeToken)
@@ -336,6 +343,13 @@ async function sendMessage(
   } else {
     const nativeToken = await source.getNativeTokenForRouter(argv.router)
     feeTokenInfo = await source.getTokenInfo(nativeToken)
+    if (feeTokenInfo.symbol === 'WHBAR') {
+      // On Hedera, default to native HBAR (msg.value) rather than WHBAR approval
+      feeToken = ZeroAddress
+      feeTokenInfo = { ...feeTokenInfo, symbol: 'HBAR' }
+    } else {
+      feeToken = nativeToken
+    }
   }
 
   const message: MessageInput = {
@@ -371,9 +385,11 @@ async function sendMessage(
     const balance = await source.getBalance({ holder: walletAddress, token: feeToken })
     if (balance < fee) {
       const symbol =
-        feeTokenInfo.symbol.startsWith('W') && !feeToken
-          ? feeTokenInfo.symbol.substring(1)
-          : feeTokenInfo.symbol
+        feeToken === ZeroAddress
+          ? feeTokenInfo.symbol
+          : feeTokenInfo.symbol.startsWith('W')
+            ? feeTokenInfo.symbol.substring(1)
+            : feeTokenInfo.symbol
       throw new CCIPInsufficientBalanceError(
         formatUnits(balance, feeTokenInfo.decimals),
         formatUnits(fee, feeTokenInfo.decimals),

ccip-cli/src/index.ts

@@ -11,7 +11,7 @@ import { Format } from './commands/index.ts'
 util.inspect.defaultOptions.depth = 6 // print down to tokenAmounts in requests
 // generate:nofail
 // `const VERSION = '${require('./package.json').version}-${require('child_process').execSync('git rev-parse --short HEAD').toString().trim()}'`
-const VERSION = '1.2.1-df4b5e6'
+const VERSION = '1.2.1-bda6deb'
 // generate:end
 
 const globalOpts = {

ccip-cli/src/providers/sui.ts

@@ -1,4 +1,5 @@
 import { CCIPArgumentInvalidError, bytesToBuffer } from '@chainlink/ccip-sdk/src/index.ts'
+import { decodeSuiPrivateKey } from '@mysten/sui/cryptography'
 import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519'
 
 /**
@@ -9,6 +10,11 @@ import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519'
 export function loadSuiWallet({ wallet: walletOpt }: { wallet?: unknown }) {
   if (typeof walletOpt !== 'string') throw new CCIPArgumentInvalidError('wallet', String(walletOpt))
 
+  if (walletOpt.startsWith('suiprivkey')) {
+    const { secretKey } = decodeSuiPrivateKey(walletOpt)
+    return Ed25519Keypair.fromSecretKey(secretKey)
+  }
+
   const keyBytes = bytesToBuffer(walletOpt)
   return Ed25519Keypair.fromSecretKey(keyBytes)
 }

ccip-sdk/src/api/index.ts

@@ -60,7 +60,7 @@ export const DEFAULT_TIMEOUT_MS = 30000
 /** SDK version string for telemetry header */
 // generate:nofail
 // `export const SDK_VERSION = '${require('./package.json').version}-${require('child_process').execSync('git rev-parse --short HEAD').toString().trim()}'`
-export const SDK_VERSION = '1.2.1-df4b5e6'
+export const SDK_VERSION = '1.2.1-bda6deb'
 // generate:end
 
 /** SDK telemetry header name */

ccip-sdk/src/chain.ts

@@ -476,6 +476,9 @@ export type ExecuteOpts = (
   forceLookupTable?: boolean
 }
 
+/** Result of {@link Chain.resolveExecuteOpts}: execute options with a concrete `input` payload. */
+export type ResolvedExecuteOpts = Extract<ExecuteOpts, { input: ExecutionInput }>
+
 /**
  * Works like an interface for a base Chain class, but provides implementation (which can be
  * specialized) for some basic methods
@@ -1088,10 +1091,9 @@ export abstract class Chain<F extends ChainFamily = ChainFamily> {
    *
    * @throws {@link CCIPApiClientNotAvailableError} if `messageId` is provided but no apiClient
    */
-  protected async resolveExecuteOpts(
-    opts: ExecuteOpts,
-  ): Promise<Extract<ExecuteOpts, { input: unknown }>> {
-    let opts_: Extract<typeof opts, { input: unknown }>
+  /** Resolves {@link ExecuteOpts} to a form that always includes `input` (fetches from API when using `messageId`). */
+  async resolveExecuteOpts(opts: ExecuteOpts): Promise<ResolvedExecuteOpts> {
+    let opts_: ResolvedExecuteOpts
     if ('input' in opts) {
       opts_ = opts
     } else if (!this.apiClient) throw new CCIPApiClientNotAvailableError()