@chainlink/ccip-sdk 0.95.0 → 0.97.0

package/dist/aptos/index.d.ts

@@ -11,11 +11,16 @@ export type { UnsignedAptosTx };
  * Aptos chain implementation supporting Aptos networks.
  */
 export declare class AptosChain extends Chain<typeof ChainFamily.Aptos> {
+    /** Chain family identifier for Aptos networks. */
     static readonly family: "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[]>;
     /**
      * Creates a new AptosChain instance.
@@ -42,18 +47,23 @@ export declare class AptosChain extends Chain<typeof ChainFamily.Aptos> {
      * @param url - RPC URL, Aptos Network enum value or [fullNodeUrl, Network] tuple.
      * @param ctx - context containing logger
      * @returns A new AptosChain instance.
+     * @throws {@link CCIPAptosNetworkUnknownError} if network cannot be determined from URL
      */
     static fromUrl(url: string | Network | readonly [string, Network], ctx?: ChainContext): Promise<AptosChain>;
     /** {@inheritDoc Chain.getBlockTimestamp} */
     getBlockTimestamp(version: number | 'finalized'): Promise<number>;
-    /** {@inheritDoc Chain.getTransaction} */
+    /**
+     * {@inheritDoc Chain.getTransaction}
+     * @throws {@link CCIPAptosTransactionInvalidError} if hash/version format is invalid
+     * @throws {@link CCIPAptosTransactionTypeInvalidError} if transaction is not a user transaction
+     */
     getTransaction(hashOrVersion: string | number): Promise<ChainTransaction>;
     /** {@inheritDoc Chain.getLogs} */
     getLogs(opts: LogFilter & {
         versionAsHash?: boolean;
     }): AsyncIterableIterator<Log_>;
     /** {@inheritDoc Chain.getMessagesInBatch} */
-    getMessagesInBatch<R extends PickDeep<CCIPRequest, 'lane' | `log.${'topics' | 'address' | 'blockNumber'}` | 'message.sequenceNumber'>>(request: R, commit: Pick<CommitReport, 'minSeqNr' | 'maxSeqNr'>, opts?: {
+    getMessagesInBatch<R extends PickDeep<CCIPRequest, 'lane' | `log.${'topics' | 'address' | 'blockNumber'}` | 'message.sequenceNumber'>>(request: R, range: Pick<CommitReport, 'minSeqNr' | 'maxSeqNr'>, opts?: {
         page?: number;
     }): Promise<R['message'][]>;
     /** {@inheritDoc Chain.typeAndVersion} */
@@ -68,20 +78,22 @@ export declare class AptosChain extends Chain<typeof ChainFamily.Aptos> {
     getOffRampsForRouter(router: string, _sourceChainSelector: bigint): Promise<string[]>;
     /** {@inheritDoc Chain.getOnRampForRouter} */
     getOnRampForRouter(router: string, _destChainSelector: bigint): Promise<string>;
-    /** {@inheritDoc Chain.getOnRampForOffRamp} */
-    getOnRampForOffRamp(offRamp: string, sourceChainSelector: bigint): Promise<string>;
-    /** {@inheritDoc Chain.getCommitStoreForOffRamp} */
-    getCommitStoreForOffRamp(offRamp: string): Promise<string>;
+    /** {@inheritDoc Chain.getOnRampsForOffRamp} */
+    getOnRampsForOffRamp(offRamp: string, sourceChainSelector: bigint): Promise<string[]>;
     /** {@inheritDoc Chain.getTokenForTokenPool} */
     getTokenForTokenPool(tokenPool: string): Promise<string>;
     /** {@inheritDoc Chain.getBalance} */
     getBalance(opts: GetBalanceOpts): Promise<bigint>;
-    /** {@inheritDoc Chain.getTokenAdminRegistryFor} */
+    /**
+     * {@inheritDoc Chain.getTokenAdminRegistryFor}
+     * @throws {@link CCIPAptosRegistryTypeInvalidError} if registry type is invalid
+     */
     getTokenAdminRegistryFor(address: string): Promise<string>;
     /**
      * Decodes a CCIP message from an Aptos log event.
      * @param log - Log with data field.
      * @returns Decoded CCIPMessage or undefined if not valid.
+     * @throws {@link CCIPAptosLogInvalidError} if log data format is invalid
      */
     static decodeMessage(log: {
         data: BytesLike | Record<string, unknown>;
@@ -100,6 +112,7 @@ export declare class AptosChain extends Chain<typeof ChainFamily.Aptos> {
      * Encodes extra arguments for Aptos CCIP messages.
      * @param extraArgs - Extra arguments to encode.
      * @returns Encoded extra arguments as hex string.
+     * @throws {@link CCIPAptosExtraArgsEncodingError} if extra args format is not supported
      */
     static encodeExtraArgs(extraArgs: ExtraArgs): string;
     /**
@@ -107,18 +120,21 @@ export declare class AptosChain extends Chain<typeof ChainFamily.Aptos> {
      * @param log - Log with data field.
      * @param lane - Lane info for filtering.
      * @returns Array of CommitReport or undefined if not valid.
+     * @throws {@link CCIPAptosLogInvalidError} if log data format is invalid
      */
     static decodeCommits({ data }: Pick<Log_, 'data'>, lane?: Lane): CommitReport[] | undefined;
     /**
      * Decodes an execution receipt from an Aptos log event.
      * @param log - Log with data field.
      * @returns ExecutionReceipt or undefined if not valid.
+     * @throws {@link CCIPAptosLogInvalidError} if log data format is invalid
      */
     static decodeReceipt({ data }: Pick<Log_, 'data'>): ExecutionReceipt | undefined;
     /**
      * Converts bytes to an Aptos address.
      * @param bytes - Bytes to convert.
      * @returns Aptos address (0x-prefixed hex, 32 bytes padded).
+     * @throws {@link CCIPDataFormatUnsupportedError} if bytes length exceeds 32
      */
     static getAddress(bytes: BytesLike | readonly number[]): string;
     /**
@@ -135,14 +151,23 @@ export declare class AptosChain extends Chain<typeof ChainFamily.Aptos> {
     getFee({ router, destChainSelector, message, }: Parameters<Chain['getFee']>[0]): Promise<bigint>;
     /** {@inheritDoc Chain.generateUnsignedSendMessage} */
     generateUnsignedSendMessage(opts: Parameters<Chain['generateUnsignedSendMessage']>[0]): Promise<UnsignedAptosTx>;
-    /** {@inheritDoc Chain.sendMessage} */
+    /**
+     * {@inheritDoc Chain.sendMessage}
+     * @throws {@link CCIPAptosWalletInvalidError} if wallet is not a valid Aptos account
+     */
     sendMessage(opts: Parameters<Chain['sendMessage']>[0]): Promise<CCIPRequest>;
     /** {@inheritDoc Chain.getOffchainTokenData} */
     getOffchainTokenData(request: CCIPRequest): Promise<OffchainTokenData[]>;
-    /** {@inheritDoc Chain.generateUnsignedExecuteReport} */
-    generateUnsignedExecuteReport({ payer, offRamp, execReport, ...opts }: Parameters<Chain['generateUnsignedExecuteReport']>[0]): Promise<UnsignedAptosTx>;
-    /** {@inheritDoc Chain.executeReport} */
-    executeReport(opts: Parameters<Chain['executeReport']>[0]): Promise<CCIPExecution>;
+    /**
+     * {@inheritDoc Chain.generateUnsignedExecute}
+     * @throws {@link CCIPAptosExtraArgsV2RequiredError} if message missing EVMExtraArgsV2 fields
+     */
+    generateUnsignedExecute({ payer, ...opts }: Parameters<Chain['generateUnsignedExecute']>[0]): Promise<UnsignedAptosTx>;
+    /**
+     * {@inheritDoc Chain.execute}
+     * @throws {@link CCIPAptosWalletInvalidError} if wallet is not a valid Aptos account
+     */
+    execute(opts: Parameters<Chain['execute']>[0]): Promise<CCIPExecution>;
     /**
      * Parses raw Aptos data into typed structures.
      * @param data - Raw data to parse.
@@ -159,14 +184,17 @@ export declare class AptosChain extends Chain<typeof ChainFamily.Aptos> {
     getSupportedTokens(address: string, opts?: {
         page?: number;
     }): Promise<string[]>;
-    /** {@inheritDoc Chain.getRegistryTokenConfig} */
+    /**
+     * {@inheritDoc Chain.getRegistryTokenConfig}
+     * @throws {@link CCIPAptosTokenNotRegisteredError} if token is not registered
+     */
     getRegistryTokenConfig(registry: string, token: string): Promise<{
         administrator: string;
         pendingAdministrator?: string;
         tokenPool?: string;
     }>;
-    /** {@inheritDoc Chain.getTokenPoolConfigs} */
-    getTokenPoolConfigs(tokenPool: string): Promise<{
+    /** {@inheritDoc Chain.getTokenPoolConfig} */
+    getTokenPoolConfig(tokenPool: string): Promise<{
         token: string;
         router: string;
         typeAndVersion?: string;

package/dist/aptos/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/aptos/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,WAAW,EAEX,OAAO,EAGR,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EACL,KAAK,SAAS,EAQf,MAAM,QAAQ,CAAA;AAEf,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAEzC,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,cAAc,EACnB,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,KAAK,EACN,MAAM,aAAa,CAAA;AAepB,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,SAAS,EACd,KAAK,cAAc,EAGpB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EACL,KAAK,eAAe,EAIrB,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAErD,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,WAAW,EAChB,KAAK,gBAAgB,EACrB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAErB,KAAK,IAAI,EACT,KAAK,IAAI,EACT,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,UAAU,EACf,WAAW,EACZ,MAAM,aAAa,CAAA;AAiBpB,YAAY,EAAE,eAAe,EAAE,CAAA;AAE/B;;GAEG;AACH,qBAAa,UAAW,SAAQ,KAAK,CAAC,OAAO,WAAW,CAAC,KAAK,CAAC;IAI7D,MAAM,CAAC,QAAQ,CAAC,MAAM,UAAoB;IAC1C,MAAM,CAAC,QAAQ,CAAC,QAAQ,KAAI;IAE5B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;IAChC,QAAQ,EAAE,KAAK,CAAA;IAEf,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,CAAA;IACnD,uBAAuB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;IAE/D;;;;OAIG;gBACS,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,CAAC,EAAE,YAAY;IAyCrE;;;;;OAKG;WACU,YAAY,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAIjF;;;;;OAKG;WACU,eAAe,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAKxF;;;;;OAKG;WACU,OAAO,CAClB,GAAG,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,EAClD,GAAG,CAAC,EAAE,YAAY,GACjB,OAAO,CAAC,UAAU,CAAC;IAiBtB,4CAA4C;IACtC,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAIvE,yCAAyC;IACnC,cAAc,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA6B/E,kCAAkC;IAC3B,OAAO,CAAC,IAAI,EAAE,SAAS,GAAG;QAAE,aAAa,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,qBAAqB,CAAC,IAAI,CAAC;IAI1F,6CAA6C;IACvC,kBAAkB,CACtB,CAAC,SAAS,QAAQ,CAChB,WAAW,EACX,MAAM,GAAG,OAAO,QAAQ,GAAG,SAAS,GAAG,aAAa,EAAE,GAAG,wBAAwB,CAClF,EAED,OAAO,EAAE,CAAC,EACV,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,UAAU,GAAG,UAAU,CAAC,EACnD,IAAI,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GACvB,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;IAI1B,yCAAyC;IACnC,cAAc,CAAC,OAAO,EAAE,MAAM;IAUpC,6CAA6C;IAC7C,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK/E,8CAA8C;IAC9C,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAInF,kDAAkD;IAClD,uBAAuB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIzD,+CAA+C;IAC/C,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAIrF,6CAA6C;IAC7C,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI/E,8CAA8C;IACxC,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWxF,mDAAmD;IACnD,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI1D,+CAA+C;IACzC,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAoB9D,qCAAqC;IAC/B,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC;IAWvD,mDAAmD;IAC7C,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAShE;;;;OAIG;IACH,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE;QACxB,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAC1C,GAAG,WAAW,GAAG,SAAS;IAe3B;;;;OAIG;IACH,MAAM,CAAC,eAAe,CACpB,SAAS,EAAE,SAAS,GAElB,CAAC,cAAc,GAAG;QAAE,IAAI,EAAE,gBAAgB,CAAA;KAAE,CAAC,GAC7C,CAAC,cAAc,GAAG;QAAE,IAAI,EAAE,gBAAgB,CAAA;KAAE,CAAC,GAC7C,SAAS;IA8Bb;;;;OAIG;IACH,MAAM,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,MAAM;IAgBpD;;;;;OAKG;IACH,MAAM,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,YAAY,EAAE,GAAG,SAAS;IA4B3F;;;;OAIG;IACH,MAAM,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,gBAAgB,GAAG,SAAS;IAShF;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,SAAS,MAAM,EAAE,GAAG,MAAM;IAe/D;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE;IAI/C;;;;OAIG;IACH,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,UAAU,GAAG,UAAU;IAInE,iCAAiC;IAC3B,MAAM,CAAC,EACX,MAAM,EACN,iBAAiB,EACjB,OAAO,GACR,EAAE,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAKnD,sDAAsD;IAChD,2BAA2B,CAC/B,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC,CAAC,CAAC,CAAC,GACxD,OAAO,CAAC,eAAe,CAAC;IAwB3B,sCAAsC;IAChC,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC;IA4BlF,+CAA+C;IAC/C,oBAAoB,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAKxE,wDAAwD;IAClD,6BAA6B,CAAC,EAClC,KAAK,EACL,OAAO,EACP,UAAU,EACV,GAAG,IAAI,EACR,EAAE,UAAU,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAkBnF,wCAAwC;IAClC,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;IA2BxF;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO;;;cA1QI,gBAAgB;;cAChB,gBAAgB;;IAgR9C,6CAA6C;IACvC,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAkBtF,iDAAiD;IAC3C,sBAAsB,CAC1B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QACT,aAAa,EAAE,MAAM,CAAA;QACrB,oBAAoB,CAAC,EAAE,MAAM,CAAA;QAC7B,SAAS,CAAC,EAAE,MAAM,CAAA;KACnB,CAAC;IAkBF,8CAA8C;IACxC,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;QACpD,KAAK,EAAE,MAAM,CAAA;QACb,MAAM,EAAE,MAAM,CAAA;QACd,cAAc,CAAC,EAAE,MAAM,CAAA;KACxB,CAAC;IAkCF,8CAA8C;IACxC,mBAAmB,CACvB,SAAS,EAAE,MAAM,EACjB,mBAAmB,CAAC,EAAE,MAAM,GAC3B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IA6F3C,uCAAuC;IACjC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAavE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/aptos/index.ts"],"names":[],"mappings":"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"}

package/dist/aptos/index.js

@@ -1,17 +1,18 @@
-import { Aptos, AptosConfig, Deserializer, Network, SimpleTransaction, TransactionResponseType, } from '@aptos-labs/ts-sdk';
-import { concat, dataSlice, getBytes, hexlify, isBytesLike, isHexString, zeroPadValue, } from 'ethers';
+import { Aptos, AptosApiError, AptosConfig, Deserializer, Network, SimpleTransaction, TransactionResponseType, } from '@aptos-labs/ts-sdk';
+import { concat, isBytesLike, isHexString } from 'ethers';
 import { memoize } from 'micro-memoize';
 import { Chain, } from "../chain.js";
+import { generateUnsignedExecuteReport } from "./exec.js";
+import { getAptosLeafHasher } from "./hasher.js";
+import { getUserTxByVersion, getVersionTimestamp, streamAptosLogs } from "./logs.js";
 import { generateUnsignedCcipSend, getFee } from "./send.js";
-import { CCIPAptosAddressInvalidError, CCIPAptosExtraArgsEncodingError, CCIPAptosExtraArgsV2RequiredError, CCIPAptosLogInvalidError, CCIPAptosNetworkUnknownError, CCIPAptosRegistryTypeInvalidError, CCIPAptosTokenNotRegisteredError, CCIPAptosTransactionInvalidError, CCIPAptosTransactionTypeInvalidError, CCIPAptosWalletInvalidError, CCIPError, } from "../errors/index.js";
+import { CCIPAptosExtraArgsEncodingError, CCIPAptosExtraArgsV2RequiredError, CCIPAptosLogInvalidError, CCIPAptosNetworkUnknownError, CCIPAptosRegistryTypeInvalidError, CCIPAptosTokenNotRegisteredError, CCIPAptosTransactionInvalidError, CCIPAptosTransactionTypeInvalidError, CCIPAptosWalletInvalidError, CCIPError, CCIPTokenPoolChainConfigNotFoundError, } from "../errors/index.js";
 import { EVMExtraArgsV2Tag, SVMExtraArgsV1Tag, } from "../extra-args.js";
-import { EVMExtraArgsV2Codec, SVMExtraArgsV1Codec, isAptosAccount, } from "./types.js";
+import { isAptosAccount } from "./types.js";
+import { BcsEVMExtraArgsV2Codec, BcsSVMExtraArgsV1Codec, decodeMoveExtraArgs, getMoveAddress, } from "../shared/bcs-codecs.js";
 import { supportedChains } from "../supported-chains.js";
 import { ChainFamily, } from "../types.js";
-import { convertKeysToCamelCase, decodeAddress, decodeOnRampAddress, getAddressBytes, getDataBytes, networkInfo, parseTypeAndVersion, util, } from "../utils.js";
-import { generateUnsignedExecuteReport } from "./exec.js";
-import { getAptosLeafHasher } from "./hasher.js";
-import { getUserTxByVersion, getVersionTimestamp, streamAptosLogs } from "./logs.js";
+import { convertKeysToCamelCase, decodeAddress, decodeOnRampAddress, getAddressBytes, networkInfo, parseTypeAndVersion, util, } from "../utils.js";
 import { getTokenInfo } from "./token.js";
 import { buildMessageForDest, decodeMessage, getMessagesInBatch } from "../requests.js";
 /**
@@ -21,11 +22,16 @@ export class AptosChain extends Chain {
     static {
         supportedChains[ChainFamily.Aptos] = AptosChain;
     }
+    /** Chain family identifier for Aptos networks. */
     static family = ChainFamily.Aptos;
+    /** Native token decimals (8 for APT). */
     static decimals = 8;
     destroy$;
+    /** The Aptos SDK provider for blockchain interactions. */
     provider;
+    /** Retrieves token information for a given token address. */
     getTokenInfo;
+    /** @internal */
     _getAccountModulesNames;
     /**
      * Creates a new AptosChain instance.
@@ -86,6 +92,7 @@ export class AptosChain extends Chain {
      * @param url - RPC URL, Aptos Network enum value or [fullNodeUrl, Network] tuple.
      * @param ctx - context containing logger
      * @returns A new AptosChain instance.
+     * @throws {@link CCIPAptosNetworkUnknownError} if network cannot be determined from URL
      */
     static async fromUrl(url, ctx) {
         let network;
@@ -114,7 +121,11 @@ export class AptosChain extends Chain {
     async getBlockTimestamp(version) {
         return getVersionTimestamp(this.provider, version);
     }
-    /** {@inheritDoc Chain.getTransaction} */
+    /**
+     * {@inheritDoc Chain.getTransaction}
+     * @throws {@link CCIPAptosTransactionInvalidError} if hash/version format is invalid
+     * @throws {@link CCIPAptosTransactionTypeInvalidError} if transaction is not a user transaction
+     */
     async getTransaction(hashOrVersion) {
         let tx;
         if (isHexString(hashOrVersion, 32)) {
@@ -150,8 +161,8 @@ export class AptosChain extends Chain {
         yield* streamAptosLogs(this, opts);
     }
     /** {@inheritDoc Chain.getMessagesInBatch} */
-    async getMessagesInBatch(request, commit, opts) {
-        return getMessagesInBatch(this, request, commit, opts);
+    async getMessagesInBatch(request, range, opts) {
+        return getMessagesInBatch(this, request, range, opts);
     }
     /** {@inheritDoc Chain.typeAndVersion} */
     async typeAndVersion(address) {
@@ -184,19 +195,15 @@ export class AptosChain extends Chain {
     getOnRampForRouter(router, _destChainSelector) {
         return Promise.resolve(router.split('::')[0] + '::onramp');
     }
-    /** {@inheritDoc Chain.getOnRampForOffRamp} */
-    async getOnRampForOffRamp(offRamp, sourceChainSelector) {
+    /** {@inheritDoc Chain.getOnRampsForOffRamp} */
+    async getOnRampsForOffRamp(offRamp, sourceChainSelector) {
         const [sourceChainConfig] = await this.provider.view({
             payload: {
                 function: `${offRamp.includes('::') ? offRamp : offRamp + '::offramp'}::get_source_chain_config`,
                 functionArguments: [sourceChainSelector],
             },
         });
-        return decodeAddress(sourceChainConfig.on_ramp, networkInfo(sourceChainSelector).family);
-    }
-    /** {@inheritDoc Chain.getCommitStoreForOffRamp} */
-    getCommitStoreForOffRamp(offRamp) {
-        return Promise.resolve(offRamp.split('::')[0] + '::offramp');
+        return [decodeAddress(sourceChainConfig.on_ramp, networkInfo(sourceChainSelector).family)];
     }
     /** {@inheritDoc Chain.getTokenForTokenPool} */
     async getTokenForTokenPool(tokenPool) {
@@ -229,7 +236,10 @@ export class AptosChain extends Chain {
         });
         return BigInt(balance);
     }
-    /** {@inheritDoc Chain.getTokenAdminRegistryFor} */
+    /**
+     * {@inheritDoc Chain.getTokenAdminRegistryFor}
+     * @throws {@link CCIPAptosRegistryTypeInvalidError} if registry type is invalid
+     */
     async getTokenAdminRegistryFor(address) {
         const registry = address.split('::')[0] + '::token_admin_registry';
         const [type] = await this.typeAndVersion(registry);
@@ -242,6 +252,7 @@ export class AptosChain extends Chain {
      * Decodes a CCIP message from an Aptos log event.
      * @param log - Log with data field.
      * @returns Decoded CCIPMessage or undefined if not valid.
+     * @throws {@link CCIPAptosLogInvalidError} if log data format is invalid
      */
     static decodeMessage(log) {
         const { data } = log;
@@ -262,43 +273,21 @@ export class AptosChain extends Chain {
      * @returns Decoded extra arguments or undefined if unknown format.
      */
     static decodeExtraArgs(extraArgs) {
-        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);
     }
     /**
      * Encodes extra arguments for Aptos CCIP messages.
      * @param extraArgs - Extra arguments to encode.
      * @returns Encoded extra arguments as hex string.
+     * @throws {@link CCIPAptosExtraArgsEncodingError} if extra args format is not supported
      */
     static encodeExtraArgs(extraArgs) {
         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),
@@ -312,6 +301,7 @@ export class AptosChain extends Chain {
      * @param log - Log with data field.
      * @param lane - Lane info for filtering.
      * @returns Array of CommitReport or undefined if not valid.
+     * @throws {@link CCIPAptosLogInvalidError} if log data format is invalid
      */
     static decodeCommits({ data }, lane) {
         if (!data || typeof data != 'object')
@@ -332,6 +322,7 @@ export class AptosChain extends Chain {
      * Decodes an execution receipt from an Aptos log event.
      * @param log - Log with data field.
      * @returns ExecutionReceipt or undefined if not valid.
+     * @throws {@link CCIPAptosLogInvalidError} if log data format is invalid
      */
     static decodeReceipt({ data }) {
         if (!data || typeof data != 'object')
@@ -345,22 +336,10 @@ export class AptosChain extends Chain {
      * Converts bytes to an Aptos address.
      * @param bytes - Bytes to convert.
      * @returns Aptos address (0x-prefixed hex, 32 bytes padded).
+     * @throws {@link CCIPDataFormatUnsupportedError} if bytes length exceeds 32
      */
     static getAddress(bytes) {
-        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);
     }
     /**
      * Validates a transaction hash format for Aptos
@@ -395,7 +374,10 @@ export class AptosChain extends Chain {
             transactions: [tx],
         };
     }
-    /** {@inheritDoc Chain.sendMessage} */
+    /**
+     * {@inheritDoc Chain.sendMessage}
+     * @throws {@link CCIPAptosWalletInvalidError} if wallet is not a valid Aptos account
+     */
     async sendMessage(opts) {
         const account = opts.wallet;
         if (!isAptosAccount(account)) {
@@ -424,24 +406,33 @@ export class AptosChain extends Chain {
         // default offchain token data
         return Promise.resolve(request.message.tokenAmounts.map(() => undefined));
     }
-    /** {@inheritDoc Chain.generateUnsignedExecuteReport} */
-    async generateUnsignedExecuteReport({ payer, offRamp, execReport, ...opts }) {
-        if (!('allowOutOfOrderExecution' in execReport.message && 'gasLimit' in execReport.message)) {
+    /**
+     * {@inheritDoc Chain.generateUnsignedExecute}
+     * @throws {@link CCIPAptosExtraArgsV2RequiredError} if message missing EVMExtraArgsV2 fields
+     */
+    async generateUnsignedExecute({ payer, ...opts }) {
+        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, opts);
+        const tx = await generateUnsignedExecuteReport(this.provider, payer, opts.offRamp, opts.input, opts);
         return {
             family: ChainFamily.Aptos,
             transactions: [tx],
         };
     }
-    /** {@inheritDoc Chain.executeReport} */
-    async executeReport(opts) {
+    /**
+     * {@inheritDoc Chain.execute}
+     * @throws {@link CCIPAptosWalletInvalidError} if wallet is not a valid Aptos account
+     */
+    async execute(opts) {
         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(),
         });
@@ -465,10 +456,15 @@ export class AptosChain extends Chain {
      * @returns Parsed data or undefined.
      */
     static parse(data) {
-        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
         }
     }
     /** {@inheritDoc Chain.getSupportedTokens} */
@@ -487,7 +483,10 @@ export class AptosChain extends Chain {
         } while (hasMore);
         return page;
     }
-    /** {@inheritDoc Chain.getRegistryTokenConfig} */
+    /**
+     * {@inheritDoc Chain.getRegistryTokenConfig}
+     * @throws {@link CCIPAptosTokenNotRegisteredError} if token is not registered
+     */
     async getRegistryTokenConfig(registry, token) {
         const [tokenPool, administrator, pendingAdministrator] = await this.provider.view({
             payload: {
@@ -503,8 +502,8 @@ export class AptosChain extends Chain {
             ...(!tokenPool.match(/^0x0*$/) && { tokenPool }),
         };
     }
-    /** {@inheritDoc Chain.getTokenPoolConfigs} */
-    async getTokenPoolConfigs(tokenPool) {
+    /** {@inheritDoc Chain.getTokenPoolConfig} */
+    async getTokenPoolConfig(tokenPool) {
         const modulesNames = (await this._getAccountModulesNames(tokenPool))
             .reverse()
             .filter((name) => name.endsWith('token_pool'));
@@ -541,8 +540,8 @@ export class AptosChain extends Chain {
     /** {@inheritDoc Chain.getTokenPoolRemotes} */
     async getTokenPoolRemotes(tokenPool, remoteChainSelector) {
         const modulesNames = (await this._getAccountModulesNames(tokenPool))
-            .reverse()
-            .filter((name) => name.endsWith('token_pool'));
+            .filter((name) => name.endsWith('token_pool'))
+            .sort((a, b) => b.length - a.length);
         let firstErr;
         for (const name of modulesNames) {
             try {
@@ -579,35 +578,43 @@ export class AptosChain extends Chain {
                             functionArguments: [chain.chainSelector],
                         },
                     });
-                    const [[remoteToken], [remotePools], [inboundRateLimiterState], [outboundRateLimiterState],] = await Promise.all([
-                        remoteToken$,
-                        remotePools$,
-                        inboundRateLimiterState$,
-                        outboundRateLimiterState$,
-                    ]);
-                    return [
-                        chain.name,
-                        {
-                            remoteToken: decodeAddress(remoteToken, chain.family),
-                            remotePools: remotePools.map((pool) => decodeAddress(pool, chain.family)),
-                            inboundRateLimiterState: inboundRateLimiterState.is_enabled
-                                ? {
-                                    capacity: BigInt(inboundRateLimiterState.capacity),
-                                    lastUpdated: Number(inboundRateLimiterState.last_updated),
-                                    rate: BigInt(inboundRateLimiterState.rate),
-                                    tokens: BigInt(inboundRateLimiterState.tokens),
-                                }
-                                : null,
-                            outboundRateLimiterState: outboundRateLimiterState.is_enabled
-                                ? {
-                                    capacity: BigInt(outboundRateLimiterState.capacity),
-                                    lastUpdated: Number(outboundRateLimiterState.last_updated),
-                                    rate: BigInt(outboundRateLimiterState.rate),
-                                    tokens: BigInt(outboundRateLimiterState.tokens),
-                                }
-                                : null,
-                        },
-                    ];
+                    try {
+                        const [[remoteToken], [remotePools], [inboundRateLimiterState], [outboundRateLimiterState],] = await Promise.all([
+                            remoteToken$,
+                            remotePools$,
+                            inboundRateLimiterState$,
+                            outboundRateLimiterState$,
+                        ]);
+                        return [
+                            chain.name,
+                            {
+                                remoteToken: decodeAddress(remoteToken, chain.family),
+                                remotePools: remotePools.map((pool) => decodeAddress(pool, chain.family)),
+                                inboundRateLimiterState: inboundRateLimiterState.is_enabled
+                                    ? {
+                                        capacity: BigInt(inboundRateLimiterState.capacity),
+                                        lastUpdated: Number(inboundRateLimiterState.last_updated),
+                                        rate: BigInt(inboundRateLimiterState.rate),
+                                        tokens: BigInt(inboundRateLimiterState.tokens),
+                                    }
+                                    : null,
+                                outboundRateLimiterState: outboundRateLimiterState.is_enabled
+                                    ? {
+                                        capacity: BigInt(outboundRateLimiterState.capacity),
+                                        lastUpdated: Number(outboundRateLimiterState.last_updated),
+                                        rate: BigInt(outboundRateLimiterState.rate),
+                                        tokens: BigInt(outboundRateLimiterState.tokens),
+                                    }
+                                    : null,
+                            },
+                        ];
+                    }
+                    catch (err) {
+                        if (err instanceof AptosApiError &&
+                            err.message.includes('Key not found in the smart table'))
+                            throw new CCIPTokenPoolChainConfigNotFoundError(tokenPool, tokenPool, chain.name);
+                        throw err;
+                    }
                 })));
             }
             catch (err) {