@chainlink/ccip-sdk 0.96.0 → 0.97.0

package/src/aptos/index.ts

@@ -7,16 +7,7 @@ import {
   SimpleTransaction,
   TransactionResponseType,
 } from '@aptos-labs/ts-sdk'
-import {
-  type BytesLike,
-  concat,
-  dataSlice,
-  getBytes,
-  hexlify,
-  isBytesLike,
-  isHexString,
-  zeroPadValue,
-} from 'ethers'
+import { type BytesLike, concat, isBytesLike, isHexString } from 'ethers'
 import { memoize } from 'micro-memoize'
 import type { PickDeep } from 'type-fest'
 
@@ -28,9 +19,11 @@ import {
   type TokenPoolRemote,
   Chain,
 } from '../chain.ts'
+import { generateUnsignedExecuteReport } from './exec.ts'
+import { getAptosLeafHasher } from './hasher.ts'
+import { getUserTxByVersion, getVersionTimestamp, streamAptosLogs } from './logs.ts'
 import { generateUnsignedCcipSend, getFee } from './send.ts'
 import {
-  CCIPAptosAddressInvalidError,
   CCIPAptosExtraArgsEncodingError,
   CCIPAptosExtraArgsV2RequiredError,
   CCIPAptosLogInvalidError,
@@ -50,13 +43,14 @@ import {
   EVMExtraArgsV2Tag,
   SVMExtraArgsV1Tag,
 } from '../extra-args.ts'
-import {
-  type UnsignedAptosTx,
-  EVMExtraArgsV2Codec,
-  SVMExtraArgsV1Codec,
-  isAptosAccount,
-} from './types.ts'
+import { type UnsignedAptosTx, isAptosAccount } from './types.ts'
 import type { LeafHasher } from '../hasher/common.ts'
+import {
+  BcsEVMExtraArgsV2Codec,
+  BcsSVMExtraArgsV1Codec,
+  decodeMoveExtraArgs,
+  getMoveAddress,
+} from '../shared/bcs-codecs.ts'
 import { supportedChains } from '../supported-chains.ts'
 import {
   type CCIPExecution,
@@ -64,8 +58,8 @@ import {
   type CCIPRequest,
   type ChainTransaction,
   type CommitReport,
+  type ExecutionInput,
   type ExecutionReceipt,
-  type ExecutionReport,
   type Lane,
   type Log_,
   type NetworkInfo,
@@ -78,14 +72,10 @@ import {
   decodeAddress,
   decodeOnRampAddress,
   getAddressBytes,
-  getDataBytes,
   networkInfo,
   parseTypeAndVersion,
   util,
 } from '../utils.ts'
-import { generateUnsignedExecuteReport } from './exec.ts'
-import { getAptosLeafHasher } from './hasher.ts'
-import { getUserTxByVersion, getVersionTimestamp, streamAptosLogs } from './logs.ts'
 import { getTokenInfo } from './token.ts'
 import type { CCIPMessage_V1_6_EVM } from '../evm/messages.ts'
 import { buildMessageForDest, decodeMessage, getMessagesInBatch } from '../requests.ts'
@@ -98,13 +88,18 @@ export class AptosChain extends Chain<typeof ChainFamily.Aptos> {
   static {
     supportedChains[ChainFamily.Aptos] = AptosChain
   }
+  /** Chain family identifier for Aptos networks. */
   static readonly family = ChainFamily.Aptos
+  /** Native token decimals (8 for APT). */
   static readonly decimals = 8
 
   readonly destroy$: Promise<void>
+  /** The Aptos SDK provider for blockchain interactions. */
   provider: Aptos
 
+  /** Retrieves token information for a given token address. */
   getTokenInfo: (token: string) => Promise<TokenInfo>
+  /** @internal */
   _getAccountModulesNames: (address: string) => Promise<string[]>
 
   /**
@@ -246,17 +241,17 @@ export class AptosChain extends Chain<typeof ChainFamily.Aptos> {
   }
 
   /** {@inheritDoc Chain.getMessagesInBatch} */
-  async getMessagesInBatch<
+  override async getMessagesInBatch<
     R extends PickDeep<
       CCIPRequest,
       'lane' | `log.${'topics' | 'address' | 'blockNumber'}` | 'message.sequenceNumber'
     >,
   >(
     request: R,
-    commit: Pick<CommitReport, 'minSeqNr' | 'maxSeqNr'>,
+    range: Pick<CommitReport, 'minSeqNr' | 'maxSeqNr'>,
     opts?: { page?: number },
   ): Promise<R['message'][]> {
-    return getMessagesInBatch(this, request, commit, opts)
+    return getMessagesInBatch(this, request, range, opts)
   }
 
   /** {@inheritDoc Chain.typeAndVersion} */
@@ -296,8 +291,8 @@ export class AptosChain extends Chain<typeof ChainFamily.Aptos> {
     return Promise.resolve(router.split('::')[0] + '::onramp')
   }
 
-  /** {@inheritDoc Chain.getOnRampForOffRamp} */
-  async getOnRampForOffRamp(offRamp: string, sourceChainSelector: bigint): Promise<string> {
+  /** {@inheritDoc Chain.getOnRampsForOffRamp} */
+  async getOnRampsForOffRamp(offRamp: string, sourceChainSelector: bigint): Promise<string[]> {
     const [sourceChainConfig] = await this.provider.view<[{ on_ramp: string }]>({
       payload: {
         function:
@@ -305,12 +300,7 @@ export class AptosChain extends Chain<typeof ChainFamily.Aptos> {
         functionArguments: [sourceChainSelector],
       },
     })
-    return decodeAddress(sourceChainConfig.on_ramp, networkInfo(sourceChainSelector).family)
-  }
-
-  /** {@inheritDoc Chain.getCommitStoreForOffRamp} */
-  getCommitStoreForOffRamp(offRamp: string): Promise<string> {
-    return Promise.resolve(offRamp.split('::')[0] + '::offramp')
+    return [decodeAddress(sourceChainConfig.on_ramp, networkInfo(sourceChainSelector).family)]
   }
 
   /** {@inheritDoc Chain.getTokenForTokenPool} */
@@ -393,33 +383,7 @@ export class AptosChain extends Chain<typeof ChainFamily.Aptos> {
     | (EVMExtraArgsV2 & { _tag: 'EVMExtraArgsV2' })
     | (SVMExtraArgsV1 & { _tag: 'SVMExtraArgsV1' })
     | undefined {
-    const data = getDataBytes(extraArgs),
-      tag = dataSlice(data, 0, 4)
-    switch (tag) {
-      case EVMExtraArgsV2Tag: {
-        const parsed = EVMExtraArgsV2Codec.parse(getBytes(dataSlice(data, 4)))
-        // Aptos serialization of EVMExtraArgsV2: 37 bytes total: 4 tag + 32 LE gasLimit + 1 allowOOOE
-        return {
-          _tag: 'EVMExtraArgsV2',
-          ...parsed,
-          gasLimit: BigInt(parsed.gasLimit),
-        }
-      }
-      case SVMExtraArgsV1Tag: {
-        const parsed = SVMExtraArgsV1Codec.parse(getBytes(dataSlice(data, 4)))
-        // Aptos serialization of SVMExtraArgsV1: 13 bytes total: 4 tag + 8 LE computeUnits
-        return {
-          _tag: 'SVMExtraArgsV1',
-          ...parsed,
-          computeUnits: BigInt(parsed.computeUnits),
-          accountIsWritableBitmap: BigInt(parsed.accountIsWritableBitmap),
-          tokenReceiver: decodeAddress(new Uint8Array(parsed.tokenReceiver), ChainFamily.Solana),
-          accounts: parsed.accounts.map((account) =>
-            decodeAddress(new Uint8Array(account), ChainFamily.Solana),
-          ),
-        }
-      }
-    }
+    return decodeMoveExtraArgs(extraArgs)
   }
 
   /**
@@ -430,11 +394,11 @@ export class AptosChain extends Chain<typeof ChainFamily.Aptos> {
    */
   static encodeExtraArgs(extraArgs: ExtraArgs): string {
     if ('gasLimit' in extraArgs && 'allowOutOfOrderExecution' in extraArgs)
-      return concat([EVMExtraArgsV2Tag, EVMExtraArgsV2Codec.serialize(extraArgs).toBytes()])
+      return concat([EVMExtraArgsV2Tag, BcsEVMExtraArgsV2Codec.serialize(extraArgs).toBytes()])
     else if ('computeUnits' in extraArgs)
       return concat([
         SVMExtraArgsV1Tag,
-        SVMExtraArgsV1Codec.serialize({
+        BcsSVMExtraArgsV1Codec.serialize({
           ...extraArgs,
           computeUnits: Number(extraArgs.computeUnits),
           tokenReceiver: getAddressBytes(extraArgs.tokenReceiver),
@@ -498,21 +462,10 @@ export class AptosChain extends Chain<typeof ChainFamily.Aptos> {
    * Converts bytes to an Aptos address.
    * @param bytes - Bytes to convert.
    * @returns Aptos address (0x-prefixed hex, 32 bytes padded).
-   * @throws {@link CCIPAptosAddressInvalidError} if bytes length exceeds 32
+   * @throws {@link CCIPDataFormatUnsupportedError} if bytes length exceeds 32
    */
   static getAddress(bytes: BytesLike | readonly number[]): string {
-    let suffix = ''
-    if (Array.isArray(bytes)) bytes = new Uint8Array(bytes)
-    if (typeof bytes === 'string' && bytes.startsWith('0x')) {
-      const idx = bytes.indexOf('::')
-      if (idx > 0) {
-        suffix = bytes.slice(idx)
-        bytes = bytes.slice(0, idx)
-      }
-    }
-    bytes = getDataBytes(bytes)
-    if (bytes.length > 32) throw new CCIPAptosAddressInvalidError(hexlify(bytes))
-    return zeroPadValue(bytes, 32) + suffix
+    return getMoveAddress(bytes)
   }
 
   /**
@@ -607,24 +560,29 @@ export class AptosChain extends Chain<typeof ChainFamily.Aptos> {
   }
 
   /**
-   * {@inheritDoc Chain.generateUnsignedExecuteReport}
+   * {@inheritDoc Chain.generateUnsignedExecute}
    * @throws {@link CCIPAptosExtraArgsV2RequiredError} if message missing EVMExtraArgsV2 fields
    */
-  async generateUnsignedExecuteReport({
+  async generateUnsignedExecute({
     payer,
-    offRamp,
-    execReport,
     ...opts
-  }: Parameters<Chain['generateUnsignedExecuteReport']>[0]): Promise<UnsignedAptosTx> {
-    if (!('allowOutOfOrderExecution' in execReport.message && 'gasLimit' in execReport.message)) {
+  }: Parameters<Chain['generateUnsignedExecute']>[0]): Promise<UnsignedAptosTx> {
+    if (
+      !(
+        'input' in opts &&
+        'message' in opts.input &&
+        'allowOutOfOrderExecution' in opts.input.message &&
+        'gasLimit' in opts.input.message
+      )
+    ) {
       throw new CCIPAptosExtraArgsV2RequiredError()
     }
 
     const tx = await generateUnsignedExecuteReport(
       this.provider,
       payer,
-      offRamp,
-      execReport as ExecutionReport<CCIPMessage_V1_6_EVM>,
+      opts.offRamp,
+      opts.input as ExecutionInput<CCIPMessage_V1_6_EVM>,
       opts,
     )
     return {
@@ -634,16 +592,16 @@ export class AptosChain extends Chain<typeof ChainFamily.Aptos> {
   }
 
   /**
-   * {@inheritDoc Chain.executeReport}
+   * {@inheritDoc Chain.execute}
    * @throws {@link CCIPAptosWalletInvalidError} if wallet is not a valid Aptos account
    */
-  async executeReport(opts: Parameters<Chain['executeReport']>[0]): Promise<CCIPExecution> {
+  async execute(opts: Parameters<Chain['execute']>[0]): Promise<CCIPExecution> {
     const account = opts.wallet
     if (!isAptosAccount(account)) {
       throw new CCIPAptosWalletInvalidError(this.constructor.name, util.inspect(opts.wallet))
     }
 
-    const unsignedTx = await this.generateUnsignedExecuteReport({
+    const unsignedTx = await this.generateUnsignedExecute({
       ...opts,
       payer: account.accountAddress.toString(),
     })
@@ -670,9 +628,13 @@ export class AptosChain extends Chain<typeof ChainFamily.Aptos> {
    * @returns Parsed data or undefined.
    */
   static parse(data: unknown) {
-    if (isBytesLike(data)) {
-      const parsedExtraArgs = this.decodeExtraArgs(data)
-      if (parsedExtraArgs) return parsedExtraArgs
+    try {
+      if (isBytesLike(data)) {
+        const parsedExtraArgs = this.decodeExtraArgs(data)
+        if (parsedExtraArgs) return parsedExtraArgs
+      }
+    } catch {
+      // ignore
     }
   }
 

package/src/aptos/types.ts

@@ -8,7 +8,7 @@ import { bcs } from '@mysten/bcs'
 import { getBytes } from 'ethers'
 
 import type { CCIPMessage_V1_6_EVM } from '../evm/messages.ts'
-import type { ChainFamily, ExecutionReport } from '../types.ts'
+import type { ChainFamily, ExecutionInput } from '../types.ts'
 import { getAddressBytes } from '../utils.ts'
 
 /** Aptos account type with async transaction signing capability. */
@@ -31,19 +31,6 @@ export function isAptosAccount(account: unknown): account is AptosAsyncAccount {
   )
 }
 
-export const EVMExtraArgsV2Codec = bcs.struct('EVMExtraArgsV2', {
-  gasLimit: bcs.u256(),
-  allowOutOfOrderExecution: bcs.bool(),
-})
-
-export const SVMExtraArgsV1Codec = bcs.struct('SVMExtraArgsV1', {
-  computeUnits: bcs.u32(),
-  accountIsWritableBitmap: bcs.u64(),
-  allowOutOfOrderExecution: bcs.bool(),
-  tokenReceiver: bcs.vector(bcs.u8()),
-  accounts: bcs.vector(bcs.vector(bcs.u8())),
-})
-
 export const ExecutionReportCodec = bcs.struct('ExecutionReport', {
   sourceChainSelector: bcs.u64(),
   messageId: bcs.fixedArray(32, bcs.u8()),
@@ -74,7 +61,7 @@ export const ExecutionReportCodec = bcs.struct('ExecutionReport', {
  * @returns BCS-encoded bytes.
  */
 export function serializeExecutionReport(
-  execReport: ExecutionReport<CCIPMessage_V1_6_EVM>,
+  execReport: ExecutionInput<CCIPMessage_V1_6_EVM>,
 ): Uint8Array {
   const message = execReport.message
   return ExecutionReportCodec.serialize({