@aptos-labs/ts-sdk 1.18.1 → 1.20.0

package/src/internal/digitalAsset.ts

@@ -25,6 +25,7 @@ import {
   OrderByArg,
   PaginationArgs,
   TokenStandardArg,
+  WhereArg,
 } from "../types";
 import {
   GetCollectionDataQuery,
@@ -41,7 +42,11 @@ import {
 import { queryIndexer } from "./general";
 import { generateTransaction } from "./transactionSubmission";
 import { MAX_U64_BIG_INT } from "../bcs/consts";
-import { CurrentTokenOwnershipsV2BoolExp, TokenActivitiesV2BoolExp } from "../types/generated/types";
+import {
+  CurrentCollectionsV2BoolExp,
+  CurrentTokenOwnershipsV2BoolExp,
+  TokenActivitiesV2BoolExp,
+} from "../types/generated/types";
 import {
   checkOrConvertArgument,
   objectStructTag,
@@ -274,17 +279,11 @@ export async function createCollectionTransaction(
 
 export async function getCollectionData(args: {
   aptosConfig: AptosConfig;
-  creatorAddress: AccountAddressInput;
-  collectionName: string;
-  options?: TokenStandardArg;
+  options?: TokenStandardArg & PaginationArgs & WhereArg<CurrentCollectionsV2BoolExp>;
 }): Promise<GetCollectionDataResponse> {
-  const { aptosConfig, creatorAddress, collectionName, options } = args;
-  const address = AccountAddress.from(creatorAddress);
+  const { aptosConfig, options } = args;
 
-  const whereCondition: any = {
-    collection_name: { _eq: collectionName },
-    creator_address: { _eq: address.toStringLong() },
-  };
+  const whereCondition: any = options?.where;
 
   if (options?.tokenStandard) {
     whereCondition.token_standard = { _eq: options?.tokenStandard ?? "v2" };
@@ -294,6 +293,8 @@ export async function getCollectionData(args: {
     query: GetCollectionData,
     variables: {
       where_condition: whereCondition,
+      offset: options?.offset,
+      limit: options?.limit,
     },
   };
   const data = await queryIndexer<GetCollectionDataQuery>({
@@ -305,30 +306,61 @@ export async function getCollectionData(args: {
   return data.current_collections_v2[0];
 }
 
+export async function getCollectionDataByCreatorAddressAndCollectionName(args: {
+  aptosConfig: AptosConfig;
+  creatorAddress: AccountAddressInput;
+  collectionName: string;
+  options?: TokenStandardArg & PaginationArgs;
+}): Promise<GetCollectionDataResponse> {
+  const { aptosConfig, creatorAddress, collectionName, options } = args;
+  const address = AccountAddress.from(creatorAddress);
+
+  const whereCondition: any = {
+    collection_name: { _eq: collectionName },
+    creator_address: { _eq: address.toStringLong() },
+  };
+  if (options?.tokenStandard) {
+    whereCondition.token_standard = { _eq: options?.tokenStandard ?? "v2" };
+  }
+
+  return getCollectionData({ aptosConfig, options: { ...options, where: whereCondition } });
+}
+
+export async function getCollectionDataByCreatorAddress(args: {
+  aptosConfig: AptosConfig;
+  creatorAddress: AccountAddressInput;
+  options?: TokenStandardArg & PaginationArgs;
+}): Promise<GetCollectionDataResponse> {
+  const { aptosConfig, creatorAddress, options } = args;
+  const address = AccountAddress.from(creatorAddress);
+
+  const whereCondition: any = {
+    creator_address: { _eq: address.toStringLong() },
+  };
+  if (options?.tokenStandard) {
+    whereCondition.token_standard = { _eq: options?.tokenStandard ?? "v2" };
+  }
+
+  return getCollectionData({ aptosConfig, options: { ...options, where: whereCondition } });
+}
+
 export async function getCollectionDataByCollectionId(args: {
   aptosConfig: AptosConfig;
   collectionId: AccountAddressInput;
+  options?: TokenStandardArg & PaginationArgs;
 }): Promise<GetCollectionDataResponse> {
-  const { aptosConfig, collectionId } = args;
+  const { aptosConfig, collectionId, options } = args;
   const address = AccountAddress.from(collectionId);
 
   const whereCondition: any = {
     collection_id: { _eq: address.toStringLong() },
   };
 
-  const graphqlQuery = {
-    query: GetCollectionData,
-    variables: {
-      where_condition: whereCondition,
-    },
-  };
-  const data = await queryIndexer<GetCollectionDataQuery>({
-    aptosConfig,
-    query: graphqlQuery,
-    originMethod: "getCollectionData",
-  });
+  if (options?.tokenStandard) {
+    whereCondition.token_standard = { _eq: options?.tokenStandard ?? "v2" };
+  }
 
-  return data.current_collections_v2[0];
+  return getCollectionData({ aptosConfig, options: { ...options, where: whereCondition } });
 }
 
 export async function getCollectionId(args: {
@@ -337,7 +369,18 @@ export async function getCollectionId(args: {
   collectionName: string;
   options?: TokenStandardArg;
 }): Promise<string> {
-  return (await getCollectionData(args)).collection_id;
+  const { creatorAddress, collectionName, options, aptosConfig } = args;
+  const address = AccountAddress.from(creatorAddress);
+
+  const whereCondition: any = {
+    collection_name: { _eq: collectionName },
+    creator_address: { _eq: address.toStringLong() },
+  };
+  if (options?.tokenStandard) {
+    whereCondition.token_standard = { _eq: options?.tokenStandard ?? "v2" };
+  }
+
+  return (await getCollectionData({ aptosConfig, options: { where: whereCondition } })).collection_id;
 }
 
 // TRANSACTIONS

package/src/internal/object.ts

@@ -0,0 +1,45 @@
+import { AptosConfig } from "../api/aptosConfig";
+import { AccountAddressInput, AccountAddress } from "../core";
+import { PaginationArgs, OrderByArg, GetObjectDataQueryResponse, WhereArg } from "../types";
+import { GetObjectDataQuery } from "../types/generated/operations";
+import { GetObjectData } from "../types/generated/queries";
+import { CurrentObjectsBoolExp } from "../types/generated/types";
+import { queryIndexer } from "./general";
+
+export async function getObjectData(args: {
+  aptosConfig: AptosConfig;
+  options?: PaginationArgs & OrderByArg<GetObjectDataQueryResponse[0]> & WhereArg<CurrentObjectsBoolExp>;
+}): Promise<GetObjectDataQueryResponse> {
+  const { aptosConfig, options } = args;
+
+  const graphqlQuery = {
+    query: GetObjectData,
+    variables: {
+      where_condition: options?.where,
+      offset: options?.offset,
+      limit: options?.limit,
+      order_by: options?.orderBy,
+    },
+  };
+  const data = await queryIndexer<GetObjectDataQuery>({
+    aptosConfig,
+    query: graphqlQuery,
+    originMethod: "getObjectData",
+  });
+
+  return data.current_objects;
+}
+
+export async function getObjectDataByObjectAddress(args: {
+  aptosConfig: AptosConfig;
+  objectAddress: AccountAddressInput;
+  options?: PaginationArgs & OrderByArg<GetObjectDataQueryResponse[0]>;
+}): Promise<GetObjectDataQueryResponse[0]> {
+  const { aptosConfig, objectAddress, options } = args;
+  const address = AccountAddress.from(objectAddress).toStringLong();
+
+  const whereCondition: { object_address: { _eq: string } } = {
+    object_address: { _eq: address },
+  };
+  return (await getObjectData({ aptosConfig, options: { ...options, where: whereCondition } }))[0];
+}

package/src/internal/queries/getCollectionData.graphql

@@ -1,7 +1,12 @@
-query getCollectionData(
-  $where_condition: current_collections_v2_bool_exp!
-) {
+query getCollectionData($where_condition: current_collections_v2_bool_exp!) {
   current_collections_v2(where: $where_condition) {
+    uri
+    total_minted_v2
+    token_standard
+    table_handle_v1
+    mutable_uri
+    mutable_description
+    max_supply
     collection_id
     collection_name
     creator_address
@@ -9,12 +14,16 @@ query getCollectionData(
     description
     last_transaction_timestamp
     last_transaction_version
-    max_supply
-    mutable_description
-    mutable_uri
-    table_handle_v1
-    token_standard
-    total_minted_v2
-    uri
+    cdn_asset_uris {
+      cdn_image_uri
+      asset_uri
+      animation_optimizer_retry_count
+      cdn_animation_uri
+      cdn_json_uri
+      image_optimizer_retry_count
+      json_parser_retry_count
+      raw_animation_uri
+      raw_image_uri
+    }
   }
 }

package/src/internal/queries/{getAccountOwnedObjects.graphql → getObjectData.graphql}

@@ -1,4 +1,4 @@
-query getAccountOwnedObjects(
+query getObjectData(
   $where_condition: current_objects_bool_exp
   $offset: Int
   $limit: Int

package/src/internal/view.ts

@@ -3,7 +3,12 @@
 
 import { LedgerVersionArg, MimeType, MoveValue } from "../types";
 import { AptosConfig } from "../api/aptosConfig";
-import { generateViewFunctionPayload, InputViewFunctionData } from "../transactions";
+import {
+  generateViewFunctionPayload,
+  InputViewFunctionData,
+  InputViewFunctionJsonData,
+  ViewFunctionJsonPayload,
+} from "../transactions";
 import { Serializer } from "../bcs";
 import { postAptosFullNode } from "../client";
 
@@ -33,3 +38,24 @@ export async function view<T extends Array<MoveValue> = Array<MoveValue>>(args:
 
   return data as T;
 }
+
+export async function viewJson<T extends Array<MoveValue> = Array<MoveValue>>(args: {
+  aptosConfig: AptosConfig;
+  payload: InputViewFunctionJsonData;
+  options?: LedgerVersionArg;
+}): Promise<T> {
+  const { aptosConfig, payload, options } = args;
+  const { data } = await postAptosFullNode<ViewFunctionJsonPayload, MoveValue[]>({
+    aptosConfig,
+    originMethod: "viewJson",
+    path: "view",
+    params: { ledger_version: options?.ledgerVersion },
+    body: {
+      function: payload.function,
+      type_arguments: payload.typeArguments ?? [],
+      arguments: payload.functionArguments ?? [],
+    },
+  });
+
+  return data as T;
+}

package/src/transactions/transactionBuilder/helpers.ts

@@ -24,11 +24,22 @@ export function isNumber(arg: SimpleEntryFunctionArgumentTypes): arg is number {
   return typeof arg === "number";
 }
 
+export function convertNumber(arg: SimpleEntryFunctionArgumentTypes): number | undefined {
+  if (isNumber(arg)) {
+    return arg;
+  }
+  if (isString(arg) && arg !== "") {
+    return Number.parseInt(arg, 10);
+  }
+
+  return undefined;
+}
+
 export function isLargeNumber(arg: SimpleEntryFunctionArgumentTypes): arg is number | bigint | string {
   return typeof arg === "number" || typeof arg === "bigint" || typeof arg === "string";
 }
 
-export function isNull(arg: SimpleEntryFunctionArgumentTypes): arg is null | undefined {
+export function isEmptyOption(arg: SimpleEntryFunctionArgumentTypes): arg is null | undefined {
   return arg === null || arg === undefined;
 }
 

package/src/transactions/transactionBuilder/remoteAbi.ts

@@ -2,7 +2,18 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { parseTypeTag } from "../typeTag/parser";
-import { TypeTag, TypeTagStruct } from "../typeTag";
+import {
+  TypeTag,
+  TypeTagAddress,
+  TypeTagBool,
+  TypeTagStruct,
+  TypeTagU128,
+  TypeTagU16,
+  TypeTagU256,
+  TypeTagU32,
+  TypeTagU64,
+  TypeTagU8,
+} from "../typeTag";
 import { AptosConfig } from "../../api/aptosConfig";
 import {
   EntryFunctionArgumentTypes,
@@ -29,10 +40,10 @@ import {
   isBool,
   isEncodedEntryFunctionArgument,
   isLargeNumber,
-  isNull,
-  isNumber,
+  isEmptyOption,
   isString,
   throwTypeMismatch,
+  convertNumber,
 } from "./helpers";
 import { MoveFunction } from "../../types";
 
@@ -167,6 +178,7 @@ export async function fetchViewFunctionAbi(
  * @param functionAbi
  * @param arg
  * @param position
+ * @param genericTypeParams
  */
 export function convertArgument(
   functionName: string,
@@ -232,31 +244,25 @@ function parseArg(
     throwTypeMismatch("string | AccountAddress", position);
   }
   if (param.isU8()) {
-    if (isNumber(arg)) {
-      return new U8(arg);
+    const num = convertNumber(arg);
+    if (num !== undefined) {
+      return new U8(num);
     }
-    if (isString(arg)) {
-      return new U8(Number.parseInt(arg, 10));
-    }
-    throwTypeMismatch("number", position);
+    throwTypeMismatch("number | string", position);
   }
   if (param.isU16()) {
-    if (isNumber(arg)) {
-      return new U16(arg);
+    const num = convertNumber(arg);
+    if (num !== undefined) {
+      return new U16(num);
     }
-    if (isString(arg)) {
-      return new U16(Number.parseInt(arg, 10));
-    }
-    throwTypeMismatch("number", position);
+    throwTypeMismatch("number | string", position);
   }
   if (param.isU32()) {
-    if (isNumber(arg)) {
-      return new U32(arg);
-    }
-    if (isString(arg)) {
-      return new U32(Number.parseInt(arg, 10));
+    const num = convertNumber(arg);
+    if (num !== undefined) {
+      return new U32(num);
     }
-    throwTypeMismatch("number", position);
+    throwTypeMismatch("number | string", position);
   }
   if (param.isU64()) {
     if (isLargeNumber(arg)) {
@@ -330,10 +336,38 @@ function parseArg(
     }
 
     if (param.isOption()) {
-      // Empty option must be handled specially
-      if (isNull(arg)) {
+      if (isEmptyOption(arg)) {
+        // Here we attempt to reconstruct the underlying type
+        // Note, for some reason the `isBool` etc. does not work with the compiler
+        const innerParam = param.value.typeArgs[0];
+        if (innerParam instanceof TypeTagBool) {
+          return new MoveOption<Bool>(null);
+        }
+        if (innerParam instanceof TypeTagAddress) {
+          return new MoveOption<AccountAddress>(null);
+        }
+        if (innerParam instanceof TypeTagU8) {
+          return new MoveOption<U8>(null);
+        }
+        if (innerParam instanceof TypeTagU16) {
+          return new MoveOption<U16>(null);
+        }
+        if (innerParam instanceof TypeTagU32) {
+          return new MoveOption<U32>(null);
+        }
+        if (innerParam instanceof TypeTagU64) {
+          return new MoveOption<U64>(null);
+        }
+        if (innerParam instanceof TypeTagU128) {
+          return new MoveOption<U128>(null);
+        }
+        if (innerParam instanceof TypeTagU256) {
+          return new MoveOption<U256>(null);
+        }
+
+        // In all other cases, we will use a placeholder, it doesn't actually matter what the type is, but it will be obvious
         // Note: This is a placeholder U8 type, and does not match the actual type, as that can't be dynamically grabbed
-        return new MoveOption<U8>(null);
+        return new MoveOption<MoveString>(null);
       }
 
       return new MoveOption(checkOrConvertArgument(arg, param.value.typeArgs[0], position, genericTypeParams));

package/src/transactions/types.ts

@@ -15,7 +15,7 @@ import {
   TransactionPayloadMultiSig,
   TransactionPayloadScript,
 } from "./instances";
-import { AnyNumber, HexInput, MoveFunctionGenericTypeParam, MoveFunctionId } from "../types";
+import { AnyNumber, HexInput, MoveFunctionGenericTypeParam, MoveFunctionId, MoveStructId, MoveValue } from "../types";
 import { TypeTag } from "./typeTag";
 import { AccountAuthenticator } from "./authenticator/account";
 import { SimpleTransaction } from "./instances/simpleTransaction";
@@ -177,6 +177,24 @@ export type InputViewFunctionData = {
   abi?: ViewFunctionABI;
 };
 
+/**
+ * The data needed to generate a View Function payload in JSON
+ */
+export type InputViewFunctionJsonData = {
+  function: MoveFunctionId;
+  typeArguments?: Array<MoveStructId>;
+  functionArguments?: Array<MoveValue>;
+};
+
+/**
+ *  Payload sent to the fullnode for a JSON view request
+ */
+export type ViewFunctionJsonPayload = {
+  function: MoveFunctionId;
+  typeArguments: Array<MoveStructId>;
+  functionArguments: Array<MoveValue>;
+};
+
 /**
  * Data needed to generate a view function payload and fetch the remote ABI
  */

package/src/types/generated/operations.ts

@@ -158,25 +158,6 @@ export type GetAccountCollectionsWithOwnedTokensQuery = {
   }>;
 };
 
-export type GetAccountOwnedObjectsQueryVariables = Types.Exact<{
-  where_condition?: Types.InputMaybe<Types.CurrentObjectsBoolExp>;
-  offset?: Types.InputMaybe<Types.Scalars["Int"]["input"]>;
-  limit?: Types.InputMaybe<Types.Scalars["Int"]["input"]>;
-  order_by?: Types.InputMaybe<Array<Types.CurrentObjectsOrderBy> | Types.CurrentObjectsOrderBy>;
-}>;
-
-export type GetAccountOwnedObjectsQuery = {
-  current_objects: Array<{
-    allow_ungated_transfer: boolean;
-    state_key_hash: string;
-    owner_address: string;
-    object_address: string;
-    last_transaction_version: any;
-    last_guid_creation_num: any;
-    is_deleted: boolean;
-  }>;
-};
-
 export type GetAccountOwnedTokensQueryVariables = Types.Exact<{
   where_condition: Types.CurrentTokenOwnershipsV2BoolExp;
   offset?: Types.InputMaybe<Types.Scalars["Int"]["input"]>;
@@ -375,6 +356,13 @@ export type GetCollectionDataQueryVariables = Types.Exact<{
 
 export type GetCollectionDataQuery = {
   current_collections_v2: Array<{
+    uri: string;
+    total_minted_v2?: any | null;
+    token_standard: string;
+    table_handle_v1?: string | null;
+    mutable_uri?: boolean | null;
+    mutable_description?: boolean | null;
+    max_supply?: any | null;
     collection_id: string;
     collection_name: string;
     creator_address: string;
@@ -382,13 +370,17 @@ export type GetCollectionDataQuery = {
     description: string;
     last_transaction_timestamp: any;
     last_transaction_version: any;
-    max_supply?: any | null;
-    mutable_description?: boolean | null;
-    mutable_uri?: boolean | null;
-    table_handle_v1?: string | null;
-    token_standard: string;
-    total_minted_v2?: any | null;
-    uri: string;
+    cdn_asset_uris?: {
+      cdn_image_uri?: string | null;
+      asset_uri: string;
+      animation_optimizer_retry_count: number;
+      cdn_animation_uri?: string | null;
+      cdn_json_uri?: string | null;
+      image_optimizer_retry_count: number;
+      json_parser_retry_count: number;
+      raw_animation_uri?: string | null;
+      raw_image_uri?: string | null;
+    } | null;
   }>;
 };
 
@@ -529,6 +521,25 @@ export type GetNumberOfDelegatorsQuery = {
   num_active_delegator_per_pool: Array<{ num_active_delegator?: any | null; pool_address?: string | null }>;
 };
 
+export type GetObjectDataQueryVariables = Types.Exact<{
+  where_condition?: Types.InputMaybe<Types.CurrentObjectsBoolExp>;
+  offset?: Types.InputMaybe<Types.Scalars["Int"]["input"]>;
+  limit?: Types.InputMaybe<Types.Scalars["Int"]["input"]>;
+  order_by?: Types.InputMaybe<Array<Types.CurrentObjectsOrderBy> | Types.CurrentObjectsOrderBy>;
+}>;
+
+export type GetObjectDataQuery = {
+  current_objects: Array<{
+    allow_ungated_transfer: boolean;
+    state_key_hash: string;
+    owner_address: string;
+    object_address: string;
+    last_transaction_version: any;
+    last_guid_creation_num: any;
+    is_deleted: boolean;
+  }>;
+};
+
 export type GetProcessorStatusQueryVariables = Types.Exact<{
   where_condition?: Types.InputMaybe<Types.ProcessorStatusBoolExp>;
 }>;

package/src/types/generated/queries.ts

@@ -160,24 +160,6 @@ export const GetAccountCollectionsWithOwnedTokens = `
   }
 }
     `;
-export const GetAccountOwnedObjects = `
-    query getAccountOwnedObjects($where_condition: current_objects_bool_exp, $offset: Int, $limit: Int, $order_by: [current_objects_order_by!]) {
-  current_objects(
-    where: $where_condition
-    offset: $offset
-    limit: $limit
-    order_by: $order_by
-  ) {
-    allow_ungated_transfer
-    state_key_hash
-    owner_address
-    object_address
-    last_transaction_version
-    last_guid_creation_num
-    is_deleted
-  }
-}
-    `;
 export const GetAccountOwnedTokens = `
     query getAccountOwnedTokens($where_condition: current_token_ownerships_v2_bool_exp!, $offset: Int, $limit: Int, $order_by: [current_token_ownerships_v2_order_by!]) {
   current_token_ownerships_v2(
@@ -246,6 +228,13 @@ export const GetChainTopUserTransactions = `
 export const GetCollectionData = `
     query getCollectionData($where_condition: current_collections_v2_bool_exp!) {
   current_collections_v2(where: $where_condition) {
+    uri
+    total_minted_v2
+    token_standard
+    table_handle_v1
+    mutable_uri
+    mutable_description
+    max_supply
     collection_id
     collection_name
     creator_address
@@ -253,13 +242,17 @@ export const GetCollectionData = `
     description
     last_transaction_timestamp
     last_transaction_version
-    max_supply
-    mutable_description
-    mutable_uri
-    table_handle_v1
-    token_standard
-    total_minted_v2
-    uri
+    cdn_asset_uris {
+      cdn_image_uri
+      asset_uri
+      animation_optimizer_retry_count
+      cdn_animation_uri
+      cdn_json_uri
+      image_optimizer_retry_count
+      json_parser_retry_count
+      raw_animation_uri
+      raw_image_uri
+    }
   }
 }
     `;
@@ -382,6 +375,24 @@ export const GetNumberOfDelegators = `
   }
 }
     `;
+export const GetObjectData = `
+    query getObjectData($where_condition: current_objects_bool_exp, $offset: Int, $limit: Int, $order_by: [current_objects_order_by!]) {
+  current_objects(
+    where: $where_condition
+    offset: $offset
+    limit: $limit
+    order_by: $order_by
+  ) {
+    allow_ungated_transfer
+    state_key_hash
+    owner_address
+    object_address
+    last_transaction_version
+    last_guid_creation_num
+    is_deleted
+  }
+}
+    `;
 export const GetProcessorStatus = `
     query getProcessorStatus($where_condition: processor_status_bool_exp) {
   processor_status(where: $where_condition) {
@@ -545,21 +556,6 @@ export function getSdk(client: GraphQLClient, withWrapper: SdkFunctionWrapper =
         variables,
       );
     },
-    getAccountOwnedObjects(
-      variables?: Types.GetAccountOwnedObjectsQueryVariables,
-      requestHeaders?: GraphQLClientRequestHeaders,
-    ): Promise<Types.GetAccountOwnedObjectsQuery> {
-      return withWrapper(
-        (wrappedRequestHeaders) =>
-          client.request<Types.GetAccountOwnedObjectsQuery>(GetAccountOwnedObjects, variables, {
-            ...requestHeaders,
-            ...wrappedRequestHeaders,
-          }),
-        "getAccountOwnedObjects",
-        "query",
-        variables,
-      );
-    },
     getAccountOwnedTokens(
       variables: Types.GetAccountOwnedTokensQueryVariables,
       requestHeaders?: GraphQLClientRequestHeaders,
@@ -765,6 +761,21 @@ export function getSdk(client: GraphQLClient, withWrapper: SdkFunctionWrapper =
         variables,
       );
     },
+    getObjectData(
+      variables?: Types.GetObjectDataQueryVariables,
+      requestHeaders?: GraphQLClientRequestHeaders,
+    ): Promise<Types.GetObjectDataQuery> {
+      return withWrapper(
+        (wrappedRequestHeaders) =>
+          client.request<Types.GetObjectDataQuery>(GetObjectData, variables, {
+            ...requestHeaders,
+            ...wrappedRequestHeaders,
+          }),
+        "getObjectData",
+        "query",
+        variables,
+      );
+    },
     getProcessorStatus(
       variables?: Types.GetProcessorStatusQueryVariables,
       requestHeaders?: GraphQLClientRequestHeaders,