@aptos-labs/ts-sdk 0.0.4 → 0.0.6

package/src/internal/ans.ts

@@ -64,11 +64,9 @@ export function isValidANSName(name: string): { domainName: string; subdomainNam
 }
 
 export const LOCAL_ANS_ACCOUNT_PK =
-  (process.env.ANS_TEST_ACCOUNT_PRIVATE_KEY as string) ||
-  "0x37368b46ce665362562c6d1d4ec01a08c8644c488690df5a17e13ba163e20221";
+  process.env.ANS_TEST_ACCOUNT_PRIVATE_KEY ?? "0x37368b46ce665362562c6d1d4ec01a08c8644c488690df5a17e13ba163e20221";
 export const LOCAL_ANS_ACCOUNT_ADDRESS =
-  (process.env.ANS_TEST_ACCOUNT_ADDRESS as string) ||
-  "0x585fc9f0f0c54183b039ffc770ca282ebd87307916c215a3e692f2f8e4305e82";
+  process.env.ANS_TEST_ACCOUNT_ADDRESS ?? "0x585fc9f0f0c54183b039ffc770ca282ebd87307916c215a3e692f2f8e4305e82";
 
 const NetworkToAnsContract: Record<Network, string | null> = {
   [Network.TESTNET]: "0x5f8fd2347449685cf41d4db97926ec3a096eaf381332be4f1318ad4d16a8497c",
@@ -84,8 +82,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] }) as any;
+const None = (): MoveValue => ({ vec: [] }) as any;
 // != 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());

package/src/internal/coin.ts

@@ -2,7 +2,7 @@ import { AptosConfig } from "../api/aptosConfig";
 import { U64 } from "../bcs/serializable/movePrimitives";
 import { Account, AccountAddress, AccountAddressInput } from "../core";
 import { InputGenerateTransactionOptions, InputSingleSignerTransaction } from "../transactions/types";
-import { AnyNumber, MoveStructType } from "../types";
+import { AnyNumber, MoveStructId } from "../types";
 import { APTOS_COIN } from "../utils/const";
 import { generateTransaction } from "./transactionSubmission";
 import { parseTypeTag } from "../transactions/typeTag/parser";
@@ -12,7 +12,7 @@ export async function transferCoinTransaction(args: {
   sender: Account;
   recipient: AccountAddressInput;
   amount: AnyNumber;
-  coinType?: MoveStructType;
+  coinType?: MoveStructId;
   options?: InputGenerateTransactionOptions;
 }): Promise<InputSingleSignerTransaction> {
   const { aptosConfig, sender, recipient, amount, coinType, options } = args;

package/src/internal/event.ts

@@ -10,7 +10,7 @@
 
 import { AptosConfig } from "../api/aptosConfig";
 import { AccountAddress, AccountAddressInput } from "../core";
-import { AnyNumber, GetEventsResponse, PaginationArgs, MoveStructType, OrderBy } from "../types";
+import { AnyNumber, GetEventsResponse, PaginationArgs, MoveStructId, OrderBy } from "../types";
 import { GetEventsQuery } from "../types/generated/operations";
 import { GetEvents } from "../types/generated/queries";
 import { EventsBoolExp } from "../types/generated/types";
@@ -35,7 +35,7 @@ export async function getAccountEventsByCreationNumber(args: {
 export async function getAccountEventsByEventType(args: {
   aptosConfig: AptosConfig;
   accountAddress: AccountAddressInput;
-  eventType: MoveStructType;
+  eventType: MoveStructId;
   options?: {
     pagination?: PaginationArgs;
     orderBy?: OrderBy<GetEventsResponse[0]>;
@@ -46,7 +46,7 @@ export async function getAccountEventsByEventType(args: {
 
   const whereCondition: EventsBoolExp = {
     account_address: { _eq: address },
-    type: { _eq: eventType },
+    indexed_type: { _eq: eventType },
   };
 
   const customOptions = {

package/src/internal/general.ts

@@ -21,7 +21,7 @@ import {
   MoveValue,
   TableItemRequest,
   ViewRequest,
-  ViewRequestData,
+  InputViewRequestData,
 } from "../types";
 import { GetChainTopUserTransactionsQuery, GetProcessorStatusQuery } from "../types/generated/operations";
 import { GetChainTopUserTransactions, GetProcessorStatus } from "../types/generated/queries";
@@ -83,11 +83,11 @@ export async function getTableItem<T>(args: {
   return response.data as T;
 }
 
-export async function view(args: {
+export async function view<T extends Array<MoveValue> = Array<MoveValue>>(args: {
   aptosConfig: AptosConfig;
-  payload: ViewRequestData;
+  payload: InputViewRequestData;
   options?: LedgerVersion;
-}): Promise<MoveValue[]> {
+}): Promise<T> {
   const { aptosConfig, payload, options } = args;
   const { data } = await postAptosFullNode<ViewRequest, MoveValue[]>({
     aptosConfig,
@@ -100,7 +100,8 @@ export async function view(args: {
       arguments: payload.functionArguments ?? [],
     },
   });
-  return data;
+
+  return data as T;
 }
 
 export async function getChainTopUserTransactions(args: {
@@ -122,7 +123,7 @@ export async function getChainTopUserTransactions(args: {
   return data.user_transactions;
 }
 
-export async function queryIndexer<T>(args: {
+export async function queryIndexer<T extends {}>(args: {
   aptosConfig: AptosConfig;
   query: GraphqlQuery;
   originMethod?: string;

package/src/internal/queries/getEvents.graphql

@@ -8,5 +8,6 @@ query getEvents($where_condition: events_bool_exp, $offset: Int, $limit: Int, $o
     transaction_block_height
     transaction_version
     type
+    indexed_type
   }
 }

package/src/internal/transactionSubmission.ts

@@ -28,6 +28,8 @@ import {
   InputSingleSignerTransaction,
   InputGenerateTransactionPayloadDataWithRemoteABI,
   InputSubmitTransactionData,
+  InputGenerateFeePayerRawTransactionData,
+  InputGenerateMultiAgentRawTransactionData,
 } from "../transactions/types";
 import { getInfo } from "./account";
 import { UserTransactionResponse, PendingTransactionResponse, MimeType, HexInput, TransactionResponse } from "../types";
@@ -75,7 +77,7 @@ import { UserTransactionResponse, PendingTransactionResponse, MimeType, HexInput
 export async function generateTransaction(
   args: { aptosConfig: AptosConfig } & InputGenerateTransactionData,
 ): Promise<AnyRawTransaction> {
-  const { aptosConfig, sender, data, options, secondarySignerAddresses, feePayerAddress } = args;
+  const { aptosConfig, sender, data, options } = args;
 
   // Merge in aptosConfig for remote ABI on non-script payloads
   let generateTransactionPayloadData: InputGenerateTransactionPayloadDataWithRemoteABI;
@@ -97,17 +99,53 @@ export async function generateTransaction(
       typeArguments: data.typeArguments,
     };
   }
+
+  if (isFeePayerTransactionInput(args)) {
+    const { secondarySignerAddresses } = args;
+    const feePayerAddress = args.hasFeePayer ? AccountAddress.ZERO : undefined;
+    const payload = await generateTransactionPayload(generateTransactionPayloadData);
+    return buildTransaction({
+      aptosConfig,
+      sender,
+      payload,
+      options,
+      secondarySignerAddresses,
+      feePayerAddress,
+    });
+  }
+  if (isMultiAgentTransactionInput(args)) {
+    const { secondarySignerAddresses } = args;
+    const payload = await generateTransactionPayload(generateTransactionPayloadData);
+    return buildTransaction({
+      aptosConfig,
+      sender,
+      payload,
+      options,
+      secondarySignerAddresses,
+    });
+  }
+
   const payload = await generateTransactionPayload(generateTransactionPayloadData);
   return buildTransaction({
     aptosConfig,
     sender,
     payload,
     options,
-    secondarySignerAddresses,
-    feePayerAddress,
   });
 }
 
+function isFeePayerTransactionInput(
+  data: InputGenerateTransactionData,
+): data is InputGenerateFeePayerRawTransactionData {
+  return "hasFeePayer" in data;
+}
+
+function isMultiAgentTransactionInput(
+  data: InputGenerateTransactionData,
+): data is InputGenerateMultiAgentRawTransactionData {
+  return "secondarySignerAddresses" in data;
+}
+
 /**
  * Sign a transaction that can later be submitted to chain
  *

package/src/transactions/transactionBuilder/helpers.ts

@@ -10,7 +10,7 @@ import {
 } from "../types";
 import { Bool, FixedBytes, MoveString, U128, U16, U256, U32, U64, U8 } from "../../bcs";
 import { AccountAddress } from "../../core";
-import { MoveFunction, MoveStructType } from "../../types";
+import { MoveFunction, MoveFunctionId } from "../../types";
 
 export function isBool(arg: SimpleEntryFunctionArgumentTypes): arg is boolean {
   return typeof arg === "boolean";
@@ -91,7 +91,7 @@ export function findFirstNonSignerArg(functionAbi: MoveFunction): number {
   return index;
 }
 
-export function getFunctionParts(functionArg: MoveStructType) {
+export function getFunctionParts(functionArg: MoveFunctionId) {
   const funcNameParts = functionArg.split("::");
   if (funcNameParts.length !== 3) {
     throw new Error(`Invalid function ${functionArg}`);

package/src/transactions/transactionBuilder/remoteAbi.ts

@@ -74,7 +74,7 @@ export async function fetchEntryFunctionAbi(
 
   // Remove the signer arguments
   const first = findFirstNonSignerArg(functionAbi);
-  const params = [];
+  const params: TypeTag[] = [];
   for (let i = first; i < functionAbi.params.length; i += 1) {
     params.push(parseTypeTag(functionAbi.params[i], { allowGenerics: true }));
   }

package/src/transactions/transactionBuilder/transactionBuilder.ts

@@ -86,9 +86,7 @@ import { getFunctionParts, isScriptDataInput } from "./helpers";
  * When we call our `generateTransactionPayload` function with the relevant type properties,
  * Typescript can infer the return type based on the appropriate function overload.
  */
-export async function generateTransactionPayload(
-  args: InputScriptData & { aptosConfig?: undefined },
-): Promise<TransactionPayloadScript>;
+export async function generateTransactionPayload(args: InputScriptData): Promise<TransactionPayloadScript>;
 export async function generateTransactionPayload(
   args: InputEntryFunctionDataWithRemoteABI,
 ): Promise<TransactionPayloadEntryFunction>;
@@ -136,10 +134,6 @@ export function generateTransactionPayloadWithABI(
   args: InputMultiSigData,
   functionAbi: EntryFunctionABI,
 ): TransactionPayloadMultisig;
-export function generateTransactionPayloadWithABI(
-  args: InputGenerateTransactionPayloadData,
-  functionAbi: EntryFunctionABI,
-): AnyTransactionPayloadInstance;
 export function generateTransactionPayloadWithABI(
   args: InputGenerateTransactionPayloadData,
   functionAbi: EntryFunctionABI,
@@ -238,7 +232,7 @@ export async function generateRawTransaction(args: {
   );
 
   const { maxGasAmount, gasUnitPrice, expireTimestamp } = {
-    maxGasAmount: BigInt(DEFAULT_MAX_GAS_AMOUNT),
+    maxGasAmount: options?.maxGasAmount ? BigInt(options.maxGasAmount) : BigInt(DEFAULT_MAX_GAS_AMOUNT),
     gasUnitPrice: BigInt(gasEstimate),
     expireTimestamp: BigInt(Math.floor(Date.now() / 1000) + DEFAULT_TXN_EXP_SEC_FROM_NOW),
     ...options,
@@ -294,7 +288,7 @@ export async function buildTransaction(args: InputGenerateRawTransactionArgs): P
  * ```
  */
 export async function buildTransaction(args: InputGenerateRawTransactionArgs): Promise<AnyRawTransaction> {
-  const { aptosConfig, sender, payload, options, secondarySignerAddresses, feePayerAddress } = args;
+  const { aptosConfig, sender, payload, options } = args;
   // generate raw transaction
   const rawTxn = await generateRawTransaction({
     aptosConfig,
@@ -303,20 +297,21 @@ export async function buildTransaction(args: InputGenerateRawTransactionArgs): P
     options,
   });
 
-  if (feePayerAddress) {
-    const signers: Array<AccountAddress> = secondarySignerAddresses
-      ? secondarySignerAddresses.map((signer) => AccountAddress.fromRelaxed(signer))
-      : [];
+  if ("feePayerAddress" in args) {
+    const signers: Array<AccountAddress> =
+      args.secondarySignerAddresses?.map((signer) => AccountAddress.fromRelaxed(signer)) ?? [];
 
     return {
       rawTransaction: rawTxn,
       secondarySignerAddresses: signers,
-      feePayerAddress: AccountAddress.fromRelaxed(feePayerAddress),
+      feePayerAddress:
+        args?.feePayerAddress !== undefined ? AccountAddress.fromRelaxed(args.feePayerAddress) : undefined,
     };
   }
 
-  if (secondarySignerAddresses) {
-    const signers: Array<AccountAddress> = secondarySignerAddresses.map((signer) => AccountAddress.fromRelaxed(signer));
+  if ("secondarySignerAddresses" in args) {
+    const signers: Array<AccountAddress> =
+      args.secondarySignerAddresses?.map((signer) => AccountAddress.fromRelaxed(signer)) ?? [];
 
     return {
       rawTransaction: rawTxn,
@@ -346,7 +341,7 @@ export function generateSignedTransactionForSimulation(args: InputSimulateTransa
 
   const accountAuthenticator = getAuthenticatorForSimulation(signerPublicKey);
   // fee payer transaction
-  if (transaction.feePayerAddress) {
+  if ("feePayerAddress" in transaction) {
     const transactionToSign = new FeePayerRawTransaction(
       deserializedTransaction,
       transaction.secondarySignerAddresses ?? [],
@@ -375,7 +370,7 @@ export function generateSignedTransactionForSimulation(args: InputSimulateTransa
   }
 
   // multi agent transaction
-  if (transaction.secondarySignerAddresses) {
+  if ("secondarySignerAddresses" in transaction) {
     const transactionToSign = new MultiAgentRawTransaction(
       deserializedTransaction,
       transaction.secondarySignerAddresses,
@@ -519,14 +514,14 @@ export function generateSignedTransaction(args: InputSubmitTransactionData): Uin
  * @returns FeePayerRawTransaction | MultiAgentRawTransaction | RawTransaction
  */
 export function deriveTransactionType(transaction: AnyRawTransaction): AnyRawTransactionInstance {
-  if (transaction.feePayerAddress) {
+  if ("feePayerAddress" in transaction) {
     return new FeePayerRawTransaction(
       transaction.rawTransaction,
       transaction.secondarySignerAddresses ?? [],
       transaction.feePayerAddress,
     );
   }
-  if (transaction.secondarySignerAddresses) {
+  if ("secondarySignerAddresses" in transaction) {
     return new MultiAgentRawTransaction(transaction.rawTransaction, transaction.secondarySignerAddresses);
   }
 

package/src/transactions/typeTag/parser.ts

@@ -29,6 +29,10 @@ function isValidWhitespaceCharacter(char: string) {
   return !!char.match(/\s/);
 }
 
+function isGeneric(str: string) {
+  return !!str.match(/^T[0-9]+$/);
+}
+
 function consumeWhitespace(tagStr: string, pos: number) {
   let i = pos;
   for (; i < tagStr.length; i += 1) {
@@ -50,6 +54,7 @@ type TypeTagState = {
 
 export enum TypeTagParserErrorType {
   InvalidTypeTag = "unknown type",
+  UnexpectedGenericType = "unexpected generic type",
   UnexpectedTypeArgumentClose = "unexpected '>'",
   UnexpectedWhitespaceCharacter = "unexpected whitespace character",
   UnexpectedComma = "unexpected ','",
@@ -262,8 +267,11 @@ function parseTypeTagInner(str: string, types: Array<TypeTag>, allowGenerics: bo
       }
       return new TypeTagVector(types[0]);
     default:
-      if (allowGenerics && str.match(/^T[0-9]+$/)) {
-        return new TypeTagGeneric(Number(str.split("T")[1]));
+      if (isGeneric(str)) {
+        if (allowGenerics) {
+          return new TypeTagGeneric(Number(str.split("T")[1]));
+        }
+        throw new TypeTagParserError(str, TypeTagParserErrorType.UnexpectedGenericType);
       }
 
       // If the value doesn't contain a colon, then we'll assume it isn't trying to be a struct

package/src/transactions/types.ts

@@ -15,7 +15,7 @@ import {
   TransactionPayloadMultisig,
   TransactionPayloadScript,
 } from "./instances";
-import { AnyNumber, HexInput, MoveFunctionGenericTypeParam, MoveStructType } from "../types";
+import { AnyNumber, HexInput, MoveFunctionGenericTypeParam, MoveFunctionId } from "../types";
 import { TypeTag } from "./typeTag";
 import { AccountAuthenticator } from "./authenticator/account";
 
@@ -97,7 +97,7 @@ export type AnyTransactionPayloadInstance =
 export type InputGenerateTransactionPayloadData = InputEntryFunctionData | InputScriptData | InputMultiSigData;
 
 export type InputGenerateTransactionPayloadDataWithRemoteABI =
-  | (InputScriptData & { aptosConfig?: undefined })
+  | InputScriptData
   | InputEntryFunctionDataWithRemoteABI
   | InputMultiSigDataWithRemoteABI;
 
@@ -105,8 +105,8 @@ export type InputGenerateTransactionPayloadDataWithRemoteABI =
  * The data needed to generate an Entry Function payload
  */
 export type InputEntryFunctionData = {
-  function: MoveStructType;
-  typeArguments?: Array<TypeTag>;
+  function: MoveFunctionId;
+  typeArguments?: Array<TypeTag | string>;
   functionArguments: Array<EntryFunctionArgumentTypes | SimpleEntryFunctionArgumentTypes>;
 };
 
@@ -152,8 +152,6 @@ export interface InputGenerateSingleSignerRawTransactionArgs {
   aptosConfig: AptosConfig;
   sender: AccountAddressInput;
   payload: AnyTransactionPayloadInstance;
-  feePayerAddress?: undefined;
-  secondarySignerAddresses?: undefined;
   options?: InputGenerateTransactionOptions;
 }
 
@@ -179,7 +177,6 @@ export interface InputGenerateMultiAgentRawTransactionArgs {
   sender: AccountAddressInput;
   payload: AnyTransactionPayloadInstance;
   secondarySignerAddresses: AccountAddressInput[];
-  feePayerAddress?: undefined;
   options?: InputGenerateTransactionOptions;
 }
 
@@ -198,8 +195,6 @@ export type InputGenerateRawTransactionArgs =
  */
 export interface InputSingleSignerTransaction {
   rawTransaction: RawTransaction;
-  feePayerAddress?: undefined;
-  secondarySignerAddresses?: undefined;
 }
 
 /**
@@ -224,7 +219,6 @@ export interface InputFeePayerTransaction {
 export interface InputMultiAgentTransaction {
   rawTransaction: RawTransaction;
   secondarySignerAddresses: AccountAddress[];
-  feePayerAddress?: undefined;
 }
 
 /**
@@ -267,8 +261,6 @@ export type InputSimulateTransactionOptions = {
  */
 export interface InputGenerateSingleSignerRawTransactionData {
   sender: AccountAddressInput;
-  feePayerAddress?: undefined;
-  secondarySignerAddresses?: undefined;
   options?: InputGenerateTransactionOptions;
   data: InputGenerateTransactionPayloadData;
 }
@@ -278,7 +270,7 @@ export interface InputGenerateSingleSignerRawTransactionData {
  */
 export interface InputGenerateFeePayerRawTransactionData {
   sender: AccountAddressInput;
-  feePayerAddress: AccountAddressInput;
+  hasFeePayer: true;
   secondarySignerAddresses?: AccountAddressInput[];
   options?: InputGenerateTransactionOptions;
   data: InputGenerateTransactionPayloadData;
@@ -290,7 +282,6 @@ export interface InputGenerateFeePayerRawTransactionData {
 export interface InputGenerateMultiAgentRawTransactionData {
   sender: AccountAddressInput;
   secondarySignerAddresses: AccountAddressInput[];
-  feePayerAddress?: undefined;
   options?: InputGenerateTransactionOptions;
   data: InputGenerateTransactionPayloadData;
 }