@aptos-labs/ts-sdk 1.14.0-zeta.3 → 1.15.0-win.0

package/src/client/post.ts

@@ -135,15 +135,3 @@ export async function postAptosFaucet<Req extends {}, Res extends {}>(
     },
   });
 }
-
-export async function postAptosPepperService<Req extends {}, Res extends {}>(
-  options: PostAptosRequestOptions,
-): Promise<AptosResponse<Req, Res>> {
-  return post<Req, Res>({ ...options, type: AptosApiType.PEPPER });
-}
-
-export async function postAptosProvingService<Req extends {}, Res extends {}>(
-  options: PostAptosRequestOptions,
-): Promise<AptosResponse<Req, Res>> {
-  return post<Req, Res>({ ...options, type: AptosApiType.PROVER });
-}

package/src/client/types.ts

@@ -41,7 +41,7 @@ export class AptosApiError extends Error {
 
   readonly statusText: string;
 
-  readonly data: { message: string; error_code?: string; vm_error_code?: number };
+  readonly data: any;
 
   readonly request: AptosRequest;
 

package/src/core/crypto/index.ts

@@ -5,8 +5,6 @@ export * from "./ed25519";
 export * from "./hdKey";
 export * from "./multiEd25519";
 export * from "./multiKey";
-export * from "./ephemeral";
-export * from "./keyless";
 export * from "./privateKey";
 export * from "./publicKey";
 export * from "./secp256k1";

package/src/core/crypto/singleKey.ts

@@ -4,7 +4,6 @@ import { AuthenticationKey } from "../authenticationKey";
 import { Ed25519PublicKey, Ed25519Signature } from "./ed25519";
 import { AccountPublicKey, PublicKey, VerifySignatureArgs } from "./publicKey";
 import { Secp256k1PublicKey, Secp256k1Signature } from "./secp256k1";
-import { KeylessPublicKey, KeylessSignature } from "./keyless";
 import { Signature } from "./signature";
 
 /**
@@ -35,8 +34,6 @@ export class AnyPublicKey extends AccountPublicKey {
       this.variant = AnyPublicKeyVariant.Ed25519;
     } else if (publicKey instanceof Secp256k1PublicKey) {
       this.variant = AnyPublicKeyVariant.Secp256k1;
-    } else if (publicKey instanceof KeylessPublicKey) {
-      this.variant = AnyPublicKeyVariant.Keyless;
     } else {
       throw new Error("Unsupported public key type");
     }
@@ -88,9 +85,6 @@ export class AnyPublicKey extends AccountPublicKey {
       case AnyPublicKeyVariant.Secp256k1:
         publicKey = Secp256k1PublicKey.deserialize(deserializer);
         break;
-      case AnyPublicKeyVariant.Keyless:
-        publicKey = KeylessPublicKey.deserialize(deserializer);
-        break;
       default:
         throw new Error(`Unknown variant index for AnyPublicKey: ${variantIndex}`);
     }
@@ -144,8 +138,6 @@ export class AnySignature extends Signature {
       this.variant = AnySignatureVariant.Ed25519;
     } else if (signature instanceof Secp256k1Signature) {
       this.variant = AnySignatureVariant.Secp256k1;
-    } else if (signature instanceof KeylessSignature) {
-      this.variant = AnySignatureVariant.Keyless;
     } else {
       throw new Error("Unsupported signature type");
     }
@@ -178,9 +170,6 @@ export class AnySignature extends Signature {
       case AnySignatureVariant.Secp256k1:
         signature = Secp256k1Signature.deserialize(deserializer);
         break;
-      case AnySignatureVariant.Keyless:
-        signature = KeylessSignature.deserialize(deserializer);
-        break;
       default:
         throw new Error(`Unknown variant index for AnySignature: ${variantIndex}`);
     }

package/src/internal/account.ts

@@ -13,7 +13,7 @@ import { AptosApiError, getAptosFullNode, paginateWithCursor } from "../client";
 import { AccountAddress, AccountAddressInput } from "../core/accountAddress";
 import { Account } from "../account";
 import { AnyPublicKey, Ed25519PublicKey, PrivateKey } from "../core/crypto";
-import { getTableItem, queryIndexer } from "./general";
+import { queryIndexer } from "./general";
 import {
   AccountData,
   GetAccountCoinsDataResponse,
@@ -54,6 +54,7 @@ import {
 import { memoizeAsync } from "../utils/memoize";
 import { Secp256k1PrivateKey, AuthenticationKey, Ed25519PrivateKey } from "../core";
 import { CurrentFungibleAssetBalancesBoolExp } from "../types/generated/types";
+import { getTableItem } from "./table";
 
 export async function getInfo(args: {
   aptosConfig: AptosConfig;

package/src/internal/general.ts

@@ -9,7 +9,7 @@
  */
 
 import { AptosConfig } from "../api/aptosConfig";
-import { getAptosFullNode, postAptosFullNode, postAptosIndexer } from "../client";
+import { getAptosFullNode, postAptosIndexer } from "../client";
 import {
   AnyNumber,
   Block,
@@ -17,8 +17,6 @@ import {
   GetProcessorStatusResponse,
   GraphqlQuery,
   LedgerInfo,
-  LedgerVersionArg,
-  TableItemRequest,
 } from "../types";
 import { GetChainTopUserTransactionsQuery, GetProcessorStatusQuery } from "../types/generated/operations";
 import { GetChainTopUserTransactions, GetProcessorStatus } from "../types/generated/queries";
@@ -64,23 +62,6 @@ export async function getBlockByHeight(args: {
   return data;
 }
 
-export async function getTableItem<T>(args: {
-  aptosConfig: AptosConfig;
-  handle: string;
-  data: TableItemRequest;
-  options?: LedgerVersionArg;
-}): Promise<T> {
-  const { aptosConfig, handle, data, options } = args;
-  const response = await postAptosFullNode<TableItemRequest, any>({
-    aptosConfig,
-    originMethod: "getTableItem",
-    path: `tables/${handle}/item`,
-    params: { ledger_version: options?.ledgerVersion },
-    body: data,
-  });
-  return response.data as T;
-}
-
 export async function getChainTopUserTransactions(args: {
   aptosConfig: AptosConfig;
   limit: number;

package/src/internal/queries/currentTokenOwnershipFieldsFragment.graphql

@@ -25,6 +25,7 @@ fragment CurrentTokenOwnershipFields on current_token_ownerships_v2 {
     token_properties
     token_standard
     token_uri
+    decimals
     current_collection {
       collection_id
       collection_name

package/src/internal/queries/getTableItemsData.graphql

@@ -0,0 +1,15 @@
+query getTableItemsData(
+  $where_condition: table_items_bool_exp!
+  $offset: Int
+  $limit: Int
+  $order_by: [table_items_order_by!]
+) {
+  table_items(where: $where_condition, offset: $offset, limit: $limit, order_by: $order_by){
+    decoded_key
+    decoded_value
+    key
+    table_handle
+    transaction_version
+    write_set_change_index
+  }
+}

package/src/internal/queries/getTableItemsMetadata.graphql

@@ -0,0 +1,12 @@
+query getTableItemsMetadata(
+  $where_condition: table_metadatas_bool_exp!
+  $offset: Int
+  $limit: Int
+  $order_by: [table_metadatas_order_by!]
+) {
+  table_metadatas(where: $where_condition, offset: $offset, limit: $limit, order_by: $order_by){
+     handle
+    key_type
+    value_type
+  }
+}

package/src/internal/table.ts

@@ -0,0 +1,82 @@
+import { AptosConfig } from "../api/aptosConfig";
+import { postAptosFullNode } from "../client";
+import {
+  TableItemRequest,
+  LedgerVersionArg,
+  PaginationArgs,
+  WhereArg,
+  OrderByArg,
+  GetTableItemsDataResponse,
+  GetTableItemsMetadataResponse,
+} from "../types";
+import { GetTableItemsDataQuery, GetTableItemsMetadataQuery } from "../types/generated/operations";
+import { GetTableItemsData, GetTableItemsMetadata } from "../types/generated/queries";
+import { TableItemsBoolExp, TableMetadatasBoolExp } from "../types/generated/types";
+import { queryIndexer } from "./general";
+
+export async function getTableItem<T>(args: {
+  aptosConfig: AptosConfig;
+  handle: string;
+  data: TableItemRequest;
+  options?: LedgerVersionArg;
+}): Promise<T> {
+  const { aptosConfig, handle, data, options } = args;
+  const response = await postAptosFullNode<TableItemRequest, any>({
+    aptosConfig,
+    originMethod: "getTableItem",
+    path: `tables/${handle}/item`,
+    params: { ledger_version: options?.ledgerVersion },
+    body: data,
+  });
+  return response.data as T;
+}
+
+export async function getTableItemsData(args: {
+  aptosConfig: AptosConfig;
+  options?: PaginationArgs & WhereArg<TableItemsBoolExp> & OrderByArg<GetTableItemsDataResponse[0]>;
+}) {
+  const { aptosConfig, options } = args;
+
+  const graphqlQuery = {
+    query: GetTableItemsData,
+    variables: {
+      where_condition: options?.where,
+      offset: options?.offset,
+      limit: options?.limit,
+      order_by: options?.orderBy,
+    },
+  };
+
+  const data = await queryIndexer<GetTableItemsDataQuery>({
+    aptosConfig,
+    query: graphqlQuery,
+    originMethod: "getTableItemsData",
+  });
+
+  return data.table_items;
+}
+
+export async function getTableItemsMetadata(args: {
+  aptosConfig: AptosConfig;
+  options?: PaginationArgs & WhereArg<TableMetadatasBoolExp> & OrderByArg<GetTableItemsMetadataResponse[0]>;
+}): Promise<GetTableItemsMetadataResponse> {
+  const { aptosConfig, options } = args;
+
+  const graphqlQuery = {
+    query: GetTableItemsMetadata,
+    variables: {
+      where_condition: options?.where,
+      offset: options?.offset,
+      limit: options?.limit,
+      order_by: options?.orderBy,
+    },
+  };
+
+  const data = await queryIndexer<GetTableItemsMetadataQuery>({
+    aptosConfig,
+    query: graphqlQuery,
+    originMethod: "getTableItemsMetadata",
+  });
+
+  return data.table_metadatas;
+}

package/src/internal/transactionSubmission.ts

@@ -7,8 +7,8 @@
 
 import { AptosConfig } from "../api/aptosConfig";
 import { MoveVector, U8 } from "../bcs";
-import { AptosApiError, postAptosFullNode } from "../client";
-import { Account, KeylessAccount, MultiKeyAccount } from "../account";
+import { postAptosFullNode } from "../client";
+import { Account } from "../account";
 import { AccountAddress, AccountAddressInput } from "../core/accountAddress";
 import { PrivateKey } from "../core/crypto";
 import { AccountAuthenticator } from "../transactions/authenticator/account";
@@ -36,7 +36,6 @@ import { UserTransactionResponse, PendingTransactionResponse, MimeType, HexInput
 import { TypeTagU8, TypeTagVector, generateSigningMessageForTransaction } from "../transactions";
 import { SimpleTransaction } from "../transactions/instances/simpleTransaction";
 import { MultiAgentTransaction } from "../transactions/instances/multiAgentTransaction";
-import { KeylessError } from "../types/keyless";
 
 /**
  * We are defining function signatures, each with its specific input and output.
@@ -276,24 +275,12 @@ export async function signAndSubmitTransaction(args: {
   transaction: AnyRawTransaction;
 }): Promise<PendingTransactionResponse> {
   const { aptosConfig, signer, transaction } = args;
-  // If the signer contains a KeylessAccount, await proof fetching in case the proof
-  // was fetched asyncronously.
-  if (signer instanceof KeylessAccount || signer instanceof MultiKeyAccount) {
-    await signer.waitForProofFetch();
-  }
   const authenticator = signTransaction({ signer, transaction });
-  try {
-    return await submitTransaction({
-      aptosConfig,
-      transaction,
-      senderAuthenticator: authenticator,
-    });
-  } catch (error) {
-    if (error instanceof AptosApiError && signer instanceof KeylessAccount) {
-      throw await KeylessError.fromAptosApiError(error, signer);
-    }
-    throw error;
-  }
+  return submitTransaction({
+    aptosConfig,
+    transaction,
+    senderAuthenticator: authenticator,
+  });
 }
 
 const packagePublishAbi: EntryFunctionABI = {

package/src/transactions/transactionBuilder/transactionBuilder.ts

@@ -9,13 +9,7 @@
 import { sha3_256 as sha3Hash } from "@noble/hashes/sha3";
 import { AptosConfig } from "../../api/aptosConfig";
 import { AccountAddress, AccountAddressInput, Hex, PublicKey } from "../../core";
-import {
-  AnyPublicKey,
-  AnySignature,
-  KeylessPublicKey,
-  Secp256k1PublicKey,
-  Secp256k1Signature,
-} from "../../core/crypto";
+import { AnyPublicKey, AnySignature, Secp256k1PublicKey, Secp256k1Signature } from "../../core/crypto";
 import { Ed25519PublicKey, Ed25519Signature } from "../../core/crypto/ed25519";
 import { getInfo } from "../../internal/account";
 import { getLedgerInfo } from "../../internal/general";
@@ -446,12 +440,7 @@ export function generateSignedTransactionForSimulation(args: InputSimulateTransa
   return new SignedTransaction(transaction.rawTransaction, transactionAuthenticator).bcsToBytes();
 }
 
-export function getAuthenticatorForSimulation(pk: PublicKey) {
-  let publicKey = pk;
-  if (publicKey instanceof KeylessPublicKey || publicKey instanceof Secp256k1PublicKey) {
-    publicKey = new AnyPublicKey(publicKey);
-  }
-
+export function getAuthenticatorForSimulation(publicKey: PublicKey) {
   // TODO add support for AnyMultiKey
   if (publicKey instanceof AnyPublicKey) {
     if (publicKey.publicKey instanceof Ed25519PublicKey) {
@@ -460,9 +449,6 @@ export function getAuthenticatorForSimulation(pk: PublicKey) {
     if (publicKey.publicKey instanceof Secp256k1PublicKey) {
       return new AccountAuthenticatorSingleKey(publicKey, new AnySignature(new Secp256k1Signature(new Uint8Array(64))));
     }
-    if (publicKey.publicKey instanceof KeylessPublicKey) {
-      return new AccountAuthenticatorSingleKey(publicKey, new AnySignature(new Ed25519Signature(new Uint8Array(64))));
-    }
   }
 
   // legacy code

package/src/types/generated/operations.ts

@@ -535,6 +535,35 @@ export type GetProcessorStatusQuery = {
   processor_status: Array<{ last_success_version: any; processor: string; last_updated: any }>;
 };
 
+export type GetTableItemsDataQueryVariables = Types.Exact<{
+  where_condition: Types.TableItemsBoolExp;
+  offset?: Types.InputMaybe<Types.Scalars["Int"]["input"]>;
+  limit?: Types.InputMaybe<Types.Scalars["Int"]["input"]>;
+  order_by?: Types.InputMaybe<Array<Types.TableItemsOrderBy> | Types.TableItemsOrderBy>;
+}>;
+
+export type GetTableItemsDataQuery = {
+  table_items: Array<{
+    decoded_key: any;
+    decoded_value?: any | null;
+    key: string;
+    table_handle: string;
+    transaction_version: any;
+    write_set_change_index: any;
+  }>;
+};
+
+export type GetTableItemsMetadataQueryVariables = Types.Exact<{
+  where_condition: Types.TableMetadatasBoolExp;
+  offset?: Types.InputMaybe<Types.Scalars["Int"]["input"]>;
+  limit?: Types.InputMaybe<Types.Scalars["Int"]["input"]>;
+  order_by?: Types.InputMaybe<Array<Types.TableMetadatasOrderBy> | Types.TableMetadatasOrderBy>;
+}>;
+
+export type GetTableItemsMetadataQuery = {
+  table_metadatas: Array<{ handle: string; key_type: string; value_type: string }>;
+};
+
 export type GetTokenActivityQueryVariables = Types.Exact<{
   where_condition: Types.TokenActivitiesV2BoolExp;
   offset?: Types.InputMaybe<Types.Scalars["Int"]["input"]>;

package/src/types/generated/queries.ts

@@ -389,6 +389,37 @@ export const GetProcessorStatus = `
   }
 }
     `;
+export const GetTableItemsData = `
+    query getTableItemsData($where_condition: table_items_bool_exp!, $offset: Int, $limit: Int, $order_by: [table_items_order_by!]) {
+  table_items(
+    where: $where_condition
+    offset: $offset
+    limit: $limit
+    order_by: $order_by
+  ) {
+    decoded_key
+    decoded_value
+    key
+    table_handle
+    transaction_version
+    write_set_change_index
+  }
+}
+    `;
+export const GetTableItemsMetadata = `
+    query getTableItemsMetadata($where_condition: table_metadatas_bool_exp!, $offset: Int, $limit: Int, $order_by: [table_metadatas_order_by!]) {
+  table_metadatas(
+    where: $where_condition
+    offset: $offset
+    limit: $limit
+    order_by: $order_by
+  ) {
+    handle
+    key_type
+    value_type
+  }
+}
+    `;
 export const GetTokenActivity = `
     query getTokenActivity($where_condition: token_activities_v2_bool_exp!, $offset: Int, $limit: Int, $order_by: [token_activities_v2_order_by!]) {
   token_activities_v2(
@@ -727,6 +758,34 @@ export function getSdk(client: GraphQLClient, withWrapper: SdkFunctionWrapper =
         "query",
       );
     },
+    getTableItemsData(
+      variables: Types.GetTableItemsDataQueryVariables,
+      requestHeaders?: GraphQLClientRequestHeaders,
+    ): Promise<Types.GetTableItemsDataQuery> {
+      return withWrapper(
+        (wrappedRequestHeaders) =>
+          client.request<Types.GetTableItemsDataQuery>(GetTableItemsData, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        "getTableItemsData",
+        "query",
+      );
+    },
+    getTableItemsMetadata(
+      variables: Types.GetTableItemsMetadataQueryVariables,
+      requestHeaders?: GraphQLClientRequestHeaders,
+    ): Promise<Types.GetTableItemsMetadataQuery> {
+      return withWrapper(
+        (wrappedRequestHeaders) =>
+          client.request<Types.GetTableItemsMetadataQuery>(GetTableItemsMetadata, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        "getTableItemsMetadata",
+        "query",
+      );
+    },
     getTokenActivity(
       variables: Types.GetTokenActivityQueryVariables,
       requestHeaders?: GraphQLClientRequestHeaders,