@aptos-labs/ts-sdk 2.0.1 → 3.0.0

package/dist/esm/types/types.mjs

@@ -1,2 +1,2 @@
-import{A,B,C,D,E,F,G,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z}from"../chunk-ODAAZLPK.mjs";import"../chunk-KDMSOCZY.mjs";export{g as AccountAuthenticatorVariant,i as AnyPublicKeyVariant,j as AnySignatureVariant,G as DeriveScheme,m as EphemeralCertificateVariant,k as EphemeralPublicKeyVariant,l as EphemeralSignatureVariant,a as MimeType,C as MoveAbility,B as MoveFunctionVisibility,h as PrivateKeyVariants,D as RoleType,c as ScriptTransactionArgumentVariants,E as SigningScheme,F as SigningSchemeInput,f as TransactionAuthenticatorVariant,d as TransactionPayloadVariants,o as TransactionResponseType,e as TransactionVariants,b as TypeTagVariants,n as ZkpVariant,v as isBlockEpilogueTransactionResponse,s as isBlockMetadataTransactionResponse,w as isEd25519Signature,z as isFeePayerSignature,r as isGenesisTransactionResponse,y as isMultiAgentSignature,A as isMultiEd25519Signature,p as isPendingTransactionResponse,x as isSecp256k1Signature,t as isStateCheckpointTransactionResponse,q as isUserTransactionResponse,u as isValidatorTransactionResponse};
+import{A,B,C,D,E,F,G,H,I,J,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z}from"../chunk-4H2RMR7D.mjs";import"../chunk-KDMSOCZY.mjs";export{j as AccountAuthenticatorVariant,l as AnyPublicKeyVariant,m as AnySignatureVariant,J as DeriveScheme,p as EphemeralCertificateVariant,n as EphemeralPublicKeyVariant,o as EphemeralSignatureVariant,a as MimeType,F as MoveAbility,E as MoveFunctionVisibility,k as PrivateKeyVariants,G as RoleType,c as ScriptTransactionArgumentVariants,H as SigningScheme,I as SigningSchemeInput,i as TransactionAuthenticatorVariant,f as TransactionExecutableVariants,g as TransactionExtraConfigVariants,e as TransactionInnerPayloadVariants,d as TransactionPayloadVariants,r as TransactionResponseType,h as TransactionVariants,b as TypeTagVariants,q as ZkpVariant,y as isBlockEpilogueTransactionResponse,v as isBlockMetadataTransactionResponse,z as isEd25519Signature,C as isFeePayerSignature,u as isGenesisTransactionResponse,B as isMultiAgentSignature,D as isMultiEd25519Signature,s as isPendingTransactionResponse,A as isSecp256k1Signature,w as isStateCheckpointTransactionResponse,t as isUserTransactionResponse,x as isValidatorTransactionResponse};
 //# sourceMappingURL=types.mjs.map

package/dist/esm/utils/helpers.d.mts

@@ -1,14 +1,10 @@
-import { MoveStructId, MoveFunctionId } from '../types/types.mjs';
-import { AccountAddress } from '../core/accountAddress.mjs';
+import { d4 as MoveStructId, d5 as MoveFunctionId, n as AccountAddress } from '../account-9G6tix5T.mjs';
 import '../types/indexer.mjs';
 import '../types/generated/operations.mjs';
 import '../types/generated/types.mjs';
 import './apiEndpoints.mjs';
-import '../bcs/serializer.mjs';
-import '../core/hex.mjs';
+import './const.mjs';
 import '../core/common.mjs';
-import '../bcs/deserializer.mjs';
-import '../transactions/instances/transactionArgument.mjs';
 
 /**
  * Sleep for the specified amount of time in milliseconds.

package/dist/esm/utils/helpers.mjs

@@ -1,2 +1,2 @@
-import{a,b,c,d,e,f,g,h,i,j,k,l,m,n}from"../chunk-7DQDJ2SA.mjs";import"../chunk-HNBVYE3N.mjs";import"../chunk-RGKRCZ36.mjs";import"../chunk-FD6FGKYY.mjs";import"../chunk-ODAAZLPK.mjs";import"../chunk-4WPQQPUF.mjs";import"../chunk-EBMEXURY.mjs";import"../chunk-STY74NUA.mjs";import"../chunk-IF4UU2MT.mjs";import"../chunk-56CNRT2K.mjs";import"../chunk-KDMSOCZY.mjs";export{e as base64UrlDecode,f as base64UrlToBytes,g as convertAmountFromHumanReadableToOnChain,h as convertAmountFromOnChainToHumanReadable,d as floorToWholeHour,b as getErrorMessage,k as getFunctionParts,j as isEncodedStruct,l as isValidFunctionInfo,c as nowInSeconds,n as pairedFaMetadataAddress,i as parseEncodedStruct,a as sleep,m as truncateAddress};
+import{a,b,c,d,e,f,g,h,i,j,k,l,m,n}from"../chunk-7DQDJ2SA.mjs";import"../chunk-HNBVYE3N.mjs";import"../chunk-RGKRCZ36.mjs";import"../chunk-FD6FGKYY.mjs";import"../chunk-4H2RMR7D.mjs";import"../chunk-4WPQQPUF.mjs";import"../chunk-EBMEXURY.mjs";import"../chunk-STY74NUA.mjs";import"../chunk-IF4UU2MT.mjs";import"../chunk-56CNRT2K.mjs";import"../chunk-KDMSOCZY.mjs";export{e as base64UrlDecode,f as base64UrlToBytes,g as convertAmountFromHumanReadableToOnChain,h as convertAmountFromOnChainToHumanReadable,d as floorToWholeHour,b as getErrorMessage,k as getFunctionParts,j as isEncodedStruct,l as isValidFunctionInfo,c as nowInSeconds,n as pairedFaMetadataAddress,i as parseEncodedStruct,a as sleep,m as truncateAddress};
 //# sourceMappingURL=helpers.mjs.map

package/dist/esm/utils/index.d.mts

@@ -2,13 +2,8 @@ export { Network, NetworkToChainId, NetworkToFaucetAPI, NetworkToIndexerAPI, Net
 export { APTOS_COIN, APTOS_FA, AptosApiType, DEFAULT_MAX_GAS_AMOUNT, DEFAULT_TXN_EXP_SEC_FROM_NOW, DEFAULT_TXN_TIMEOUT_SEC, FIREBASE_AUTH_ISS_PATTERN, ProcessorType, RAW_TRANSACTION_SALT, RAW_TRANSACTION_WITH_DATA_SALT } from './const.mjs';
 export { DeserializableClass, normalizeBundle } from './normalizeBundle.mjs';
 export { base64UrlDecode, base64UrlToBytes, convertAmountFromHumanReadableToOnChain, convertAmountFromOnChainToHumanReadable, floorToWholeHour, getErrorMessage, getFunctionParts, isEncodedStruct, isValidFunctionInfo, nowInSeconds, pairedFaMetadataAddress, parseEncodedStruct, sleep, truncateAddress } from './helpers.mjs';
-import '../bcs/deserializer.mjs';
-import '../types/types.mjs';
+import '../account-9G6tix5T.mjs';
 import '../types/indexer.mjs';
 import '../types/generated/operations.mjs';
 import '../types/generated/types.mjs';
-import '../bcs/serializer.mjs';
-import '../core/hex.mjs';
 import '../core/common.mjs';
-import '../core/accountAddress.mjs';
-import '../transactions/instances/transactionArgument.mjs';

package/dist/esm/utils/index.mjs

@@ -1,2 +1,2 @@
-import"../chunk-HGLO5LDS.mjs";import{a as s}from"../chunk-CW35YAMN.mjs";import{a,b,c,d,e,f,g,h}from"../chunk-4RXKALLC.mjs";import{a as i,b as j,c as k,d as l,e as m,f as n,g as o,h as p,i as q,j as r}from"../chunk-RJ7F4JDV.mjs";import"../chunk-FZY4PMEE.mjs";import"../chunk-Q4W3WJ2U.mjs";import"../chunk-ORMOQWWH.mjs";import"../chunk-TOBQ5UE6.mjs";import"../chunk-MT2RJ7H3.mjs";import"../chunk-FLZPUYXQ.mjs";import{a as t,b as u,c as v,d as w,e as x,f as y,g as z,h as A,i as B,j as C,k as D,l as E,m as F,n as G}from"../chunk-7DQDJ2SA.mjs";import"../chunk-HNBVYE3N.mjs";import"../chunk-RGKRCZ36.mjs";import"../chunk-FD6FGKYY.mjs";import"../chunk-ODAAZLPK.mjs";import"../chunk-4WPQQPUF.mjs";import"../chunk-EBMEXURY.mjs";import"../chunk-STY74NUA.mjs";import"../chunk-IF4UU2MT.mjs";import"../chunk-56CNRT2K.mjs";import"../chunk-KDMSOCZY.mjs";export{m as APTOS_COIN,n as APTOS_FA,i as AptosApiType,j as DEFAULT_MAX_GAS_AMOUNT,k as DEFAULT_TXN_EXP_SEC_FROM_NOW,l as DEFAULT_TXN_TIMEOUT_SEC,r as FIREBASE_AUTH_ISS_PATTERN,f as Network,g as NetworkToChainId,c as NetworkToFaucetAPI,a as NetworkToIndexerAPI,h as NetworkToNetworkName,b as NetworkToNodeAPI,d as NetworkToPepperAPI,e as NetworkToProverAPI,q as ProcessorType,o as RAW_TRANSACTION_SALT,p as RAW_TRANSACTION_WITH_DATA_SALT,x as base64UrlDecode,y as base64UrlToBytes,z as convertAmountFromHumanReadableToOnChain,A as convertAmountFromOnChainToHumanReadable,w as floorToWholeHour,u as getErrorMessage,D as getFunctionParts,C as isEncodedStruct,E as isValidFunctionInfo,s as normalizeBundle,v as nowInSeconds,G as pairedFaMetadataAddress,B as parseEncodedStruct,t as sleep,F as truncateAddress};
+import"../chunk-HGLO5LDS.mjs";import{a as s}from"../chunk-CW35YAMN.mjs";import{a as t,b as u,c as v,d as w,e as x,f as y,g as z,h as A,i as B,j as C,k as D,l as E,m as F,n as G}from"../chunk-7DQDJ2SA.mjs";import"../chunk-HNBVYE3N.mjs";import"../chunk-RGKRCZ36.mjs";import"../chunk-FZY4PMEE.mjs";import"../chunk-Q4W3WJ2U.mjs";import"../chunk-ORMOQWWH.mjs";import"../chunk-TOBQ5UE6.mjs";import"../chunk-MT2RJ7H3.mjs";import"../chunk-FD6FGKYY.mjs";import"../chunk-4H2RMR7D.mjs";import"../chunk-4WPQQPUF.mjs";import"../chunk-FLZPUYXQ.mjs";import"../chunk-EBMEXURY.mjs";import"../chunk-STY74NUA.mjs";import"../chunk-IF4UU2MT.mjs";import"../chunk-56CNRT2K.mjs";import{a,b,c,d,e,f,g,h}from"../chunk-4RXKALLC.mjs";import{a as i,b as j,c as k,d as l,e as m,f as n,g as o,h as p,i as q,j as r}from"../chunk-RJ7F4JDV.mjs";import"../chunk-KDMSOCZY.mjs";export{m as APTOS_COIN,n as APTOS_FA,i as AptosApiType,j as DEFAULT_MAX_GAS_AMOUNT,k as DEFAULT_TXN_EXP_SEC_FROM_NOW,l as DEFAULT_TXN_TIMEOUT_SEC,r as FIREBASE_AUTH_ISS_PATTERN,f as Network,g as NetworkToChainId,c as NetworkToFaucetAPI,a as NetworkToIndexerAPI,h as NetworkToNetworkName,b as NetworkToNodeAPI,d as NetworkToPepperAPI,e as NetworkToProverAPI,q as ProcessorType,o as RAW_TRANSACTION_SALT,p as RAW_TRANSACTION_WITH_DATA_SALT,x as base64UrlDecode,y as base64UrlToBytes,z as convertAmountFromHumanReadableToOnChain,A as convertAmountFromOnChainToHumanReadable,w as floorToWholeHour,u as getErrorMessage,D as getFunctionParts,C as isEncodedStruct,E as isValidFunctionInfo,s as normalizeBundle,v as nowInSeconds,G as pairedFaMetadataAddress,B as parseEncodedStruct,t as sleep,F as truncateAddress};
 //# sourceMappingURL=index.mjs.map

package/dist/esm/utils/normalizeBundle.d.mts

@@ -1,11 +1,9 @@
-import { Deserializer } from '../bcs/deserializer.mjs';
-import { Serializable } from '../bcs/serializer.mjs';
-import '../types/types.mjs';
+import { S as Serializable, a as Deserializer } from '../account-9G6tix5T.mjs';
 import '../types/indexer.mjs';
 import '../types/generated/operations.mjs';
 import '../types/generated/types.mjs';
 import './apiEndpoints.mjs';
-import '../core/hex.mjs';
+import './const.mjs';
 import '../core/common.mjs';
 
 /**

package/dist/esm/utils/normalizeBundle.mjs

@@ -1,2 +1,2 @@
-import{a}from"../chunk-CW35YAMN.mjs";import"../chunk-FZY4PMEE.mjs";import"../chunk-Q4W3WJ2U.mjs";import"../chunk-ORMOQWWH.mjs";import"../chunk-TOBQ5UE6.mjs";import"../chunk-MT2RJ7H3.mjs";import"../chunk-FLZPUYXQ.mjs";import"../chunk-FD6FGKYY.mjs";import"../chunk-ODAAZLPK.mjs";import"../chunk-4WPQQPUF.mjs";import"../chunk-EBMEXURY.mjs";import"../chunk-STY74NUA.mjs";import"../chunk-IF4UU2MT.mjs";import"../chunk-56CNRT2K.mjs";import"../chunk-KDMSOCZY.mjs";export{a as normalizeBundle};
+import{a}from"../chunk-CW35YAMN.mjs";import"../chunk-FZY4PMEE.mjs";import"../chunk-Q4W3WJ2U.mjs";import"../chunk-ORMOQWWH.mjs";import"../chunk-TOBQ5UE6.mjs";import"../chunk-MT2RJ7H3.mjs";import"../chunk-FD6FGKYY.mjs";import"../chunk-4H2RMR7D.mjs";import"../chunk-4WPQQPUF.mjs";import"../chunk-FLZPUYXQ.mjs";import"../chunk-EBMEXURY.mjs";import"../chunk-STY74NUA.mjs";import"../chunk-IF4UU2MT.mjs";import"../chunk-56CNRT2K.mjs";import"../chunk-KDMSOCZY.mjs";export{a as normalizeBundle};
 //# sourceMappingURL=normalizeBundle.mjs.map

package/dist/esm/version.d.mts

@@ -3,6 +3,6 @@
  *
  * hardcoded for now, we would want to have it injected dynamically
  */
-declare const VERSION = "2.0.1";
+declare const VERSION = "3.0.0";
 
 export { VERSION };

package/dist/esm/version.mjs

@@ -1,2 +1,2 @@
-import{a}from"./chunk-VEGW6HP5.mjs";import"./chunk-KDMSOCZY.mjs";export{a as VERSION};
+import{a}from"./chunk-HMUIOIBG.mjs";import"./chunk-KDMSOCZY.mjs";export{a as VERSION};
 //# sourceMappingURL=version.mjs.map

package/package.json

@@ -32,23 +32,6 @@
     "dist",
     "src"
   ],
-  "scripts": {
-    "build:clean": "rm -rf dist",
-    "build": "pnpm build:clean && tsup",
-    "prepublishOnly": "pnpm run build",
-    "_fmt": "prettier 'src/**/*.ts' 'tests/**/*.ts' 'examples/**/*.js' 'examples/**/*.ts' 'confidential-assets/**/*.ts' 'eslint.config.cjs'",
-    "fmt": "pnpm _fmt --write",
-    "lint": "eslint '**/*.{cts,mts,ts}'",
-    "test": "pnpm jest",
-    "unit-test": "pnpm jest tests/unit",
-    "e2e-test": "pnpm jest tests/e2e",
-    "indexer-codegen": "graphql-codegen --config ./src/types/codegen.yaml && pnpm fmt",
-    "doc": "scripts/generateDocs.sh",
-    "check-version": "scripts/checkVersion.sh",
-    "update-version": "scripts/updateVersion.sh && pnpm doc",
-    "spec": "pnpm build && pnpm _spec",
-    "_spec": "cucumber-js -p default"
-  },
   "dependencies": {
     "@aptos-labs/aptos-cli": "^1.0.2",
     "@aptos-labs/aptos-client": "^2.0.0",
@@ -97,5 +80,21 @@
     "typedoc-plugin-missing-exports": "^4.0.0",
     "typescript": "^5.8.2"
   },
-  "version": "2.0.1"
-}
+  "version": "3.0.0",
+  "scripts": {
+    "build:clean": "rm -rf dist",
+    "build": "pnpm build:clean && tsup",
+    "_fmt": "prettier 'src/**/*.ts' 'tests/**/*.ts' 'examples/**/*.js' 'examples/**/*.ts' 'confidential-assets/**/*.ts' 'eslint.config.cjs'",
+    "fmt": "pnpm _fmt --write",
+    "lint": "eslint '**/*.{cts,mts,ts}'",
+    "test": "pnpm jest",
+    "unit-test": "pnpm jest tests/unit",
+    "e2e-test": "pnpm jest tests/e2e",
+    "indexer-codegen": "graphql-codegen --config ./src/types/codegen.yaml && pnpm fmt",
+    "doc": "scripts/generateDocs.sh",
+    "check-version": "scripts/checkVersion.sh",
+    "update-version": "scripts/updateVersion.sh && pnpm doc",
+    "spec": "pnpm build && pnpm _spec",
+    "_spec": "cucumber-js -p default"
+  }
+}

package/src/api/aptos.ts

@@ -92,8 +92,8 @@ export class Aptos {
    * ```
    * @group Client
    */
-  constructor(settings?: AptosConfig) {
-    this.config = new AptosConfig(settings);
+  constructor(config?: AptosConfig) {
+    this.config = config ?? new AptosConfig();
     this.account = new Account(this.config);
     this.abstraction = new AccountAbstraction(this.config);
     this.ans = new ANS(this.config);
@@ -109,6 +109,10 @@ export class Aptos {
     this.keyless = new Keyless(this.config);
     this.object = new AptosObject(this.config);
   }
+
+  setIgnoreTransactionSubmitter(ignore: boolean) {
+    this.config.setIgnoreTransactionSubmitter(ignore);
+  }
 }
 
 // extends Aptos interface so all the methods and properties

package/src/api/aptosConfig.ts

@@ -2,7 +2,17 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import aptosClient from "@aptos-labs/aptos-client";
-import { AptosSettings, ClientConfig, Client, FullNodeConfig, IndexerConfig, FaucetConfig } from "../types";
+import {
+  AptosSettings,
+  ClientConfig,
+  Client,
+  FullNodeConfig,
+  IndexerConfig,
+  FaucetConfig,
+  TransactionGenerationConfig,
+  PluginConfig,
+  TransactionSubmitter,
+} from "../types";
 import {
   NetworkToNodeAPI,
   NetworkToFaucetAPI,
@@ -11,7 +21,7 @@ import {
   NetworkToPepperAPI,
   NetworkToProverAPI,
 } from "../utils/apiEndpoints";
-import { AptosApiType } from "../utils/const";
+import { AptosApiType, DEFAULT_MAX_GAS_AMOUNT, DEFAULT_TXN_EXP_SEC_FROM_NOW } from "../utils/const";
 
 /**
  * Represents the configuration settings for an Aptos SDK client instance.
@@ -101,6 +111,18 @@ export class AptosConfig {
    */
   readonly faucetConfig?: FaucetConfig;
 
+  /**
+   * Optional specific Transaction Generation configurations
+   * @group Client
+   */
+  readonly transactionGenerationConfig?: TransactionGenerationConfig;
+
+  /**
+   * Optional plugin config to override client behavior.
+   * @group Client
+   */
+  private pluginConfig?: PluginConfig;
+
   /**
    * Initializes an instance of the Aptos client with the specified settings.
    * This allows users to configure various aspects of the client, such as network and endpoints.
@@ -154,6 +176,13 @@ export class AptosConfig {
     this.fullnodeConfig = settings?.fullnodeConfig ?? {};
     this.indexerConfig = settings?.indexerConfig ?? {};
     this.faucetConfig = settings?.faucetConfig ?? {};
+    this.transactionGenerationConfig = settings?.transactionGenerationConfig ?? {};
+    this.pluginConfig = settings?.pluginSettings
+      ? {
+          ...settings.pluginSettings,
+          IGNORE_TRANSACTION_SUBMITTER: false,
+        }
+      : undefined;
   }
 
   /**
@@ -265,4 +294,46 @@ export class AptosConfig {
   isProverServiceRequest(url: string): boolean {
     return NetworkToProverAPI[this.network] === url;
   }
+
+  getDefaultMaxGasAmount(): number {
+    return this.transactionGenerationConfig?.defaultMaxGasAmount ?? DEFAULT_MAX_GAS_AMOUNT;
+  }
+
+  getDefaultTxnExpirySecFromNow(): number {
+    return this.transactionGenerationConfig?.defaultTxnExpirySecFromNow ?? DEFAULT_TXN_EXP_SEC_FROM_NOW;
+  }
+
+  /**
+   * If you have set a custom transaction submitter, you can use this to determine
+   * whether to use it or not. For example, to stop using the transaction submitter:
+   *
+   * @example
+   * ```
+   * aptos.config.setIgnoreTransactionSubmitter(true);
+   * ```
+   *
+   * @group Client
+   */
+  setIgnoreTransactionSubmitter(ignore: boolean) {
+    if (this.pluginConfig) {
+      this.pluginConfig.IGNORE_TRANSACTION_SUBMITTER = ignore;
+    }
+  }
+
+  /**
+   * If a custom transaction submitter has been specified in the PluginConfig and
+   * IGNORE_TRANSACTION_SUBMITTER is false, this will return a transaction submitter
+   * that should be used instead of the default transaction submission behavior.
+   */
+  getTransactionSubmitter(): TransactionSubmitter | undefined {
+    if (this.pluginConfig === undefined) {
+      return undefined;
+    }
+
+    if (this.pluginConfig.IGNORE_TRANSACTION_SUBMITTER === true) {
+      return undefined;
+    }
+
+    return this.pluginConfig.TRANSACTION_SUBMITTER;
+  }
 }

package/src/api/transaction.ts

@@ -34,6 +34,7 @@ import {
   AnyRawTransaction,
   InputGenerateTransactionOptions,
   InputGenerateTransactionPayloadData,
+  InputTransactionPluginData,
 } from "../transactions";
 import { AccountAddressInput, AuthenticationKey, Ed25519PrivateKey } from "../core";
 import { Account } from "../account";
@@ -717,7 +718,7 @@ export class Transaction {
     args: FeePayerOrFeePayerAuthenticatorOrNeither & {
       signer: Account;
       transaction: AnyRawTransaction;
-    },
+    } & InputTransactionPluginData,
   ): Promise<PendingTransactionResponse> {
     return signAndSubmitTransaction({
       aptosConfig: this.config,
@@ -744,11 +745,13 @@ export class Transaction {
    * @return PendingTransactionResponse
    * @group Transaction
    */
-  async signAndSubmitAsFeePayer(args: {
-    feePayer: Account;
-    senderAuthenticator: AccountAuthenticator;
-    transaction: AnyRawTransaction;
-  }): Promise<PendingTransactionResponse> {
+  async signAndSubmitAsFeePayer(
+    args: {
+      feePayer: Account;
+      senderAuthenticator: AccountAuthenticator;
+      transaction: AnyRawTransaction;
+    } & InputTransactionPluginData,
+  ): Promise<PendingTransactionResponse> {
     return signAndSubmitAsFeePayer({
       aptosConfig: this.config,
       ...args,

package/src/api/transactionSubmission/build.ts

@@ -3,7 +3,11 @@
 
 import { AccountAddressInput } from "../../core";
 import { generateTransaction } from "../../internal/transactionSubmission";
-import { InputGenerateTransactionPayloadData, InputGenerateTransactionOptions } from "../../transactions";
+import {
+  InputGenerateTransactionPayloadData,
+  InputGenerateTransactionOptions,
+  InputGenerateOrderlessTransactionOptions,
+} from "../../transactions";
 import { MultiAgentTransaction } from "../../transactions/instances/multiAgentTransaction";
 import { SimpleTransaction } from "../../transactions/instances/simpleTransaction";
 import { AptosConfig } from "../aptosConfig";

package/src/api/transactionSubmission/submit.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { submitTransaction } from "../../internal/transactionSubmission";
-import { AccountAuthenticator, AnyRawTransaction } from "../../transactions";
+import { AccountAuthenticator, AnyRawTransaction, InputTransactionPluginData } from "../../transactions";
 import { PendingTransactionResponse } from "../../types";
 import { AptosConfig } from "../aptosConfig";
 import { ValidateFeePayerDataOnSubmission } from "./helpers";
@@ -87,11 +87,13 @@ export class Submit {
    * @group Implementation
    */
   @ValidateFeePayerDataOnSubmission
-  async simple(args: {
-    transaction: AnyRawTransaction;
-    senderAuthenticator: AccountAuthenticator;
-    feePayerAuthenticator?: AccountAuthenticator;
-  }): Promise<PendingTransactionResponse> {
+  async simple(
+    args: {
+      transaction: AnyRawTransaction;
+      senderAuthenticator: AccountAuthenticator;
+      feePayerAuthenticator?: AccountAuthenticator;
+    } & InputTransactionPluginData,
+  ): Promise<PendingTransactionResponse> {
     return submitTransaction({ aptosConfig: this.config, ...args });
   }
 
@@ -141,12 +143,14 @@ export class Submit {
    * @group Implementation
    */
   @ValidateFeePayerDataOnSubmission
-  async multiAgent(args: {
-    transaction: AnyRawTransaction;
-    senderAuthenticator: AccountAuthenticator;
-    additionalSignersAuthenticators: Array<AccountAuthenticator>;
-    feePayerAuthenticator?: AccountAuthenticator;
-  }): Promise<PendingTransactionResponse> {
+  async multiAgent(
+    args: {
+      transaction: AnyRawTransaction;
+      senderAuthenticator: AccountAuthenticator;
+      additionalSignersAuthenticators: Array<AccountAuthenticator>;
+      feePayerAuthenticator?: AccountAuthenticator;
+    } & InputTransactionPluginData,
+  ): Promise<PendingTransactionResponse> {
     return submitTransaction({ aptosConfig: this.config, ...args });
   }
 }

package/src/core/crypto/multiKey.ts

@@ -1,4 +1,4 @@
-import { SigningScheme as AuthenticationKeyScheme, HexInput } from "../../types";
+import { AnyPublicKeyVariant, SigningScheme as AuthenticationKeyScheme, HexInput } from "../../types";
 import { Deserializer } from "../../bcs/deserializer";
 import { Serializer } from "../../bcs/serializer";
 import { AuthenticationKey } from "../authenticationKey";
@@ -24,6 +24,7 @@ function bitCount(byte: number) {
 }
 /* eslint-enable no-bitwise */
 
+const MAX_NUM_KEYLESS_PUBLIC_FOR_MULTI_KEY = 3;
 export abstract class AbstractMultiKey extends AccountPublicKey {
   publicKeys: PublicKey[];
 
@@ -158,6 +159,18 @@ export class MultiKey extends AbstractMultiKey {
     this.publicKeys = publicKeys.map((publicKey) =>
       publicKey instanceof AnyPublicKey ? publicKey : new AnyPublicKey(publicKey),
     );
+    if (signaturesRequired > MAX_NUM_KEYLESS_PUBLIC_FOR_MULTI_KEY) {
+      const keylessCount = this.publicKeys.filter(
+        (pk) => pk.variant === AnyPublicKeyVariant.Keyless || pk.variant === AnyPublicKeyVariant.FederatedKeyless,
+      ).length;
+      if (keylessCount > MAX_NUM_KEYLESS_PUBLIC_FOR_MULTI_KEY) {
+        throw new Error(
+          `Construction of MultiKey with more than ${MAX_NUM_KEYLESS_PUBLIC_FOR_MULTI_KEY} keyless public keys is not allowed when signaturesRequired 
+          is greater than ${MAX_NUM_KEYLESS_PUBLIC_FOR_MULTI_KEY}. This is because a maximum of 3 keyless signatures are supported for a 
+          K-of-N MultiKey transaction.`,
+        );
+      }
+    }
 
     this.signaturesRequired = signaturesRequired;
   }

package/src/internal/transactionSubmission.ts

@@ -30,6 +30,7 @@ import {
   InputGenerateSingleSignerRawTransactionData,
   AnyTransactionPayloadInstance,
   EntryFunctionABI,
+  InputTransactionPluginData,
 } from "../transactions/types";
 import { UserTransactionResponse, PendingTransactionResponse, MimeType, HexInput } from "../types";
 import { SignedTransaction, TypeTagVector, generateSigningMessageForTransaction } from "../transactions";
@@ -319,7 +320,12 @@ export async function submitTransaction(
     aptosConfig: AptosConfig;
   } & InputSubmitTransactionData,
 ): Promise<PendingTransactionResponse> {
-  const { aptosConfig } = args;
+  const { aptosConfig, transactionSubmitter } = args;
+  const maybeTransactionSubmitter =
+    transactionSubmitter === undefined ? aptosConfig.getTransactionSubmitter() : transactionSubmitter;
+  if (maybeTransactionSubmitter) {
+    return maybeTransactionSubmitter.submitTransaction(args);
+  }
   const signedTransaction = generateSignedTransaction({ ...args });
   try {
     const { data } = await postAptosFullNode<Uint8Array, PendingTransactionResponse>({
@@ -358,9 +364,9 @@ export async function signAndSubmitTransaction(
     aptosConfig: AptosConfig;
     signer: Account;
     transaction: AnyRawTransaction;
-  },
+  } & InputTransactionPluginData,
 ): Promise<PendingTransactionResponse> {
-  const { aptosConfig, signer, feePayer, transaction } = args;
+  const { aptosConfig, signer, feePayer, transaction, ...rest } = args;
   // If the signer contains a KeylessAccount, await proof fetching in case the proof
   // was fetched asynchronously.
   if (isKeylessSigner(signer)) {
@@ -378,16 +384,19 @@ export async function signAndSubmitTransaction(
     transaction,
     senderAuthenticator,
     feePayerAuthenticator,
+    ...rest,
   });
 }
 
-export async function signAndSubmitAsFeePayer(args: {
-  aptosConfig: AptosConfig;
-  feePayer: Account;
-  senderAuthenticator: AccountAuthenticator;
-  transaction: AnyRawTransaction;
-}): Promise<PendingTransactionResponse> {
-  const { aptosConfig, senderAuthenticator, feePayer, transaction } = args;
+export async function signAndSubmitAsFeePayer(
+  args: {
+    aptosConfig: AptosConfig;
+    feePayer: Account;
+    senderAuthenticator: AccountAuthenticator;
+    transaction: AnyRawTransaction;
+  } & InputTransactionPluginData,
+): Promise<PendingTransactionResponse> {
+  const { aptosConfig, senderAuthenticator, feePayer, transaction, ...rest } = args;
 
   if (isKeylessSigner(feePayer)) {
     await feePayer.checkKeylessAccountValidity(aptosConfig);
@@ -400,6 +409,7 @@ export async function signAndSubmitAsFeePayer(args: {
     transaction,
     senderAuthenticator,
     feePayerAuthenticator,
+    ...rest,
   });
 }