@layerzerolabs/lz-corekit-aptos 3.0.11 → 3.0.12

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @layerzerolabs/lz-corekit-aptos
 
+## 3.0.12
+
+### Patch Changes
+
+- 1f77709: endpoints: superposition mainnet and some testnets
+- Updated dependencies [1f77709]
+  - @layerzerolabs/lz-core@3.0.12
+  - @layerzerolabs/lz-utilities@3.0.12
+  - @layerzerolabs/lz-aptos-sdk-v1@3.0.12
+
 ## 3.0.11
 
 ### Patch Changes

package/dist/index.cjs

@@ -1,7 +1,6 @@
 'use strict';
 
 var aptos2 = require('aptos');
-var ethers = require('ethers');
 var lzCore = require('@layerzerolabs/lz-core');
 var lzUtilities = require('@layerzerolabs/lz-utilities');
 
@@ -61,7 +60,7 @@ var AptosProvider = class _AptosProvider {
     if (typeof blockTag === "number") {
       blockNumber = blockTag;
     } else if (blockTag === "latest") {
-      blockNumber = await this.nativeProvider.getLedgerInfo().then((ledgerInfo) => ethers.BigNumber.from(ledgerInfo.block_height).toNumber());
+      blockNumber = await this.nativeProvider.getLedgerInfo().then((ledgerInfo) => Number(ledgerInfo.block_height));
     } else {
       throw new Error("Invalid blockTag");
     }
@@ -81,7 +80,7 @@ var AptosProvider = class _AptosProvider {
     return lzCore.BlockWithTransactions.from(response);
   }
   async getBlockNumber() {
-    return this.nativeProvider.getLedgerInfo().then((ledgerInfo) => ethers.BigNumber.from(ledgerInfo.block_height).toNumber());
+    return this.nativeProvider.getLedgerInfo().then((ledgerInfo) => Number(ledgerInfo.block_height));
   }
   async getSlot(_finality) {
     await Promise.resolve();
@@ -89,9 +88,9 @@ var AptosProvider = class _AptosProvider {
   }
   async getBlockTimestamp(blockTag) {
     if (typeof blockTag === "number") {
-      return this.nativeProvider.getBlockByHeight(blockTag).then((block) => ethers.BigNumber.from(block.block_timestamp).toNumber());
+      return this.nativeProvider.getBlockByHeight(blockTag).then((block) => Number(block.block_timestamp));
     } else if (blockTag === "latest") {
-      return this.nativeProvider.getLedgerInfo().then((ledgerInfo) => ethers.BigNumber.from(ledgerInfo.ledger_timestamp).toNumber());
+      return this.nativeProvider.getLedgerInfo().then((ledgerInfo) => Number(ledgerInfo.ledger_timestamp));
     } else {
       throw new Error("Invalid blockTag");
     }
@@ -123,31 +122,42 @@ var AptosProvider = class _AptosProvider {
     const response = await this.nativeProvider.submitSignedBCSTransaction(stx);
     return lzCore.TransactionPending.from(response);
   }
-  async sendAndConfirm(transaction, opts) {
-    const pending = (await this.sendTransaction(transaction, opts)).pending;
-    const response = await this.nativeProvider.waitForTransactionWithResult(pending.hash);
+  async confirmTransaction(pending, opts) {
+    const nativePending = pending.pending;
+    const response = await this.nativeProvider.waitForTransactionWithResult(nativePending.hash);
+    if (response.type !== "user_transaction") {
+      throw new Error(`Invalid response type: ${response.type}`);
+    }
     const userTransaction = response;
     if (!userTransaction.success) {
       throw new Error(`aptos transaction failed ,vm_status: ${userTransaction.vm_status}`);
     }
     return lzCore.TransactionReceipt.from(response);
   }
+  async sendAndConfirm(transaction, opts) {
+    const pending = await this.sendTransaction(transaction, opts);
+    return this.confirmTransaction(pending, opts);
+  }
 };
 var AptosSigner = class {
   constructor(signer) {
     this.nativeSigner = signer;
   }
+  /**
+   *
+   * @param source
+   * @param path e.g. m/44'/637'/0'/0'/0'
+   */
   static from(source, path) {
     if (source instanceof aptos2__namespace.AptosAccount) {
       return new this(source);
-    } else if (typeof source === "string" && path === void 0) {
+    }
+    if (path === void 0) {
       const signer = new aptos2__namespace.AptosAccount(Buffer.from(lzUtilities.trim0x(source)));
       return new this(signer);
-    } else if (typeof source === "string" && path !== void 0) {
-      if (path.startsWith("m/")) {
-        const signer = aptos2__namespace.AptosAccount.fromDerivePath(path, source);
-        return new this(signer);
-      }
+    } else if (path.startsWith("m/")) {
+      const signer = aptos2__namespace.AptosAccount.fromDerivePath(path, source);
+      return new this(signer);
     }
     throw new Error("Invalid parameters");
   }

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/providers/aptos.ts","../src/signers/aptos.ts"],"names":["aptos","SignedTransaction"],"mappings":"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","sourcesContent":["import * as aptos from 'aptos'\nimport { BigNumber } from 'ethers'\n\nimport {\n    Block,\n    BlockTag,\n    BlockWithTransactions,\n    Finality,\n    Provider,\n    SignedTransaction,\n    TransactionPending,\n    TransactionReceipt,\n    TransactionResponse,\n} from '@layerzerolabs/lz-core'\nimport { isHexString } from '@layerzerolabs/lz-utilities'\n\nexport class AptosProvider implements Provider {\n    readonly nativeProvider: aptos.AptosClient\n\n    private constructor(\n        public readonly url: string,\n        public readonly faucet?: string,\n        public readonly indexer?: string\n    ) {\n        this.nativeProvider = new aptos.AptosClient(url)\n    }\n    static from(source: string, faucet?: string, indexer?: string): AptosProvider {\n        if (typeof source === 'string') {\n            return new AptosProvider(source, faucet, indexer)\n        } else {\n            throw new Error('Invalid parameters')\n        }\n    }\n\n    get native(): aptos.AptosClient {\n        return this.nativeProvider\n    }\n\n    async getBalance(address: string): Promise<string> {\n        if (!isHexString(address)) {\n            throw new Error('Invalid Aptos address')\n        }\n\n        const aptosCoin = '0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>'\n        const resources = await this.nativeProvider.getAccountResources(address)\n        const accountResource = resources.find((r) => r.type === aptosCoin)\n        if (accountResource === undefined) {\n            throw new Error('Account resource not found')\n        }\n\n        const { coin } = accountResource.data as { coin: { value: string } }\n        return BigInt(coin.value).toString()\n    }\n\n    async getBlock(blockTag: string | number): Promise<Block> {\n        let blockNumber = 0\n        if (typeof blockTag === 'number') {\n            blockNumber = blockTag\n        } else if (blockTag === 'latest') {\n            blockNumber = await this.nativeProvider\n                .getLedgerInfo()\n                .then((ledgerInfo) => BigNumber.from(ledgerInfo.block_height).toNumber())\n        } else {\n            throw new Error('Invalid blockTag')\n        }\n\n        const response = await this.nativeProvider.getBlockByHeight(blockNumber)\n        return Block.from(response)\n    }\n\n    async getBlockWithTransactions(blockTag: string | number): Promise<BlockWithTransactions> {\n        let blockNumber = 0\n        if (typeof blockTag === 'number') {\n            blockNumber = blockTag\n        } else if (blockTag === 'latest') {\n            blockNumber = await this.getBlockNumber()\n        } else {\n            throw new Error('Invalid blockTag')\n        }\n\n        const response = await this.nativeProvider.getBlockByHeight(blockNumber, true)\n        return BlockWithTransactions.from(response)\n    }\n\n    async getBlockNumber(): Promise<number> {\n        return this.nativeProvider\n            .getLedgerInfo()\n            .then((ledgerInfo) => BigNumber.from(ledgerInfo.block_height).toNumber())\n    }\n\n    async getSlot(_finality?: Finality): Promise<number> {\n        await Promise.resolve()\n        throw new Error('Method not implemented.')\n    }\n\n    async getBlockTimestamp(blockTag: string | number): Promise<number> {\n        if (typeof blockTag === 'number') {\n            return this.nativeProvider\n                .getBlockByHeight(blockTag)\n                .then((block) => BigNumber.from(block.block_timestamp).toNumber())\n        } else if (blockTag === 'latest') {\n            return this.nativeProvider\n                .getLedgerInfo()\n                .then((ledgerInfo) => BigNumber.from(ledgerInfo.ledger_timestamp).toNumber())\n        } else {\n            throw new Error('Invalid blockTag')\n        }\n    }\n\n    async getTransaction(txHash: string): Promise<TransactionResponse> {\n        if (!isHexString(txHash)) {\n            throw new Error('Invalid Aptos transaction hash')\n        }\n\n        const response = await this.nativeProvider.getTransactionByHash(txHash)\n        return TransactionResponse.from(response)\n    }\n\n    async getTransactionReceipt(txHash: string): Promise<TransactionReceipt> {\n        if (!isHexString(txHash)) {\n            throw new Error('Invalid Aptos transaction hash')\n        }\n\n        const response = await this.nativeProvider.getTransactionByHash(txHash)\n        return TransactionReceipt.from(response)\n    }\n\n    async getTransactionCount(\n        addressOrName: string | Promise<string>,\n        _blockTag?: BlockTag | Promise<BlockTag>\n    ): Promise<number> {\n        const _addressOrName = await Promise.resolve(addressOrName)\n        if (!isHexString(_addressOrName)) {\n            throw new Error('Invalid Aptos transaction hash')\n        }\n\n        const response = await this.nativeProvider.getAccount(_addressOrName)\n        return parseInt(response.sequence_number)\n    }\n\n    async sendTransaction(transaction: SignedTransaction, _sendOptions?: object): Promise<TransactionPending> {\n        type NativeSignedTransaction = Parameters<typeof this.nativeProvider.submitSignedBCSTransaction>[0]\n        const stx = transaction.signed as NativeSignedTransaction\n\n        const response = await this.nativeProvider.submitSignedBCSTransaction(stx)\n        return TransactionPending.from(response)\n    }\n\n    async sendAndConfirm(transaction: SignedTransaction, opts?: object): Promise<TransactionReceipt> {\n        const pending = (await this.sendTransaction(transaction, opts)).pending as aptos.Types.PendingTransaction\n        const response = await this.nativeProvider.waitForTransactionWithResult(pending.hash)\n        const userTransaction = response as aptos.Types.UserTransaction\n        if (!userTransaction.success) {\n            throw new Error(`aptos transaction failed ,vm_status: ${userTransaction.vm_status}`)\n        }\n        return TransactionReceipt.from(response)\n    }\n}\n","import * as aptos from 'aptos'\n\nimport {\n    Provider,\n    SignedTransaction,\n    Signer,\n    TransactionPending,\n    TransactionReceipt,\n    TransactionRequest,\n} from '@layerzerolabs/lz-core'\nimport { trim0x } from '@layerzerolabs/lz-utilities'\n\nimport { AptosProvider } from '../providers'\n\nexport class AptosSigner implements Signer {\n    public nativeSigner: aptos.AptosAccount\n    public provider: AptosProvider | undefined\n\n    private constructor(signer: aptos.AptosAccount) {\n        this.nativeSigner = signer\n    }\n\n    static from(signer: aptos.AptosAccount): Signer\n    static from(privKey: string): Signer\n    /**\n     *\n     * @param mnemonic\n     * @param path e.g. m/44'/637'/0'/0'/0'\n     */\n    static from(mnemonic: string, path: string): Signer\n\n    static from(source: string | aptos.AptosAccount, path?: string): Signer {\n        if (source instanceof aptos.AptosAccount) {\n            return new this(source)\n        } else if (typeof source === 'string' && path === undefined) {\n            const signer = new aptos.AptosAccount(Buffer.from(trim0x(source)))\n            return new this(signer)\n        } else if (typeof source === 'string' && path !== undefined) {\n            if (path.startsWith('m/')) {\n                const signer = aptos.AptosAccount.fromDerivePath(path, source)\n                return new this(signer)\n            }\n        }\n        throw new Error('Invalid parameters')\n    }\n\n    get native(): aptos.AptosAccount {\n        return this.nativeSigner\n    }\n\n    connect(provider: Provider): Signer {\n        if (!(provider instanceof AptosProvider)) {\n            throw new Error('Only aptos.AptosClient is supported.')\n        }\n\n        this.provider = provider\n        return this\n    }\n\n    async getAddress(): Promise<string> {\n        return Promise.resolve(this.nativeSigner.address().toString())\n    }\n\n    get address(): string {\n        return this.nativeSigner.address().toString()\n    }\n\n    async sendAndConfirm(transaction: SignedTransaction, opts?: object): Promise<TransactionReceipt> {\n        if (this.provider === undefined) {\n            throw new Error('provider is required')\n        }\n\n        return this.provider.sendAndConfirm(transaction, opts)\n    }\n\n    async sendTransaction(transaction: SignedTransaction, sendOptions?: object): Promise<TransactionPending> {\n        if (this.provider === undefined) {\n            throw new Error('provider is required')\n        }\n\n        return this.provider.sendTransaction(transaction, sendOptions)\n    }\n\n    async signTransaction(transaction: TransactionRequest): Promise<SignedTransaction> {\n        const nativeProvider = this.provider?.native\n        if (nativeProvider === undefined) {\n            throw new Error('Connect the native provider first with AptosSigner.connect()')\n        }\n\n        type NativeTransactionRequest = Parameters<aptos.AptosClient['signTransaction']>[1]\n        const tx = transaction.request as NativeTransactionRequest\n\n        // signTransaction is an offline operation\n        const response = await nativeProvider.signTransaction(this.nativeSigner, tx)\n        return SignedTransaction.from(response)\n    }\n\n    async signBuffer(buffer: Uint8Array): Promise<Uint8Array> {\n        const rv = this.nativeSigner.signBuffer(Buffer.from(buffer)).toUint8Array()\n        return Promise.resolve(rv)\n    }\n    async buildTransaction(buildTxRequest: unknown): Promise<TransactionRequest> {\n        return Promise.reject(new Error('Method not implemented.'))\n    }\n}\n"]}
+{"version":3,"sources":["../src/providers/aptos.ts","../src/signers/aptos.ts"],"names":["aptos","SignedTransaction"],"mappings":"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","sourcesContent":["import * as aptos from 'aptos'\n\nimport {\n    Block,\n    BlockTag,\n    BlockWithTransactions,\n    Finality,\n    Provider,\n    SignedTransaction,\n    TransactionPending,\n    TransactionReceipt,\n    TransactionResponse,\n} from '@layerzerolabs/lz-core'\nimport { isHexString } from '@layerzerolabs/lz-utilities'\n\nexport class AptosProvider implements Provider {\n    readonly nativeProvider: aptos.AptosClient\n\n    private constructor(\n        public readonly url: string,\n        public readonly faucet?: string,\n        public readonly indexer?: string\n    ) {\n        this.nativeProvider = new aptos.AptosClient(url)\n    }\n\n    static from(source: string, faucet?: string, indexer?: string): AptosProvider {\n        if (typeof source === 'string') {\n            return new AptosProvider(source, faucet, indexer)\n        } else {\n            throw new Error('Invalid parameters')\n        }\n    }\n\n    get native(): aptos.AptosClient {\n        return this.nativeProvider\n    }\n\n    async getBalance(address: string): Promise<string> {\n        if (!isHexString(address)) {\n            throw new Error('Invalid Aptos address')\n        }\n\n        const aptosCoin = '0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>'\n        const resources = await this.nativeProvider.getAccountResources(address)\n        const accountResource = resources.find((r) => r.type === aptosCoin)\n        if (accountResource === undefined) {\n            throw new Error('Account resource not found')\n        }\n\n        const { coin } = accountResource.data as { coin: { value: string } }\n        return BigInt(coin.value).toString()\n    }\n\n    async getBlock(blockTag: string | number): Promise<Block> {\n        let blockNumber = 0\n        if (typeof blockTag === 'number') {\n            blockNumber = blockTag\n        } else if (blockTag === 'latest') {\n            blockNumber = await this.nativeProvider\n                .getLedgerInfo()\n                .then((ledgerInfo) => Number(ledgerInfo.block_height))\n        } else {\n            throw new Error('Invalid blockTag')\n        }\n\n        const response = await this.nativeProvider.getBlockByHeight(blockNumber)\n        return Block.from(response)\n    }\n\n    async getBlockWithTransactions(blockTag: string | number): Promise<BlockWithTransactions> {\n        let blockNumber = 0\n        if (typeof blockTag === 'number') {\n            blockNumber = blockTag\n        } else if (blockTag === 'latest') {\n            blockNumber = await this.getBlockNumber()\n        } else {\n            throw new Error('Invalid blockTag')\n        }\n\n        const response = await this.nativeProvider.getBlockByHeight(blockNumber, true)\n        return BlockWithTransactions.from(response)\n    }\n\n    async getBlockNumber(): Promise<number> {\n        return this.nativeProvider.getLedgerInfo().then((ledgerInfo) => Number(ledgerInfo.block_height))\n    }\n\n    async getSlot(_finality?: Finality): Promise<number> {\n        await Promise.resolve()\n        throw new Error('Method not implemented.')\n    }\n\n    async getBlockTimestamp(blockTag: string | number): Promise<number> {\n        if (typeof blockTag === 'number') {\n            return this.nativeProvider.getBlockByHeight(blockTag).then((block) => Number(block.block_timestamp))\n        } else if (blockTag === 'latest') {\n            return this.nativeProvider.getLedgerInfo().then((ledgerInfo) => Number(ledgerInfo.ledger_timestamp))\n        } else {\n            throw new Error('Invalid blockTag')\n        }\n    }\n\n    async getTransaction(txHash: string): Promise<TransactionResponse> {\n        if (!isHexString(txHash)) {\n            throw new Error('Invalid Aptos transaction hash')\n        }\n\n        const response = await this.nativeProvider.getTransactionByHash(txHash)\n        return TransactionResponse.from(response)\n    }\n\n    async getTransactionReceipt(txHash: string): Promise<TransactionReceipt> {\n        if (!isHexString(txHash)) {\n            throw new Error('Invalid Aptos transaction hash')\n        }\n\n        const response = await this.nativeProvider.getTransactionByHash(txHash)\n        return TransactionReceipt.from(response)\n    }\n\n    async getTransactionCount(\n        addressOrName: string | Promise<string>,\n        _blockTag?: BlockTag | Promise<BlockTag>\n    ): Promise<number> {\n        const _addressOrName = await Promise.resolve(addressOrName)\n        if (!isHexString(_addressOrName)) {\n            throw new Error('Invalid Aptos transaction hash')\n        }\n\n        const response = await this.nativeProvider.getAccount(_addressOrName)\n        return parseInt(response.sequence_number)\n    }\n\n    async sendTransaction(transaction: SignedTransaction, _sendOptions?: object): Promise<TransactionPending> {\n        type NativeSignedTransaction = Parameters<typeof this.nativeProvider.submitSignedBCSTransaction>[0] // Uint8Array\n        const stx = transaction.signed as NativeSignedTransaction\n\n        const response = await this.nativeProvider.submitSignedBCSTransaction(stx)\n        return TransactionPending.from(response)\n    }\n\n    async confirmTransaction(pending: TransactionPending, opts?: object): Promise<TransactionReceipt> {\n        const nativePending = pending.pending as aptos.Types.PendingTransaction\n        const response = await this.nativeProvider.waitForTransactionWithResult(nativePending.hash)\n        if (response.type !== 'user_transaction') {\n            throw new Error(`Invalid response type: ${response.type}`)\n        }\n        const userTransaction = response as aptos.Types.UserTransaction\n        if (!userTransaction.success) {\n            throw new Error(`aptos transaction failed ,vm_status: ${userTransaction.vm_status}`)\n        }\n        return TransactionReceipt.from(response)\n    }\n\n    async sendAndConfirm(transaction: SignedTransaction, opts?: object): Promise<TransactionReceipt> {\n        const pending = await this.sendTransaction(transaction, opts)\n        return this.confirmTransaction(pending, opts)\n    }\n}\n","import * as aptos from 'aptos'\n\nimport {\n    Provider,\n    SignedTransaction,\n    Signer,\n    TransactionPending,\n    TransactionReceipt,\n    TransactionRequest,\n} from '@layerzerolabs/lz-core'\nimport { trim0x } from '@layerzerolabs/lz-utilities'\n\nimport { AptosProvider } from '../providers'\n\nexport class AptosSigner implements Signer {\n    public nativeSigner: aptos.AptosAccount\n    public provider: AptosProvider | undefined\n\n    private constructor(signer: aptos.AptosAccount) {\n        this.nativeSigner = signer\n    }\n\n    /**\n     *\n     * @param source\n     * @param path e.g. m/44'/637'/0'/0'/0'\n     */\n    static from(source: string | aptos.AptosAccount, path?: string): AptosSigner {\n        if (source instanceof aptos.AptosAccount) {\n            return new this(source)\n        }\n        if (path === undefined) {\n            const signer = new aptos.AptosAccount(Buffer.from(trim0x(source)))\n            return new this(signer)\n        } else if (path.startsWith('m/')) {\n            const signer = aptos.AptosAccount.fromDerivePath(path, source)\n            return new this(signer)\n        }\n        throw new Error('Invalid parameters')\n    }\n\n    get native(): aptos.AptosAccount {\n        return this.nativeSigner\n    }\n\n    connect(provider: Provider): this {\n        if (!(provider instanceof AptosProvider)) {\n            throw new Error('Only aptos.AptosClient is supported.')\n        }\n\n        this.provider = provider\n        return this\n    }\n\n    async getAddress(): Promise<string> {\n        return Promise.resolve(this.nativeSigner.address().toString())\n    }\n\n    get address(): string {\n        return this.nativeSigner.address().toString()\n    }\n\n    async sendAndConfirm(transaction: SignedTransaction, opts?: object): Promise<TransactionReceipt> {\n        if (this.provider === undefined) {\n            throw new Error('provider is required')\n        }\n\n        return this.provider.sendAndConfirm(transaction, opts)\n    }\n\n    async sendTransaction(transaction: SignedTransaction, sendOptions?: object): Promise<TransactionPending> {\n        if (this.provider === undefined) {\n            throw new Error('provider is required')\n        }\n\n        return this.provider.sendTransaction(transaction, sendOptions)\n    }\n\n    async signTransaction(transaction: TransactionRequest): Promise<SignedTransaction> {\n        const nativeProvider = this.provider?.native\n        if (nativeProvider === undefined) {\n            throw new Error('Connect the native provider first with AptosSigner.connect()')\n        }\n\n        type NativeTransactionRequest = Parameters<aptos.AptosClient['signTransaction']>[1]\n        const tx = transaction.request as NativeTransactionRequest\n\n        // signTransaction is an offline operation\n        const response = await nativeProvider.signTransaction(this.nativeSigner, tx)\n        return SignedTransaction.from(response)\n    }\n\n    async signBuffer(buffer: Uint8Array): Promise<Uint8Array> {\n        const rv = this.nativeSigner.signBuffer(Buffer.from(buffer)).toUint8Array()\n        return Promise.resolve(rv)\n    }\n\n    async buildTransaction(buildTxRequest: unknown): Promise<TransactionRequest> {\n        return Promise.reject(new Error('Method not implemented.'))\n    }\n}\n"]}

package/dist/index.d.mts

@@ -19,6 +19,7 @@ declare class AptosProvider implements Provider {
     getTransactionReceipt(txHash: string): Promise<TransactionReceipt>;
     getTransactionCount(addressOrName: string | Promise<string>, _blockTag?: BlockTag | Promise<BlockTag>): Promise<number>;
     sendTransaction(transaction: SignedTransaction, _sendOptions?: object): Promise<TransactionPending>;
+    confirmTransaction(pending: TransactionPending, opts?: object): Promise<TransactionReceipt>;
     sendAndConfirm(transaction: SignedTransaction, opts?: object): Promise<TransactionReceipt>;
 }
 
@@ -26,16 +27,14 @@ declare class AptosSigner implements Signer {
     nativeSigner: aptos.AptosAccount;
     provider: AptosProvider | undefined;
     private constructor();
-    static from(signer: aptos.AptosAccount): Signer;
-    static from(privKey: string): Signer;
     /**
      *
-     * @param mnemonic
+     * @param source
      * @param path e.g. m/44'/637'/0'/0'/0'
      */
-    static from(mnemonic: string, path: string): Signer;
+    static from(source: string | aptos.AptosAccount, path?: string): AptosSigner;
     get native(): aptos.AptosAccount;
-    connect(provider: Provider): Signer;
+    connect(provider: Provider): this;
     getAddress(): Promise<string>;
     get address(): string;
     sendAndConfirm(transaction: SignedTransaction, opts?: object): Promise<TransactionReceipt>;

package/dist/index.d.ts

@@ -19,6 +19,7 @@ declare class AptosProvider implements Provider {
     getTransactionReceipt(txHash: string): Promise<TransactionReceipt>;
     getTransactionCount(addressOrName: string | Promise<string>, _blockTag?: BlockTag | Promise<BlockTag>): Promise<number>;
     sendTransaction(transaction: SignedTransaction, _sendOptions?: object): Promise<TransactionPending>;
+    confirmTransaction(pending: TransactionPending, opts?: object): Promise<TransactionReceipt>;
     sendAndConfirm(transaction: SignedTransaction, opts?: object): Promise<TransactionReceipt>;
 }
 
@@ -26,16 +27,14 @@ declare class AptosSigner implements Signer {
     nativeSigner: aptos.AptosAccount;
     provider: AptosProvider | undefined;
     private constructor();
-    static from(signer: aptos.AptosAccount): Signer;
-    static from(privKey: string): Signer;
     /**
      *
-     * @param mnemonic
+     * @param source
      * @param path e.g. m/44'/637'/0'/0'/0'
      */
-    static from(mnemonic: string, path: string): Signer;
+    static from(source: string | aptos.AptosAccount, path?: string): AptosSigner;
     get native(): aptos.AptosAccount;
-    connect(provider: Provider): Signer;
+    connect(provider: Provider): this;
     getAddress(): Promise<string>;
     get address(): string;
     sendAndConfirm(transaction: SignedTransaction, opts?: object): Promise<TransactionReceipt>;

package/dist/index.mjs

@@ -1,5 +1,4 @@
 import * as aptos2 from 'aptos';
-import { BigNumber } from 'ethers';
 import { Block, BlockWithTransactions, TransactionResponse, TransactionReceipt, TransactionPending, SignedTransaction } from '@layerzerolabs/lz-core';
 import { isHexString, trim0x } from '@layerzerolabs/lz-utilities';
 
@@ -39,7 +38,7 @@ var AptosProvider = class _AptosProvider {
     if (typeof blockTag === "number") {
       blockNumber = blockTag;
     } else if (blockTag === "latest") {
-      blockNumber = await this.nativeProvider.getLedgerInfo().then((ledgerInfo) => BigNumber.from(ledgerInfo.block_height).toNumber());
+      blockNumber = await this.nativeProvider.getLedgerInfo().then((ledgerInfo) => Number(ledgerInfo.block_height));
     } else {
       throw new Error("Invalid blockTag");
     }
@@ -59,7 +58,7 @@ var AptosProvider = class _AptosProvider {
     return BlockWithTransactions.from(response);
   }
   async getBlockNumber() {
-    return this.nativeProvider.getLedgerInfo().then((ledgerInfo) => BigNumber.from(ledgerInfo.block_height).toNumber());
+    return this.nativeProvider.getLedgerInfo().then((ledgerInfo) => Number(ledgerInfo.block_height));
   }
   async getSlot(_finality) {
     await Promise.resolve();
@@ -67,9 +66,9 @@ var AptosProvider = class _AptosProvider {
   }
   async getBlockTimestamp(blockTag) {
     if (typeof blockTag === "number") {
-      return this.nativeProvider.getBlockByHeight(blockTag).then((block) => BigNumber.from(block.block_timestamp).toNumber());
+      return this.nativeProvider.getBlockByHeight(blockTag).then((block) => Number(block.block_timestamp));
     } else if (blockTag === "latest") {
-      return this.nativeProvider.getLedgerInfo().then((ledgerInfo) => BigNumber.from(ledgerInfo.ledger_timestamp).toNumber());
+      return this.nativeProvider.getLedgerInfo().then((ledgerInfo) => Number(ledgerInfo.ledger_timestamp));
     } else {
       throw new Error("Invalid blockTag");
     }
@@ -101,31 +100,42 @@ var AptosProvider = class _AptosProvider {
     const response = await this.nativeProvider.submitSignedBCSTransaction(stx);
     return TransactionPending.from(response);
   }
-  async sendAndConfirm(transaction, opts) {
-    const pending = (await this.sendTransaction(transaction, opts)).pending;
-    const response = await this.nativeProvider.waitForTransactionWithResult(pending.hash);
+  async confirmTransaction(pending, opts) {
+    const nativePending = pending.pending;
+    const response = await this.nativeProvider.waitForTransactionWithResult(nativePending.hash);
+    if (response.type !== "user_transaction") {
+      throw new Error(`Invalid response type: ${response.type}`);
+    }
     const userTransaction = response;
     if (!userTransaction.success) {
       throw new Error(`aptos transaction failed ,vm_status: ${userTransaction.vm_status}`);
     }
     return TransactionReceipt.from(response);
   }
+  async sendAndConfirm(transaction, opts) {
+    const pending = await this.sendTransaction(transaction, opts);
+    return this.confirmTransaction(pending, opts);
+  }
 };
 var AptosSigner = class {
   constructor(signer) {
     this.nativeSigner = signer;
   }
+  /**
+   *
+   * @param source
+   * @param path e.g. m/44'/637'/0'/0'/0'
+   */
   static from(source, path) {
     if (source instanceof aptos2.AptosAccount) {
       return new this(source);
-    } else if (typeof source === "string" && path === void 0) {
+    }
+    if (path === void 0) {
       const signer = new aptos2.AptosAccount(Buffer.from(trim0x(source)));
       return new this(signer);
-    } else if (typeof source === "string" && path !== void 0) {
-      if (path.startsWith("m/")) {
-        const signer = aptos2.AptosAccount.fromDerivePath(path, source);
-        return new this(signer);
-      }
+    } else if (path.startsWith("m/")) {
+      const signer = aptos2.AptosAccount.fromDerivePath(path, source);
+      return new this(signer);
     }
     throw new Error("Invalid parameters");
   }

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/providers/aptos.ts","../src/signers/aptos.ts"],"names":["aptos","SignedTransaction"],"mappings":"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","sourcesContent":["import * as aptos from 'aptos'\nimport { BigNumber } from 'ethers'\n\nimport {\n    Block,\n    BlockTag,\n    BlockWithTransactions,\n    Finality,\n    Provider,\n    SignedTransaction,\n    TransactionPending,\n    TransactionReceipt,\n    TransactionResponse,\n} from '@layerzerolabs/lz-core'\nimport { isHexString } from '@layerzerolabs/lz-utilities'\n\nexport class AptosProvider implements Provider {\n    readonly nativeProvider: aptos.AptosClient\n\n    private constructor(\n        public readonly url: string,\n        public readonly faucet?: string,\n        public readonly indexer?: string\n    ) {\n        this.nativeProvider = new aptos.AptosClient(url)\n    }\n    static from(source: string, faucet?: string, indexer?: string): AptosProvider {\n        if (typeof source === 'string') {\n            return new AptosProvider(source, faucet, indexer)\n        } else {\n            throw new Error('Invalid parameters')\n        }\n    }\n\n    get native(): aptos.AptosClient {\n        return this.nativeProvider\n    }\n\n    async getBalance(address: string): Promise<string> {\n        if (!isHexString(address)) {\n            throw new Error('Invalid Aptos address')\n        }\n\n        const aptosCoin = '0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>'\n        const resources = await this.nativeProvider.getAccountResources(address)\n        const accountResource = resources.find((r) => r.type === aptosCoin)\n        if (accountResource === undefined) {\n            throw new Error('Account resource not found')\n        }\n\n        const { coin } = accountResource.data as { coin: { value: string } }\n        return BigInt(coin.value).toString()\n    }\n\n    async getBlock(blockTag: string | number): Promise<Block> {\n        let blockNumber = 0\n        if (typeof blockTag === 'number') {\n            blockNumber = blockTag\n        } else if (blockTag === 'latest') {\n            blockNumber = await this.nativeProvider\n                .getLedgerInfo()\n                .then((ledgerInfo) => BigNumber.from(ledgerInfo.block_height).toNumber())\n        } else {\n            throw new Error('Invalid blockTag')\n        }\n\n        const response = await this.nativeProvider.getBlockByHeight(blockNumber)\n        return Block.from(response)\n    }\n\n    async getBlockWithTransactions(blockTag: string | number): Promise<BlockWithTransactions> {\n        let blockNumber = 0\n        if (typeof blockTag === 'number') {\n            blockNumber = blockTag\n        } else if (blockTag === 'latest') {\n            blockNumber = await this.getBlockNumber()\n        } else {\n            throw new Error('Invalid blockTag')\n        }\n\n        const response = await this.nativeProvider.getBlockByHeight(blockNumber, true)\n        return BlockWithTransactions.from(response)\n    }\n\n    async getBlockNumber(): Promise<number> {\n        return this.nativeProvider\n            .getLedgerInfo()\n            .then((ledgerInfo) => BigNumber.from(ledgerInfo.block_height).toNumber())\n    }\n\n    async getSlot(_finality?: Finality): Promise<number> {\n        await Promise.resolve()\n        throw new Error('Method not implemented.')\n    }\n\n    async getBlockTimestamp(blockTag: string | number): Promise<number> {\n        if (typeof blockTag === 'number') {\n            return this.nativeProvider\n                .getBlockByHeight(blockTag)\n                .then((block) => BigNumber.from(block.block_timestamp).toNumber())\n        } else if (blockTag === 'latest') {\n            return this.nativeProvider\n                .getLedgerInfo()\n                .then((ledgerInfo) => BigNumber.from(ledgerInfo.ledger_timestamp).toNumber())\n        } else {\n            throw new Error('Invalid blockTag')\n        }\n    }\n\n    async getTransaction(txHash: string): Promise<TransactionResponse> {\n        if (!isHexString(txHash)) {\n            throw new Error('Invalid Aptos transaction hash')\n        }\n\n        const response = await this.nativeProvider.getTransactionByHash(txHash)\n        return TransactionResponse.from(response)\n    }\n\n    async getTransactionReceipt(txHash: string): Promise<TransactionReceipt> {\n        if (!isHexString(txHash)) {\n            throw new Error('Invalid Aptos transaction hash')\n        }\n\n        const response = await this.nativeProvider.getTransactionByHash(txHash)\n        return TransactionReceipt.from(response)\n    }\n\n    async getTransactionCount(\n        addressOrName: string | Promise<string>,\n        _blockTag?: BlockTag | Promise<BlockTag>\n    ): Promise<number> {\n        const _addressOrName = await Promise.resolve(addressOrName)\n        if (!isHexString(_addressOrName)) {\n            throw new Error('Invalid Aptos transaction hash')\n        }\n\n        const response = await this.nativeProvider.getAccount(_addressOrName)\n        return parseInt(response.sequence_number)\n    }\n\n    async sendTransaction(transaction: SignedTransaction, _sendOptions?: object): Promise<TransactionPending> {\n        type NativeSignedTransaction = Parameters<typeof this.nativeProvider.submitSignedBCSTransaction>[0]\n        const stx = transaction.signed as NativeSignedTransaction\n\n        const response = await this.nativeProvider.submitSignedBCSTransaction(stx)\n        return TransactionPending.from(response)\n    }\n\n    async sendAndConfirm(transaction: SignedTransaction, opts?: object): Promise<TransactionReceipt> {\n        const pending = (await this.sendTransaction(transaction, opts)).pending as aptos.Types.PendingTransaction\n        const response = await this.nativeProvider.waitForTransactionWithResult(pending.hash)\n        const userTransaction = response as aptos.Types.UserTransaction\n        if (!userTransaction.success) {\n            throw new Error(`aptos transaction failed ,vm_status: ${userTransaction.vm_status}`)\n        }\n        return TransactionReceipt.from(response)\n    }\n}\n","import * as aptos from 'aptos'\n\nimport {\n    Provider,\n    SignedTransaction,\n    Signer,\n    TransactionPending,\n    TransactionReceipt,\n    TransactionRequest,\n} from '@layerzerolabs/lz-core'\nimport { trim0x } from '@layerzerolabs/lz-utilities'\n\nimport { AptosProvider } from '../providers'\n\nexport class AptosSigner implements Signer {\n    public nativeSigner: aptos.AptosAccount\n    public provider: AptosProvider | undefined\n\n    private constructor(signer: aptos.AptosAccount) {\n        this.nativeSigner = signer\n    }\n\n    static from(signer: aptos.AptosAccount): Signer\n    static from(privKey: string): Signer\n    /**\n     *\n     * @param mnemonic\n     * @param path e.g. m/44'/637'/0'/0'/0'\n     */\n    static from(mnemonic: string, path: string): Signer\n\n    static from(source: string | aptos.AptosAccount, path?: string): Signer {\n        if (source instanceof aptos.AptosAccount) {\n            return new this(source)\n        } else if (typeof source === 'string' && path === undefined) {\n            const signer = new aptos.AptosAccount(Buffer.from(trim0x(source)))\n            return new this(signer)\n        } else if (typeof source === 'string' && path !== undefined) {\n            if (path.startsWith('m/')) {\n                const signer = aptos.AptosAccount.fromDerivePath(path, source)\n                return new this(signer)\n            }\n        }\n        throw new Error('Invalid parameters')\n    }\n\n    get native(): aptos.AptosAccount {\n        return this.nativeSigner\n    }\n\n    connect(provider: Provider): Signer {\n        if (!(provider instanceof AptosProvider)) {\n            throw new Error('Only aptos.AptosClient is supported.')\n        }\n\n        this.provider = provider\n        return this\n    }\n\n    async getAddress(): Promise<string> {\n        return Promise.resolve(this.nativeSigner.address().toString())\n    }\n\n    get address(): string {\n        return this.nativeSigner.address().toString()\n    }\n\n    async sendAndConfirm(transaction: SignedTransaction, opts?: object): Promise<TransactionReceipt> {\n        if (this.provider === undefined) {\n            throw new Error('provider is required')\n        }\n\n        return this.provider.sendAndConfirm(transaction, opts)\n    }\n\n    async sendTransaction(transaction: SignedTransaction, sendOptions?: object): Promise<TransactionPending> {\n        if (this.provider === undefined) {\n            throw new Error('provider is required')\n        }\n\n        return this.provider.sendTransaction(transaction, sendOptions)\n    }\n\n    async signTransaction(transaction: TransactionRequest): Promise<SignedTransaction> {\n        const nativeProvider = this.provider?.native\n        if (nativeProvider === undefined) {\n            throw new Error('Connect the native provider first with AptosSigner.connect()')\n        }\n\n        type NativeTransactionRequest = Parameters<aptos.AptosClient['signTransaction']>[1]\n        const tx = transaction.request as NativeTransactionRequest\n\n        // signTransaction is an offline operation\n        const response = await nativeProvider.signTransaction(this.nativeSigner, tx)\n        return SignedTransaction.from(response)\n    }\n\n    async signBuffer(buffer: Uint8Array): Promise<Uint8Array> {\n        const rv = this.nativeSigner.signBuffer(Buffer.from(buffer)).toUint8Array()\n        return Promise.resolve(rv)\n    }\n    async buildTransaction(buildTxRequest: unknown): Promise<TransactionRequest> {\n        return Promise.reject(new Error('Method not implemented.'))\n    }\n}\n"]}
+{"version":3,"sources":["../src/providers/aptos.ts","../src/signers/aptos.ts"],"names":["aptos","SignedTransaction"],"mappings":"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","sourcesContent":["import * as aptos from 'aptos'\n\nimport {\n    Block,\n    BlockTag,\n    BlockWithTransactions,\n    Finality,\n    Provider,\n    SignedTransaction,\n    TransactionPending,\n    TransactionReceipt,\n    TransactionResponse,\n} from '@layerzerolabs/lz-core'\nimport { isHexString } from '@layerzerolabs/lz-utilities'\n\nexport class AptosProvider implements Provider {\n    readonly nativeProvider: aptos.AptosClient\n\n    private constructor(\n        public readonly url: string,\n        public readonly faucet?: string,\n        public readonly indexer?: string\n    ) {\n        this.nativeProvider = new aptos.AptosClient(url)\n    }\n\n    static from(source: string, faucet?: string, indexer?: string): AptosProvider {\n        if (typeof source === 'string') {\n            return new AptosProvider(source, faucet, indexer)\n        } else {\n            throw new Error('Invalid parameters')\n        }\n    }\n\n    get native(): aptos.AptosClient {\n        return this.nativeProvider\n    }\n\n    async getBalance(address: string): Promise<string> {\n        if (!isHexString(address)) {\n            throw new Error('Invalid Aptos address')\n        }\n\n        const aptosCoin = '0x1::coin::CoinStore<0x1::aptos_coin::AptosCoin>'\n        const resources = await this.nativeProvider.getAccountResources(address)\n        const accountResource = resources.find((r) => r.type === aptosCoin)\n        if (accountResource === undefined) {\n            throw new Error('Account resource not found')\n        }\n\n        const { coin } = accountResource.data as { coin: { value: string } }\n        return BigInt(coin.value).toString()\n    }\n\n    async getBlock(blockTag: string | number): Promise<Block> {\n        let blockNumber = 0\n        if (typeof blockTag === 'number') {\n            blockNumber = blockTag\n        } else if (blockTag === 'latest') {\n            blockNumber = await this.nativeProvider\n                .getLedgerInfo()\n                .then((ledgerInfo) => Number(ledgerInfo.block_height))\n        } else {\n            throw new Error('Invalid blockTag')\n        }\n\n        const response = await this.nativeProvider.getBlockByHeight(blockNumber)\n        return Block.from(response)\n    }\n\n    async getBlockWithTransactions(blockTag: string | number): Promise<BlockWithTransactions> {\n        let blockNumber = 0\n        if (typeof blockTag === 'number') {\n            blockNumber = blockTag\n        } else if (blockTag === 'latest') {\n            blockNumber = await this.getBlockNumber()\n        } else {\n            throw new Error('Invalid blockTag')\n        }\n\n        const response = await this.nativeProvider.getBlockByHeight(blockNumber, true)\n        return BlockWithTransactions.from(response)\n    }\n\n    async getBlockNumber(): Promise<number> {\n        return this.nativeProvider.getLedgerInfo().then((ledgerInfo) => Number(ledgerInfo.block_height))\n    }\n\n    async getSlot(_finality?: Finality): Promise<number> {\n        await Promise.resolve()\n        throw new Error('Method not implemented.')\n    }\n\n    async getBlockTimestamp(blockTag: string | number): Promise<number> {\n        if (typeof blockTag === 'number') {\n            return this.nativeProvider.getBlockByHeight(blockTag).then((block) => Number(block.block_timestamp))\n        } else if (blockTag === 'latest') {\n            return this.nativeProvider.getLedgerInfo().then((ledgerInfo) => Number(ledgerInfo.ledger_timestamp))\n        } else {\n            throw new Error('Invalid blockTag')\n        }\n    }\n\n    async getTransaction(txHash: string): Promise<TransactionResponse> {\n        if (!isHexString(txHash)) {\n            throw new Error('Invalid Aptos transaction hash')\n        }\n\n        const response = await this.nativeProvider.getTransactionByHash(txHash)\n        return TransactionResponse.from(response)\n    }\n\n    async getTransactionReceipt(txHash: string): Promise<TransactionReceipt> {\n        if (!isHexString(txHash)) {\n            throw new Error('Invalid Aptos transaction hash')\n        }\n\n        const response = await this.nativeProvider.getTransactionByHash(txHash)\n        return TransactionReceipt.from(response)\n    }\n\n    async getTransactionCount(\n        addressOrName: string | Promise<string>,\n        _blockTag?: BlockTag | Promise<BlockTag>\n    ): Promise<number> {\n        const _addressOrName = await Promise.resolve(addressOrName)\n        if (!isHexString(_addressOrName)) {\n            throw new Error('Invalid Aptos transaction hash')\n        }\n\n        const response = await this.nativeProvider.getAccount(_addressOrName)\n        return parseInt(response.sequence_number)\n    }\n\n    async sendTransaction(transaction: SignedTransaction, _sendOptions?: object): Promise<TransactionPending> {\n        type NativeSignedTransaction = Parameters<typeof this.nativeProvider.submitSignedBCSTransaction>[0] // Uint8Array\n        const stx = transaction.signed as NativeSignedTransaction\n\n        const response = await this.nativeProvider.submitSignedBCSTransaction(stx)\n        return TransactionPending.from(response)\n    }\n\n    async confirmTransaction(pending: TransactionPending, opts?: object): Promise<TransactionReceipt> {\n        const nativePending = pending.pending as aptos.Types.PendingTransaction\n        const response = await this.nativeProvider.waitForTransactionWithResult(nativePending.hash)\n        if (response.type !== 'user_transaction') {\n            throw new Error(`Invalid response type: ${response.type}`)\n        }\n        const userTransaction = response as aptos.Types.UserTransaction\n        if (!userTransaction.success) {\n            throw new Error(`aptos transaction failed ,vm_status: ${userTransaction.vm_status}`)\n        }\n        return TransactionReceipt.from(response)\n    }\n\n    async sendAndConfirm(transaction: SignedTransaction, opts?: object): Promise<TransactionReceipt> {\n        const pending = await this.sendTransaction(transaction, opts)\n        return this.confirmTransaction(pending, opts)\n    }\n}\n","import * as aptos from 'aptos'\n\nimport {\n    Provider,\n    SignedTransaction,\n    Signer,\n    TransactionPending,\n    TransactionReceipt,\n    TransactionRequest,\n} from '@layerzerolabs/lz-core'\nimport { trim0x } from '@layerzerolabs/lz-utilities'\n\nimport { AptosProvider } from '../providers'\n\nexport class AptosSigner implements Signer {\n    public nativeSigner: aptos.AptosAccount\n    public provider: AptosProvider | undefined\n\n    private constructor(signer: aptos.AptosAccount) {\n        this.nativeSigner = signer\n    }\n\n    /**\n     *\n     * @param source\n     * @param path e.g. m/44'/637'/0'/0'/0'\n     */\n    static from(source: string | aptos.AptosAccount, path?: string): AptosSigner {\n        if (source instanceof aptos.AptosAccount) {\n            return new this(source)\n        }\n        if (path === undefined) {\n            const signer = new aptos.AptosAccount(Buffer.from(trim0x(source)))\n            return new this(signer)\n        } else if (path.startsWith('m/')) {\n            const signer = aptos.AptosAccount.fromDerivePath(path, source)\n            return new this(signer)\n        }\n        throw new Error('Invalid parameters')\n    }\n\n    get native(): aptos.AptosAccount {\n        return this.nativeSigner\n    }\n\n    connect(provider: Provider): this {\n        if (!(provider instanceof AptosProvider)) {\n            throw new Error('Only aptos.AptosClient is supported.')\n        }\n\n        this.provider = provider\n        return this\n    }\n\n    async getAddress(): Promise<string> {\n        return Promise.resolve(this.nativeSigner.address().toString())\n    }\n\n    get address(): string {\n        return this.nativeSigner.address().toString()\n    }\n\n    async sendAndConfirm(transaction: SignedTransaction, opts?: object): Promise<TransactionReceipt> {\n        if (this.provider === undefined) {\n            throw new Error('provider is required')\n        }\n\n        return this.provider.sendAndConfirm(transaction, opts)\n    }\n\n    async sendTransaction(transaction: SignedTransaction, sendOptions?: object): Promise<TransactionPending> {\n        if (this.provider === undefined) {\n            throw new Error('provider is required')\n        }\n\n        return this.provider.sendTransaction(transaction, sendOptions)\n    }\n\n    async signTransaction(transaction: TransactionRequest): Promise<SignedTransaction> {\n        const nativeProvider = this.provider?.native\n        if (nativeProvider === undefined) {\n            throw new Error('Connect the native provider first with AptosSigner.connect()')\n        }\n\n        type NativeTransactionRequest = Parameters<aptos.AptosClient['signTransaction']>[1]\n        const tx = transaction.request as NativeTransactionRequest\n\n        // signTransaction is an offline operation\n        const response = await nativeProvider.signTransaction(this.nativeSigner, tx)\n        return SignedTransaction.from(response)\n    }\n\n    async signBuffer(buffer: Uint8Array): Promise<Uint8Array> {\n        const rv = this.nativeSigner.signBuffer(Buffer.from(buffer)).toUint8Array()\n        return Promise.resolve(rv)\n    }\n\n    async buildTransaction(buildTxRequest: unknown): Promise<TransactionRequest> {\n        return Promise.reject(new Error('Method not implemented.'))\n    }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@layerzerolabs/lz-corekit-aptos",
-  "version": "3.0.11",
+  "version": "3.0.12",
   "description": "LayerZero Core Library",
   "license": "BUSL-1.1",
   "exports": {
@@ -23,23 +23,16 @@
     "clean-prebuild": "rimraf dist"
   },
   "dependencies": {
-    "@layerzerolabs/lz-aptos-sdk-v1": "^3.0.11",
-    "@layerzerolabs/lz-core": "^3.0.11",
-    "@layerzerolabs/lz-utilities": "^3.0.11",
-    "@layerzerolabs/tron-utilities": "^3.0.11",
-    "aptos": "^1.20.0",
-    "bip39": "^3.1.0",
-    "ed25519-hd-key": "^1.3.0",
-    "ethers": "^5.7.2",
-    "mem": "^8.1.1",
-    "tiny-invariant": "^1.3.1",
-    "tronweb": "^5.3.1"
+    "@layerzerolabs/lz-aptos-sdk-v1": "^3.0.12",
+    "@layerzerolabs/lz-core": "^3.0.12",
+    "@layerzerolabs/lz-utilities": "^3.0.12",
+    "aptos": "^1.20.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
     "@layerzerolabs/tronweb-typescript": "^0.0.0",
-    "@layerzerolabs/tsup-config-next": "^3.0.11",
-    "@layerzerolabs/typescript-config-next": "^3.0.11",
+    "@layerzerolabs/tsup-config-next": "^3.0.12",
+    "@layerzerolabs/typescript-config-next": "^3.0.12",
     "@types/jest": "^29.5.10",
     "@types/tronweb": "npm:@layerzerolabs/tronweb-typescript@workspace:^",
     "jest": "^29.7.0",