@aptos-labs/ts-sdk 0.0.5 → 0.0.6

package/package.json

@@ -45,39 +45,39 @@
   "dependencies": {
     "@aptos-labs/aptos-client": "^0.0.2",
     "@noble/curves": "^1.2.0",
-    "@noble/hashes": "1.1.3",
+    "@noble/hashes": "^1.3.2",
     "@scure/bip32": "^1.3.2",
-    "@scure/bip39": "1.1.0",
-    "form-data": "4.0.0",
-    "tweetnacl": "1.0.3"
+    "@scure/bip39": "^1.2.1",
+    "form-data": "^4.0.0",
+    "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",
+    "@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.7",
+    "@types/node": "^20.8.10",
+    "@typescript-eslint/eslint-plugin": "^6.9.1",
+    "@typescript-eslint/parser": "^6.9.1",
     "cross-var": "^1.1.0",
-    "dotenv": "16.0.2",
-    "eslint": "8.23.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",
-    "prettier": "2.6.2",
-    "ts-jest": "28.0.8",
-    "ts-loader": "9.3.1",
-    "ts-node": "10.9.1",
-    "tsup": "7.2.0",
-    "typedoc": "^0.23.20",
-    "typescript": "4.8.2"
+    "dotenv": "^16.3.1",
+    "eslint": "^8.52.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-config-airbnb-typescript": "^17.1.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-import": "^2.29.0",
+    "graphql": "^16.8.1",
+    "graphql-request": "^6.1.0",
+    "jest": "^29.7.0",
+    "prettier": "^3.0.3",
+    "ts-jest": "^29.1.1",
+    "ts-loader": "^9.5.0",
+    "ts-node": "^10.9.1",
+    "tsup": "^7.2.0",
+    "typedoc": "^0.25.3",
+    "typescript": "^5.2.2"
   },
-  "version": "0.0.5"
+  "version": "0.0.6"
 }

package/src/api/account.ts

@@ -13,7 +13,7 @@ import {
   LedgerVersion,
   MoveModuleBytecode,
   MoveResource,
-  MoveStructType,
+  MoveStructId,
   OrderBy,
   PaginationArgs,
   TokenStandard,
@@ -174,7 +174,7 @@ export class Account {
    */
   async getAccountResource<T extends {} = any>(args: {
     accountAddress: AccountAddressInput;
-    resourceType: MoveStructType;
+    resourceType: MoveStructId;
     options?: LedgerVersion;
   }): Promise<T> {
     return getResource<T>({ aptosConfig: this.config, ...args });

package/src/api/coin.ts

@@ -5,7 +5,7 @@ import { AptosConfig } from "./aptosConfig";
 import { Account, AccountAddressInput } from "../core";
 import { transferCoinTransaction } from "../internal/coin";
 import { InputSingleSignerTransaction, InputGenerateTransactionOptions } from "../transactions/types";
-import { AnyNumber, MoveStructType } from "../types";
+import { AnyNumber, MoveStructId } from "../types";
 
 /**
  * A class to handle all `Coin` operations
@@ -31,7 +31,7 @@ export class Coin {
     sender: Account;
     recipient: AccountAddressInput;
     amount: AnyNumber;
-    coinType?: MoveStructType;
+    coinType?: MoveStructId;
     options?: InputGenerateTransactionOptions;
   }): Promise<InputSingleSignerTransaction> {
     return transferCoinTransaction({ aptosConfig: this.config, ...args });

package/src/api/event.ts

@@ -3,7 +3,7 @@
 
 import { AptosConfig } from "./aptosConfig";
 import { getAccountEventsByCreationNumber, getAccountEventsByEventType, getEvents } from "../internal/event";
-import { AnyNumber, GetEventsResponse, MoveStructType, OrderBy, PaginationArgs } from "../types";
+import { AnyNumber, GetEventsResponse, MoveStructId, OrderBy, PaginationArgs } from "../types";
 import { EventsBoolExp } from "../types/generated/types";
 import { AccountAddressInput } from "../core";
 
@@ -42,7 +42,7 @@ export class Event {
    */
   async getAccountEventsByEventType(args: {
     accountAddress: AccountAddressInput;
-    eventType: MoveStructType;
+    eventType: MoveStructId;
     options?: {
       pagination?: PaginationArgs;
       orderBy?: OrderBy<GetEventsResponse[0]>;

package/src/api/general.ts

@@ -21,7 +21,7 @@ import {
   LedgerVersion,
   MoveValue,
   TableItemRequest,
-  ViewRequestData,
+  InputViewRequestData,
 } from "../types";
 
 /**
@@ -133,8 +133,8 @@ export class General {
    *
    * @returns an array of Move values
    */
-  async view(args: { payload: ViewRequestData; options?: LedgerVersion }): Promise<Array<MoveValue>> {
-    return view({ aptosConfig: this.config, ...args });
+  async view<T extends Array<MoveValue>>(args: { payload: InputViewRequestData; options?: LedgerVersion }): Promise<T> {
+    return view<T>({ aptosConfig: this.config, ...args });
   }
 
   /**
@@ -170,7 +170,7 @@ export class General {
    *
    * @return The provided T type
    */
-  async queryIndexer<T>(args: { query: GraphqlQuery }): Promise<T> {
+  async queryIndexer<T extends {}>(args: { query: GraphqlQuery }): Promise<T> {
     return queryIndexer<T>({
       aptosConfig: this.config,
       ...args,

package/src/api/transactionSubmission.ts

@@ -99,7 +99,7 @@ export class TransactionSubmission {
    * ```
    * {
    *  rawTransaction: RawTransaction,
-   *  secondarySignerAddresses? : Array<AccountAddress>,
+   *  secondarySignerAddresses?: Array<AccountAddress>,
    *  feePayerAddress?: AccountAddress
    * }
    * ```
@@ -113,9 +113,14 @@ export class TransactionSubmission {
     asFeePayer?: boolean;
   }): AccountAuthenticator {
     const { signer, transaction, asFeePayer } = args;
-    if (asFeePayer) {
+
+    // Account can only sign as fee payer if it's a fee payer transaction
+    if ("feePayerAddress" in transaction && asFeePayer) {
       transaction.feePayerAddress = signer.accountAddress;
+    } else if (asFeePayer) {
+      throw new Error("Transaction being signed is not a Fee payer transaction, but `asFeePayer` is set to true");
     }
+
     return signTransaction({
       signer,
       transaction,

package/src/client/core.ts

@@ -60,7 +60,7 @@ export async function request<Req, Res>(options: ClientRequest<Req>, client: Cli
  * @param aptosConfig The config information for the SDK client instance
  * @returns the response or AptosApiError
  */
-export async function aptosRequest<Req, Res>(
+export async function aptosRequest<Req extends {}, Res extends {}>(
   options: AptosRequest,
   aptosConfig: AptosConfig,
 ): Promise<AptosResponse<Req, Res>> {

package/src/client/get.ts

@@ -47,7 +47,9 @@ export type GetAptosRequestOptions = Omit<GetRequestOptions, "type">;
  * @param options GetRequestOptions
  * @returns
  */
-export async function get<Req, Res>(options: GetRequestOptions): Promise<AptosResponse<Req, Res>> {
+export async function get<Req extends {}, Res extends {}>(
+  options: GetRequestOptions,
+): Promise<AptosResponse<Req, Res>> {
   const { aptosConfig, overrides, params, contentType, acceptType, path, originMethod, type } = options;
   const url = aptosConfig.getRequestUrl(type);
 
@@ -69,7 +71,9 @@ export async function get<Req, Res>(options: GetRequestOptions): Promise<AptosRe
   );
 }
 
-export async function getAptosFullNode<Req, Res>(options: GetAptosRequestOptions): Promise<AptosResponse<Req, Res>> {
+export async function getAptosFullNode<Req extends {}, Res extends {}>(
+  options: GetAptosRequestOptions,
+): Promise<AptosResponse<Req, Res>> {
   return get<Req, Res>({ ...options, type: AptosApiType.FULLNODE });
 }
 

package/src/client/post.ts

@@ -54,7 +54,9 @@ export type PostAptosRequestOptions = Omit<PostRequestOptions, "type">;
  * @param options PostRequestOptions
  * @returns
  */
-export async function post<Req, Res>(options: PostRequestOptions): Promise<AptosResponse<Req, Res>> {
+export async function post<Req extends {}, Res extends {}>(
+  options: PostRequestOptions,
+): Promise<AptosResponse<Req, Res>> {
   const { type, originMethod, path, body, acceptType, contentType, params, aptosConfig, overrides } = options;
   const url = aptosConfig.getRequestUrl(type);
 
@@ -77,14 +79,20 @@ export async function post<Req, Res>(options: PostRequestOptions): Promise<Aptos
   );
 }
 
-export async function postAptosFullNode<Req, Res>(options: PostAptosRequestOptions): Promise<AptosResponse<Req, Res>> {
+export async function postAptosFullNode<Req extends {}, Res extends {}>(
+  options: PostAptosRequestOptions,
+): Promise<AptosResponse<Req, Res>> {
   return post<Req, Res>({ ...options, type: AptosApiType.FULLNODE });
 }
 
-export async function postAptosIndexer<Req, Res>(options: PostAptosRequestOptions): Promise<AptosResponse<Req, Res>> {
+export async function postAptosIndexer<Req extends {}, Res extends {}>(
+  options: PostAptosRequestOptions,
+): Promise<AptosResponse<Req, Res>> {
   return post<Req, Res>({ ...options, type: AptosApiType.INDEXER });
 }
 
-export async function postAptosFaucet<Req, Res>(options: PostAptosRequestOptions): Promise<AptosResponse<Req, Res>> {
+export async function postAptosFaucet<Req extends {}, Res extends {}>(
+  options: PostAptosRequestOptions,
+): Promise<AptosResponse<Req, Res>> {
   return post<Req, Res>({ ...options, type: AptosApiType.FAUCET });
 }

package/src/index.ts

@@ -7,4 +7,4 @@ export * from "./client";
 export * from "./core";
 export * from "./transactions";
 export * from "./types";
-export * from "./utils/apiEndpoints";
+export * from "./utils";

package/src/internal/account.ts

@@ -24,7 +24,7 @@ import {
   LedgerVersion,
   MoveModuleBytecode,
   MoveResource,
-  MoveStructType,
+  MoveStructId,
   OrderBy,
   PaginationArgs,
   SigningScheme,
@@ -165,7 +165,7 @@ export async function getResources(args: {
 export async function getResource<T extends {}>(args: {
   aptosConfig: AptosConfig;
   accountAddress: AccountAddressInput;
-  resourceType: MoveStructType;
+  resourceType: MoveStructId;
   options?: LedgerVersion;
 }): Promise<T> {
   const { aptosConfig, accountAddress, resourceType, options } = args;

package/src/internal/ans.ts

@@ -82,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]>;

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/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,13 +77,7 @@ import { UserTransactionResponse, PendingTransactionResponse, MimeType, HexInput
 export async function generateTransaction(
   args: { aptosConfig: AptosConfig } & InputGenerateTransactionData,
 ): Promise<AnyRawTransaction> {
-  const { aptosConfig, sender, data, options, secondarySignerAddresses, hasFeePayer } = args;
-
-  // Upate feePayerAddress if it has sponsor
-  let feePayerAddress;
-  if (hasFeePayer === true) {
-    feePayerAddress = AccountAddress.ZERO.toString();
-  }
+  const { aptosConfig, sender, data, options } = args;
 
   // Merge in aptosConfig for remote ABI on non-script payloads
   let generateTransactionPayloadData: InputGenerateTransactionPayloadDataWithRemoteABI;
@@ -103,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/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>;
@@ -234,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,
@@ -290,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,
@@ -299,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,
@@ -342,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 ?? [],
@@ -371,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,
@@ -515,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