aptos - npm Package Compare versions

Comparing version 1.20.0 to 1.21.0

CHANGELOG.md

@@ -7,2 +7,6 @@ # Aptos TS SDK Changelog
 
+## 1.21.0 (2023-12-13)
+- Fix nested type tag parsing in `Object` types
+- Update all dependencies including `@aptos-labs/aptos-client`
+
 ## 1.20.0 (2023-09-22)
@@ -9,0 +13,0 @@

package.json

@@ -19,22 +19,2 @@ {
   },
-  "scripts": {
-    "prepack": "pnpm build",
-    "build": "pnpm build:clean && pnpm _build:node && pnpm _build:browser",
-    "build:clean": "rm -rf dist",
-    "_build:browser": "tsup --platform browser --format iife --global-name aptosSDK --minify",
-    "_build:node": "tsup --platform node --format cjs,esm --dts",
-    "lint": "eslint \"**/*.ts\"",
-    "test": "pnpm run publish-ans-contract && jest",
-    "test:ci": "pnpm run publish-ans-contract && jest --testPathIgnorePatterns=indexer.test.ts",
-    "test:indexer": "jest --collectCoverageFrom='./src/tests/e2e/indexer.test.ts' -- ./src/tests/e2e/indexer.test.ts",
-    "_fmt": "prettier 'scripts/**/*.ts' 'src/**/*.ts' 'examples/**/*.js' 'examples/**/*.ts' '.eslintrc.js'",
-    "fmt": "pnpm _fmt --write",
-    "fmt:check": "pnpm _fmt --check",
-    "cov:clean": "rm -rf coverage",
-    "generate-client": "openapi -i ../../../api/doc/spec.yaml -o ./src/generated --exportCore=false --exportServices=false",
-    "checked-publish": "scripts/checked_publish.sh",
-    "generate-ts-docs": "scripts/generate_ts_docs.sh",
-    "indexer-codegen": "graphql-codegen --config ./src/indexer/codegen.yml",
-    "publish-ans-contract": "ts-node ./scripts/publish_ans_contract.ts"
-  },
   "repository": {
@@ -55,6 +35,6 @@ "type": "git",
   "dependencies": {
-    "@aptos-labs/aptos-client": "^0.0.2",
+    "@aptos-labs/aptos-client": "^0.1.0",
     "eventemitter3": "^5.0.1",
-    "@noble/hashes": "1.1.3",
-    "@scure/bip39": "1.1.0",
+    "@noble/hashes": "1.3.3",
+    "@scure/bip39": "1.2.1",
     "form-data": "4.0.0",
@@ -64,30 +44,54 @@ "tweetnacl": "1.0.3"
   "devDependencies": {
-    "@graphql-codegen/cli": "^2.13.5",
-    "@graphql-codegen/import-types-preset": "^2.2.3",
-    "@graphql-codegen/typescript": "^2.7.3",
-    "@graphql-codegen/typescript-graphql-request": "^4.5.8",
-    "@graphql-codegen/typescript-operations": "^2.5.3",
-    "@types/jest": "28.1.8",
-    "@types/node": "18.6.2",
-    "@typescript-eslint/eslint-plugin": "5.36.2",
-    "@typescript-eslint/parser": "5.36.2",
-    "dotenv": "16.0.2",
-    "eslint": "8.23.0",
+    "@babel/traverse": "^7.23.6",
+    "@graphql-codegen/cli": "^5.0.0",
+    "@graphql-codegen/import-types-preset": "^3.0.0",
+    "@graphql-codegen/typescript": "^4.0.1",
+    "@graphql-codegen/typescript-graphql-request": "^6.0.1",
+    "@graphql-codegen/typescript-operations": "^4.0.1",
+    "@types/jest": "29.5.11",
+    "@types/node": "20.10.4",
+    "@typescript-eslint/eslint-plugin": "6.14.0",
+    "@typescript-eslint/parser": "^6.14.0",
+    "dotenv": "16.3.1",
+    "eslint": "8.55.0",
     "eslint-config-airbnb-base": "15.0.0",
-    "eslint-config-airbnb-typescript": "17.0.0",
-    "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-import": "2.26.0",
-    "graphql": "^16.5.0",
-    "graphql-request": "5.1.0",
-    "jest": "28.1.3",
+    "eslint-config-airbnb-typescript": "17.1.0",
+    "eslint-config-prettier": "9.1.0",
+    "eslint-plugin-import": "2.29.0",
+    "graphql": "^16.8.1",
+    "graphql-request": "6.1.0",
+    "graphql-tag": "^2.12.6",
+    "jest": "29.7.0",
+    "json5": "^2.2.3",
     "openapi-typescript-codegen": "https://github.com/aptos-labs/openapi-typescript-codegen/releases/download/v0.24.0-p1/openapi-typescript-codegen-v0.24.0-p1.tgz",
-    "prettier": "2.6.2",
-    "ts-jest": "28.0.8",
-    "ts-loader": "9.3.1",
-    "ts-node": "10.9.1",
-    "tsup": "6.2.3",
-    "typedoc": "^0.23.20",
-    "typescript": "4.8.2"
+    "prettier": "3.1.1",
+    "semver": "^6.3.1",
+    "ts-jest": "29.1.1",
+    "ts-loader": "9.5.1",
+    "ts-node": "10.9.2",
+    "tsup": "8.0.1",
+    "typedoc": "^0.25.4",
+    "typescript": "5.3.3",
+    "webpack": "^5.89.0"
   },
-  "version": "1.20.0"
-}
+  "version": "1.21.0",
+  "scripts": {
+    "build": "pnpm build:clean && pnpm _build:node && pnpm _build:browser",
+    "build:clean": "rm -rf dist",
+    "_build:browser": "tsup --platform browser --format iife --global-name aptosSDK --minify",
+    "_build:node": "tsup --platform node --format cjs,esm --dts",
+    "lint": "eslint \"**/*.ts\"",
+    "test": "pnpm run publish-ans-contract && jest",
+    "test:ci": "pnpm run publish-ans-contract && jest --testPathIgnorePatterns=indexer.test.ts",
+    "test:indexer": "jest --collectCoverageFrom='./src/tests/e2e/indexer.test.ts' -- ./src/tests/e2e/indexer.test.ts",
+    "_fmt": "prettier 'scripts/**/*.ts' 'src/**/*.ts' 'examples/**/*.js' 'examples/**/*.ts' '.eslintrc.js'",
+    "fmt": "pnpm _fmt --write",
+    "fmt:check": "pnpm _fmt --check",
+    "cov:clean": "rm -rf coverage",
+    "generate-client": "openapi -i ../../../api/doc/spec.yaml -o ./src/generated --exportCore=false --exportServices=false",
+    "checked-publish": "scripts/checked_publish.sh",
+    "generate-ts-docs": "scripts/generate_ts_docs.sh",
+    "indexer-codegen": "graphql-codegen --config ./src/indexer/codegen.yml",
+    "publish-ans-contract": "ts-node ./scripts/publish_ans_contract.ts"
+  }
+}

README.md

 # SDK for Aptos Node API
 
+> **_NOTE:_**
+> This is the `legacy TypeScript SDK`, aka the npm package `aptos`. For a more robust SDK and better support, we recommend upgrading to the `new TypeScript SDK` [@aptos-labs/ts-sdk](https://github.com/aptos-labs/aptos-ts-sdk). Take a look at the [documentation](https://aptos.dev/sdks/new-ts-sdk/) and the [migration guide](https://aptos.dev/sdks/new-ts-sdk/migration-guide).
+
 [![Discord][discord-image]][discord-url]
@@ -76,3 +79,3 @@ [![NPM Package Version][npm-image-version]][npm-url]
 ```ts
-cargo run -p aptos -- node run-local-testnet --with-faucet --faucet-port 8081 --force-restart --assume-yes
+cargo run -p aptos -- node run-local-testnet --force-restart --assume-yes
 ```
@@ -79,0 +82,0 @@

src/aptos_types/abi.ts

@@ -33,3 +33,6 @@ // Copyright © Aptos Foundation
    */
-  constructor(public readonly name: string, public readonly type_tag: TypeTag) {}
+  constructor(
+    public readonly name: string,
+    public readonly type_tag: TypeTag,
+  ) {}
 
@@ -36,0 +39,0 @@ serialize(serializer: Serializer): void {

src/aptos_types/authenticator.ts

@@ -39,3 +39,6 @@ // Copyright © Aptos Foundation
    */
-  constructor(public readonly public_key: Ed25519PublicKey, public readonly signature: Ed25519Signature) {
+  constructor(
+    public readonly public_key: Ed25519PublicKey,
+    public readonly signature: Ed25519Signature,
+  ) {
     super();
@@ -65,3 +68,6 @@ }
    */
-  constructor(public readonly public_key: MultiEd25519PublicKey, public readonly signature: MultiEd25519Signature) {
+  constructor(
+    public readonly public_key: MultiEd25519PublicKey,
+    public readonly signature: MultiEd25519Signature,
+  ) {
     super();
@@ -154,3 +160,6 @@ }
 export class AccountAuthenticatorEd25519 extends AccountAuthenticator {
-  constructor(public readonly public_key: Ed25519PublicKey, public readonly signature: Ed25519Signature) {
+  constructor(
+    public readonly public_key: Ed25519PublicKey,
+    public readonly signature: Ed25519Signature,
+  ) {
     super();
@@ -173,3 +182,6 @@ }
 export class AccountAuthenticatorMultiEd25519 extends AccountAuthenticator {
-  constructor(public readonly public_key: MultiEd25519PublicKey, public readonly signature: MultiEd25519Signature) {
+  constructor(
+    public readonly public_key: MultiEd25519PublicKey,
+    public readonly signature: MultiEd25519Signature,
+  ) {
     super();
@@ -176,0 +188,0 @@ }

src/aptos_types/multi_ed25519.ts

@@ -25,3 +25,6 @@ // Copyright © Aptos Foundation
    */
-  constructor(public readonly public_keys: Seq<Ed25519PublicKey>, public readonly threshold: Uint8) {
+  constructor(
+    public readonly public_keys: Seq<Ed25519PublicKey>,
+    public readonly threshold: Uint8,
+  ) {
     if (threshold > MAX_SIGNATURES_SUPPORTED) {
@@ -77,3 +80,6 @@ throw new Error(`"threshold" cannot be larger than ${MAX_SIGNATURES_SUPPORTED}`);
    */
-  constructor(public readonly signatures: Seq<Ed25519Signature>, public readonly bitmap: Uint8Array) {
+  constructor(
+    public readonly signatures: Seq<Ed25519Signature>,
+    public readonly bitmap: Uint8Array,
+  ) {
     if (bitmap.length !== MultiEd25519Signature.BITMAP_LEN) {
@@ -80,0 +86,0 @@ throw new Error(`"bitmap" length should be ${MultiEd25519Signature.BITMAP_LEN}`);

src/aptos_types/transaction.ts

@@ -293,3 +293,6 @@ // Copyright © Aptos Foundation
    */
-  constructor(public readonly address: AccountAddress, public readonly name: Identifier) {}
+  constructor(
+    public readonly address: AccountAddress,
+    public readonly name: Identifier,
+  ) {}
 
@@ -353,3 +356,6 @@ /**
    */
-  constructor(public readonly raw_txn: RawTransaction, public readonly authenticator: TransactionAuthenticator) {}
+  constructor(
+    public readonly raw_txn: RawTransaction,
+    public readonly authenticator: TransactionAuthenticator,
+  ) {}
 
@@ -356,0 +362,0 @@ serialize(serializer: Serializer): void {

src/aptos_types/type_tag.ts

@@ -354,4 +354,5 @@ // Copyright © Aptos Foundation
         this.consumeWholeGeneric();
+      } else {
+        this.tokens.shift();
       }
-      this.tokens.shift();
     }
@@ -358,0 +359,0 @@ this.consume(">");

src/generated/index.ts

@@ -9,2 +9,4 @@ /* istanbul ignore file */
 export type { AccountSignature_MultiEd25519Signature } from './models/AccountSignature_MultiEd25519Signature';
+export type { AccountSignature_MultiKeySignature } from './models/AccountSignature_MultiKeySignature';
+export type { AccountSignature_SingleKeySignature } from './models/AccountSignature_SingleKeySignature';
 export type { Address } from './models/Address';
@@ -36,2 +38,3 @@ export type { AptosError } from './models/AptosError';
 export type { IdentifierWrapper } from './models/IdentifierWrapper';
+export type { IndexedSignature } from './models/IndexedSignature';
 export type { IndexResponse } from './models/IndexResponse';
@@ -57,5 +60,8 @@ export type { ModuleBundlePayload } from './models/ModuleBundlePayload';
 export type { MultiEd25519Signature } from './models/MultiEd25519Signature';
+export type { MultiKeySignature } from './models/MultiKeySignature';
 export type { MultisigPayload } from './models/MultisigPayload';
 export type { MultisigTransactionPayload } from './models/MultisigTransactionPayload';
 export type { PendingTransaction } from './models/PendingTransaction';
+export type { PublicKey } from './models/PublicKey';
+export type { PublicKey_string_HexEncodedBytes_ } from './models/PublicKey_string_HexEncodedBytes_';
 export type { RawTableItemRequest } from './models/RawTableItemRequest';
@@ -65,2 +71,5 @@ export { RoleType } from './models/RoleType';
 export type { ScriptWriteSet } from './models/ScriptWriteSet';
+export type { Signature } from './models/Signature';
+export type { Signature_string_HexEncodedBytes_ } from './models/Signature_string_HexEncodedBytes_';
+export type { SingleKeySignature } from './models/SingleKeySignature';
 export type { StateCheckpointTransaction } from './models/StateCheckpointTransaction';
@@ -84,2 +93,3 @@ export type { StateKeyWrapper } from './models/StateKeyWrapper';
 export type { TransactionSignature } from './models/TransactionSignature';
+export type { TransactionSignature_AccountSignature } from './models/TransactionSignature_AccountSignature';
 export type { TransactionSignature_Ed25519Signature } from './models/TransactionSignature_Ed25519Signature';
@@ -86,0 +96,0 @@ export type { TransactionSignature_FeePayerSignature } from './models/TransactionSignature_FeePayerSignature';

src/generated/models/AccountSignature.ts

@@ -7,2 +7,4 @@ /* istanbul ignore file */
 import type { AccountSignature_MultiEd25519Signature } from './AccountSignature_MultiEd25519Signature';
+import type { AccountSignature_MultiKeySignature } from './AccountSignature_MultiKeySignature';
+import type { AccountSignature_SingleKeySignature } from './AccountSignature_SingleKeySignature';
 
@@ -16,4 +18,5 @@ /**
  * 2. A k-of-n multi-Ed25519 key account, multiple private keys, such that k-of-n must sign a transaction.
+ * 3. A single Secp256k1Ecdsa key account, one private key
  */
-export type AccountSignature = (AccountSignature_Ed25519Signature | AccountSignature_MultiEd25519Signature);
+export type AccountSignature = (AccountSignature_Ed25519Signature | AccountSignature_MultiEd25519Signature | AccountSignature_SingleKeySignature | AccountSignature_MultiKeySignature);
 

src/generated/models/TransactionSignature.ts

@@ -5,2 +5,3 @@ /* istanbul ignore file */
 
+import type { TransactionSignature_AccountSignature } from './TransactionSignature_AccountSignature';
 import type { TransactionSignature_Ed25519Signature } from './TransactionSignature_Ed25519Signature';
@@ -14,3 +15,3 @@ import type { TransactionSignature_FeePayerSignature } from './TransactionSignature_FeePayerSignature';
  */
-export type TransactionSignature = (TransactionSignature_Ed25519Signature | TransactionSignature_MultiEd25519Signature | TransactionSignature_MultiAgentSignature | TransactionSignature_FeePayerSignature);
+export type TransactionSignature = (TransactionSignature_Ed25519Signature | TransactionSignature_MultiEd25519Signature | TransactionSignature_MultiAgentSignature | TransactionSignature_FeePayerSignature | TransactionSignature_AccountSignature);
 

src/indexer/generated/operations.ts

@@ -6,3 +6,3 @@ import * as Types from './types';
 export type GetAccountCoinsDataCountQueryVariables = Types.Exact<{
-  address?: Types.InputMaybe<Types.Scalars['String']>;
+  address?: Types.InputMaybe<Types.Scalars['String']['input']>;
 }>;
@@ -15,4 +15,4 @@
   where_condition: Types.Current_Fungible_Asset_Balances_Bool_Exp;
-  offset?: Types.InputMaybe<Types.Scalars['Int']>;
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
+  offset?: Types.InputMaybe<Types.Scalars['Int']['input']>;
+  limit?: Types.InputMaybe<Types.Scalars['Int']['input']>;
   order_by?: Types.InputMaybe<Array<Types.Current_Fungible_Asset_Balances_Order_By> | Types.Current_Fungible_Asset_Balances_Order_By>;
@@ -25,5 +25,5 @@ }>;
 export type GetAccountCurrentTokensQueryVariables = Types.Exact<{
-  address: Types.Scalars['String'];
-  offset?: Types.InputMaybe<Types.Scalars['Int']>;
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
+  address: Types.Scalars['String']['input'];
+  offset?: Types.InputMaybe<Types.Scalars['Int']['input']>;
+  limit?: Types.InputMaybe<Types.Scalars['Int']['input']>;
 }>;
@@ -40,4 +40,4 @@
   where_condition?: Types.InputMaybe<Types.Current_Token_Ownerships_V2_Bool_Exp>;
-  offset?: Types.InputMaybe<Types.Scalars['Int']>;
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
+  offset?: Types.InputMaybe<Types.Scalars['Int']['input']>;
+  limit?: Types.InputMaybe<Types.Scalars['Int']['input']>;
 }>;
@@ -49,3 +49,3 @@
 export type GetAccountTransactionsCountQueryVariables = Types.Exact<{
-  address?: Types.InputMaybe<Types.Scalars['String']>;
+  address?: Types.InputMaybe<Types.Scalars['String']['input']>;
 }>;
@@ -58,4 +58,4 @@
   where_condition: Types.Account_Transactions_Bool_Exp;
-  offset?: Types.InputMaybe<Types.Scalars['Int']>;
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
+  offset?: Types.InputMaybe<Types.Scalars['Int']['input']>;
+  limit?: Types.InputMaybe<Types.Scalars['Int']['input']>;
   order_by?: Types.InputMaybe<Array<Types.Account_Transactions_Order_By> | Types.Account_Transactions_Order_By>;
@@ -69,4 +69,4 @@ }>;
   where_condition: Types.Current_Collections_V2_Bool_Exp;
-  offset?: Types.InputMaybe<Types.Scalars['Int']>;
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
+  offset?: Types.InputMaybe<Types.Scalars['Int']['input']>;
+  limit?: Types.InputMaybe<Types.Scalars['Int']['input']>;
   order_by?: Types.InputMaybe<Array<Types.Current_Collections_V2_Order_By> | Types.Current_Collections_V2_Order_By>;
@@ -80,4 +80,4 @@ }>;
   where_condition: Types.Current_Collection_Ownership_V2_View_Bool_Exp;
-  offset?: Types.InputMaybe<Types.Scalars['Int']>;
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
+  offset?: Types.InputMaybe<Types.Scalars['Int']['input']>;
+  limit?: Types.InputMaybe<Types.Scalars['Int']['input']>;
   order_by?: Types.InputMaybe<Array<Types.Current_Collection_Ownership_V2_View_Order_By> | Types.Current_Collection_Ownership_V2_View_Order_By>;
@@ -91,4 +91,4 @@ }>;
   where_condition?: Types.InputMaybe<Types.Current_Objects_Bool_Exp>;
-  offset?: Types.InputMaybe<Types.Scalars['Int']>;
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
+  offset?: Types.InputMaybe<Types.Scalars['Int']['input']>;
+  limit?: Types.InputMaybe<Types.Scalars['Int']['input']>;
   order_by?: Types.InputMaybe<Array<Types.Current_Objects_Order_By> | Types.Current_Objects_Order_By>;
@@ -101,4 +101,4 @@ }>;
 export type GetDelegatedStakingActivitiesQueryVariables = Types.Exact<{
-  delegatorAddress?: Types.InputMaybe<Types.Scalars['String']>;
-  poolAddress?: Types.InputMaybe<Types.Scalars['String']>;
+  delegatorAddress?: Types.InputMaybe<Types.Scalars['String']['input']>;
+  poolAddress?: Types.InputMaybe<Types.Scalars['String']['input']>;
 }>;
@@ -115,3 +115,3 @@
 export type GetNumberOfDelegatorsQueryVariables = Types.Exact<{
-  poolAddress?: Types.InputMaybe<Types.Scalars['String']>;
+  poolAddress?: Types.InputMaybe<Types.Scalars['String']['input']>;
 }>;
@@ -124,4 +124,4 @@
   where_condition: Types.Current_Token_Ownerships_V2_Bool_Exp;
-  offset?: Types.InputMaybe<Types.Scalars['Int']>;
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
+  offset?: Types.InputMaybe<Types.Scalars['Int']['input']>;
+  limit?: Types.InputMaybe<Types.Scalars['Int']['input']>;
   order_by?: Types.InputMaybe<Array<Types.Current_Token_Ownerships_V2_Order_By> | Types.Current_Token_Ownerships_V2_Order_By>;
@@ -135,4 +135,4 @@ }>;
   where_condition: Types.Current_Token_Ownerships_V2_Bool_Exp;
-  offset?: Types.InputMaybe<Types.Scalars['Int']>;
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
+  offset?: Types.InputMaybe<Types.Scalars['Int']['input']>;
+  limit?: Types.InputMaybe<Types.Scalars['Int']['input']>;
   order_by?: Types.InputMaybe<Array<Types.Current_Token_Ownerships_V2_Order_By> | Types.Current_Token_Ownerships_V2_Order_By>;
@@ -146,4 +146,4 @@ }>;
   where_condition: Types.Token_Activities_V2_Bool_Exp;
-  offset?: Types.InputMaybe<Types.Scalars['Int']>;
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
+  offset?: Types.InputMaybe<Types.Scalars['Int']['input']>;
+  limit?: Types.InputMaybe<Types.Scalars['Int']['input']>;
   order_by?: Types.InputMaybe<Array<Types.Token_Activities_V2_Order_By> | Types.Token_Activities_V2_Order_By>;
@@ -156,3 +156,3 @@ }>;
 export type GetTokenActivitiesCountQueryVariables = Types.Exact<{
-  token_id?: Types.InputMaybe<Types.Scalars['String']>;
+  token_id?: Types.InputMaybe<Types.Scalars['String']['input']>;
 }>;
@@ -165,4 +165,4 @@
   where_condition: Types.Current_Token_Ownerships_V2_Bool_Exp;
-  offset?: Types.InputMaybe<Types.Scalars['Int']>;
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
+  offset?: Types.InputMaybe<Types.Scalars['Int']['input']>;
+  limit?: Types.InputMaybe<Types.Scalars['Int']['input']>;
   order_by?: Types.InputMaybe<Array<Types.Current_Token_Ownerships_V2_Order_By> | Types.Current_Token_Ownerships_V2_Order_By>;
@@ -176,4 +176,4 @@ }>;
   where_condition?: Types.InputMaybe<Types.Current_Token_Datas_V2_Bool_Exp>;
-  offset?: Types.InputMaybe<Types.Scalars['Int']>;
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
+  offset?: Types.InputMaybe<Types.Scalars['Int']['input']>;
+  limit?: Types.InputMaybe<Types.Scalars['Int']['input']>;
   order_by?: Types.InputMaybe<Array<Types.Current_Token_Datas_V2_Order_By> | Types.Current_Token_Datas_V2_Order_By>;
@@ -187,4 +187,4 @@ }>;
   where_condition: Types.Current_Token_Ownerships_V2_Bool_Exp;
-  offset?: Types.InputMaybe<Types.Scalars['Int']>;
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
+  offset?: Types.InputMaybe<Types.Scalars['Int']['input']>;
+  limit?: Types.InputMaybe<Types.Scalars['Int']['input']>;
   order_by?: Types.InputMaybe<Array<Types.Current_Token_Ownerships_V2_Order_By> | Types.Current_Token_Ownerships_V2_Order_By>;
@@ -198,4 +198,4 @@ }>;
   where_condition: Types.Current_Token_Ownerships_V2_Bool_Exp;
-  offset?: Types.InputMaybe<Types.Scalars['Int']>;
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
+  offset?: Types.InputMaybe<Types.Scalars['Int']['input']>;
+  limit?: Types.InputMaybe<Types.Scalars['Int']['input']>;
   order_by?: Types.InputMaybe<Array<Types.Current_Token_Ownerships_V2_Order_By> | Types.Current_Token_Ownerships_V2_Order_By>;
@@ -208,3 +208,3 @@ }>;
 export type GetTopUserTransactionsQueryVariables = Types.Exact<{
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
+  limit?: Types.InputMaybe<Types.Scalars['Int']['input']>;
 }>;
@@ -217,4 +217,4 @@
   where_condition: Types.User_Transactions_Bool_Exp;
-  offset?: Types.InputMaybe<Types.Scalars['Int']>;
-  limit?: Types.InputMaybe<Types.Scalars['Int']>;
+  offset?: Types.InputMaybe<Types.Scalars['Int']['input']>;
+  limit?: Types.InputMaybe<Types.Scalars['Int']['input']>;
   order_by?: Types.InputMaybe<Array<Types.User_Transactions_Order_By> | Types.User_Transactions_Order_By>;
@@ -221,0 +221,0 @@ }>;

src/indexer/generated/queries.ts

 import * as Types from './operations';
 
 import { GraphQLClient } from 'graphql-request';
-import * as Dom from 'graphql-request/dist/types.dom';
+import { GraphQLClientRequestHeaders } from 'graphql-request/build/cjs/types';
 export const CurrentTokenOwnershipFieldsFragmentDoc = `
@@ -455,66 +455,66 @@ fragment CurrentTokenOwnershipFields on current_token_ownerships_v2 {
   return {
-    getAccountCoinsDataCount(variables?: Types.GetAccountCoinsDataCountQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetAccountCoinsDataCountQuery> {
+    getAccountCoinsDataCount(variables?: Types.GetAccountCoinsDataCountQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetAccountCoinsDataCountQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetAccountCoinsDataCountQuery>(GetAccountCoinsDataCount, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getAccountCoinsDataCount', 'query');
     },
-    getAccountCoinsData(variables: Types.GetAccountCoinsDataQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetAccountCoinsDataQuery> {
+    getAccountCoinsData(variables: Types.GetAccountCoinsDataQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetAccountCoinsDataQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetAccountCoinsDataQuery>(GetAccountCoinsData, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getAccountCoinsData', 'query');
     },
-    getAccountCurrentTokens(variables: Types.GetAccountCurrentTokensQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetAccountCurrentTokensQuery> {
+    getAccountCurrentTokens(variables: Types.GetAccountCurrentTokensQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetAccountCurrentTokensQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetAccountCurrentTokensQuery>(GetAccountCurrentTokens, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getAccountCurrentTokens', 'query');
     },
-    getAccountTokensCount(variables?: Types.GetAccountTokensCountQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetAccountTokensCountQuery> {
+    getAccountTokensCount(variables?: Types.GetAccountTokensCountQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetAccountTokensCountQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetAccountTokensCountQuery>(GetAccountTokensCount, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getAccountTokensCount', 'query');
     },
-    getAccountTransactionsCount(variables?: Types.GetAccountTransactionsCountQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetAccountTransactionsCountQuery> {
+    getAccountTransactionsCount(variables?: Types.GetAccountTransactionsCountQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetAccountTransactionsCountQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetAccountTransactionsCountQuery>(GetAccountTransactionsCount, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getAccountTransactionsCount', 'query');
     },
-    getAccountTransactionsData(variables: Types.GetAccountTransactionsDataQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetAccountTransactionsDataQuery> {
+    getAccountTransactionsData(variables: Types.GetAccountTransactionsDataQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetAccountTransactionsDataQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetAccountTransactionsDataQuery>(GetAccountTransactionsData, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getAccountTransactionsData', 'query');
     },
-    getCollectionData(variables: Types.GetCollectionDataQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetCollectionDataQuery> {
+    getCollectionData(variables: Types.GetCollectionDataQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetCollectionDataQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetCollectionDataQuery>(GetCollectionData, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getCollectionData', 'query');
     },
-    getCollectionsWithOwnedTokens(variables: Types.GetCollectionsWithOwnedTokensQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetCollectionsWithOwnedTokensQuery> {
+    getCollectionsWithOwnedTokens(variables: Types.GetCollectionsWithOwnedTokensQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetCollectionsWithOwnedTokensQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetCollectionsWithOwnedTokensQuery>(GetCollectionsWithOwnedTokens, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getCollectionsWithOwnedTokens', 'query');
     },
-    getCurrentObjects(variables?: Types.GetCurrentObjectsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetCurrentObjectsQuery> {
+    getCurrentObjects(variables?: Types.GetCurrentObjectsQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetCurrentObjectsQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetCurrentObjectsQuery>(GetCurrentObjects, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getCurrentObjects', 'query');
     },
-    getDelegatedStakingActivities(variables?: Types.GetDelegatedStakingActivitiesQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetDelegatedStakingActivitiesQuery> {
+    getDelegatedStakingActivities(variables?: Types.GetDelegatedStakingActivitiesQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetDelegatedStakingActivitiesQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetDelegatedStakingActivitiesQuery>(GetDelegatedStakingActivities, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getDelegatedStakingActivities', 'query');
     },
-    getIndexerLedgerInfo(variables?: Types.GetIndexerLedgerInfoQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetIndexerLedgerInfoQuery> {
+    getIndexerLedgerInfo(variables?: Types.GetIndexerLedgerInfoQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetIndexerLedgerInfoQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetIndexerLedgerInfoQuery>(GetIndexerLedgerInfo, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getIndexerLedgerInfo', 'query');
     },
-    getNumberOfDelegators(variables?: Types.GetNumberOfDelegatorsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetNumberOfDelegatorsQuery> {
+    getNumberOfDelegators(variables?: Types.GetNumberOfDelegatorsQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetNumberOfDelegatorsQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetNumberOfDelegatorsQuery>(GetNumberOfDelegators, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getNumberOfDelegators', 'query');
     },
-    getOwnedTokens(variables: Types.GetOwnedTokensQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetOwnedTokensQuery> {
+    getOwnedTokens(variables: Types.GetOwnedTokensQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetOwnedTokensQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetOwnedTokensQuery>(GetOwnedTokens, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getOwnedTokens', 'query');
     },
-    getOwnedTokensByTokenData(variables: Types.GetOwnedTokensByTokenDataQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetOwnedTokensByTokenDataQuery> {
+    getOwnedTokensByTokenData(variables: Types.GetOwnedTokensByTokenDataQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetOwnedTokensByTokenDataQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetOwnedTokensByTokenDataQuery>(GetOwnedTokensByTokenData, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getOwnedTokensByTokenData', 'query');
     },
-    getTokenActivities(variables: Types.GetTokenActivitiesQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetTokenActivitiesQuery> {
+    getTokenActivities(variables: Types.GetTokenActivitiesQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetTokenActivitiesQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetTokenActivitiesQuery>(GetTokenActivities, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getTokenActivities', 'query');
     },
-    getTokenActivitiesCount(variables?: Types.GetTokenActivitiesCountQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetTokenActivitiesCountQuery> {
+    getTokenActivitiesCount(variables?: Types.GetTokenActivitiesCountQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetTokenActivitiesCountQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetTokenActivitiesCountQuery>(GetTokenActivitiesCount, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getTokenActivitiesCount', 'query');
     },
-    getTokenCurrentOwnerData(variables: Types.GetTokenCurrentOwnerDataQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetTokenCurrentOwnerDataQuery> {
+    getTokenCurrentOwnerData(variables: Types.GetTokenCurrentOwnerDataQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetTokenCurrentOwnerDataQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetTokenCurrentOwnerDataQuery>(GetTokenCurrentOwnerData, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getTokenCurrentOwnerData', 'query');
     },
-    getTokenData(variables?: Types.GetTokenDataQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetTokenDataQuery> {
+    getTokenData(variables?: Types.GetTokenDataQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetTokenDataQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetTokenDataQuery>(GetTokenData, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getTokenData', 'query');
     },
-    getTokenOwnedFromCollection(variables: Types.GetTokenOwnedFromCollectionQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetTokenOwnedFromCollectionQuery> {
+    getTokenOwnedFromCollection(variables: Types.GetTokenOwnedFromCollectionQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetTokenOwnedFromCollectionQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetTokenOwnedFromCollectionQuery>(GetTokenOwnedFromCollection, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getTokenOwnedFromCollection', 'query');
     },
-    getTokenOwnersData(variables: Types.GetTokenOwnersDataQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetTokenOwnersDataQuery> {
+    getTokenOwnersData(variables: Types.GetTokenOwnersDataQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetTokenOwnersDataQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetTokenOwnersDataQuery>(GetTokenOwnersData, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getTokenOwnersData', 'query');
     },
-    getTopUserTransactions(variables?: Types.GetTopUserTransactionsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetTopUserTransactionsQuery> {
+    getTopUserTransactions(variables?: Types.GetTopUserTransactionsQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetTopUserTransactionsQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetTopUserTransactionsQuery>(GetTopUserTransactions, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getTopUserTransactions', 'query');
     },
-    getUserTransactions(variables: Types.GetUserTransactionsQueryVariables, requestHeaders?: Dom.RequestInit["headers"]): Promise<Types.GetUserTransactionsQuery> {
+    getUserTransactions(variables: Types.GetUserTransactionsQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<Types.GetUserTransactionsQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<Types.GetUserTransactionsQuery>(GetUserTransactions, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'getUserTransactions', 'query');
@@ -521,0 +521,0 @@ }

src/plugins/aptos_token.ts

@@ -105,2 +105,3 @@ // Copyright © Aptos Foundation
    */
+  // :!:>createCollection
   async createCollection(
@@ -115,2 +116,3 @@ creator: AptosAccount,
   ): Promise<string> {
+    // <:!:createCollection
     return this.submitTransaction(
@@ -154,2 +156,3 @@ creator,
    */
+  // :!:>mint
   async mint(
@@ -166,2 +169,3 @@ account: AptosAccount,
   ): Promise<string> {
+    // <:!:mint
     return this.submitTransaction(
@@ -168,0 +172,0 @@ account,

src/providers/indexer.ts

@@ -320,2 +320,3 @@ import { AnyNumber } from "../bcs/types";
    */
+  // :!:>getTokenData
   async getTokenData(
@@ -349,3 +350,3 @@ token: string,
     return this.queryIndexer(graphqlQuery);
-  }
+  } // <:!:getTokenData
 
@@ -352,0 +353,0 @@ /**

src/tests/e2e/indexer.test.ts

 import { AptosAccount } from "../../account/aptos_account";
 import { bcsSerializeBool } from "../../bcs";
-import { FaucetClient } from "../../plugins/faucet_client";
-import { IndexerClient } from "../../providers/indexer";
 import { TokenClient } from "../../plugins/token_client";
-import { FAUCET_AUTH_TOKEN, longTestTimeout } from "../unit/test_helper.test";
-import { Network, NetworkToIndexerAPI, sleep } from "../../utils";
+import { getFaucetClient, longTestTimeout } from "../unit/test_helper.test";
+import { Network, sleep } from "../../utils";
 import { Provider } from "../../providers";
 import { AptosToken } from "../../plugins";
 
-const provider = new Provider(Network.DEVNET);
+const provider = new Provider(Network.LOCAL);
+const faucetClient = getFaucetClient();
+const tokenClient = new TokenClient(provider.aptosClient);
 const aptosToken = new AptosToken(provider);
-const faucetClient = new FaucetClient("https://fullnode.devnet.aptoslabs.com", "https://faucet.devnet.aptoslabs.com", {
-  TOKEN: FAUCET_AUTH_TOKEN,
-});
-const tokenClient = new TokenClient(provider.aptosClient);
 const alice = new AptosAccount();
@@ -21,3 +17,2 @@ const collectionName = "AliceCollection";
 const tokenName = "Alice Token";
-const indexerClient = new IndexerClient(NetworkToIndexerAPI[Network.DEVNET]);
 
@@ -31,3 +26,3 @@ let skipTest = false;
     expect(async () => {
-      await indexerClient.getOwnedTokens(address1);
+      await provider.getOwnedTokens(address1);
     }).rejects.toThrow(`${address1} is less than 66 chars long.`);
@@ -37,3 +32,3 @@
     expect(async () => {
-      await indexerClient.getOwnedTokens(address2);
+      await provider.getOwnedTokens(address2);
     }).rejects.toThrow(`${address2} is less than 66 chars long.`);
@@ -45,3 +40,3 @@ });
     expect(async () => {
-      await indexerClient.getOwnedTokens(address);
+      await provider.getOwnedTokens(address);
     }).not.toThrow();
@@ -55,11 +50,11 @@ });
     console.log(
-      `\n devnet chain id is: ${fullNodeChainId}, indexer chain id is: ${indexerLedgerInfo.ledger_infos[0].chain_id}`,
+      `\n network chain id is: ${fullNodeChainId}, indexer chain id is: ${indexerLedgerInfo.ledger_infos[0].chain_id}`,
     );
 
     if (indexerLedgerInfo.ledger_infos[0].chain_id !== fullNodeChainId) {
-      console.log(`\n devnet chain id and indexer chain id are not synced, skipping rest of tests`);
+      console.log(`\n network chain id and indexer chain id are not synced, skipping rest of tests`);
       skipTest = true;
       runTests = describe.skip;
     } else {
-      console.log(`\n devnet chain id and indexer chain id are in synced, running tests`);
+      console.log(`\n network chain id and indexer chain id are in synced, running tests`);
     }
@@ -133,3 +128,3 @@
     it("gets indexer ledger info", async () => {
-      const ledgerInfo = await indexerClient.getIndexerLedgerInfo();
+      const ledgerInfo = await provider.getIndexerLedgerInfo();
       expect(ledgerInfo.ledger_infos[0].chain_id).toBeGreaterThan(1);
@@ -143,3 +138,3 @@ });
       async () => {
-        const accountObjects = await indexerClient.getAccountOwnedObjects(alice.address().hex());
+        const accountObjects = await provider.getAccountOwnedObjects(alice.address().hex());
         expect(accountObjects.current_objects.length).toBe(2);
@@ -155,6 +150,6 @@ },
       async () => {
-        const accountTokens = await indexerClient.getOwnedTokens(alice.address().hex());
+        const accountTokens = await provider.getOwnedTokens(alice.address().hex());
         expect(accountTokens.current_token_ownerships_v2).toHaveLength(2);
         // V1
-        const tokenActivityV1 = await indexerClient.getTokenActivities(
+        const tokenActivityV1 = await provider.getTokenActivities(
           accountTokens.current_token_ownerships_v2[0].current_token_data!.token_data_id,
@@ -170,3 +165,3 @@ );
         // V2
-        const tokenActivityV2 = await indexerClient.getTokenActivities(
+        const tokenActivityV2 = await provider.getTokenActivities(
           accountTokens.current_token_ownerships_v2[1].current_token_data!.token_data_id,
@@ -184,3 +179,3 @@ );
       async () => {
-        const accountTokens = await indexerClient.getOwnedTokens(alice.address().hex(), {
+        const accountTokens = await provider.getOwnedTokens(alice.address().hex(), {
           orderBy: [{ last_transaction_version: "desc" }],
@@ -190,7 +185,7 @@ });
         expect(accountTokens.current_token_ownerships_v2[1].token_standard).toBe("v1");
-        const tokenActivitiesV2Count = await indexerClient.getTokenActivitiesCount(
+        const tokenActivitiesV2Count = await provider.getTokenActivitiesCount(
           accountTokens.current_token_ownerships_v2[0].current_token_data!.token_data_id,
         );
         expect(tokenActivitiesV2Count.token_activities_v2_aggregate.aggregate?.count).toBe(1);
-        const tokenActivitiesV1Count = await indexerClient.getTokenActivitiesCount(
+        const tokenActivitiesV1Count = await provider.getTokenActivitiesCount(
           accountTokens.current_token_ownerships_v2[1].current_token_data!.token_data_id,
@@ -206,3 +201,3 @@ );
       async () => {
-        const accountTokenCount = await indexerClient.getAccountTokensCount(alice.address().hex());
+        const accountTokenCount = await provider.getAccountTokensCount(alice.address().hex());
         expect(accountTokenCount.current_token_ownerships_v2_aggregate.aggregate?.count).toEqual(2);
@@ -216,4 +211,4 @@ },
       async () => {
-        const accountTokens = await indexerClient.getOwnedTokens(alice.address().hex());
-        const tokenData = await indexerClient.getTokenData(
+        const accountTokens = await provider.getOwnedTokens(alice.address().hex());
+        const tokenData = await provider.getTokenData(
           accountTokens.current_token_ownerships_v2[0].current_token_data!.token_data_id,
@@ -229,4 +224,4 @@ );
       async () => {
-        const accountTokens = await indexerClient.getOwnedTokens(alice.address().hex());
-        const tokenOwnersData = await indexerClient.getTokenOwnersData(
+        const accountTokens = await provider.getOwnedTokens(alice.address().hex());
+        const tokenOwnersData = await provider.getTokenOwnersData(
           accountTokens.current_token_ownerships_v2[0].current_token_data!.token_data_id,
@@ -243,4 +238,4 @@ 0,
       async () => {
-        const accountTokens = await indexerClient.getOwnedTokens(alice.address().hex());
-        const tokenOwnersData = await indexerClient.getTokenCurrentOwnerData(
+        const accountTokens = await provider.getOwnedTokens(alice.address().hex());
+        const tokenOwnersData = await provider.getTokenCurrentOwnerData(
           accountTokens.current_token_ownerships_v2[0].current_token_data!.token_data_id,
@@ -255,3 +250,3 @@ 0,
     it("gets account owned tokens", async () => {
-      const tokens = await indexerClient.getOwnedTokens(alice.address().hex());
+      const tokens = await provider.getOwnedTokens(alice.address().hex());
       expect(tokens.current_token_ownerships_v2.length).toEqual(2);
@@ -261,5 +256,5 @@ });
     it("gets account owned tokens by token data id", async () => {
-      const accountTokens = await indexerClient.getOwnedTokens(alice.address().hex());
+      const accountTokens = await provider.getOwnedTokens(alice.address().hex());
 
-      const tokens = await indexerClient.getOwnedTokensByTokenData(
+      const tokens = await provider.getOwnedTokensByTokenData(
         accountTokens.current_token_ownerships_v2[0].current_token_data!.token_data_id,
@@ -272,4 +267,4 @@ );
     it("gets account tokens owned from collection address", async () => {
-      const collectionAddress = await indexerClient.getCollectionAddress(alice.address().hex(), collectionNameV2);
-      const tokensFromCollectionAddress = await indexerClient.getTokenOwnedFromCollectionAddress(
+      const collectionAddress = await provider.getCollectionAddress(alice.address().hex(), collectionNameV2);
+      const tokensFromCollectionAddress = await provider.getTokenOwnedFromCollectionAddress(
         alice.address().hex(),
@@ -286,3 +281,3 @@ collectionAddress,
       async () => {
-        const tokens = await indexerClient.getTokenOwnedFromCollectionNameAndCreatorAddress(
+        const tokens = await provider.getTokenOwnedFromCollectionNameAndCreatorAddress(
           alice.address().hex(),
@@ -301,8 +296,8 @@ collectionNameV2,
       async () => {
-        const collectionAddress = await indexerClient.getCollectionAddress(alice.address().hex(), collectionNameV2);
-        const tokensFromCollectionAddress = await indexerClient.getTokenOwnedFromCollectionAddress(
+        const collectionAddress = await provider.getCollectionAddress(alice.address().hex(), collectionNameV2);
+        const tokensFromCollectionAddress = await provider.getTokenOwnedFromCollectionAddress(
           alice.address().hex(),
           collectionAddress,
         );
-        const tokensFromNameAndCreatorAddress = await indexerClient.getTokenOwnedFromCollectionNameAndCreatorAddress(
+        const tokensFromNameAndCreatorAddress = await provider.getTokenOwnedFromCollectionNameAndCreatorAddress(
           alice.address().hex(),
@@ -321,3 +316,3 @@ collectionNameV2,
     it("gets the collection data", async () => {
-      const collectionData = await indexerClient.getCollectionData(alice.address().hex(), collectionName);
+      const collectionData = await provider.getCollectionData(alice.address().hex(), collectionName);
       expect(collectionData.current_collections_v2).toHaveLength(1);
@@ -328,4 +323,4 @@ expect(collectionData.current_collections_v2[0].collection_name).toEqual(collectionName);
     it("gets the currect collection address", async () => {
-      const collectionData = await indexerClient.getCollectionData(alice.address().hex(), collectionNameV2);
-      const collectionAddress = await indexerClient.getCollectionAddress(alice.address().hex(), collectionNameV2);
+      const collectionData = await provider.getCollectionData(alice.address().hex(), collectionNameV2);
+      const collectionAddress = await provider.getCollectionAddress(alice.address().hex(), collectionNameV2);
       expect(collectionData.current_collections_v2[0].collection_id).toEqual(collectionAddress);
@@ -337,3 +332,3 @@ });
       async () => {
-        const collections = await indexerClient.getCollectionsWithOwnedTokens(alice.address().hex());
+        const collections = await provider.getCollectionsWithOwnedTokens(alice.address().hex());
         expect(collections.current_collection_ownership_v2_view.length).toEqual(2);
@@ -348,3 +343,3 @@ },
       async () => {
-        const accountTransactionsCount = await indexerClient.getAccountTransactionsCount(alice.address().hex());
+        const accountTransactionsCount = await provider.getAccountTransactionsCount(alice.address().hex());
         expect(accountTransactionsCount.account_transactions_aggregate.aggregate?.count).toEqual(5);
@@ -358,3 +353,3 @@ },
       async () => {
-        const accountTransactionsData = await indexerClient.getAccountTransactionsData(alice.address().hex());
+        const accountTransactionsData = await provider.getAccountTransactionsData(alice.address().hex());
         expect(accountTransactionsData.account_transactions.length).toEqual(5);
@@ -369,3 +364,3 @@ expect(accountTransactionsData.account_transactions[0]).toHaveProperty("transaction_version");
       async () => {
-        const topUserTransactions = await indexerClient.getTopUserTransactions(5);
+        const topUserTransactions = await provider.getTopUserTransactions(5);
         expect(topUserTransactions.user_transactions.length).toEqual(5);
@@ -379,3 +374,3 @@ },
       async () => {
-        const userTransactions = await indexerClient.getUserTransactions({ options: { limit: 4 } });
+        const userTransactions = await provider.getUserTransactions({ options: { limit: 4 } });
         expect(userTransactions.user_transactions.length).toEqual(4);
@@ -389,3 +384,3 @@ },
       async () => {
-        const numberOfDelegators = await indexerClient.getNumberOfDelegators(alice.address().hex());
+        const numberOfDelegators = await provider.getNumberOfDelegators(alice.address().hex());
         expect(numberOfDelegators.num_active_delegator_per_pool).toHaveLength(0);
@@ -400,3 +395,3 @@ },
       async () => {
-        const accountCoinData = await indexerClient.getAccountCoinsData(alice.address().hex());
+        const accountCoinData = await provider.getAccountCoinsData(alice.address().hex());
         expect(accountCoinData.current_fungible_asset_balances[0].asset_type).toEqual("0x1::aptos_coin::AptosCoin");
@@ -410,3 +405,3 @@ },
       async () => {
-        const accountCoinDataCount = await indexerClient.getAccountCoinsDataCount(alice.address().hex());
+        const accountCoinDataCount = await provider.getAccountCoinsDataCount(alice.address().hex());
         expect(accountCoinDataCount.current_fungible_asset_balances_aggregate.aggregate?.count).toEqual(1);
@@ -420,3 +415,3 @@ },
     it("gets account owned tokens with a specified token standard", async () => {
-      const tokens = await indexerClient.getOwnedTokens(alice.address().hex(), { tokenStandard: "v2" });
+      const tokens = await provider.getOwnedTokens(alice.address().hex(), { tokenStandard: "v2" });
       expect(tokens.current_token_ownerships_v2).toHaveLength(1);
@@ -428,3 +423,3 @@ });
       async () => {
-        const tokens = await indexerClient.getTokenOwnedFromCollectionNameAndCreatorAddress(
+        const tokens = await provider.getTokenOwnedFromCollectionNameAndCreatorAddress(
           alice.address().hex(),
@@ -446,3 +441,3 @@ collectionNameV2,
       async () => {
-        const collections = await indexerClient.getCollectionsWithOwnedTokens(alice.address().hex(), {
+        const collections = await provider.getCollectionsWithOwnedTokens(alice.address().hex(), {
           tokenStandard: "v2",
@@ -458,3 +453,3 @@ });
     it("gets account owned tokens sorted desc by token standard", async () => {
-      const tokens = await indexerClient.getOwnedTokens(alice.address().hex(), {
+      const tokens = await provider.getOwnedTokens(alice.address().hex(), {
         orderBy: [{ token_standard: "desc" }],
@@ -467,3 +462,3 @@ });
     it("gets account owned tokens sorted desc by collection name", async () => {
-      const tokens = await indexerClient.getOwnedTokens(alice.address().hex(), {
+      const tokens = await provider.getOwnedTokens(alice.address().hex(), {
         orderBy: [{ current_token_data: { current_collection: { collection_name: "desc" } } }],
@@ -476,7 +471,7 @@ });
     it("gets token activities sorted desc by collection name", async () => {
-      const accountTokens = await indexerClient.getOwnedTokens(alice.address().hex());
+      const accountTokens = await provider.getOwnedTokens(alice.address().hex());
       expect(accountTokens.current_token_ownerships_v2).toHaveLength(2);
       expect(accountTokens.current_token_ownerships_v2[0].token_standard).toEqual("v1");
 
-      const tokens = await indexerClient.getTokenActivities(
+      const tokens = await provider.getTokenActivities(
         accountTokens.current_token_ownerships_v2[0].current_token_data!.token_data_id,
@@ -494,3 +489,3 @@ {
       async () => {
-        const accountTransactionsData = await indexerClient.getAccountTransactionsData(alice.address().hex(), {
+        const accountTransactionsData = await provider.getAccountTransactionsData(alice.address().hex(), {
           orderBy: [{ transaction_version: "desc" }],
@@ -497,0 +492,0 @@ });

src/tests/e2e/provider.test.ts

@@ -31,8 +31,2 @@ import { Provider } from "../../providers/provider";
 
-  it("does not set indexer client when local netowrk is provided", async () => {
-    const provider = new Provider(Network.LOCAL);
-    expect(provider.aptosClient.nodeUrl).toBe(NetworkToNodeAPI[Network.LOCAL]);
-    expect(provider.indexerClient).toBe(undefined);
-  });
-
   it("includes static methods", async () => {
@@ -39,0 +33,0 @@ expect(Provider).toHaveProperty("generateBCSTransaction");

src/tests/unit/type_tag.test.ts

@@ -118,3 +118,3 @@ import {
       const typeTag2 = "0x1::object::Object<0x1::coin::Fun<A, B<C>>>";
-      const parser2 = new TypeTagParser(typeTag);
+      const parser2 = new TypeTagParser(typeTag2);
       const result2 = parser2.parseTypeTag();
@@ -121,0 +121,0 @@ expect(result2 instanceof TypeTagAddress).toBeTruthy();

src/transaction_builder/builder.ts

@@ -57,3 +57,6 @@ // Copyright © Aptos Foundation
 
-  constructor(signingFunction: F, public readonly rawTxnBuilder?: TransactionBuilderABI) {
+  constructor(
+    signingFunction: F,
+    public readonly rawTxnBuilder?: TransactionBuilderABI,
+  ) {
     this.signingFunction = signingFunction;
@@ -359,3 +362,3 @@ }
                 ...ef,
-              } as Gen.MoveFunction & { fullName: string }),
+              }) as Gen.MoveFunction & { fullName: string },
           ),
@@ -362,0 +365,0 @@ );

src/transactions/async_queue.ts

@@ -9,10 +9,13 @@ /**
 
+interface PendingDequeue<T> {
+  resolve: (value: T) => void;
+  reject: (reason?: AsyncQueueCancelledError) => void;
+}
+
 export class AsyncQueue<T> {
   readonly queue: T[] = [];
 
-  // The resolveMap is used to handle the resolution of promises when items are enqueued and dequeued.
-  private resolveMap: Map<number, (value: T) => void> = new Map();
+  // The pendingDequeue is used to handle the resolution of promises when items are enqueued and dequeued.
+  private pendingDequeue: PendingDequeue<T>[] = [];
 
-  private counter: number = 0;
-
   private cancelled: boolean = false;
@@ -22,3 +25,3 @@
    * The enqueue method adds an item to the queue. If there are pending dequeued promises,
-   * in the resolveMap, it resolves the oldest promise with the enqueued item immediately.
+   * in the pendingDequeue, it resolves the oldest promise with the enqueued item immediately.
    * Otherwise, it adds the item to the queue.
@@ -29,10 +32,12 @@ *
   enqueue(item: T): void {
-    if (this.resolveMap.size > 0) {
-      const resolve = this.resolveMap.get(0);
-      if (resolve) {
-        this.resolveMap.delete(0);
-        resolve(item);
-        return;
-      }
+    this.cancelled = false;
+
+    if (this.pendingDequeue.length > 0) {
+      const promise = this.pendingDequeue.shift();
+
+      promise?.resolve(item);
+
+      return;
     }
+
     this.queue.push(item);
@@ -45,3 +50,3 @@ }
    * Otherwise, it creates a new promise. The promise's resolve function is stored
-   * in the resolveMap with a unique counter value as the key.
+   * in the pendingDequeue with a unique counter value as the key.
    * The newly created promise is then returned, and it will be resolved later when an item is enqueued.
@@ -55,7 +60,6 @@ *
     }
-    const promise = new Promise<T>((resolve) => {
-      this.counter += 1;
-      this.resolveMap.set(this.counter, resolve);
+
+    return new Promise<T>((resolve, reject) => {
+      this.pendingDequeue.push({ resolve, reject });
     });
-    return promise;
   }
@@ -79,6 +83,9 @@
     this.cancelled = true;
-    this.resolveMap.forEach(async (resolve) => {
-      resolve(await Promise.reject(new AsyncQueueCancelledError("Task cancelled")));
+
+    this.pendingDequeue.forEach(async ({ reject }) => {
+      reject(new AsyncQueueCancelledError("Task cancelled"));
     });
-    this.resolveMap.clear();
+
+    this.pendingDequeue = [];
+
     this.queue.length = 0;
@@ -95,9 +102,13 @@ }
   }
-}
 
-export class AsyncQueueCancelledError extends Error {
-  /* eslint-disable @typescript-eslint/no-useless-constructor */
-  constructor(message: string) {
-    super(message);
+  /**
+   * The pendingDequeueLength method returns the length of the pendingDequeue.
+   *
+   * @returns number
+   */
+  pendingDequeueLength(): number {
+    return this.pendingDequeue.length;
   }
 }
+
+export class AsyncQueueCancelledError extends Error {}

src/utils/api-endpoints.ts

@@ -5,2 +5,3 @@ export const NetworkToIndexerAPI: Record<string, string> = {
   devnet: "https://indexer-devnet.staging.gcp.aptosdev.com/v1/graphql",
+  local: "http://127.0.0.1:8090/v1/graphql",
 };
@@ -12,3 +13,3 @@
   devnet: "https://fullnode.devnet.aptoslabs.com/v1",
-  local: "http://localhost:8080/v1",
+  local: "http://127.0.0.1:8080/v1",
 };
@@ -20,3 +21,3 @@
   "https://fullnode.devnet.aptoslabs.com/v1": "devnet",
-  "http://localhost:8080/v1": "local",
+  "http://127.0.0.1:8080/v1": "local",
 };
@@ -23,0 +24,0 @@

src/version.ts

 // hardcoded for now, we would want to have it injected dynamically
-export const VERSION = "1.20.0";
+export const VERSION = "1.21.0";

No alert changes

Improved metrics

Total package byte prevSize

6734640

increased by19.06%

Number of package files

254

increased by7.63%

Lines of code

56996

increased by7.84%

Number of lines in readme file

91

increased by3.41%

Worsened metrics

Dev dependency count

31

increased by19.23%

Dependency changes

• + Added@aptos-labs/aptos-client@0.1.1(transitive)

• + Added@noble/hashes@1.3.3(transitive)

• + Added@scure/bip39@1.2.1(transitive)

• + Addedaxios@1.7.4(transitive)

• + Addedproxy-from-env@1.1.0(transitive)

• - Removed@aptos-labs/aptos-client@0.0.2(transitive)

• - Removed@noble/hashes@1.1.3(transitive)

• - Removed@scure/bip39@1.1.0(transitive)

• - Removedaxios@0.27.2(transitive)

• Updated@aptos-labs/aptos-client@^0.1.0

• Updated@noble/hashes@1.3.3

• Updated@scure/bip39@1.2.1