@aptos-labs/ts-sdk 1.6.0 → 1.8.0

package/src/internal/transactionSubmission.ts

@@ -20,6 +20,7 @@ import {
   generateSignedTransaction,
   sign,
   generateSigningMessage,
+  generateTransactionPayloadWithABI,
 } from "../transactions/transactionBuilder/transactionBuilder";
 import {
   InputGenerateTransactionData,
@@ -33,9 +34,11 @@ import {
   InputGenerateSingleSignerRawTransactionData,
   MultiAgentTransaction,
   AnyTransactionPayloadInstance,
+  EntryFunctionABI,
 } from "../transactions/types";
 import { getInfo } from "./account";
 import { UserTransactionResponse, PendingTransactionResponse, MimeType, HexInput, TransactionResponse } from "../types";
+import { TypeTagU8, TypeTagVector } from "../transactions";
 
 /**
  * We are defining function signatures, each with its specific input and output.
@@ -105,17 +108,23 @@ export async function buildTransactionPayload(
   let generateTransactionPayloadData: InputGenerateTransactionPayloadDataWithRemoteABI;
   let payload: AnyTransactionPayloadInstance;
   if ("bytecode" in data) {
-    generateTransactionPayloadData = data;
-    payload = await generateTransactionPayload(generateTransactionPayloadData);
+    // TODO: Add ABI checking later
+    payload = await generateTransactionPayload(data);
   } else if ("multisigAddress" in data) {
-    generateTransactionPayloadData = {
-      aptosConfig,
-      multisigAddress: data.multisigAddress,
-      function: data.function,
-      functionArguments: data.functionArguments,
-      typeArguments: data.typeArguments,
-    };
-    payload = await generateTransactionPayload(generateTransactionPayloadData);
+    if (data.abi) {
+      payload = generateTransactionPayloadWithABI({ abi: data.abi, ...data });
+    } else {
+      generateTransactionPayloadData = {
+        aptosConfig,
+        multisigAddress: data.multisigAddress,
+        function: data.function,
+        functionArguments: data.functionArguments,
+        typeArguments: data.typeArguments,
+      };
+      payload = await generateTransactionPayload(generateTransactionPayloadData);
+    }
+  } else if (data.abi) {
+    payload = generateTransactionPayloadWithABI({ abi: data.abi, ...data });
   } else {
     generateTransactionPayloadData = {
       aptosConfig,
@@ -281,6 +290,11 @@ export async function signAndSubmitTransaction(args: {
   });
 }
 
+const packagePublishAbi: EntryFunctionABI = {
+  typeParameters: [],
+  parameters: [TypeTagVector.u8(), new TypeTagVector(TypeTagVector.u8())],
+};
+
 export async function publicPackageTransaction(args: {
   aptosConfig: AptosConfig;
   account: AccountAddressInput;
@@ -292,18 +306,30 @@ export async function publicPackageTransaction(args: {
 
   const totalByteCode = moduleBytecode.map((bytecode) => MoveVector.U8(bytecode));
 
-  const transaction = await generateTransaction({
+  return generateTransaction({
     aptosConfig,
     sender: AccountAddress.from(account),
     data: {
       function: "0x1::code::publish_package_txn",
       functionArguments: [MoveVector.U8(metadataBytes), new MoveVector(totalByteCode)],
+      abi: packagePublishAbi,
     },
     options,
   });
-  return transaction;
 }
 
+const rotateAuthKeyAbi: EntryFunctionABI = {
+  typeParameters: [],
+  parameters: [
+    new TypeTagU8(),
+    TypeTagVector.u8(),
+    new TypeTagU8(),
+    TypeTagVector.u8(),
+    TypeTagVector.u8(),
+    TypeTagVector.u8(),
+  ],
+};
+
 /**
  * TODO: Need to refactor and move this function out of transactionSubmission
  */
@@ -346,12 +372,12 @@ export async function rotateAuthKey(args: {
         MoveVector.U8(proofSignedByCurrentPrivateKey.toUint8Array()),
         MoveVector.U8(proofSignedByNewPrivateKey.toUint8Array()),
       ],
+      abi: rotateAuthKeyAbi,
     },
   });
-  const pendingTxn = await signAndSubmitTransaction({
+  return signAndSubmitTransaction({
     aptosConfig,
     signer: fromAccount,
     transaction: rawTxn,
   });
-  return pendingTxn;
 }

package/src/transactions/management/transactionWorker.ts

@@ -260,13 +260,19 @@ export class TransactionWorker extends EventEmitter<TransactionWorkerEvents> {
 
   /**
    * Push transaction to the transactions queue
-   * @param payload Transaction payload
+   *
+   * @param transactionData Transaction payload
+   * @param transactionData.abi For all entry function payloads, the ABI to skip remote ABI lookups
+   * @param options.maxGasAmount Maximum gas amount for the transaction
+   * @param options.gasUnitPrice Gas unit price for the transaction
+   * @param options.expireTimestamp expiration timestamp on the transaction
+   * @param options.accountSequenceNumber the sequence number for the transaction
    */
   async push(
     transactionData: InputGenerateTransactionPayloadData,
     options?: InputGenerateTransactionOptions,
   ): Promise<void> {
-    await this.transactionsQueue.enqueue([transactionData, options]);
+    this.transactionsQueue.enqueue([transactionData, options]);
   }
 
   /**
@@ -278,14 +284,12 @@ export class TransactionWorker extends EventEmitter<TransactionWorkerEvents> {
   async generateNextTransaction(account: Account, sequenceNumber: bigint): Promise<SimpleTransaction | undefined> {
     if (this.transactionsQueue.isEmpty()) return undefined;
     const [transactionData, options] = await this.transactionsQueue.dequeue();
-    const transaction = await generateTransaction({
+    return generateTransaction({
       aptosConfig: this.aptosConfig,
       sender: account.accountAddress,
       data: transactionData,
       options: { ...options, accountSequenceNumber: sequenceNumber },
     });
-
-    return transaction;
   }
 
   /**

package/src/transactions/transactionBuilder/transactionBuilder.ts

@@ -55,7 +55,6 @@ import {
   AnyTransactionPayloadInstance,
   AnyRawTransactionInstance,
   EntryFunctionArgumentTypes,
-  EntryFunctionABI,
   InputGenerateMultiAgentRawTransactionArgs,
   InputGenerateRawTransactionArgs,
   InputGenerateSingleSignerRawTransactionArgs,
@@ -64,13 +63,13 @@ import {
   MultiAgentTransaction,
   InputScriptData,
   InputSimulateTransactionData,
-  InputGenerateTransactionPayloadData,
-  InputEntryFunctionData,
-  InputMultiSigData,
   InputMultiSigDataWithRemoteABI,
   InputEntryFunctionDataWithRemoteABI,
   InputGenerateTransactionPayloadDataWithRemoteABI,
   InputSubmitTransactionData,
+  InputGenerateTransactionPayloadDataWithABI,
+  InputEntryFunctionDataWithABI,
+  InputMultiSigDataWithABI,
 } from "../types";
 import { convertArgument, fetchEntryFunctionAbi, standardizeTypeTags } from "./remoteAbi";
 import { memoizeAsync } from "../../utils/memoize";
@@ -117,25 +116,16 @@ export async function generateTransactionPayload(
     1000 * 60 * 5, // 5 minutes
   )();
 
-  return generateTransactionPayloadWithABI(args, functionAbi);
+  // Fill in the ABI
+  return generateTransactionPayloadWithABI({ abi: functionAbi, ...args });
 }
 
+export function generateTransactionPayloadWithABI(args: InputEntryFunctionDataWithABI): TransactionPayloadEntryFunction;
+export function generateTransactionPayloadWithABI(args: InputMultiSigDataWithABI): TransactionPayloadMultiSig;
 export function generateTransactionPayloadWithABI(
-  args: InputEntryFunctionData,
-  functionAbi: EntryFunctionABI,
-): TransactionPayloadEntryFunction;
-export function generateTransactionPayloadWithABI(
-  args: InputMultiSigData,
-  functionAbi: EntryFunctionABI,
-): TransactionPayloadMultiSig;
-export function generateTransactionPayloadWithABI(
-  args: InputGenerateTransactionPayloadData,
-  functionAbi: EntryFunctionABI,
+  args: InputGenerateTransactionPayloadDataWithABI,
 ): AnyTransactionPayloadInstance {
-  if (isScriptDataInput(args)) {
-    return generateTransactionPayloadScript(args);
-  }
-
+  const functionAbi = args.abi;
   const { moduleAddress, moduleName, functionName } = getFunctionParts(args.function);
 
   // Ensure that all type arguments are typed properly

package/src/transactions/typeTag/index.ts

@@ -277,6 +277,10 @@ export class TypeTagVector extends TypeTag {
     super();
   }
 
+  static u8(): TypeTagVector {
+    return new TypeTagVector(new TypeTagU8());
+  }
+
   serialize(serializer: Serializer): void {
     serializer.serializeU32AsUleb128(TypeTagVariants.Vector);
     this.value.serialize(serializer);

package/src/transactions/typeTag/parser.ts

@@ -275,7 +275,7 @@ function parseTypeTagInner(str: string, types: Array<TypeTag>, allowGenerics: bo
       }
 
       // If the value doesn't contain a colon, then we'll assume it isn't trying to be a struct
-      if (!str.match(/.*:.*/)) {
+      if (!str.match(/:/)) {
         throw new TypeTagParserError(str, TypeTagParserErrorType.InvalidTypeTag);
       }
 

package/src/transactions/types.ts

@@ -109,8 +109,19 @@ export type InputEntryFunctionData = {
   function: MoveFunctionId;
   typeArguments?: Array<TypeTag | string>;
   functionArguments: Array<EntryFunctionArgumentTypes | SimpleEntryFunctionArgumentTypes>;
+  abi?: EntryFunctionABI;
 };
 
+export type InputGenerateTransactionPayloadDataWithABI = InputEntryFunctionDataWithABI | InputMultiSigDataWithABI;
+
+export type InputEntryFunctionDataWithABI = Omit<InputEntryFunctionData, "abi"> & {
+  abi: EntryFunctionABI;
+};
+
+export type InputMultiSigDataWithABI = {
+  multisigAddress: AccountAddressInput;
+} & InputEntryFunctionDataWithABI;
+
 export type InputEntryFunctionDataWithRemoteABI = InputEntryFunctionData & { aptosConfig: AptosConfig };
 /**
  * The data needed to generate a Multi Sig payload

package/src/types/generated/operations.ts

@@ -55,6 +55,7 @@ export type CurrentTokenOwnershipFieldsFragment = {
     token_properties: any;
     token_standard: string;
     token_uri: string;
+    decimals: any;
     current_collection?: {
       collection_id: string;
       collection_name: string;
@@ -211,6 +212,7 @@ export type GetAccountOwnedTokensQuery = {
       token_properties: any;
       token_standard: string;
       token_uri: string;
+      decimals: any;
       current_collection?: {
         collection_id: string;
         collection_name: string;
@@ -266,6 +268,7 @@ export type GetAccountOwnedTokensByTokenDataQuery = {
       token_properties: any;
       token_standard: string;
       token_uri: string;
+      decimals: any;
       current_collection?: {
         collection_id: string;
         collection_name: string;
@@ -321,6 +324,7 @@ export type GetAccountOwnedTokensFromCollectionQuery = {
       token_properties: any;
       token_standard: string;
       token_uri: string;
+      decimals: any;
       current_collection?: {
         collection_id: string;
         collection_name: string;
@@ -593,6 +597,7 @@ export type GetCurrentTokenOwnershipQuery = {
       token_properties: any;
       token_standard: string;
       token_uri: string;
+      decimals: any;
       current_collection?: {
         collection_id: string;
         collection_name: string;
@@ -635,6 +640,7 @@ export type GetTokenDataQuery = {
     token_properties: any;
     token_standard: string;
     token_uri: string;
+    decimals: any;
     current_collection?: {
       collection_id: string;
       collection_name: string;

package/src/types/generated/queries.ts

@@ -60,6 +60,7 @@ export const CurrentTokenOwnershipFieldsFragmentDoc = `
     token_properties
     token_standard
     token_uri
+    decimals
     current_collection {
       collection_id
       collection_name
@@ -433,6 +434,7 @@ export const GetTokenData = `
     token_properties
     token_standard
     token_uri
+    decimals
     current_collection {
       collection_id
       collection_name