@aptos-labs/ts-sdk 6.3.1 → 7.0.1

package/src/core/crypto/singleKey.ts

@@ -1,19 +1,23 @@
-import { Deserializer, Serializer } from "../../bcs";
+import { Deserializer, Serializer } from "../../bcs/index.js";
 import {
   AnyPublicKeyVariant,
   AnySignatureVariant,
   SigningScheme as AuthenticationKeyScheme,
   HexInput,
-} from "../../types";
-import { AuthenticationKey } from "../authenticationKey";
-import { Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature } from "./ed25519";
-import { AccountPublicKey, PublicKey } from "./publicKey";
-import { Secp256k1PrivateKey, Secp256k1PublicKey, Secp256k1Signature } from "./secp256k1";
-import { KeylessPublicKey, KeylessSignature } from "./keyless";
-import { Signature } from "./signature";
-import { FederatedKeylessPublicKey } from "./federatedKeyless";
-import { AptosConfig } from "../../api";
-import { Secp256r1PublicKey, WebAuthnSignature } from "./secp256r1";
+} from "../../types/index.js";
+import { AuthenticationKey } from "../authenticationKey.js";
+import { Ed25519PrivateKey, Ed25519PublicKey, Ed25519Signature } from "./ed25519.js";
+import { AccountPublicKey, PublicKey } from "./publicKey.js";
+import { Secp256k1PrivateKey, Secp256k1PublicKey, Secp256k1Signature } from "./secp256k1.js";
+import { Signature } from "./signature.js";
+import { AptosConfig } from "../../api/aptosConfig.js";
+import { Secp256r1PublicKey, WebAuthnSignature } from "./secp256r1.js";
+import {
+  detectPublicKeyVariant,
+  detectSignatureVariant,
+  getPublicKeyDeserializer,
+  getSignatureDeserializer,
+} from "./anyKeyRegistry.js";
 
 export type PrivateKeyInput = Ed25519PrivateKey | Secp256k1PrivateKey;
 
@@ -53,21 +57,25 @@ export class AnyPublicKey extends AccountPublicKey {
    * @group Implementation
    * @category Serialization
    */
-  constructor(publicKey: PublicKey) {
+  constructor(publicKey: PublicKey, variant?: AnyPublicKeyVariant) {
     super();
     this.publicKey = publicKey;
-    if (publicKey instanceof Ed25519PublicKey) {
+    if (variant !== undefined) {
+      this.variant = variant;
+    } else if (publicKey instanceof Ed25519PublicKey) {
       this.variant = AnyPublicKeyVariant.Ed25519;
     } else if (publicKey instanceof Secp256k1PublicKey) {
       this.variant = AnyPublicKeyVariant.Secp256k1;
     } else if (publicKey instanceof Secp256r1PublicKey) {
       this.variant = AnyPublicKeyVariant.Secp256r1;
-    } else if (publicKey instanceof KeylessPublicKey) {
-      this.variant = AnyPublicKeyVariant.Keyless;
-    } else if (publicKey instanceof FederatedKeylessPublicKey) {
-      this.variant = AnyPublicKeyVariant.FederatedKeyless;
     } else {
-      throw new Error("Unsupported public key type");
+      // Check registered variants (e.g., keyless, federated keyless)
+      const registeredVariant = detectPublicKeyVariant(publicKey);
+      if (registeredVariant !== undefined) {
+        this.variant = registeredVariant;
+      } else {
+        throw new Error("Unsupported public key type");
+      }
     }
   }
 
@@ -88,7 +96,7 @@ export class AnyPublicKey extends AccountPublicKey {
    */
   verifySignature(args: { message: HexInput; signature: AnySignature }): boolean {
     const { message, signature } = args;
-    if (this.publicKey instanceof KeylessPublicKey) {
+    if (this.variant === AnyPublicKeyVariant.Keyless || this.variant === AnyPublicKeyVariant.FederatedKeyless) {
       throw new Error("Use verifySignatureAsync to verify Keyless signatures");
     }
     return this.publicKey.verifySignature({
@@ -194,16 +202,18 @@ export class AnyPublicKey extends AccountPublicKey {
       case AnyPublicKeyVariant.Secp256r1:
         publicKey = Secp256r1PublicKey.deserialize(deserializer);
         break;
-      case AnyPublicKeyVariant.Keyless:
-        publicKey = KeylessPublicKey.deserialize(deserializer);
-        break;
-      case AnyPublicKeyVariant.FederatedKeyless:
-        publicKey = FederatedKeylessPublicKey.deserialize(deserializer);
-        break;
-      case AnyPublicKeyVariant.SlhDsaSha2_128s:
-        throw new Error("SlhDsaSha2_128s public key deserialization is not yet implemented");
-      default:
-        throw new Error(`Unknown variant index for AnyPublicKey: ${variantIndex}`);
+      default: {
+        // Check registered variant deserializers (e.g., keyless, federated keyless)
+        const registeredDeserializer = getPublicKeyDeserializer(variantIndex);
+        if (registeredDeserializer) {
+          publicKey = registeredDeserializer(deserializer);
+          break;
+        }
+        throw new Error(
+          `Unknown variant index for AnyPublicKey: ${variantIndex}. ` +
+            "If this is a keyless key, ensure keyless support is imported.",
+        );
+      }
     }
     return new AnyPublicKey(publicKey);
   }
@@ -288,10 +298,14 @@ export class AnySignature extends Signature {
       this.variant = AnySignatureVariant.Secp256k1;
     } else if (signature instanceof WebAuthnSignature) {
       this.variant = AnySignatureVariant.WebAuthn;
-    } else if (signature instanceof KeylessSignature) {
-      this.variant = AnySignatureVariant.Keyless;
     } else {
-      throw new Error("Unsupported signature type");
+      // Check registered variants (e.g., keyless)
+      const registeredVariant = detectSignatureVariant(signature);
+      if (registeredVariant !== undefined) {
+        this.variant = registeredVariant;
+      } else {
+        throw new Error("Unsupported signature type");
+      }
     }
   }
 
@@ -330,13 +344,18 @@ export class AnySignature extends Signature {
       case AnySignatureVariant.WebAuthn:
         signature = WebAuthnSignature.deserialize(deserializer);
         break;
-      case AnySignatureVariant.Keyless:
-        signature = KeylessSignature.deserialize(deserializer);
-        break;
-      case AnySignatureVariant.SlhDsaSha2_128s:
-        throw new Error("SlhDsaSha2_128s signature deserialization is not yet implemented");
-      default:
-        throw new Error(`Unknown variant index for AnySignature: ${variantIndex}`);
+      default: {
+        // Check registered variant deserializers (e.g., keyless)
+        const registeredDeserializer = getSignatureDeserializer(variantIndex);
+        if (registeredDeserializer) {
+          signature = registeredDeserializer(deserializer);
+          break;
+        }
+        throw new Error(
+          `Unknown variant index for AnySignature: ${variantIndex}. ` +
+            "If this is a keyless signature, ensure keyless support is imported.",
+        );
+      }
     }
     return new AnySignature(signature);
   }

package/src/core/crypto/types.ts

@@ -1,7 +1,7 @@
-import { AnyPublicKey } from "./singleKey";
-import { Ed25519PublicKey } from "./ed25519";
-import { MultiKey } from "./multiKey";
-import { MultiEd25519PublicKey } from "./multiEd25519";
+import { AnyPublicKey } from "./singleKey.js";
+import { Ed25519PublicKey } from "./ed25519.js";
+import { MultiKey } from "./multiKey.js";
+import { MultiEd25519PublicKey } from "./multiEd25519.js";
 
 // This type is used to represent the base from of an account's public key.
 // These are the types of public keys that can be used to derive an account's address by appending

package/src/core/crypto/utils.ts

@@ -1,13 +1,13 @@
-import { HexInput, SigningScheme } from "../../types";
-import { Hex } from "../hex";
-import { Ed25519PublicKey } from "./ed25519";
-import { FederatedKeylessPublicKey } from "./federatedKeyless";
-import { KeylessPublicKey } from "./keyless";
-import { MultiEd25519PublicKey } from "./multiEd25519";
-import { MultiKey } from "./multiKey";
-import { AccountPublicKey } from "./publicKey";
-import { AnyPublicKey } from "./singleKey";
-import { BaseAccountPublicKey } from "./types";
+import { HexInput, SigningScheme } from "../../types/index.js";
+import { TEXT_ENCODER } from "../../utils/const.js";
+import { Hex } from "../hex.js";
+import { Ed25519PublicKey } from "./ed25519.js";
+import { MultiEd25519PublicKey } from "./multiEd25519.js";
+import { MultiKey } from "./multiKey.js";
+import { AccountPublicKey } from "./publicKey.js";
+import { AnyPublicKey } from "./singleKey.js";
+import { BaseAccountPublicKey } from "./types.js";
+import { detectPublicKeyVariant } from "./anyKeyRegistry.js";
 
 /**
  * Helper function to convert a message to sign or to verify to a valid message input
@@ -24,7 +24,7 @@ export const convertSigningMessage = (message: HexInput): HexInput => {
     const isValid = Hex.isValid(message);
     // If message is not a valid Hex string, convert it
     if (!isValid.valid) {
-      return new TextEncoder().encode(message);
+      return TEXT_ENCODER.encode(message);
     }
     // If message is a valid Hex string, return it
     return message;
@@ -42,7 +42,11 @@ export const accountPublicKeyToBaseAccountPublicKey = (publicKey: AccountPublicK
   ) {
     return publicKey;
   }
-  if (publicKey instanceof KeylessPublicKey || publicKey instanceof FederatedKeylessPublicKey) {
+  // Keyless / FederatedKeyless public keys register themselves in the variant
+  // registry when imported. Using the registry lets us wrap them in
+  // `AnyPublicKey` here without a compile-time dependency on the keyless
+  // module (which would pull poseidon-lite into the `/account` sub-path).
+  if (detectPublicKeyVariant(publicKey) !== undefined) {
     return new AnyPublicKey(publicKey);
   }
   throw new Error(`Unknown account public key: ${publicKey}`);

package/src/core/hex.ts

@@ -1,9 +1,9 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-import { bytesToHex, hexToBytes } from "@noble/hashes/utils";
-import { ParsingError, ParsingResult } from "./common";
-import { HexInput } from "../types";
+import { bytesToHex, hexToBytes } from "@noble/hashes/utils.js";
+import { ParsingError, ParsingResult } from "./common.js";
+import { HexInput } from "../types/index.js";
 
 /**
  * Provides reasons for parsing failures related to hexadecimal values.

package/src/core/index.ts

@@ -1,9 +1,9 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-export * from "./account";
-export * from "./accountAddress";
-export * from "./authenticationKey";
-export * from "./common";
-export * from "./crypto";
-export * from "./hex";
+export * from "./account/index.js";
+export * from "./accountAddress.js";
+export * from "./authenticationKey.js";
+export * from "./common.js";
+export * from "./crypto/index.js";
+export * from "./hex.js";

package/src/errors/index.ts

@@ -1,6 +1,6 @@
-import { AptosApiType } from "../utils/const";
-import { getErrorMessage } from "../utils/helpers";
-import { AptosRequest, AptosResponse } from "../types";
+import { AptosApiType } from "../utils/const.js";
+import { getErrorMessage } from "../utils/helpers.js";
+import { AptosRequest, AptosResponse } from "../types/index.js";
 
 export enum KeylessErrorCategory {
   API_ERROR,

package/src/functions/abstraction.ts

@@ -0,0 +1,11 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+export {
+  addAuthenticationFunctionTransaction,
+  removeAuthenticationFunctionTransaction,
+  removeDispatchableAuthenticatorTransaction,
+} from "../internal/abstraction.js";
+
+export { AccountAbstraction } from "../api/account/abstraction.js";
+export { AptosConfig } from "../api/aptosConfig.js";

package/src/functions/account.ts

@@ -0,0 +1,38 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+/**
+ * Standalone account functions for tree-shakeable imports.
+ * @module
+ */
+
+export {
+  getInfo as getAccountInfo,
+  getModules as getAccountModules,
+  getModulesPage as getAccountModulesPage,
+  getModule as getAccountModule,
+  getTransactions as getAccountTransactions,
+  getResources as getAccountResources,
+  getResourcesPage as getAccountResourcesPage,
+  getResource as getAccountResource,
+  lookupOriginalAccountAddress,
+  getAccountTokensCount,
+  getAccountOwnedTokens,
+  getAccountOwnedTokensFromCollectionAddress,
+  getAccountCollectionsWithOwnedTokens,
+  getAccountTransactionsCount,
+  getAccountCoinAmount,
+  getAccountCoinsData,
+  getAccountCoinsCount,
+  getBalance,
+  getAccountOwnedObjects,
+  deriveAccountFromPrivateKey,
+  isAccountExist,
+  rotateAuthKey,
+  rotateAuthKeyUnverified,
+  getAccountsForPublicKey,
+  deriveOwnedAccountsFromSigner,
+} from "../internal/account.js";
+
+export { Account } from "../api/account.js";
+export { AptosConfig } from "../api/aptosConfig.js";

package/src/functions/ans.ts

@@ -0,0 +1,26 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+export {
+  isValidANSSegment,
+  isValidANSName,
+  getANSExpirationStatus,
+  getOwnerAddress,
+  registerName,
+  getExpiration,
+  getPrimaryName,
+  setPrimaryName,
+  getTargetAddress,
+  setTargetAddress,
+  clearTargetAddress,
+  getName,
+  getAccountNames,
+  getAccountDomains,
+  getAccountSubdomains,
+  getDomainSubdomains,
+  getANSGracePeriod,
+  renewDomain,
+} from "../internal/ans.js";
+
+export { ANS } from "../api/ans.js";
+export { AptosConfig } from "../api/aptosConfig.js";

package/src/functions/coin.ts

@@ -0,0 +1,7 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+export { transferCoinTransaction } from "../internal/coin.js";
+
+export { Coin } from "../api/coin.js";
+export { AptosConfig } from "../api/aptosConfig.js";

package/src/functions/digitalAsset.ts

@@ -0,0 +1,32 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+export {
+  getDigitalAssetData,
+  getCurrentDigitalAssetOwnership,
+  getOwnedDigitalAssets,
+  getDigitalAssetActivity,
+  createCollectionTransaction,
+  getCollectionData,
+  getCollectionDataByCreatorAddressAndCollectionName,
+  getCollectionDataByCreatorAddress,
+  getCollectionDataByCollectionId,
+  getCollectionId,
+  mintDigitalAssetTransaction,
+  transferDigitalAssetTransaction,
+  mintSoulBoundTransaction,
+  burnDigitalAssetTransaction,
+  freezeDigitalAssetTransferTransaction,
+  unfreezeDigitalAssetTransferTransaction,
+  setDigitalAssetDescriptionTransaction,
+  setDigitalAssetNameTransaction,
+  setDigitalAssetURITransaction,
+  addDigitalAssetPropertyTransaction,
+  removeDigitalAssetPropertyTransaction,
+  updateDigitalAssetPropertyTransaction,
+  addDigitalAssetTypedPropertyTransaction,
+  updateDigitalAssetTypedPropertyTransaction,
+} from "../internal/digitalAsset.js";
+
+export { DigitalAsset } from "../api/digitalAsset.js";
+export { AptosConfig } from "../api/aptosConfig.js";

package/src/functions/faucet.ts

@@ -0,0 +1,7 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+export { fundAccount } from "../internal/faucet.js";
+
+export { Faucet } from "../api/faucet.js";
+export { AptosConfig } from "../api/aptosConfig.js";

package/src/functions/fungibleAsset.ts

@@ -0,0 +1,13 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+export {
+  getFungibleAssetMetadata,
+  getFungibleAssetActivities,
+  getCurrentFungibleAssetBalances,
+  transferFungibleAsset,
+  transferFungibleAssetBetweenStores,
+} from "../internal/fungibleAsset.js";
+
+export { FungibleAsset } from "../api/fungibleAsset.js";
+export { AptosConfig } from "../api/aptosConfig.js";

package/src/functions/general.ts

@@ -0,0 +1,14 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+export {
+  getLedgerInfo,
+  getChainTopUserTransactions,
+  queryIndexer,
+  getProcessorStatuses,
+  getIndexerLastSuccessVersion,
+  getProcessorStatus,
+} from "../internal/general.js";
+
+export { General } from "../api/general.js";
+export { AptosConfig } from "../api/aptosConfig.js";

package/src/functions/index.ts

@@ -0,0 +1,21 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+/**
+ * Standalone functions for tree-shakeable imports.
+ * Keyless functions are intentionally excluded — import from '@aptos-labs/ts-sdk/keyless'.
+ */
+
+export * from "./account.js";
+export * from "./abstraction.js";
+export * from "./ans.js";
+export * from "./coin.js";
+export * from "./digitalAsset.js";
+export * from "./faucet.js";
+export * from "./fungibleAsset.js";
+export * from "./general.js";
+export * from "./object.js";
+export * from "./staking.js";
+export * from "./table.js";
+export * from "./transaction.js";
+export * from "./view.js";

package/src/functions/keyless.ts

@@ -0,0 +1,42 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+/**
+ * Keyless sub-path entry. NOT included in the main entry point to avoid
+ * pulling in poseidon-lite. Import from '@aptos-labs/ts-sdk/keyless'.
+ */
+
+// Standalone functions
+export {
+  getPepper,
+  getProof,
+  deriveKeylessAccount,
+  updateFederatedKeylessJwkSetTransaction,
+} from "../internal/keyless.js";
+
+// Namespace class and config
+export { Keyless } from "../api/keyless.js";
+export { AptosConfig } from "../api/aptosConfig.js";
+
+// Account classes (pull in poseidon-lite)
+export { KeylessAccount } from "../account/KeylessAccount.js";
+export { FederatedKeylessAccount } from "../account/FederatedKeylessAccount.js";
+export { AbstractKeylessAccount } from "../account/AbstractKeylessAccount.js";
+export { EphemeralKeyPair } from "../account/EphemeralKeyPair.js";
+
+// Crypto primitives
+export {
+  KeylessPublicKey,
+  KeylessSignature,
+  EphemeralCertificate,
+  ZeroKnowledgeSig,
+  Groth16Zkp,
+  Groth16ProofAndStatement,
+  ZkProof,
+  KeylessConfiguration,
+} from "../core/crypto/keyless.js";
+export { FederatedKeylessPublicKey } from "../core/crypto/federatedKeyless.js";
+export { EphemeralPublicKey, EphemeralSignature } from "../core/crypto/ephemeral.js";
+
+// Poseidon utilities
+export { poseidonHash, hashStrToField } from "../core/crypto/poseidon.js";

package/src/functions/object.ts

@@ -0,0 +1,10 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+export {
+  getObjectData,
+  getObjectDataByObjectAddress,
+} from "../internal/object.js";
+
+export { AptosObject } from "../api/object.js";
+export { AptosConfig } from "../api/aptosConfig.js";

package/src/functions/staking.ts

@@ -0,0 +1,11 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+export {
+  getNumberOfDelegators,
+  getNumberOfDelegatorsForAllPools,
+  getDelegatedStakingActivities,
+} from "../internal/staking.js";
+
+export { Staking } from "../api/staking.js";
+export { AptosConfig } from "../api/aptosConfig.js";

package/src/functions/table.ts

@@ -0,0 +1,11 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+export {
+  getTableItem,
+  getTableItemsData,
+  getTableItemsMetadata,
+} from "../internal/table.js";
+
+export { Table } from "../api/table.js";
+export { AptosConfig } from "../api/aptosConfig.js";

package/src/functions/transaction.ts

@@ -0,0 +1,32 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+export {
+  getTransactions,
+  getGasPriceEstimation,
+  getTransactionByVersion,
+  getTransactionByHash,
+  isTransactionPending,
+  longWaitForTransaction,
+  waitForTransaction,
+  waitForIndexer,
+  getBlockByVersion,
+  getBlockByHeight,
+} from "../internal/transaction.js";
+
+export {
+  generateTransaction,
+  buildTransactionPayload,
+  buildRawTransaction,
+  getSigningMessage,
+  signTransaction,
+  signAsFeePayer,
+  simulateTransaction,
+  submitTransaction,
+  signAndSubmitTransaction,
+  signAndSubmitAsFeePayer,
+  publicPackageTransaction,
+} from "../internal/transactionSubmission.js";
+
+export { Transaction } from "../api/transaction.js";
+export { AptosConfig } from "../api/aptosConfig.js";

package/src/functions/view.ts

@@ -0,0 +1,6 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+export { view, viewJson } from "../internal/view.js";
+
+export { AptosConfig } from "../api/aptosConfig.js";

package/src/index.ts

@@ -1,13 +1,39 @@
 // Copyright © Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-export * from "./account";
-export * from "./api";
-export * from "./bcs";
-export * from "./client";
-export * from "./core";
-export * from "./errors";
-export * from "./transactions";
-export * from "./transactions/management";
-export * from "./types";
-export * from "./utils";
+// NOTE: Standalone functions are NOT re-exported from the barrel to avoid
+// circular dependency issues and to keep the main entry tree-shakeable. Import
+// them from their per-namespace sub-path exports instead — e.g.
+// `@aptos-labs/ts-sdk/general`, `@aptos-labs/ts-sdk/account`,
+// `@aptos-labs/ts-sdk/keyless` (see `package.json#exports` for the full list).
+
+// ---- Configuration ----
+export * from "./api/aptosConfig.js";
+
+// ---- Aptos class (convenience, not tree-shakeable — see sub-path imports) ----
+export { Aptos } from "./api/aptos.js";
+
+// ---- Account classes (without keyless — import keyless from sub-paths) ----
+export * from "./account/index.js";
+
+// ---- Core primitives (without keyless/poseidon/hdKey) ----
+export * from "./core/index.js";
+
+// ---- BCS serialization ----
+export * from "./bcs/index.js";
+
+// ---- HTTP client ----
+export * from "./client/index.js";
+
+// ---- Errors ----
+export * from "./errors/index.js";
+
+// ---- Transactions ----
+export * from "./transactions/index.js";
+export * from "./transactions/management/index.js";
+
+// ---- Types ----
+export * from "./types/index.js";
+
+// ---- Utils ----
+export * from "./utils/index.js";

package/src/internal/abstraction.ts

@@ -4,21 +4,21 @@ import {
   TypeTagAddress,
   TypeTagStruct,
   stringStructTag,
-} from "../transactions";
-import { AccountAddressInput } from "../core";
-import { generateTransaction } from "./transactionSubmission";
-import { MoveFunctionId } from "../types";
-import { AptosConfig } from "../api/aptosConfig";
-import { getFunctionParts } from "../utils/helpers";
+} from "../transactions/index.js";
+import { AccountAddressInput } from "../core/index.js";
+import { generateTransaction } from "./transactionSubmission.js";
+import { MoveFunctionId } from "../types/index.js";
+import { AptosConfig } from "../api/aptosConfig.js";
+import { getFunctionParts } from "../utils/helpers.js";
 
 export async function addAuthenticationFunctionTransaction(args: {
   aptosConfig: AptosConfig;
   sender: AccountAddressInput;
-  authenticationFunction: string;
+  authenticationFunction: MoveFunctionId;
   options?: InputGenerateTransactionOptions;
 }): Promise<SimpleTransaction> {
   const { aptosConfig, sender, authenticationFunction, options } = args;
-  const { moduleAddress, moduleName, functionName } = getFunctionParts(authenticationFunction as MoveFunctionId);
+  const { moduleAddress, moduleName, functionName } = getFunctionParts(authenticationFunction);
   return generateTransaction({
     aptosConfig,
     sender,
@@ -38,11 +38,11 @@ export async function addAuthenticationFunctionTransaction(args: {
 export async function removeAuthenticationFunctionTransaction(args: {
   aptosConfig: AptosConfig;
   sender: AccountAddressInput;
-  authenticationFunction: string;
+  authenticationFunction: MoveFunctionId;
   options?: InputGenerateTransactionOptions;
 }) {
   const { aptosConfig, sender, authenticationFunction, options } = args;
-  const { moduleAddress, moduleName, functionName } = getFunctionParts(authenticationFunction as MoveFunctionId);
+  const { moduleAddress, moduleName, functionName } = getFunctionParts(authenticationFunction);
   return generateTransaction({
     aptosConfig,
     sender,