@aptos-labs/ts-sdk 6.3.0 → 7.0.0

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,

package/src/internal/account.ts

@@ -8,13 +8,13 @@
  * account namespace and without having a dependency cycle error.
  * @group Implementation
  */
-import { AptosConfig } from "../api/aptosConfig";
+import { AptosConfig } from "../api/aptosConfig.js";
 import {
   getAptosFullNode,
   getPageWithObfuscatedCursor,
   paginateWithCursor,
   paginateWithObfuscatedCursor,
-} from "../client";
+} from "../client/index.js";
 import {
   AccountData,
   anyPublicKeyVariantToString,
@@ -33,29 +33,24 @@ import {
   PaginationArgs,
   TokenStandardArg,
   WhereArg,
-} from "../types";
-import { AccountAddress, AccountAddressInput } from "../core/accountAddress";
-import {
-  Account,
-  Ed25519Account,
-  FederatedKeylessAccount,
-  KeylessAccount,
-  MultiEd25519Account,
-  MultiKeyAccount,
-  SingleKeyAccount,
-} from "../account";
-import {
-  AbstractMultiKey,
-  AccountPublicKey,
-  AnyPublicKey,
-  BaseAccountPublicKey,
-  Ed25519PublicKey,
-  MultiEd25519PublicKey,
-  MultiKey,
-  PrivateKeyInput,
-} from "../core/crypto";
-import { queryIndexer } from "./general";
-import { getModule as getModuleUtil, getInfo as getInfoUtil } from "./utils";
+} from "../types/index.js";
+import { AccountAddress, AccountAddressInput } from "../core/accountAddress.js";
+import { Account, Ed25519Account, MultiEd25519Account, MultiKeyAccount, SingleKeyAccount } from "../account/index.js";
+import { isKeylessSigner } from "../account/keylessSigner.js";
+// Type-only imports are erased at compile time, so they do not pull in the
+// poseidon-lite dependency that the concrete keyless account classes require.
+// The runtime `.create()` calls are behind dynamic `import()` in
+// `deriveOwnedAccountsFromKeylessSigner` below.
+import type { AbstractKeylessAccount } from "../account/AbstractKeylessAccount.js";
+import type { FederatedKeylessPublicKey } from "../core/crypto/federatedKeyless.js";
+import { AccountPublicKey } from "../core/crypto/publicKey.js";
+import { AnyPublicKey, PrivateKeyInput } from "../core/crypto/singleKey.js";
+import { Ed25519PublicKey } from "../core/crypto/ed25519.js";
+import { MultiEd25519PublicKey } from "../core/crypto/multiEd25519.js";
+import { AbstractMultiKey, MultiKey } from "../core/crypto/multiKey.js";
+import { BaseAccountPublicKey } from "../core/crypto/types.js";
+import { queryIndexer } from "./general.js";
+import { getModule as getModuleUtil, getInfo as getInfoUtil } from "./utils/index.js";
 import {
   GetAccountCoinsCountQuery,
   GetAccountCoinsDataQuery,
@@ -67,7 +62,7 @@ import {
   GetAccountTransactionsCountQuery,
   GetAuthKeysForPublicKeyQuery,
   GetAccountAddressesForAuthKeyQuery,
-} from "../types/generated/operations";
+} from "../types/generated/operations.js";
 import {
   GetAccountCoinsCount,
   GetAccountCoinsData,
@@ -79,14 +74,18 @@ import {
   GetAccountTransactionsCount,
   GetAuthKeysForPublicKey,
   GetAccountAddressesForAuthKey,
-} from "../types/generated/queries";
-import { Secp256k1PrivateKey, AuthenticationKey, Ed25519PrivateKey, createObjectAddress, Hex } from "../core";
-import { CurrentFungibleAssetBalancesBoolExp } from "../types/generated/types";
-import { getTableItem } from "./table";
-import { APTOS_COIN } from "../utils";
-import { AptosApiError } from "../errors";
-import { Deserializer, U8, MoveVector } from "../bcs";
-import { generateTransaction } from "./transactionSubmission";
+} from "../types/generated/queries.js";
+import { Secp256k1PrivateKey } from "../core/crypto/secp256k1.js";
+import { Ed25519PrivateKey } from "../core/crypto/ed25519.js";
+import { AuthenticationKey } from "../core/authenticationKey.js";
+import { createObjectAddress } from "../core/account/utils/address.js";
+import { Hex } from "../core/hex.js";
+import { CurrentFungibleAssetBalancesBoolExp } from "../types/generated/types.js";
+import { getTableItem } from "./table.js";
+import { APTOS_COIN } from "../utils/index.js";
+import { AptosApiError } from "../errors/index.js";
+import { Deserializer, U8, MoveVector } from "../bcs/index.js";
+import { generateTransaction } from "./transactionSubmission.js";
 import {
   EntryFunctionABI,
   InputGenerateTransactionOptions,
@@ -94,8 +93,8 @@ import {
   SimpleTransaction,
   TypeTagU8,
   TypeTagVector,
-} from "../transactions";
-import { accountPublicKeyToBaseAccountPublicKey, accountPublicKeyToSigningScheme } from "../core/crypto/utils";
+} from "../transactions/index.js";
+import { accountPublicKeyToBaseAccountPublicKey, accountPublicKeyToSigningScheme } from "../core/crypto/utils.js";
 
 /**
  * Retrieves account information for a specified account address.
@@ -304,9 +303,27 @@ export async function getResource<T extends {}>(args: {
     path: `accounts/${AccountAddress.from(accountAddress).toString()}/resource/${resourceType}`,
     params: { ledger_version: options?.ledgerVersion },
   });
+  // TODO: Fix type checking, so cast is unnecessary
   return data.data as T;
 }
 
+export async function getResourceFallible<T extends {}>(args: {
+  aptosConfig: AptosConfig;
+  accountAddress: AccountAddressInput;
+  resourceType: MoveStructId;
+  options?: LedgerVersionArg;
+}): Promise<T | null> {
+  try {
+    return await getResource<T>(args);
+  } catch (error: any) {
+    // explicitly return null if there is no resource
+    if (error?.status === 404 && error?.data?.error_code === "resource_not_found") {
+      return null;
+    }
+    throw error;
+  }
+}
+
 /**
  * Retrieves the original account address associated with a given authentication key, which is useful for handling key rotations.
  *
@@ -896,10 +913,11 @@ async function doesAccountExistAtAddress(args: {
   try {
     // Get the account resources and the balance of the account.  We need to check both because
     // an account resource can exist with 0 balance and a balance can exist without an account resource (light accounts).
-    const [resources, ownedObjects] = await Promise.all([
-      getResources({
+    const [accountResource, ownedObjects] = await Promise.all([
+      getResourceFallible<{ authentication_key: string }>({
         aptosConfig,
         accountAddress,
+        resourceType: "0x1::account::Account",
       }),
       getAccountOwnedObjects({
         aptosConfig,
@@ -910,10 +928,6 @@ async function doesAccountExistAtAddress(args: {
       }),
     ]);
 
-    const accountResource: MoveResource<{ authentication_key: string }> | undefined = resources.find(
-      (r) => r.type === "0x1::account::Account",
-    ) as MoveResource<{ authentication_key: string }> | undefined;
-
     // If the account resource is not found and the balance is 0, then the account does not exist.
     if (!accountResource && ownedObjects.length === 0) {
       return false;
@@ -928,7 +942,7 @@ async function doesAccountExistAtAddress(args: {
     // then the auth key is the account address by default.
     let authKey;
     if (accountResource) {
-      authKey = accountResource.data.authentication_key;
+      authKey = accountResource.authentication_key;
     } else {
       authKey = accountAddress.toStringLong();
     }
@@ -1205,8 +1219,12 @@ export async function deriveOwnedAccountsFromSigner(args: {
     return deriveOwnedAccountsFromPrivateKey({ aptosConfig, privateKey: signer.privateKey, options });
   }
 
-  if (signer instanceof KeylessAccount || signer instanceof FederatedKeylessAccount) {
-    return deriveOwnedAccountsFromKeylessSigner({ aptosConfig, keylessAccount: signer, options });
+  if (isKeylessSigner(signer)) {
+    return deriveOwnedAccountsFromKeylessSigner({
+      aptosConfig,
+      keylessAccount: signer as AbstractKeylessAccount,
+      options,
+    });
   }
 
   if (signer instanceof MultiKeyAccount) {
@@ -1226,7 +1244,7 @@ export async function deriveOwnedAccountsFromSigner(args: {
 
 async function deriveOwnedAccountsFromKeylessSigner(args: {
   aptosConfig: AptosConfig;
-  keylessAccount: KeylessAccount | FederatedKeylessAccount;
+  keylessAccount: AbstractKeylessAccount;
   options?: { includeUnverified?: boolean; noMultiKey?: boolean };
 }): Promise<Account[]> {
   const { aptosConfig, keylessAccount, options } = args;
@@ -1244,6 +1262,11 @@ async function deriveOwnedAccountsFromKeylessSigner(args: {
     verificationKeyHash: keylessAccount.verificationKeyHash,
   };
 
+  // Structural discriminator: `FederatedKeylessPublicKey` has a `jwkAddress`
+  // field; plain `KeylessPublicKey` does not. Avoids pulling the concrete
+  // keyless account classes (and poseidon-lite) into the static import graph.
+  const isFederated = "jwkAddress" in keylessAccount.publicKey;
+
   const accounts: Account[] = [];
   for (const { accountAddress, publicKey } of addressesAndPublicKeys) {
     if (publicKey instanceof AbstractMultiKey) {
@@ -1255,15 +1278,19 @@ async function deriveOwnedAccountsFromKeylessSigner(args: {
       } else if (publicKey instanceof MultiKey) {
         accounts.push(new MultiKeyAccount({ multiKey: publicKey, signers: [keylessAccount], address: accountAddress }));
       }
-    } else if (keylessAccount instanceof FederatedKeylessAccount) {
+    } else if (isFederated) {
+      // Dynamic import to avoid pulling poseidon-lite into the `/account` sub-path bundle.
+      const { FederatedKeylessAccount } = await import("../account/FederatedKeylessAccount.js");
       accounts.push(
         FederatedKeylessAccount.create({
           ...keylessAccountParams,
           address: accountAddress,
-          jwkAddress: keylessAccount.publicKey.jwkAddress,
+          jwkAddress: (keylessAccount.publicKey as FederatedKeylessPublicKey).jwkAddress,
         }),
       );
     } else {
+      // Dynamic import to avoid pulling poseidon-lite into the `/account` sub-path bundle.
+      const { KeylessAccount } = await import("../account/KeylessAccount.js");
       accounts.push(
         KeylessAccount.create({
           ...keylessAccountParams,
@@ -1299,9 +1326,10 @@ async function deriveOwnedAccountsFromPrivateKey(args: {
       }
       // Construct the appropriate multi-key type.
       if (publicKey instanceof MultiEd25519PublicKey) {
-        accounts.push(
-          new MultiEd25519Account({ publicKey, signers: [privateKey as Ed25519PrivateKey], address: accountAddress }),
-        );
+        if (!(privateKey instanceof Ed25519PrivateKey)) {
+          throw new Error("Private key not Ed25519 for MultiEd25519 signature");
+        }
+        accounts.push(new MultiEd25519Account({ publicKey, signers: [privateKey], address: accountAddress }));
       } else if (publicKey instanceof MultiKey) {
         accounts.push(
           new MultiKeyAccount({ multiKey: publicKey, signers: [singleKeyAccount], address: accountAddress }),

package/src/internal/ans.ts

@@ -9,12 +9,11 @@
  * @group Implementation
  */
 
-import { AptosConfig } from "../api/aptosConfig";
-import { AccountAddress, AccountAddressInput } from "../core";
-import { InputGenerateTransactionOptions, InputEntryFunctionData } from "../transactions/types";
+import { AptosConfig } from "../api/aptosConfig.js";
+import { AccountAddress, AccountAddressInput } from "../core/index.js";
+import { InputGenerateTransactionOptions, InputEntryFunctionData } from "../transactions/types.js";
 import {
   AnsName,
-  AnsTokenStandard,
   ExpirationStatus,
   MoveAddressType,
   OrderByArg,
@@ -22,15 +21,16 @@ import {
   RawANSName,
   SubdomainExpirationPolicy,
   WhereArg,
-} from "../types";
-import { GetNamesQuery } from "../types/generated/operations";
-import { GetNames } from "../types/generated/queries";
-import { CurrentAptosNamesBoolExp } from "../types/generated/types";
-import { Network } from "../utils/apiEndpoints";
-import { queryIndexer } from "./general";
-import { view } from "./view";
-import { generateTransaction } from "./transactionSubmission";
-import { SimpleTransaction } from "../transactions/instances/simpleTransaction";
+} from "../types/index.js";
+import { GetNamesQuery } from "../types/generated/operations.js";
+import { GetNames } from "../types/generated/queries.js";
+import { CurrentAptosNamesBoolExp } from "../types/generated/types.js";
+import { Network } from "../utils/apiEndpoints.js";
+import { getEnvVar } from "../utils/helpers.js";
+import { queryIndexer } from "./general.js";
+import { view } from "./view.js";
+import { generateTransaction } from "./transactionSubmission.js";
+import { SimpleTransaction } from "../transactions/instances/simpleTransaction.js";
 
 let GRACE_PERIOD_IN_SECONDS: number | undefined;
 
@@ -55,8 +55,7 @@ export function isValidANSSegment(fragment: string): boolean {
   if (fragment.length < 3) return false;
   if (fragment.length > 63) return false;
   // only lowercase a-z and 0-9 are allowed, along with -. a domain may not start or end with a hyphen
-  if (!/^[a-z\d][a-z\d-]{1,61}[a-z\d]$/.test(fragment)) return false;
-  return true;
+  return /^[a-z\d][a-z\d-]{1,61}[a-z\d]$/.test(fragment);
 }
 
 /**
@@ -90,6 +89,7 @@ export function isValidANSName(name: string): { domainName: string; subdomainNam
  * Determines the status of an ANS name's expiration.
  *
  * @param name - An ANS name returned from one of the functions of the SDK.
+ * @param gracePeriod - grace period after expiration
  * @returns An ExpirationStatus indicating whether the name is Active, InGracePeriod, or Expired.
  * @group Implementation
  */
@@ -135,10 +135,10 @@ export function getANSExpirationStatus({
 }
 
 export const LOCAL_ANS_ACCOUNT_PK =
-  process.env.ANS_TEST_ACCOUNT_PRIVATE_KEY ??
+  getEnvVar("ANS_TEST_ACCOUNT_PRIVATE_KEY") ??
   "ed25519-priv-0x37368b46ce665362562c6d1d4ec01a08c8644c488690df5a17e13ba163e20221";
 export const LOCAL_ANS_ACCOUNT_ADDRESS =
-  process.env.ANS_TEST_ACCOUNT_ADDRESS ?? "0x585fc9f0f0c54183b039ffc770ca282ebd87307916c215a3e692f2f8e4305e82";
+  getEnvVar("ANS_TEST_ACCOUNT_ADDRESS") ?? "0x585fc9f0f0c54183b039ffc770ca282ebd87307916c215a3e692f2f8e4305e82";
 
 const NetworkToAnsContract: Record<Network, string | null> = {
   [Network.TESTNET]: "0x5f8fd2347449685cf41d4db97926ec3a096eaf381332be4f1318ad4d16a8497c",
@@ -969,6 +969,8 @@ export async function renewDomain(args: {
  * be extended.
  *
  * @param name - The ANS name response to sanitize.
+ * @param aptosConfig - config for the aptos client
+ * @param gracePeriod - grace period after expiration
  * @param name.expiration_timestamp - The expiration timestamp in ISO string format.
  * @group Implementation
  */
@@ -985,7 +987,7 @@ function sanitizeANSName({
   const domain_expiration_timestamp = `${name.domain_expiration_timestamp}Z`;
 
   const isSubdomain = !!name.subdomain;
-  const expirationPolicy = name.subdomain_expiration_policy as SubdomainExpirationPolicy;
+  const expirationPolicy = name.subdomain_expiration_policy;
   const expiration =
     isSubdomain && expirationPolicy === SubdomainExpirationPolicy.FollowsDomain
       ? domain_expiration_timestamp
@@ -1005,18 +1007,23 @@ function sanitizeANSName({
     isInRenewablePeriod = expirationDate < renewalWindowDate;
   }
 
+  // Pass nullable indexer fields through as `undefined` rather than fabricating
+  // placeholder values ("N/A", "v2", false, ""). Consumers that need these
+  // fields should treat a missing value as a bad row from the indexer.
+  // `subdomain_expiration_policy` keeps a default of `FollowsDomain` because
+  // that is the contract's semantic fallback for subdomains, not a fabrication.
   return {
-    domain: name.domain!,
+    domain: name.domain ?? undefined,
     subdomain: name.subdomain || undefined,
     expiration_timestamp,
     expiration_status,
-    domain_expiration_timestamp: domain_expiration_timestamp!,
+    domain_expiration_timestamp,
     expiration: new Date(expiration),
-    token_standard: name.token_standard! as AnsTokenStandard,
-    is_primary: name.is_primary!,
+    token_standard: name.token_standard ?? undefined,
+    is_primary: name.is_primary ?? undefined,
     subdomain_expiration_policy: name.subdomain_expiration_policy ?? SubdomainExpirationPolicy.FollowsDomain,
-    owner_address: name.owner_address ?? "",
-    registered_address: name.registered_address!,
+    owner_address: name.owner_address ?? undefined,
+    registered_address: name.registered_address ?? undefined,
     isInRenewablePeriod,
   };
 }

package/src/internal/coin.ts

@@ -1,11 +1,11 @@
-import { AptosConfig } from "../api/aptosConfig";
-import { AccountAddressInput } from "../core";
-import { EntryFunctionABI, InputGenerateTransactionOptions } from "../transactions/types";
-import { AnyNumber, MoveStructId } from "../types";
-import { APTOS_COIN } from "../utils/const";
-import { generateTransaction } from "./transactionSubmission";
-import { TypeTagAddress, TypeTagU64 } from "../transactions";
-import { SimpleTransaction } from "../transactions/instances/simpleTransaction";
+import { AptosConfig } from "../api/aptosConfig.js";
+import { AccountAddressInput } from "../core/index.js";
+import { EntryFunctionABI, InputGenerateTransactionOptions } from "../transactions/types.js";
+import { AnyNumber, MoveStructId } from "../types/index.js";
+import { APTOS_COIN } from "../utils/const.js";
+import { generateTransaction } from "./transactionSubmission.js";
+import { TypeTagAddress, TypeTagU64 } from "../transactions/index.js";
+import { SimpleTransaction } from "../transactions/instances/simpleTransaction.js";
 
 const coinTransferAbi: EntryFunctionABI = {
   typeParameters: [{ constraints: [] }],

package/src/internal/digitalAsset.ts

@@ -9,11 +9,11 @@
  * @group Implementation
  */
 
-import { AptosConfig } from "../api/aptosConfig";
-import { Bool, MoveString, MoveVector, U64 } from "../bcs";
-import { AccountAddress, AccountAddressInput } from "../core";
-import { Account } from "../account";
-import { EntryFunctionABI, InputGenerateTransactionOptions } from "../transactions/types";
+import { AptosConfig } from "../api/aptosConfig.js";
+import { Bool, MoveString, MoveVector, U64 } from "../bcs/index.js";
+import { AccountAddress, AccountAddressInput } from "../core/index.js";
+import { Account } from "../account/index.js";
+import { EntryFunctionABI, InputGenerateTransactionOptions } from "../transactions/types.js";
 import {
   AnyNumber,
   GetCollectionDataResponse,
@@ -27,27 +27,27 @@ import {
   PaginationArgs,
   TokenStandardArg,
   WhereArg,
-} from "../types";
+} from "../types/index.js";
 import {
   GetCollectionDataQuery,
   GetCurrentTokenOwnershipQuery,
   GetTokenActivityQuery,
   GetTokenDataQuery,
-} from "../types/generated/operations";
+} from "../types/generated/operations.js";
 import {
   GetCollectionData,
   GetCurrentTokenOwnership,
   GetTokenActivity,
   GetTokenData,
-} from "../types/generated/queries";
-import { queryIndexer } from "./general";
-import { generateTransaction } from "./transactionSubmission";
-import { MAX_U64_BIG_INT } from "../bcs/consts";
+} from "../types/generated/queries.js";
+import { queryIndexer } from "./general.js";
+import { generateTransaction } from "./transactionSubmission.js";
+import { MAX_U64_BIG_INT } from "../bcs/consts.js";
 import {
   CurrentCollectionsV2BoolExp,
   CurrentTokenOwnershipsV2BoolExp,
   TokenActivitiesV2BoolExp,
-} from "../types/generated/types";
+} from "../types/generated/types.js";
 import {
   checkOrConvertArgument,
   objectStructTag,
@@ -59,8 +59,8 @@ import {
   TypeTagStruct,
   TypeTagU64,
   TypeTagVector,
-} from "../transactions";
-import { SimpleTransaction } from "../transactions/instances/simpleTransaction";
+} from "../transactions/index.js";
+import { SimpleTransaction } from "../transactions/instances/simpleTransaction.js";
 
 // A property type map for the user input and what Move expects
 const PropertyTypeMap = {
@@ -1280,7 +1280,6 @@ function getPropertyValueRaw(propertyValues: Array<PropertyValue>, propertyTypes
   propertyTypes.forEach((typ, index) => {
     results.push(getSinglePropertyValueRaw(propertyValues[index], typ));
   });
-
   return results;
 }
 

package/src/internal/encryptionKey.ts

@@ -0,0 +1,53 @@
+// Copyright © Aptos Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+/**
+ * Fetches and caches the encryption key from the fullnode API.
+ * The key is per-epoch; cache by epoch and refresh when epoch changes.
+ */
+
+import { AptosConfig } from "../api/aptosConfig.js";
+import { Hex } from "../core/hex.js";
+import { Deserializer } from "../bcs/deserializer.js";
+import { EncryptionKey } from "../core/crypto/encryption/index.js";
+import { getLedgerInfo } from "./general.js";
+
+interface CachedEncryptionKey {
+  epoch: string;
+  key: EncryptionKey;
+}
+
+const encryptionKeyCache = new Map<string, CachedEncryptionKey>();
+
+/**
+ * Fetches the encryption key from the fullnode index endpoint, deserializes it,
+ * and caches it by fullnode URL (or network label) + epoch. Returns null if the node does not support
+ * encrypted transactions.
+ *
+ * @param args.aptosConfig - Aptos configuration.
+ */
+export async function fetchAndCacheEncryptionKey(args: {
+  aptosConfig: AptosConfig;
+}): Promise<{ key: EncryptionKey; epoch: bigint } | null> {
+  const { aptosConfig } = args;
+  const cacheKey = `encryption-key-${aptosConfig.fullnode ?? aptosConfig.network}`;
+
+  const ledgerInfo = await getLedgerInfo({ aptosConfig });
+
+  const cached = encryptionKeyCache.get(cacheKey);
+  if (cached && cached.epoch === ledgerInfo.epoch) {
+    return { key: cached.key, epoch: BigInt(cached.epoch) };
+  }
+
+  const hexKey = ledgerInfo.encryption_key;
+  if (!hexKey) {
+    return null;
+  }
+
+  const keyBytes = Hex.fromHexInput(hexKey).toUint8Array();
+  const deserializer = new Deserializer(keyBytes);
+  const key = EncryptionKey.deserialize(deserializer);
+
+  encryptionKeyCache.set(cacheKey, { epoch: ledgerInfo.epoch, key });
+  return { key, epoch: BigInt(ledgerInfo.epoch) };
+}

package/src/internal/faucet.ts

@@ -9,12 +9,12 @@
  * @group Implementation
  */
 
-import { AptosConfig } from "../api/aptosConfig";
-import { postAptosFaucet } from "../client";
-import { AccountAddress, AccountAddressInput } from "../core";
-import { TransactionResponseType, UserTransactionResponse, WaitForTransactionOptions } from "../types";
-import { DEFAULT_TXN_TIMEOUT_SEC } from "../utils/const";
-import { waitForTransaction } from "./transaction";
+import { AptosConfig } from "../api/aptosConfig.js";
+import { postAptosFaucet } from "../client/index.js";
+import { AccountAddress, AccountAddressInput } from "../core/index.js";
+import { TransactionResponseType, UserTransactionResponse, WaitForTransactionOptions } from "../types/index.js";
+import { DEFAULT_TXN_TIMEOUT_SEC } from "../utils/const.js";
+import { waitForTransaction } from "./transaction.js";
 
 /**
  * Funds an account with a specified amount of tokens from the Aptos faucet.