@aptos-labs/ts-sdk 0.0.7 → 1.0.0

package/src/internal/account.ts

@@ -21,15 +21,16 @@ import {
   GetAccountOwnedObjectsResponse,
   GetAccountOwnedTokensFromCollectionResponse,
   GetAccountOwnedTokensQueryResponse,
-  LedgerVersion,
+  LedgerVersionArg,
   MoveModuleBytecode,
   MoveResource,
   MoveStructId,
-  OrderBy,
+  OrderByArg,
   PaginationArgs,
   SigningScheme,
-  TokenStandard,
+  TokenStandardArg,
   TransactionResponse,
+  WhereArg,
 } from "../types";
 import {
   GetAccountCoinsCountQuery,
@@ -54,6 +55,7 @@ import {
 import { memoizeAsync } from "../utils/memoize";
 import { Secp256k1PrivateKey, AuthenticationKey, Ed25519PrivateKey } from "../core";
 import { AnyPublicKey } from "../core/crypto/anyPublicKey";
+import { CurrentFungibleAssetBalancesBoolExp } from "../types/generated/types";
 
 export async function getInfo(args: {
   aptosConfig: AptosConfig;
@@ -71,7 +73,7 @@ export async function getInfo(args: {
 export async function getModules(args: {
   aptosConfig: AptosConfig;
   accountAddress: AccountAddressInput;
-  options?: PaginationArgs & LedgerVersion;
+  options?: PaginationArgs & LedgerVersionArg;
 }): Promise<MoveModuleBytecode[]> {
   const { aptosConfig, accountAddress, options } = args;
   return paginateWithCursor<{}, MoveModuleBytecode[]>({
@@ -98,7 +100,7 @@ export async function getModule(args: {
   aptosConfig: AptosConfig;
   accountAddress: AccountAddressInput;
   moduleName: string;
-  options?: LedgerVersion;
+  options?: LedgerVersionArg;
 }): Promise<MoveModuleBytecode> {
   // We don't memoize the account module by ledger version, as it's not a common use case, this would be handled
   // by the developer directly
@@ -117,7 +119,7 @@ async function getModuleInner(args: {
   aptosConfig: AptosConfig;
   accountAddress: AccountAddressInput;
   moduleName: string;
-  options?: LedgerVersion;
+  options?: LedgerVersionArg;
 }): Promise<MoveModuleBytecode> {
   const { aptosConfig, accountAddress, moduleName, options } = args;
 
@@ -147,7 +149,7 @@ export async function getTransactions(args: {
 export async function getResources(args: {
   aptosConfig: AptosConfig;
   accountAddress: AccountAddressInput;
-  options?: PaginationArgs & LedgerVersion;
+  options?: PaginationArgs & LedgerVersionArg;
 }): Promise<MoveResource[]> {
   const { aptosConfig, accountAddress, options } = args;
   return paginateWithCursor<{}, MoveResource[]>({
@@ -166,7 +168,7 @@ export async function getResource<T extends {}>(args: {
   aptosConfig: AptosConfig;
   accountAddress: AccountAddressInput;
   resourceType: MoveStructId;
-  options?: LedgerVersion;
+  options?: LedgerVersionArg;
 }): Promise<T> {
   const { aptosConfig, accountAddress, resourceType, options } = args;
   const { data } = await getAptosFullNode<{}, MoveResource>({
@@ -181,7 +183,7 @@ export async function getResource<T extends {}>(args: {
 export async function lookupOriginalAccountAddress(args: {
   aptosConfig: AptosConfig;
   authenticationKey: AccountAddressInput;
-  options?: LedgerVersion;
+  options?: LedgerVersionArg;
 }): Promise<AccountAddress> {
   const { aptosConfig, authenticationKey, options } = args;
   type OriginatingAddress = {
@@ -247,20 +249,18 @@ export async function getAccountTokensCount(args: {
     query: graphqlQuery,
     originMethod: "getAccountTokensCount",
   });
-  if (!data.current_token_ownerships_v2_aggregate.aggregate) {
-    throw Error("Failed to get the count of account tokens");
-  }
-  return data.current_token_ownerships_v2_aggregate.aggregate.count;
+
+  // commonjs (aka cjs) doesnt handle Nullish Coalescing for some reason
+  // might be because of how ts infer the graphql generated scheme type
+  return data.current_token_ownerships_v2_aggregate.aggregate
+    ? data.current_token_ownerships_v2_aggregate.aggregate.count
+    : 0;
 }
 
 export async function getAccountOwnedTokens(args: {
   aptosConfig: AptosConfig;
   accountAddress: AccountAddressInput;
-  options?: {
-    tokenStandard?: TokenStandard;
-    pagination?: PaginationArgs;
-    orderBy?: OrderBy<GetAccountOwnedTokensQueryResponse[0]>;
-  };
+  options?: TokenStandardArg & PaginationArgs & OrderByArg<GetAccountOwnedTokensQueryResponse[0]>;
 }): Promise<GetAccountOwnedTokensQueryResponse> {
   const { aptosConfig, accountAddress, options } = args;
   const address = AccountAddress.from(accountAddress).toStringLong();
@@ -279,8 +279,8 @@ export async function getAccountOwnedTokens(args: {
     query: GetAccountOwnedTokens,
     variables: {
       where_condition: whereCondition,
-      offset: options?.pagination?.offset,
-      limit: options?.pagination?.limit,
+      offset: options?.offset,
+      limit: options?.limit,
       order_by: options?.orderBy,
     },
   };
@@ -298,11 +298,7 @@ export async function getAccountOwnedTokensFromCollectionAddress(args: {
   aptosConfig: AptosConfig;
   accountAddress: AccountAddressInput;
   collectionAddress: AccountAddressInput;
-  options?: {
-    tokenStandard?: TokenStandard;
-    pagination?: PaginationArgs;
-    orderBy?: OrderBy<GetAccountOwnedTokensFromCollectionResponse[0]>;
-  };
+  options?: TokenStandardArg & PaginationArgs & OrderByArg<GetAccountOwnedTokensFromCollectionResponse[0]>;
 }): Promise<GetAccountOwnedTokensFromCollectionResponse> {
   const { aptosConfig, accountAddress, collectionAddress, options } = args;
   const ownerAddress = AccountAddress.from(accountAddress).toStringLong();
@@ -327,8 +323,8 @@ export async function getAccountOwnedTokensFromCollectionAddress(args: {
     query: GetAccountOwnedTokensFromCollection,
     variables: {
       where_condition: whereCondition,
-      offset: options?.pagination?.offset,
-      limit: options?.pagination?.limit,
+      offset: options?.offset,
+      limit: options?.limit,
       order_by: options?.orderBy,
     },
   };
@@ -345,11 +341,7 @@ export async function getAccountOwnedTokensFromCollectionAddress(args: {
 export async function getAccountCollectionsWithOwnedTokens(args: {
   aptosConfig: AptosConfig;
   accountAddress: AccountAddressInput;
-  options?: {
-    tokenStandard?: TokenStandard;
-    pagination?: PaginationArgs;
-    orderBy?: OrderBy<GetAccountCollectionsWithOwnedTokenResponse[0]>;
-  };
+  options?: TokenStandardArg & PaginationArgs & OrderByArg<GetAccountCollectionsWithOwnedTokenResponse[0]>;
 }): Promise<GetAccountCollectionsWithOwnedTokenResponse> {
   const { aptosConfig, accountAddress, options } = args;
   const address = AccountAddress.from(accountAddress).toStringLong();
@@ -373,8 +365,8 @@ export async function getAccountCollectionsWithOwnedTokens(args: {
     query: GetAccountCollectionsWithOwnedTokens,
     variables: {
       where_condition: whereCondition,
-      offset: options?.pagination?.offset,
-      limit: options?.pagination?.limit,
+      offset: options?.offset,
+      limit: options?.limit,
       order_by: options?.orderBy,
     },
   };
@@ -407,25 +399,42 @@ export async function getAccountTransactionsCount(args: {
     originMethod: "getAccountTransactionsCount",
   });
 
-  if (!data.account_transactions_aggregate.aggregate) {
-    throw Error("Failed to get the count of account transactions");
-  }
+  // commonjs (aka cjs) doesnt handle Nullish Coalescing for some reason
+  // might be because of how ts infer the graphql generated scheme type
+  return data.account_transactions_aggregate.aggregate ? data.account_transactions_aggregate.aggregate.count : 0;
+}
+
+export async function getAccountCoinAmount(args: {
+  aptosConfig: AptosConfig;
+  accountAddress: AccountAddressInput;
+  coinType: MoveStructId;
+}): Promise<number> {
+  const { aptosConfig, accountAddress, coinType } = args;
+  const address = AccountAddress.from(accountAddress).toStringLong();
 
-  return data.account_transactions_aggregate.aggregate.count;
+  const data = await getAccountCoinsData({
+    aptosConfig,
+    accountAddress: address,
+    options: {
+      where: { asset_type: { _eq: coinType } },
+    },
+  });
+
+  // commonjs (aka cjs) doesnt handle Nullish Coalescing for some reason
+  // might be because of how ts infer the graphql generated scheme type
+  return data[0] ? data[0].amount : 0;
 }
 
 export async function getAccountCoinsData(args: {
   aptosConfig: AptosConfig;
   accountAddress: AccountAddressInput;
-  options?: {
-    pagination?: PaginationArgs;
-    orderBy?: OrderBy<GetAccountCoinsDataResponse[0]>;
-  };
+  options?: PaginationArgs & OrderByArg<GetAccountCoinsDataResponse[0]> & WhereArg<CurrentFungibleAssetBalancesBoolExp>;
 }): Promise<GetAccountCoinsDataResponse> {
   const { aptosConfig, accountAddress, options } = args;
   const address = AccountAddress.from(accountAddress).toStringLong();
 
   const whereCondition: { owner_address: { _eq: string } } = {
+    ...options?.where,
     owner_address: { _eq: address },
   };
 
@@ -433,8 +442,8 @@ export async function getAccountCoinsData(args: {
     query: GetAccountCoinsData,
     variables: {
       where_condition: whereCondition,
-      offset: options?.pagination?.offset,
-      limit: options?.pagination?.limit,
+      offset: options?.offset,
+      limit: options?.limit,
       order_by: options?.orderBy,
     },
   };
@@ -476,10 +485,7 @@ export async function getAccountCoinsCount(args: {
 export async function getAccountOwnedObjects(args: {
   aptosConfig: AptosConfig;
   accountAddress: AccountAddressInput;
-  options?: {
-    pagination?: PaginationArgs;
-    orderBy?: OrderBy<GetAccountOwnedObjectsResponse[0]>;
-  };
+  options?: PaginationArgs & OrderByArg<GetAccountOwnedObjectsResponse[0]>;
 }): Promise<GetAccountOwnedObjectsResponse> {
   const { aptosConfig, accountAddress, options } = args;
   const address = AccountAddress.from(accountAddress).toStringLong();
@@ -491,8 +497,8 @@ export async function getAccountOwnedObjects(args: {
     query: GetAccountOwnedObjects,
     variables: {
       where_condition: whereCondition,
-      offset: options?.pagination?.offset,
-      limit: options?.pagination?.limit,
+      offset: options?.offset,
+      limit: options?.limit,
       order_by: options?.orderBy,
     },
   };

package/src/internal/ans.ts

@@ -11,7 +11,7 @@
 import { AptosConfig } from "../api/aptosConfig";
 import { Account, AccountAddress, AccountAddressInput } from "../core";
 import { InputGenerateTransactionOptions, SingleSignerTransaction } from "../transactions/types";
-import { GetANSNameResponse, MoveAddressType, MoveValue, OrderBy, PaginationArgs } from "../types";
+import { GetANSNameResponse, MoveAddressType, MoveValue, OrderByArg, PaginationArgs, WhereArg } from "../types";
 import { GetNamesQuery } from "../types/generated/operations";
 import { GetNames } from "../types/generated/queries";
 import { CurrentAptosNamesBoolExp } from "../types/generated/types";
@@ -84,8 +84,8 @@ function getRouterAddress(aptosConfig: AptosConfig): string {
   return address;
 }
 
-const Some = <T>(value: T): MoveValue => ({ vec: [value] }) as any;
-const None = (): MoveValue => ({ vec: [] }) as any;
+const Some = <T>(value: T): MoveValue => ({ vec: [value] });
+const None = (): MoveValue => ({ vec: [] });
 // != here is intentional, we want to check for null and undefined
 // eslint-disable-next-line eqeqeq
 const Option = <T>(value: T | undefined | null): MoveValue => (value != undefined ? Some(value) : None());
@@ -113,7 +113,7 @@ export async function getOwnerAddress(args: { aptosConfig: AptosConfig; name: st
 
   const owner = unwrapOption<MoveAddressType>(res[0]);
 
-  return owner ? AccountAddress.fromRelaxed(owner).toString() : undefined;
+  return owner ? AccountAddress.from(owner).toString() : undefined;
 }
 
 export interface RegisterNameParameters {
@@ -123,7 +123,7 @@ export interface RegisterNameParameters {
   expiration:
     | { policy: "domain"; years?: 1 }
     | { policy: "subdomain:follow-domain" }
-    | { policy: "subdomain:independent"; expirationDate: Date };
+    | { policy: "subdomain:independent"; expirationDate: number };
   transferable?: boolean;
   toAddress?: AccountAddressInput;
   targetAddress?: AccountAddressInput;
@@ -167,7 +167,7 @@ export async function registerName(args: RegisterNameParameters): Promise<Single
       options,
     });
 
-    return transaction as SingleSignerTransaction;
+    return transaction;
   }
 
   // We are a subdomain
@@ -175,15 +175,13 @@ export async function registerName(args: RegisterNameParameters): Promise<Single
     throw new Error(`${expiration.policy} requires a subdomain to be provided.`);
   }
 
-  let tldExpiration = await getExpiration({ aptosConfig, name: domainName });
+  const tldExpiration = await getExpiration({ aptosConfig, name: domainName });
   if (!tldExpiration) {
     throw new Error("The domain does not exist");
   }
-  // The contract gives us seconds, but JS expects milliseconds
-  tldExpiration *= 1000;
 
   const expirationDateInMillisecondsSinceEpoch =
-    expiration.policy === "subdomain:independent" ? expiration.expirationDate.valueOf() : tldExpiration;
+    expiration.policy === "subdomain:independent" ? expiration.expirationDate : tldExpiration;
 
   if (expirationDateInMillisecondsSinceEpoch > tldExpiration) {
     throw new Error("The subdomain expiration time cannot be greater than the domain expiration time");
@@ -207,7 +205,7 @@ export async function registerName(args: RegisterNameParameters): Promise<Single
     options,
   });
 
-  return transaction as SingleSignerTransaction;
+  return transaction;
 }
 
 export async function getExpiration(args: { aptosConfig: AptosConfig; name: string }): Promise<number | undefined> {
@@ -224,7 +222,8 @@ export async function getExpiration(args: { aptosConfig: AptosConfig; name: stri
       },
     });
 
-    return res[0] as number;
+    // Normalize expiration time from epoch seconds to epoch milliseconds
+    return Number(res[0]) * 1000;
   } catch (e) {
     return undefined;
   }
@@ -241,7 +240,7 @@ export async function getPrimaryName(args: {
     aptosConfig,
     payload: {
       function: `${routerAddress}::router::get_primary_name`,
-      functionArguments: [AccountAddress.fromRelaxed(address).toString()],
+      functionArguments: [AccountAddress.from(address).toString()],
     },
   });
 
@@ -256,7 +255,7 @@ export async function getPrimaryName(args: {
 export async function setPrimaryName(args: {
   aptosConfig: AptosConfig;
   sender: Account;
-  name: string | null;
+  name?: string;
   options?: InputGenerateTransactionOptions;
 }): Promise<SingleSignerTransaction> {
   const { aptosConfig, sender, name, options } = args;
@@ -273,7 +272,7 @@ export async function setPrimaryName(args: {
       options,
     });
 
-    return transaction as SingleSignerTransaction;
+    return transaction;
   }
 
   const { domainName, subdomainName } = isValidANSName(name);
@@ -288,7 +287,7 @@ export async function setPrimaryName(args: {
     options,
   });
 
-  return transaction as SingleSignerTransaction;
+  return transaction;
 }
 
 export async function getTargetAddress(args: {
@@ -308,7 +307,7 @@ export async function getTargetAddress(args: {
   });
 
   const target = unwrapOption<MoveAddressType>(res[0]);
-  return target ? AccountAddress.fromRelaxed(target).toString() : undefined;
+  return target ? AccountAddress.from(target).toString() : undefined;
 }
 
 export async function setTargetAddress(args: {
@@ -332,7 +331,7 @@ export async function setTargetAddress(args: {
     options,
   });
 
-  return transaction as SingleSignerTransaction;
+  return transaction;
 }
 
 export async function getName(args: {
@@ -359,15 +358,17 @@ export async function getName(args: {
     originMethod: "getName",
   });
 
-  return data.current_aptos_names[0] as GetANSNameResponse[0] | undefined;
+  // Convert the expiration_timestamp from an ISO string to milliseconds since epoch
+  let res = data.current_aptos_names[0];
+  if (res) {
+    res = sanitizeANSName(res);
+  }
+
+  return res;
 }
 
 interface QueryNamesOptions {
-  options?: {
-    pagination?: PaginationArgs;
-    orderBy?: OrderBy<GetANSNameResponse[0]>;
-    where?: CurrentAptosNamesBoolExp;
-  };
+  options?: PaginationArgs & OrderByArg<GetANSNameResponse[0]> & WhereArg<CurrentAptosNamesBoolExp>;
 }
 
 export interface GetAccountNamesArgs extends QueryNamesOptions {
@@ -387,8 +388,8 @@ export async function getAccountNames(
     query: {
       query: GetNames,
       variables: {
-        limit: options?.pagination?.limit,
-        offset: options?.pagination?.offset,
+        limit: options?.limit,
+        offset: options?.offset,
         order_by: options?.orderBy,
         where_condition: {
           ...(args.options?.where ?? {}),
@@ -399,7 +400,7 @@ export async function getAccountNames(
     },
   });
 
-  return data.current_aptos_names;
+  return data.current_aptos_names.map(sanitizeANSName);
 }
 
 export interface GetAccountDomainsArgs extends QueryNamesOptions {
@@ -419,8 +420,8 @@ export async function getAccountDomains(
     query: {
       query: GetNames,
       variables: {
-        limit: options?.pagination?.limit,
-        offset: options?.pagination?.offset,
+        limit: options?.limit,
+        offset: options?.offset,
         order_by: options?.orderBy,
         where_condition: {
           ...(args.options?.where ?? {}),
@@ -432,7 +433,7 @@ export async function getAccountDomains(
     },
   });
 
-  return data.current_aptos_names;
+  return data.current_aptos_names.map(sanitizeANSName);
 }
 
 export interface GetAccountSubdomainsArgs extends QueryNamesOptions {
@@ -452,8 +453,8 @@ export async function getAccountSubdomains(
     query: {
       query: GetNames,
       variables: {
-        limit: options?.pagination?.limit,
-        offset: options?.pagination?.offset,
+        limit: options?.limit,
+        offset: options?.offset,
         order_by: options?.orderBy,
         where_condition: {
           ...(args.options?.where ?? {}),
@@ -465,7 +466,7 @@ export async function getAccountSubdomains(
     },
   });
 
-  return data.current_aptos_names;
+  return data.current_aptos_names.map(sanitizeANSName);
 }
 
 export interface GetDomainSubdomainsArgs extends QueryNamesOptions {
@@ -483,8 +484,8 @@ export async function getDomainSubdomains(
     query: {
       query: GetNames,
       variables: {
-        limit: options?.pagination?.limit,
-        offset: options?.pagination?.offset,
+        limit: options?.limit,
+        offset: options?.offset,
         order_by: options?.orderBy,
         where_condition: {
           ...(args.options?.where ?? {}),
@@ -495,7 +496,7 @@ export async function getDomainSubdomains(
     },
   });
 
-  return data.current_aptos_names;
+  return data.current_aptos_names.map(sanitizeANSName);
 }
 
 /**
@@ -513,7 +514,7 @@ async function getANSExpirationDate(args: { aptosConfig: AptosConfig }): Promise
   const { aptosConfig } = args;
   const routerAddress = getRouterAddress(aptosConfig);
 
-  const res = await view({
+  const [gracePeriodInSeconds] = await view<[number]>({
     aptosConfig,
     payload: {
       function: `${routerAddress}::config::reregistration_grace_sec`,
@@ -521,7 +522,6 @@ async function getANSExpirationDate(args: { aptosConfig: AptosConfig }): Promise
     },
   });
 
-  const gracePeriodInSeconds = res[0] as number;
   const gracePeriodInDays = gracePeriodInSeconds / 60 / 60 / 24;
   const now = () => new Date();
   return new Date(now().setDate(now().getDate() - gracePeriodInDays)).toISOString();
@@ -557,5 +557,18 @@ export async function renewDomain(args: {
     options,
   });
 
-  return transaction as SingleSignerTransaction;
+  return transaction;
+}
+
+/**
+ * The indexer returns ISO strings for expiration, however the contract works in
+ * epoch milliseconds. This function converts the ISO string to epoch
+ * milliseconds. In the future, if other properties need sanitization, this can
+ * be extended.
+ */
+function sanitizeANSName(name: GetANSNameResponse[0]): GetANSNameResponse[0] {
+  return {
+    ...name,
+    expiration_timestamp: new Date(name.expiration_timestamp).valueOf(),
+  };
 }

package/src/internal/coin.ts

@@ -1,11 +1,9 @@
 import { AptosConfig } from "../api/aptosConfig";
-import { U64 } from "../bcs/serializable/movePrimitives";
-import { Account, AccountAddress, AccountAddressInput } from "../core";
+import { Account, AccountAddressInput } from "../core";
 import { InputGenerateTransactionOptions, SingleSignerTransaction } from "../transactions/types";
 import { AnyNumber, MoveStructId } from "../types";
 import { APTOS_COIN } from "../utils/const";
 import { generateTransaction } from "./transactionSubmission";
-import { parseTypeTag } from "../transactions/typeTag/parser";
 
 export async function transferCoinTransaction(args: {
   aptosConfig: AptosConfig;
@@ -22,11 +20,11 @@ export async function transferCoinTransaction(args: {
     sender: sender.accountAddress,
     data: {
       function: "0x1::aptos_account::transfer_coins",
-      typeArguments: [parseTypeTag(coinStructType)],
-      functionArguments: [AccountAddress.from(recipient), new U64(amount)],
+      typeArguments: [coinStructType],
+      functionArguments: [recipient, amount],
     },
     options,
   });
 
-  return transaction as SingleSignerTransaction;
+  return transaction;
 }

package/src/internal/digitalAsset.ts

@@ -19,9 +19,10 @@ import {
   GetOwnedTokensResponse,
   GetTokenActivityResponse,
   GetTokenDataResponse,
-  OrderBy,
+  MoveStructId,
+  OrderByArg,
   PaginationArgs,
-  TokenStandard,
+  TokenStandardArg,
 } from "../types";
 import {
   GetCollectionDataQuery,
@@ -74,7 +75,7 @@ export async function mintTokenTransaction(args: {
     },
     options,
   });
-  return transaction as SingleSignerTransaction;
+  return transaction;
 }
 
 export async function getTokenData(args: {
@@ -132,23 +133,21 @@ export async function getCurrentTokenOwnership(args: {
 export async function getOwnedTokens(args: {
   aptosConfig: AptosConfig;
   ownerAddress: AccountAddressInput;
-  options?: {
-    pagination?: PaginationArgs;
-    orderBy?: OrderBy<GetTokenActivityResponse[0]>;
-  };
+  options?: PaginationArgs & OrderByArg<GetTokenActivityResponse[0]>;
 }): Promise<GetOwnedTokensResponse> {
   const { aptosConfig, ownerAddress, options } = args;
 
   const whereCondition: CurrentTokenOwnershipsV2BoolExp = {
     owner_address: { _eq: AccountAddress.from(ownerAddress).toStringLong() },
+    amount: { _gt: 0 },
   };
 
   const graphqlQuery = {
     query: GetCurrentTokenOwnership,
     variables: {
       where_condition: whereCondition,
-      offset: options?.pagination?.offset,
-      limit: options?.pagination?.limit,
+      offset: options?.offset,
+      limit: options?.limit,
       order_by: options?.orderBy,
     },
   };
@@ -165,10 +164,7 @@ export async function getOwnedTokens(args: {
 export async function getTokenActivity(args: {
   aptosConfig: AptosConfig;
   tokenAddress: AccountAddressInput;
-  options?: {
-    pagination?: PaginationArgs;
-    orderBy?: OrderBy<GetTokenActivityResponse[0]>;
-  };
+  options?: PaginationArgs & OrderByArg<GetTokenActivityResponse[0]>;
 }): Promise<GetTokenActivityResponse> {
   const { aptosConfig, tokenAddress, options } = args;
 
@@ -180,8 +176,8 @@ export async function getTokenActivity(args: {
     query: GetTokenActivity,
     variables: {
       where_condition: whereCondition,
-      offset: options?.pagination?.offset,
-      limit: options?.pagination?.limit,
+      offset: options?.offset,
+      limit: options?.limit,
       order_by: options?.orderBy,
     },
   };
@@ -247,16 +243,14 @@ export async function createCollectionTransaction(
     },
     options,
   });
-  return transaction as SingleSignerTransaction;
+  return transaction;
 }
 
 export async function getCollectionData(args: {
   aptosConfig: AptosConfig;
   creatorAddress: AccountAddressInput;
   collectionName: string;
-  options?: {
-    tokenStandard?: TokenStandard;
-  };
+  options?: TokenStandardArg;
 }): Promise<GetCollectionDataResponse> {
   const { aptosConfig, creatorAddress, collectionName, options } = args;
   const address = AccountAddress.from(creatorAddress);
@@ -289,9 +283,29 @@ export async function getCollectionId(args: {
   aptosConfig: AptosConfig;
   creatorAddress: AccountAddressInput;
   collectionName: string;
-  options?: {
-    tokenStandard?: TokenStandard;
-  };
+  options?: TokenStandardArg;
 }): Promise<string> {
   return (await getCollectionData(args)).collection_id;
 }
+
+export async function transferDigitalAsset(args: {
+  aptosConfig: AptosConfig;
+  sender: Account;
+  digitalAssetAddress: AccountAddressInput;
+  recipient: AccountAddress;
+  digitalAssetType?: MoveStructId;
+  options?: InputGenerateTransactionOptions;
+}): Promise<SingleSignerTransaction> {
+  const { aptosConfig, sender, digitalAssetAddress, recipient, digitalAssetType, options } = args;
+  const transaction = await generateTransaction({
+    aptosConfig,
+    sender: sender.accountAddress,
+    data: {
+      function: "0x1::object::transfer",
+      typeArguments: [digitalAssetType ?? "0x4::token::Token"],
+      functionArguments: [digitalAssetAddress, recipient],
+    },
+    options,
+  });
+  return transaction;
+}