@chainlink/ccip-sdk 0.93.0 → 0.94.0

package/src/chain.ts

@@ -1,4 +1,4 @@
-import type { BytesLike } from 'ethers'
+import { type BytesLike, dataLength } from 'ethers'
 import type { PickDeep, SetOptional } from 'type-fest'
 
 import { type LaneLatencyResponse, CCIPAPIClient } from './api/index.ts'
@@ -10,6 +10,7 @@ import {
   CCIPExecTxRevertedError,
   CCIPTransactionNotFinalizedError,
 } from './errors/index.ts'
+import { DEFAULT_GAS_LIMIT } from './evm/const.ts'
 import type { UnsignedEVMTx } from './evm/types.ts'
 import type {
   EVMExtraArgsV1,
@@ -37,6 +38,7 @@ import {
   type Logger,
   type NetworkInfo,
   type OffchainTokenData,
+  type MessageInput,
   type WithLogger,
   ExecutionState,
 } from './types.ts'
@@ -153,7 +155,7 @@ export type UnsignedTx = {
 }
 
 /**
- * Common options for [[generateUnsignedSendMessage]] and [[sendMessage]] Chain methods
+ * Common options for [[getFee]], [[generateUnsignedSendMessage]] and [[sendMessage]] Chain methods
  */
 export type SendMessageOpts = {
   /** Router address on this chain */
@@ -161,7 +163,7 @@ export type SendMessageOpts = {
   /** Destination network selector. */
   destChainSelector: bigint
   /** Message to send. If `fee` is omitted, it'll be calculated */
-  message: AnyMessage & { fee?: bigint }
+  message: MessageInput
   /** Approve the maximum amount of tokens to transfer */
   approveMax?: boolean
 }
@@ -690,6 +692,21 @@ export abstract class Chain<F extends ChainFamily = ChainFamily> {
    * @returns Mapping of token addresses to respective TokenInfo objects.
    */
   abstract getFeeTokens(router: string): Promise<Record<string, TokenInfo>>
+
+  /** {@inheritDoc ChainStatic.buildMessageForDest} */
+  static buildMessageForDest(
+    message: Parameters<ChainStatic['buildMessageForDest']>[0],
+  ): AnyMessage {
+    // default to GenericExtraArgsV2, aka EVMExtraArgsV2
+    return {
+      ...message,
+      extraArgs: {
+        gasLimit: message.data && dataLength(message.data) ? DEFAULT_GAS_LIMIT : 0n,
+        allowOutOfOrderExecution: true,
+        ...message.extraArgs,
+      },
+    }
+  }
 }
 
 /** Static methods and properties available on Chain class constructors. */
@@ -775,6 +792,13 @@ export type ChainStatic<F extends ChainFamily = ChainFamily> = Function & {
    * @returns Ordered record with messages/properties, or undefined if not a recognized error
    */
   parse?(data: unknown): Record<string, unknown> | undefined | null
+  /**
+   * Returns a copy of a message, populating missing fields like `extraArgs` with defaults
+   * It's expected to return a message suitable at least for basic token transfers
+   * @param message - AnyMessage (from source), containing at least `receiver`
+   * @returns A message suitable for `sendMessage` to this destination chain family
+   */
+  buildMessageForDest(message: MessageInput): AnyMessage
 }
 
 /** Function type for getting a Chain instance by ID, selector, or name. */

package/src/evm/index.ts

@@ -116,7 +116,12 @@ import {
   parseSourceTokenData,
 } from './messages.ts'
 import { encodeEVMOffchainTokenData, fetchEVMOffchainTokenData } from './offchain.ts'
-import { getMessageById, getMessagesInBatch, getMessagesInTx } from '../requests.ts'
+import {
+  buildMessageForDest,
+  getMessageById,
+  getMessagesInBatch,
+  getMessagesInTx,
+} from '../requests.ts'
 import type { UnsignedEVMTx } from './types.ts'
 export type { UnsignedEVMTx }
 
@@ -960,17 +965,20 @@ export class EVMChain extends Chain<typeof ChainFamily.EVM> {
     destChainSelector,
     message,
   }: Parameters<Chain['getFee']>[0]): Promise<bigint> {
+    const populatedMessage = buildMessageForDest(message, networkInfo(destChainSelector).family)
     const contract = new Contract(
       router,
       interfaces.Router,
       this.provider,
     ) as unknown as TypedContract<typeof Router_ABI>
     return contract.getFee(destChainSelector, {
-      receiver: zeroPadValue(getAddressBytes(message.receiver), 32),
-      data: hexlify(message.data),
-      tokenAmounts: message.tokenAmounts ?? [],
-      feeToken: message.feeToken ?? ZeroAddress,
-      extraArgs: hexlify((this.constructor as typeof EVMChain).encodeExtraArgs(message.extraArgs)),
+      receiver: zeroPadValue(getAddressBytes(populatedMessage.receiver), 32),
+      data: hexlify(populatedMessage.data ?? '0x'),
+      tokenAmounts: populatedMessage.tokenAmounts ?? [],
+      feeToken: populatedMessage.feeToken ?? ZeroAddress,
+      extraArgs: hexlify(
+        (this.constructor as typeof EVMChain).encodeExtraArgs(populatedMessage.extraArgs),
+      ),
     })
   }
 
@@ -982,11 +990,19 @@ export class EVMChain extends Chain<typeof ChainFamily.EVM> {
   async generateUnsignedSendMessage(
     opts: Parameters<Chain['generateUnsignedSendMessage']>[0],
   ): Promise<UnsignedEVMTx> {
-    const { sender, router, destChainSelector, message } = opts
-    if (!message.fee) message.fee = await this.getFee(opts)
+    const { sender, router, destChainSelector } = opts
+    const populatedMessage = buildMessageForDest(
+      opts.message,
+      networkInfo(destChainSelector).family,
+    )
+    const message = {
+      ...populatedMessage,
+      fee: opts.message.fee ?? (await this.getFee({ ...opts, message: populatedMessage })),
+    }
+
     const feeToken = message.feeToken ?? ZeroAddress
     const receiver = zeroPadValue(getAddressBytes(message.receiver), 32)
-    const data = hexlify(message.data)
+    const data = hexlify(message.data ?? '0x')
     const extraArgs = hexlify(
       (this.constructor as typeof EVMChain).encodeExtraArgs(message.extraArgs),
     )

package/src/index.ts

@@ -24,7 +24,6 @@ export {
 export { estimateExecGasForRequest } from './gas.ts'
 export { decodeMessage, getMessagesForSender, sourceToDestTokenAmounts } from './requests.ts'
 export {
-  type AnyMessage,
   type CCIPCommit,
   type CCIPExecution,
   type CCIPMessage,
@@ -37,6 +36,7 @@ export {
   type Logger,
   type NetworkInfo,
   type OffchainTokenData,
+  type MessageInput,
   type WithLogger,
   CCIPVersion,
   ExecutionState,

package/src/requests.ts

@@ -2,7 +2,7 @@ import { isBytesLike, toBigInt } from 'ethers'
 import type { PickDeep } from 'type-fest'
 import yaml from 'yaml'
 
-import type { Chain, ChainStatic, LogFilter } from './chain.ts'
+import { type ChainStatic, type LogFilter, Chain } from './chain.ts'
 import {
   CCIPMessageBatchIncompleteError,
   CCIPMessageDecodeError,
@@ -16,11 +16,13 @@ import type { EVMChain } from './evm/index.ts'
 import { decodeExtraArgs } from './extra-args.ts'
 import { supportedChains } from './supported-chains.ts'
 import {
+  type AnyMessage,
   type CCIPMessage,
   type CCIPRequest,
   type CCIPVersion,
   type ChainTransaction,
   type Log_,
+  type MessageInput,
   ChainFamily,
 } from './types.ts'
 import { convertKeysToCamelCase, decodeAddress, leToBigInt, networkInfo } from './utils.ts'
@@ -109,6 +111,16 @@ export function decodeMessage(data: string | Uint8Array | Record<string, unknown
   throw new CCIPMessageDecodeError()
 }
 
+/**
+ * Populates missing required fields (e.g. `extraArgs`) from AnyMessage
+ * @param message - partial AnyMessage
+ * @returns original message or shallow copy with defaults for required fields
+ **/
+export function buildMessageForDest(message: MessageInput, dest: ChainFamily): AnyMessage {
+  const chain = supportedChains[dest] ?? Chain
+  return chain.buildMessageForDest(message)
+}
+
 /**
  * Fetch all CCIP messages in a transaction
  * @param source - Chain

package/src/selectors.ts

@@ -453,6 +453,11 @@ const selectors: Selectors = {
     name: 'story-testnet',
     family: 'evm',
   },
+  '1672': {
+    selector: 7801139999541420232n,
+    name: 'pharos-mainnet',
+    family: 'evm',
+  },
   '1687': {
     selector: 10749384167430721561n,
     name: 'mint-testnet',
@@ -759,6 +764,11 @@ const selectors: Selectors = {
     name: 'ethereum-testnet-sepolia-immutable-zkevm-1',
     family: 'evm',
   },
+  '14601': {
+    selector: 1763698235108410440n,
+    name: 'sonic-testnet',
+    family: 'evm',
+  },
   '16600': {
     selector: 16088006396410204581n,
     name: '0g-testnet-newton',
@@ -807,6 +817,11 @@ const selectors: Selectors = {
     family: 'evm',
   },
   '36888': { selector: 4829375610284793157n, name: 'ab-mainnet', family: 'evm' },
+  '36900': {
+    selector: 4059281736450291836n,
+    name: 'adi-mainnet',
+    family: 'evm',
+  },
   '37111': {
     selector: 6827576821754315911n,
     name: 'ethereum-testnet-sepolia-lens-1',
@@ -1009,6 +1024,11 @@ const selectors: Selectors = {
     name: 'plume-testnet-sepolia',
     family: 'evm',
   },
+  '99999': {
+    selector: 9418205736192840573n,
+    name: 'adi-testnet',
+    family: 'evm',
+  },
   '128123': {
     selector: 1910019406958449359n,
     name: 'etherlink-testnet',

package/src/solana/index.ts

@@ -26,16 +26,18 @@ import {
   toBigInt,
 } from 'ethers'
 import { type Memoized, memoize } from 'micro-memoize'
-import type { PickDeep, SetRequired } from 'type-fest'
+import type { PickDeep } from 'type-fest'
 
 import {
   type ChainContext,
+  type ChainStatic,
   type LogFilter,
   type TokenInfo,
   type TokenPoolRemote,
   Chain,
 } from '../chain.ts'
 import {
+  CCIPArgumentInvalidError,
   CCIPBlockTimeNotFoundError,
   CCIPContractNotRouterError,
   CCIPDataFormatUnsupportedError,
@@ -59,11 +61,17 @@ import {
   CCIPTransactionNotFoundError,
   CCIPWalletInvalidError,
 } from '../errors/index.ts'
-import { type EVMExtraArgsV2, type ExtraArgs, EVMExtraArgsV2Tag } from '../extra-args.ts'
+import {
+  type EVMExtraArgsV2,
+  type ExtraArgs,
+  type SVMExtraArgsV1,
+  EVMExtraArgsV2Tag,
+} from '../extra-args.ts'
 import type { LeafHasher } from '../hasher/common.ts'
 import SELECTORS from '../selectors.ts'
 import { supportedChains } from '../supported-chains.ts'
 import {
+  type AnyMessage,
   type CCIPCommit,
   type CCIPExecution,
   type CCIPMessage,
@@ -114,8 +122,14 @@ import {
   simulateAndSendTxs,
   simulationProvider,
 } from './utils.ts'
-import { getMessageById, getMessagesInBatch, getMessagesInTx } from '../requests.ts'
+import {
+  buildMessageForDest,
+  getMessageById,
+  getMessagesInBatch,
+  getMessagesInTx,
+} from '../requests.ts'
 import { patchBorsh } from './patchBorsh.ts'
+import { DEFAULT_GAS_LIMIT } from '../evm/const.ts'
 export type { UnsignedSolanaTx }
 
 const routerCoder = new BorshCoder(CCIP_ROUTER_IDL)
@@ -976,7 +990,8 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
 
   /** {@inheritDoc Chain.getFee} */
   getFee({ router, destChainSelector, message }: Parameters<Chain['getFee']>[0]): Promise<bigint> {
-    return getFee(this, router, destChainSelector, message)
+    const populatedMessage = buildMessageForDest(message, networkInfo(destChainSelector).family)
+    return getFee(this, router, destChainSelector, populatedMessage)
   }
 
   /**
@@ -988,14 +1003,21 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
   async generateUnsignedSendMessage(
     opts: Parameters<Chain['generateUnsignedSendMessage']>[0],
   ): Promise<UnsignedSolanaTx> {
-    const { sender, router, destChainSelector, message } = opts
-    if (!message.fee) message.fee = await this.getFee(opts)
+    const { sender, router, destChainSelector } = opts
+    const populatedMessage = buildMessageForDest(
+      opts.message,
+      networkInfo(destChainSelector).family,
+    )
+    const message = {
+      ...populatedMessage,
+      fee: opts.message.fee ?? (await this.getFee({ ...opts, message: populatedMessage })),
+    }
     return generateUnsignedCcipSend(
       this,
       new PublicKey(sender),
       new PublicKey(router),
       destChainSelector,
-      message as SetRequired<typeof message, 'fee'>,
+      message,
       opts,
     )
   }
@@ -1479,4 +1501,74 @@ export class SolanaChain extends Chain<typeof ChainFamily.Solana> {
     // the offramps, so we can use it to narrow the search for the offramp
     return program.account.config.fetch(configPda)
   }
+
+  /** {@inheritDoc ChainStatic.buildMessageForDest} */
+  static override buildMessageForDest(
+    message: Parameters<ChainStatic['buildMessageForDest']>[0],
+  ): AnyMessage & { extraArgs: SVMExtraArgsV1 } {
+    if (
+      !(
+        message.extraArgs &&
+        'tokenReceiver' in message.extraArgs &&
+        message.extraArgs.tokenReceiver
+      ) &&
+      message.data &&
+      getDataBytes(message.data).length &&
+      message.tokenAmounts?.length
+    )
+      throw new CCIPArgumentInvalidError(
+        'tokenReceiver',
+        'required when sending tokens with data to Solana',
+      )
+
+    const computeUnits =
+      message.extraArgs &&
+      'computeUnits' in message.extraArgs &&
+      message.extraArgs.computeUnits != null
+        ? message.extraArgs.computeUnits
+        : message.extraArgs && 'gasLimit' in message.extraArgs && message.extraArgs.gasLimit != null
+          ? message.extraArgs.gasLimit // populates computeUnits from gasLimit
+          : message.data && getDataBytes(message.data).length
+            ? DEFAULT_GAS_LIMIT
+            : 0n
+    const allowOutOfOrderExecution =
+      message.extraArgs &&
+      'allowOutOfOrderExecution' in message.extraArgs &&
+      message.extraArgs.allowOutOfOrderExecution != null
+        ? message.extraArgs.allowOutOfOrderExecution
+        : true
+    const tokenReceiver =
+      message.extraArgs &&
+      'tokenReceiver' in message.extraArgs &&
+      message.extraArgs.tokenReceiver != null
+        ? message.extraArgs.tokenReceiver
+        : message.tokenAmounts?.length
+          ? this.getAddress(message.receiver)
+          : PublicKey.default.toBase58()
+    const accounts =
+      message.extraArgs && 'accounts' in message.extraArgs && message.extraArgs.accounts != null
+        ? message.extraArgs.accounts
+        : []
+    const accountIsWritableBitmap =
+      message.extraArgs &&
+      'accountIsWritableBitmap' in message.extraArgs &&
+      message.extraArgs.accountIsWritableBitmap != null
+        ? message.extraArgs.accountIsWritableBitmap
+        : 0n
+
+    const extraArgs: SVMExtraArgsV1 = {
+      computeUnits,
+      allowOutOfOrderExecution,
+      tokenReceiver,
+      accounts,
+      accountIsWritableBitmap,
+    }
+
+    return {
+      ...message,
+      extraArgs,
+      // if tokenReceiver, then message.receiver can (must?) be default
+      ...(!!message.tokenAmounts?.length && { receiver: PublicKey.default.toBase58() }),
+    }
+  }
 }

package/src/sui/index.ts

@@ -1,29 +1,30 @@
-import { toHex } from '@mysten/bcs'
+import { Buffer } from 'buffer'
+
 import { type SuiTransactionBlockResponse, SuiClient } from '@mysten/sui/client'
 import type { Keypair } from '@mysten/sui/cryptography'
 import { SuiGraphQLClient } from '@mysten/sui/graphql'
 import { Transaction } from '@mysten/sui/transactions'
-import { type BytesLike, AbiCoder, hexlify, isBytesLike } from 'ethers'
+import { type BytesLike, dataLength, hexlify, isBytesLike } from 'ethers'
 import type { PickDeep } from 'type-fest'
 
 import { AptosChain } from '../aptos/index.ts'
-import { type ChainContext, type LogFilter, Chain } from '../chain.ts'
+import { type ChainContext, type ChainStatic, type LogFilter, Chain } from '../chain.ts'
 import {
   CCIPContractNotRouterError,
   CCIPDataFormatUnsupportedError,
   CCIPError,
   CCIPErrorCode,
   CCIPExecTxRevertedError,
-  CCIPExtraArgsInvalidError,
   CCIPNotImplementedError,
   CCIPSuiMessageVersionInvalidError,
   CCIPVersionFeatureUnavailableError,
 } from '../errors/index.ts'
-import type { ExtraArgs, SuiExtraArgsV1 } from '../extra-args.ts'
+import type { EVMExtraArgsV2, ExtraArgs, SVMExtraArgsV1, SuiExtraArgsV1 } from '../extra-args.ts'
 import { getSuiLeafHasher } from './hasher.ts'
 import type { LeafHasher } from '../hasher/common.ts'
 import { supportedChains } from '../supported-chains.ts'
 import {
+  type AnyMessage,
   type CCIPExecution,
   type CCIPMessage,
   type CCIPRequest,
@@ -42,7 +43,7 @@ import {
 } from '../types.ts'
 import { discoverCCIP, discoverOfframp } from './discovery.ts'
 import type { CCIPMessage_V1_6_Sui } from './types.ts'
-import { bytesToBuffer, decodeAddress, getDataBytes, networkInfo } from '../utils.ts'
+import { bytesToBuffer, decodeAddress, networkInfo } from '../utils.ts'
 import { type CommitEvent, getSuiEventsInTimeRange } from './events.ts'
 import {
   type SuiManuallyExecuteInput,
@@ -57,6 +58,7 @@ import {
 } from './objects.ts'
 
 export const SUI_EXTRA_ARGS_V1_TAG = '21ea4ca9' as const
+const DEFAULT_GAS_LIMIT = 1000000n
 
 type SuiContractDir = {
   ccip?: string
@@ -438,28 +440,11 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
    */
   static decodeExtraArgs(
     extraArgs: BytesLike,
-  ): (SuiExtraArgsV1 & { _tag: 'SuiExtraArgsV1' }) | undefined {
-    const data = getDataBytes(extraArgs)
-    const hexBytes = toHex(data)
-    if (!hexBytes.startsWith(SUI_EXTRA_ARGS_V1_TAG)) {
-      throw new CCIPExtraArgsInvalidError('Sui', hexBytes)
-    }
-
-    const abiData = '0x' + hexBytes.slice(8)
-    const decoded = AbiCoder.defaultAbiCoder().decode(
-      ['tuple(uint256,bool,bytes32,bytes32[])'],
-      abiData,
-    )
-
-    const tuple = decoded[0] as readonly [bigint, boolean, string, string[]]
-
-    return {
-      gasLimit: tuple[0],
-      allowOutOfOrderExecution: tuple[1],
-      tokenReceiver: tuple[2],
-      receiverObjectIds: tuple[3], // Already an array of hex strings
-      _tag: 'SuiExtraArgsV1',
-    }
+  ):
+    | (EVMExtraArgsV2 & { _tag: 'EVMExtraArgsV2' })
+    | (SVMExtraArgsV1 & { _tag: 'SVMExtraArgsV1' })
+    | undefined {
+    return AptosChain.decodeExtraArgs(extraArgs)
   }
 
   /**
@@ -743,4 +728,52 @@ export class SuiChain extends Chain<typeof ChainFamily.Sui> {
   async getFeeTokens(_router: string): Promise<never> {
     return Promise.reject(new CCIPNotImplementedError('SuiChain.getFeeTokens'))
   }
+
+  /** {@inheritDoc ChainStatic.buildMessageForDest} */
+  static override buildMessageForDest(
+    message: Parameters<ChainStatic['buildMessageForDest']>[0],
+  ): AnyMessage & { extraArgs: SuiExtraArgsV1 } {
+    const gasLimit =
+      message.extraArgs && 'gasLimit' in message.extraArgs && message.extraArgs.gasLimit != null
+        ? message.extraArgs.gasLimit
+        : message.data && dataLength(message.data)
+          ? DEFAULT_GAS_LIMIT
+          : 0n
+    const allowOutOfOrderExecution =
+      message.extraArgs &&
+      'allowOutOfOrderExecution' in message.extraArgs &&
+      message.extraArgs.allowOutOfOrderExecution != null
+        ? message.extraArgs.allowOutOfOrderExecution
+        : true
+    const tokenReceiver =
+      message.extraArgs &&
+      'tokenReceiver' in message.extraArgs &&
+      message.extraArgs.tokenReceiver != null
+        ? message.extraArgs.tokenReceiver
+        : message.tokenAmounts?.length
+          ? this.getAddress(message.receiver)
+          : '0x0000000000000000000000000000000000000000000000000000000000000000'
+    const receiverObjectIds =
+      message.extraArgs &&
+      'receiverObjectIds' in message.extraArgs &&
+      message.extraArgs.receiverObjectIds?.length
+        ? message.extraArgs.receiverObjectIds
+        : message.extraArgs && 'accounts' in message.extraArgs && message.extraArgs.accounts?.length
+          ? message.extraArgs.accounts // populates receiverObjectIds from accounts
+          : []
+    const extraArgs: SuiExtraArgsV1 = {
+      gasLimit,
+      allowOutOfOrderExecution,
+      tokenReceiver,
+      receiverObjectIds,
+    }
+    return {
+      ...message,
+      extraArgs,
+      // if tokenReceiver, then message.receiver can (must?) be default
+      ...(!!message.tokenAmounts?.length && {
+        receiver: '0x0000000000000000000000000000000000000000000000000000000000000000',
+      }),
+    }
+  }
 }

package/src/sui/manuallyExec/encoder.ts

@@ -1,3 +1,5 @@
+import { Buffer } from 'buffer'
+
 import { bcs } from '@mysten/sui/bcs'
 import type { BytesLike } from 'ethers'
 

package/src/sui/manuallyExec/index.ts

@@ -1,3 +1,5 @@
+import { Buffer } from 'buffer'
+
 import { Transaction } from '@mysten/sui/transactions'
 
 import { serializeExecutionReport } from './encoder.ts'

package/src/sui/objects.ts

@@ -1,8 +1,10 @@
+import { Buffer } from 'buffer'
+
 import { bcs } from '@mysten/sui/bcs'
 import type { SuiClient } from '@mysten/sui/client'
 import { Transaction } from '@mysten/sui/transactions'
 import { normalizeSuiAddress } from '@mysten/sui/utils'
-import { blake2b } from '@noble/hashes/blake2'
+import { blake2b } from '@noble/hashes/blake2.js'
 
 import { CCIPDataFormatUnsupportedError } from '../errors/index.ts'
 import type { CCIPMessage, CCIPVersion } from '../types.ts'

package/src/ton/hasher.ts

@@ -1,3 +1,5 @@
+import { Buffer } from 'buffer'
+
 import { type Cell, Address, beginCell } from '@ton/core'
 import { sha256, toBigInt } from 'ethers'
 

package/src/ton/index.ts

@@ -1,3 +1,5 @@
+import { Buffer } from 'buffer'
+
 import { type Transaction, Address, Cell, beginCell, toNano } from '@ton/core'
 import { TonClient } from '@ton/ton'
 import { type AxiosAdapter, getAdapter } from 'axios'

package/src/types.ts

@@ -294,12 +294,21 @@ export type ExecutionReport<M extends CCIPMessage = CCIPMessage> = {
 export type AnyMessage = {
   /** Receiver address on the destination chain. */
   receiver: BytesLike
-  /** Arbitrary data payload. */
-  data: BytesLike
   /** Extra arguments for gas limits and other settings. */
   extraArgs: ExtraArgs
+  /** Arbitrary data payload. */
+  data?: BytesLike
   /** Optional token transfers. */
   tokenAmounts?: readonly { token: string; amount: bigint }[]
   /** Optional fee token address (native if omitted). */
   feeToken?: string
 }
+
+/**
+ * Partial [[AnyMessage]], which populates default fields like `extraArgs` if needed
+ */
+export type MessageInput = Partial<AnyMessage> & {
+  receiver: AnyMessage['receiver']
+  extraArgs?: Partial<ExtraArgs>
+  fee?: bigint
+}

package/src/utils.ts

@@ -1,3 +1,5 @@
+import { Buffer } from 'buffer'
+
 import bs58 from 'bs58'
 import {
   type BigNumberish,