@aptos-labs/ts-sdk 2.0.0-zeta.0 → 2.0.1-zeta.0

package/src/api/account.ts

@@ -50,6 +50,7 @@ import {
   getTransactions,
   lookupOriginalAccountAddress,
   deriveOwnedAccountsFromSigner,
+  AccountInfo,
 } from "../internal/account";
 import { APTOS_COIN, APTOS_FA, ProcessorType } from "../utils/const";
 import { AptosConfig } from "./aptosConfig";
@@ -1047,12 +1048,14 @@ export class Account {
   }
 
   /**
-   * Gets all account info (address, account public key, last transaction version) that have are associated with a public key.
+   * Gets all account info (address, account public key, last transaction version) that have are associated with a public key and **related public keys**
    *
    * For a given public key, it will query all multikeys that the public key is part of.  Then for the provided public key and
    * any multikeys found in the previous step, it will query for any accounts that have an auth key that matches any of the
    * public keys.
    *
+   * Note: If an Ed25519PublicKey or an AnyPublicKey that wraps Ed25519PublicKey is passed in, it will query for both legacy and single singer cases.
+   *
    * @param args - The arguments for getting accounts for a public key
    * @param args.publicKey - The public key to look up accounts for
    * @param args.minimumLedgerVersion - The minimum ledger version to wait for before querying
@@ -1084,12 +1087,7 @@ export class Account {
     publicKey: BaseAccountPublicKey;
     minimumLedgerVersion?: AnyNumber;
     options?: { includeUnverified?: boolean; noMultiKey?: boolean };
-  }): Promise<
-    {
-      accountAddress: AccountAddress;
-      publicKey: BaseAccountPublicKey;
-    }[]
-  > {
+  }): Promise<AccountInfo[]> {
     await waitForIndexerOnVersion({
       config: this.config,
       minimumLedgerVersion: args.minimumLedgerVersion,

package/src/bcs/deserializer.ts

@@ -99,6 +99,19 @@ export class Deserializer {
     return this.buffer.byteLength - this.offset;
   }
 
+  /**
+   * Asserts that the buffer has no remaining bytes.
+   *
+   * @throws {Error} Throws an error if there are remaining bytes in the buffer.
+   * @group Implementation
+   * @category BCS
+   */
+  assertFinished(): void {
+    if (this.remaining() !== 0) {
+      throw new Error("Buffer has remaining bytes");
+    }
+  }
+
   /**
    * Deserializes a UTF-8 encoded string from a byte array. It first reads the length of the string in bytes,
    * followed by the actual byte content, and decodes it into a string.

package/src/core/crypto/deserializationUtils.ts

@@ -0,0 +1,106 @@
+import {
+  AnyPublicKey,
+  Ed25519PublicKey,
+  MultiKey,
+  KeylessPublicKey,
+  MultiEd25519PublicKey,
+  FederatedKeylessPublicKey,
+  Secp256k1PublicKey,
+  Signature,
+  PublicKey,
+  Ed25519Signature,
+  Secp256k1Signature,
+  KeylessSignature,
+  AnySignature,
+  MultiEd25519Signature,
+  MultiKeySignature,
+} from "..";
+import { Deserializer } from "../../bcs/deserializer";
+import { HexInput } from "../../types";
+
+const MULTIPLE_DESERIALIZATIONS_ERROR_MSG = "Multiple possible deserializations found";
+
+/**
+ * Deserializes a public key from a hex string.
+ * Attempts to deserialize using various public key types in sequence until one succeeds.
+ *
+ * @param publicKey - The hex string representation of the public key to deserialize
+ * @returns The deserialized public key
+ * @throws Error if deserialization fails for all supported key types or if multiple deserializations are found
+ */
+export function deserializePublicKey(publicKey: HexInput): PublicKey {
+  const publicKeyTypes = [
+    Ed25519PublicKey,
+    AnyPublicKey,
+    MultiEd25519PublicKey,
+    MultiKey,
+    KeylessPublicKey,
+    FederatedKeylessPublicKey,
+    Secp256k1PublicKey,
+  ];
+
+  let result: PublicKey | undefined;
+  for (const KeyType of publicKeyTypes) {
+    try {
+      const deserializer = Deserializer.fromHex(publicKey);
+      const key = KeyType.deserialize(deserializer);
+      deserializer.assertFinished();
+      if (result) {
+        throw new Error(`${MULTIPLE_DESERIALIZATIONS_ERROR_MSG}: ${publicKey}`);
+      }
+      result = key;
+    } catch (error) {
+      if (error instanceof Error && error.message.includes(MULTIPLE_DESERIALIZATIONS_ERROR_MSG)) {
+        throw error;
+      }
+    }
+  }
+
+  if (!result) {
+    throw new Error(`Failed to deserialize public key: ${publicKey}`);
+  }
+
+  return result;
+}
+
+/**
+ * Deserializes a signature from a hex string.
+ * Attempts to deserialize using various signature types in sequence until one succeeds.
+ *
+ * @param signature - The hex string representation of the signature to deserialize
+ * @returns The deserialized signature
+ * @throws Error if deserialization fails for all supported signature types or if multiple deserializations are found
+ */
+export function deserializeSignature(signature: HexInput): Signature {
+  const signatureTypes = [
+    Ed25519Signature,
+    AnySignature,
+    MultiEd25519Signature,
+    MultiKeySignature,
+    KeylessSignature,
+    Secp256k1Signature,
+  ];
+
+  let result: Signature | undefined;
+  for (const SignatureType of signatureTypes) {
+    try {
+      const deserializer = Deserializer.fromHex(signature);
+      const sig = SignatureType.deserialize(deserializer);
+      deserializer.assertFinished();
+      if (result) {
+        throw new Error(`${MULTIPLE_DESERIALIZATIONS_ERROR_MSG}: ${signature}`);
+      }
+      result = sig;
+    } catch (error) {
+      if (error instanceof Error && error.message.includes(MULTIPLE_DESERIALIZATIONS_ERROR_MSG)) {
+        throw error;
+      }
+    }
+  }
+
+  if (!result) {
+    throw new Error(`Failed to deserialize signature: ${signature}`);
+  }
+
+  return result;
+}

package/src/core/crypto/index.ts

@@ -16,3 +16,4 @@ export * from "./secp256k1";
 export * from "./signature";
 export * from "./singleKey";
 export * from "./types";
+export * from "./deserializationUtils";

package/src/internal/account.ts

@@ -1121,17 +1121,17 @@ async function rotateAuthKeyUnverified(args: {
   });
 }
 
+export type AccountInfo = {
+  accountAddress: AccountAddress;
+  publicKey: BaseAccountPublicKey;
+  lastTransactionVersion: number;
+};
+
 export async function getAccountsForPublicKey(args: {
   aptosConfig: AptosConfig;
   publicKey: BaseAccountPublicKey;
   options?: { includeUnverified?: boolean; noMultiKey?: boolean };
-}): Promise<
-  {
-    accountAddress: AccountAddress;
-    publicKey: BaseAccountPublicKey;
-    lastTransactionVersion: number;
-  }[]
-> {
+}): Promise<AccountInfo[]> {
   const { aptosConfig, publicKey, options } = args;
   const noMultiKey = options?.noMultiKey ?? false;
   if (noMultiKey && publicKey instanceof AbstractMultiKey) {
@@ -1385,7 +1385,7 @@ async function getMultiKeysForPublicKey(args: {
   const { public_key_auth_keys: data } = await queryIndexer<GetAuthKeysForPublicKeyQuery>({
     aptosConfig,
     query: graphqlQuery,
-    originMethod: "getAuthKeysForPublicKey",
+    originMethod: "getMultiKeysForPublicKey",
   });
 
   const authKeys = data.map((entry) => {

package/src/internal/move/jwks/build/jwk/BuildInfo.yaml

@@ -0,0 +1,56 @@
+---
+compiled_package_info:
+  package_name: jwk
+  address_alias_instantiation:
+    Extensions: "0000000000000000000000000000000000000000000000000000000000000001"
+    aptos_framework: "0000000000000000000000000000000000000000000000000000000000000001"
+    aptos_fungible_asset: 000000000000000000000000000000000000000000000000000000000000000a
+    aptos_std: "0000000000000000000000000000000000000000000000000000000000000001"
+    aptos_token: "0000000000000000000000000000000000000000000000000000000000000003"
+    core_resources: 000000000000000000000000000000000000000000000000000000000a550c18
+    std: "0000000000000000000000000000000000000000000000000000000000000001"
+    vm: "0000000000000000000000000000000000000000000000000000000000000000"
+    vm_reserved: "0000000000000000000000000000000000000000000000000000000000000000"
+  source_digest: 3437D4FB002907781F0FE5D46FC4E668C8B8F0420AA77751774AD63B0C2730BF
+  build_flags:
+    dev_mode: false
+    test_mode: false
+    override_std: ~
+    generate_docs: false
+    generate_abis: false
+    generate_move_model: true
+    full_model_generation: false
+    install_dir: ~
+    force_recompilation: false
+    additional_named_addresses: {}
+    architecture: ~
+    fetch_deps_only: false
+    skip_fetch_latest_git_deps: false
+    compiler_config:
+      bytecode_version: 6
+      known_attributes:
+        - bytecode_instruction
+        - deprecated
+        - event
+        - expected_failure
+        - "fmt::skip"
+        - legacy_entry_fun
+        - "lint::allow_unsafe_randomness"
+        - "lint::skip"
+        - native_interface
+        - randomness
+        - resource_group
+        - resource_group_member
+        - test
+        - test_only
+        - verify_only
+        - view
+      skip_attribute_checks: false
+      compiler_version: ~
+      language_version: ~
+      experiments:
+        - optimize=on
+dependencies:
+  - AptosFramework
+  - AptosStdlib
+  - MoveStdlib