@aptos-labs/ts-sdk 1.27.1-zeta.0 → 1.28.0-zeta.0

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

@@ -55,7 +55,8 @@ declare enum ScriptTransactionArgumentVariants {
     Bool = 5,
     U16 = 6,
     U32 = 7,
-    U256 = 8
+    U256 = 8,
+    Serialized = 9
 }
 /**
  * Transaction payload enum as they are represented in Rust

package/dist/esm/types/index.mjs

@@ -1,71 +1,2 @@
-import {
-  AccountAuthenticatorVariant,
-  AnyPublicKeyVariant,
-  AnySignatureVariant,
-  DeriveScheme,
-  EphemeralCertificateVariant,
-  EphemeralPublicKeyVariant,
-  EphemeralSignatureVariant,
-  MimeType,
-  MoveAbility,
-  MoveFunctionVisibility,
-  RoleType,
-  ScriptTransactionArgumentVariants,
-  SigningScheme,
-  SigningSchemeInput,
-  TransactionAuthenticatorVariant,
-  TransactionPayloadVariants,
-  TransactionResponseType,
-  TransactionVariants,
-  TypeTagVariants,
-  ZkpVariant,
-  isBlockEpilogueTransactionResponse,
-  isBlockMetadataTransactionResponse,
-  isEd25519Signature,
-  isFeePayerSignature,
-  isGenesisTransactionResponse,
-  isMultiAgentSignature,
-  isMultiEd25519Signature,
-  isPendingTransactionResponse,
-  isSecp256k1Signature,
-  isStateCheckpointTransactionResponse,
-  isUserTransactionResponse,
-  isValidatorTransactionResponse
-} from "../chunk-4FVXWQGX.mjs";
-import "../chunk-4WPQQPUF.mjs";
-import "../chunk-OR7TEZ25.mjs";
-export {
-  AccountAuthenticatorVariant,
-  AnyPublicKeyVariant,
-  AnySignatureVariant,
-  DeriveScheme,
-  EphemeralCertificateVariant,
-  EphemeralPublicKeyVariant,
-  EphemeralSignatureVariant,
-  MimeType,
-  MoveAbility,
-  MoveFunctionVisibility,
-  RoleType,
-  ScriptTransactionArgumentVariants,
-  SigningScheme,
-  SigningSchemeInput,
-  TransactionAuthenticatorVariant,
-  TransactionPayloadVariants,
-  TransactionResponseType,
-  TransactionVariants,
-  TypeTagVariants,
-  ZkpVariant,
-  isBlockEpilogueTransactionResponse,
-  isBlockMetadataTransactionResponse,
-  isEd25519Signature,
-  isFeePayerSignature,
-  isGenesisTransactionResponse,
-  isMultiAgentSignature,
-  isMultiEd25519Signature,
-  isPendingTransactionResponse,
-  isSecp256k1Signature,
-  isStateCheckpointTransactionResponse,
-  isUserTransactionResponse,
-  isValidatorTransactionResponse
-};
+import{A,B,C,D,E,F,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-23J256KA.mjs";import"../chunk-4WPQQPUF.mjs";import"../chunk-FVA2OPG4.mjs";export{g as AccountAuthenticatorVariant,h as AnyPublicKeyVariant,i as AnySignatureVariant,F as DeriveScheme,l as EphemeralCertificateVariant,j as EphemeralPublicKeyVariant,k as EphemeralSignatureVariant,a as MimeType,B as MoveAbility,A as MoveFunctionVisibility,C as RoleType,c as ScriptTransactionArgumentVariants,D as SigningScheme,E as SigningSchemeInput,f as TransactionAuthenticatorVariant,d as TransactionPayloadVariants,n as TransactionResponseType,e as TransactionVariants,b as TypeTagVariants,m as ZkpVariant,u as isBlockEpilogueTransactionResponse,r as isBlockMetadataTransactionResponse,v as isEd25519Signature,y as isFeePayerSignature,q as isGenesisTransactionResponse,x as isMultiAgentSignature,z as isMultiEd25519Signature,o as isPendingTransactionResponse,w as isSecp256k1Signature,s as isStateCheckpointTransactionResponse,p as isUserTransactionResponse,t as isValidatorTransactionResponse};
 //# sourceMappingURL=index.mjs.map

package/dist/esm/types/indexer.mjs

@@ -1,2 +1,2 @@
-import "../chunk-4WPQQPUF.mjs";
+import"../chunk-4WPQQPUF.mjs";
 //# sourceMappingURL=indexer.mjs.map

package/dist/esm/utils/apiEndpoints.mjs

@@ -1,22 +1,2 @@
-import {
-  Network,
-  NetworkToChainId,
-  NetworkToFaucetAPI,
-  NetworkToIndexerAPI,
-  NetworkToNetworkName,
-  NetworkToNodeAPI,
-  NetworkToPepperAPI,
-  NetworkToProverAPI
-} from "../chunk-3NHOLSZE.mjs";
-import "../chunk-OR7TEZ25.mjs";
-export {
-  Network,
-  NetworkToChainId,
-  NetworkToFaucetAPI,
-  NetworkToIndexerAPI,
-  NetworkToNetworkName,
-  NetworkToNodeAPI,
-  NetworkToPepperAPI,
-  NetworkToProverAPI
-};
+import{a,b,c,d,e,f,g,h}from"../chunk-5VQK4F5X.mjs";import"../chunk-FVA2OPG4.mjs";export{f as Network,g as NetworkToChainId,c as NetworkToFaucetAPI,a as NetworkToIndexerAPI,h as NetworkToNetworkName,b as NetworkToNodeAPI,d as NetworkToPepperAPI,e as NetworkToProverAPI};
 //# sourceMappingURL=apiEndpoints.mjs.map

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

@@ -37,6 +37,7 @@ declare const DEFAULT_TXN_TIMEOUT_SEC = 20;
  * The default gas currency for the network.
  */
 declare const APTOS_COIN = "0x1::aptos_coin::AptosCoin";
+declare const APTOS_FA = "0x000000000000000000000000000000000000000000000000000000000000000a";
 declare const RAW_TRANSACTION_SALT = "APTOS::RawTransaction";
 declare const RAW_TRANSACTION_WITH_DATA_SALT = "APTOS::RawTransactionWithData";
 /**
@@ -56,4 +57,4 @@ declare enum ProcessorType {
     OBJECT_PROCESSOR = "objects_processor"
 }
 
-export { APTOS_COIN, AptosApiType, DEFAULT_MAX_GAS_AMOUNT, DEFAULT_TXN_EXP_SEC_FROM_NOW, DEFAULT_TXN_TIMEOUT_SEC, ProcessorType, RAW_TRANSACTION_SALT, RAW_TRANSACTION_WITH_DATA_SALT };
+export { APTOS_COIN, APTOS_FA, AptosApiType, DEFAULT_MAX_GAS_AMOUNT, DEFAULT_TXN_EXP_SEC_FROM_NOW, DEFAULT_TXN_TIMEOUT_SEC, ProcessorType, RAW_TRANSACTION_SALT, RAW_TRANSACTION_WITH_DATA_SALT };

package/dist/esm/utils/const.mjs

@@ -1,22 +1,2 @@
-import {
-  APTOS_COIN,
-  AptosApiType,
-  DEFAULT_MAX_GAS_AMOUNT,
-  DEFAULT_TXN_EXP_SEC_FROM_NOW,
-  DEFAULT_TXN_TIMEOUT_SEC,
-  ProcessorType,
-  RAW_TRANSACTION_SALT,
-  RAW_TRANSACTION_WITH_DATA_SALT
-} from "../chunk-4K4TZF3H.mjs";
-import "../chunk-OR7TEZ25.mjs";
-export {
-  APTOS_COIN,
-  AptosApiType,
-  DEFAULT_MAX_GAS_AMOUNT,
-  DEFAULT_TXN_EXP_SEC_FROM_NOW,
-  DEFAULT_TXN_TIMEOUT_SEC,
-  ProcessorType,
-  RAW_TRANSACTION_SALT,
-  RAW_TRANSACTION_WITH_DATA_SALT
-};
+import{a,b,c,d,e,f,g,h,i}from"../chunk-EXP5STXZ.mjs";import"../chunk-FVA2OPG4.mjs";export{e as APTOS_COIN,f as APTOS_FA,a as AptosApiType,b as DEFAULT_MAX_GAS_AMOUNT,c as DEFAULT_TXN_EXP_SEC_FROM_NOW,d as DEFAULT_TXN_TIMEOUT_SEC,i as ProcessorType,g as RAW_TRANSACTION_SALT,h as RAW_TRANSACTION_WITH_DATA_SALT};
 //# sourceMappingURL=const.mjs.map

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

@@ -1,3 +1,9 @@
+import { MoveStructId } from '../types/index.mjs';
+import './apiEndpoints.mjs';
+import '../types/indexer.mjs';
+import '../types/generated/operations.mjs';
+import '../types/generated/types.mjs';
+
 /**
  * Sleep the current thread for the given amount of time
  * @param timeMs time in milliseconds to sleep
@@ -30,5 +36,39 @@ declare const convertAmountFromHumanReadableToOnChain: (value: number, decimal:
  * @returns The value is smallest units
  */
 declare const convertAmountFromOnChainToHumanReadable: (value: number, decimal: number) => number;
+/**
+ * Convert an encoded struct to a MoveStructId.
+ *
+ * @example
+ * const structObj = {
+ *   account_address: "0x1",
+ *   module_name: "0x6170746f735f636f696e",
+ *   struct_name: "0x4170746f73436f696e",
+ * };
+ * // structId is "0x1::aptos_coin::AptosCoin"
+ * const structId = parseEncodedStruct(structObj);
+ *
+ * @param structObj The struct with account_address, module_name, and struct_name properties
+ * @returns The MoveStructId
+ */
+declare const parseEncodedStruct: (structObj: {
+    account_address: string;
+    module_name: string;
+    struct_name: string;
+}) => MoveStructId;
+/**
+ * Determines whether the given object is an encoded struct type with the following properties:
+ * - account_address: string
+ * - module_name: string
+ * - struct_name: string
+ *
+ * @param structObj The object to check
+ * @returns Whether the object is an encoded struct type
+ */
+declare const isEncodedStruct: (structObj: any) => structObj is {
+    account_address: string;
+    module_name: string;
+    struct_name: string;
+};
 
-export { base64UrlDecode, convertAmountFromHumanReadableToOnChain, convertAmountFromOnChainToHumanReadable, floorToWholeHour, nowInSeconds, sleep };
+export { base64UrlDecode, convertAmountFromHumanReadableToOnChain, convertAmountFromOnChainToHumanReadable, floorToWholeHour, isEncodedStruct, nowInSeconds, parseEncodedStruct, sleep };

package/dist/esm/utils/helpers.mjs

@@ -1,18 +1,2 @@
-import {
-  base64UrlDecode,
-  convertAmountFromHumanReadableToOnChain,
-  convertAmountFromOnChainToHumanReadable,
-  floorToWholeHour,
-  nowInSeconds,
-  sleep
-} from "../chunk-YPHGPN2P.mjs";
-import "../chunk-OR7TEZ25.mjs";
-export {
-  base64UrlDecode,
-  convertAmountFromHumanReadableToOnChain,
-  convertAmountFromOnChainToHumanReadable,
-  floorToWholeHour,
-  nowInSeconds,
-  sleep
-};
+import{a,b,c,d,e,f,g,h}from"../chunk-UAL27G6B.mjs";import"../chunk-FVA2OPG4.mjs";export{d as base64UrlDecode,e as convertAmountFromHumanReadableToOnChain,f as convertAmountFromOnChainToHumanReadable,c as floorToWholeHour,h as isEncodedStruct,b as nowInSeconds,g as parseEncodedStruct,a as sleep};
 //# sourceMappingURL=helpers.mjs.map

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

@@ -1,7 +1,7 @@
 export { Network, NetworkToChainId, NetworkToFaucetAPI, NetworkToIndexerAPI, NetworkToNetworkName, NetworkToNodeAPI, NetworkToPepperAPI, NetworkToProverAPI } from './apiEndpoints.mjs';
-export { APTOS_COIN, AptosApiType, DEFAULT_MAX_GAS_AMOUNT, DEFAULT_TXN_EXP_SEC_FROM_NOW, DEFAULT_TXN_TIMEOUT_SEC, ProcessorType, RAW_TRANSACTION_SALT, RAW_TRANSACTION_WITH_DATA_SALT } from './const.mjs';
+export { APTOS_COIN, APTOS_FA, AptosApiType, DEFAULT_MAX_GAS_AMOUNT, DEFAULT_TXN_EXP_SEC_FROM_NOW, DEFAULT_TXN_TIMEOUT_SEC, ProcessorType, RAW_TRANSACTION_SALT, RAW_TRANSACTION_WITH_DATA_SALT } from './const.mjs';
 export { DeserializableClass, normalizeBundle } from './normalizeBundle.mjs';
-export { base64UrlDecode, convertAmountFromHumanReadableToOnChain, convertAmountFromOnChainToHumanReadable, floorToWholeHour, nowInSeconds, sleep } from './helpers.mjs';
+export { base64UrlDecode, convertAmountFromHumanReadableToOnChain, convertAmountFromOnChainToHumanReadable, floorToWholeHour, isEncodedStruct, nowInSeconds, parseEncodedStruct, sleep } from './helpers.mjs';
 import '../bcs/deserializer.mjs';
 import '../types/index.mjs';
 import '../types/indexer.mjs';

package/dist/esm/utils/index.mjs

@@ -1,71 +1,2 @@
-import "../chunk-HGLO5LDS.mjs";
-import {
-  normalizeBundle
-} from "../chunk-G2VEDGO7.mjs";
-import {
-  base64UrlDecode,
-  convertAmountFromHumanReadableToOnChain,
-  convertAmountFromOnChainToHumanReadable,
-  floorToWholeHour,
-  nowInSeconds,
-  sleep
-} from "../chunk-YPHGPN2P.mjs";
-import {
-  Network,
-  NetworkToChainId,
-  NetworkToFaucetAPI,
-  NetworkToIndexerAPI,
-  NetworkToNetworkName,
-  NetworkToNodeAPI,
-  NetworkToPepperAPI,
-  NetworkToProverAPI
-} from "../chunk-3NHOLSZE.mjs";
-import {
-  APTOS_COIN,
-  AptosApiType,
-  DEFAULT_MAX_GAS_AMOUNT,
-  DEFAULT_TXN_EXP_SEC_FROM_NOW,
-  DEFAULT_TXN_TIMEOUT_SEC,
-  ProcessorType,
-  RAW_TRANSACTION_SALT,
-  RAW_TRANSACTION_WITH_DATA_SALT
-} from "../chunk-4K4TZF3H.mjs";
-import "../chunk-FZY4PMEE.mjs";
-import "../chunk-PSW5OBY2.mjs";
-import "../chunk-GWS7OLIU.mjs";
-import "../chunk-6AO2MJMN.mjs";
-import "../chunk-ACAXM6CI.mjs";
-import "../chunk-4FVXWQGX.mjs";
-import "../chunk-4WPQQPUF.mjs";
-import "../chunk-6J7C4S3H.mjs";
-import "../chunk-UZXDD3QH.mjs";
-import "../chunk-YV7M4CFP.mjs";
-import "../chunk-QMM2KL6C.mjs";
-import "../chunk-SBB4YEPT.mjs";
-import "../chunk-OR7TEZ25.mjs";
-export {
-  APTOS_COIN,
-  AptosApiType,
-  DEFAULT_MAX_GAS_AMOUNT,
-  DEFAULT_TXN_EXP_SEC_FROM_NOW,
-  DEFAULT_TXN_TIMEOUT_SEC,
-  Network,
-  NetworkToChainId,
-  NetworkToFaucetAPI,
-  NetworkToIndexerAPI,
-  NetworkToNetworkName,
-  NetworkToNodeAPI,
-  NetworkToPepperAPI,
-  NetworkToProverAPI,
-  ProcessorType,
-  RAW_TRANSACTION_SALT,
-  RAW_TRANSACTION_WITH_DATA_SALT,
-  base64UrlDecode,
-  convertAmountFromHumanReadableToOnChain,
-  convertAmountFromOnChainToHumanReadable,
-  floorToWholeHour,
-  normalizeBundle,
-  nowInSeconds,
-  sleep
-};
+import"../chunk-HGLO5LDS.mjs";import{a as r}from"../chunk-BSUYPXRD.mjs";import"../chunk-FZY4PMEE.mjs";import"../chunk-YELQZVBK.mjs";import"../chunk-CDIKSNSU.mjs";import"../chunk-TVWAYKEP.mjs";import"../chunk-E7VSBBQM.mjs";import"../chunk-23J256KA.mjs";import"../chunk-4WPQQPUF.mjs";import"../chunk-KEYAPEAX.mjs";import"../chunk-ZZIMFLVT.mjs";import"../chunk-AOCNYMMX.mjs";import"../chunk-FBPNHF54.mjs";import"../chunk-56CNRT2K.mjs";import{a as s,b as t,c as u,d as v,e as w,f as x,g as y,h as z}from"../chunk-UAL27G6B.mjs";import{a as j,b as k,c as l,d as m,e as n,f as o,g as p,h as q}from"../chunk-5VQK4F5X.mjs";import{a,b,c,d,e,f,g,h,i}from"../chunk-EXP5STXZ.mjs";import"../chunk-FVA2OPG4.mjs";export{e as APTOS_COIN,f as APTOS_FA,a as AptosApiType,b as DEFAULT_MAX_GAS_AMOUNT,c as DEFAULT_TXN_EXP_SEC_FROM_NOW,d as DEFAULT_TXN_TIMEOUT_SEC,o as Network,p as NetworkToChainId,l as NetworkToFaucetAPI,j as NetworkToIndexerAPI,q as NetworkToNetworkName,k as NetworkToNodeAPI,m as NetworkToPepperAPI,n as NetworkToProverAPI,i as ProcessorType,g as RAW_TRANSACTION_SALT,h as RAW_TRANSACTION_WITH_DATA_SALT,v as base64UrlDecode,w as convertAmountFromHumanReadableToOnChain,x as convertAmountFromOnChainToHumanReadable,u as floorToWholeHour,z as isEncodedStruct,r as normalizeBundle,t as nowInSeconds,y as parseEncodedStruct,s as sleep};
 //# sourceMappingURL=index.mjs.map

package/dist/esm/utils/memoize.mjs

@@ -1,10 +1,2 @@
-import {
-  memoize,
-  memoizeAsync
-} from "../chunk-EYHRMZPO.mjs";
-import "../chunk-OR7TEZ25.mjs";
-export {
-  memoize,
-  memoizeAsync
-};
+import{a,b}from"../chunk-AH44UPM4.mjs";import"../chunk-FVA2OPG4.mjs";export{b as memoize,a as memoizeAsync};
 //# sourceMappingURL=memoize.mjs.map

package/dist/esm/utils/normalizeBundle.mjs

@@ -1,20 +1,2 @@
-import {
-  normalizeBundle
-} from "../chunk-G2VEDGO7.mjs";
-import "../chunk-FZY4PMEE.mjs";
-import "../chunk-PSW5OBY2.mjs";
-import "../chunk-GWS7OLIU.mjs";
-import "../chunk-6AO2MJMN.mjs";
-import "../chunk-ACAXM6CI.mjs";
-import "../chunk-4FVXWQGX.mjs";
-import "../chunk-4WPQQPUF.mjs";
-import "../chunk-6J7C4S3H.mjs";
-import "../chunk-UZXDD3QH.mjs";
-import "../chunk-YV7M4CFP.mjs";
-import "../chunk-QMM2KL6C.mjs";
-import "../chunk-SBB4YEPT.mjs";
-import "../chunk-OR7TEZ25.mjs";
-export {
-  normalizeBundle
-};
+import{a}from"../chunk-BSUYPXRD.mjs";import"../chunk-FZY4PMEE.mjs";import"../chunk-YELQZVBK.mjs";import"../chunk-CDIKSNSU.mjs";import"../chunk-TVWAYKEP.mjs";import"../chunk-E7VSBBQM.mjs";import"../chunk-23J256KA.mjs";import"../chunk-4WPQQPUF.mjs";import"../chunk-KEYAPEAX.mjs";import"../chunk-ZZIMFLVT.mjs";import"../chunk-AOCNYMMX.mjs";import"../chunk-FBPNHF54.mjs";import"../chunk-56CNRT2K.mjs";import"../chunk-FVA2OPG4.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 = "1.27.1";
+declare const VERSION = "1.28.0";
 
 export { VERSION };

package/dist/esm/version.mjs

@@ -1,8 +1,2 @@
-import {
-  VERSION
-} from "./chunk-N6K44CGJ.mjs";
-import "./chunk-OR7TEZ25.mjs";
-export {
-  VERSION
-};
+import{a}from"./chunk-ZXVQ2OBJ.mjs";import"./chunk-FVA2OPG4.mjs";export{a as VERSION};
 //# sourceMappingURL=version.mjs.map

package/package.json

@@ -95,5 +95,5 @@
     "typedoc": "^0.25.4",
     "typescript": "^5.3.3"
   },
-  "version": "1.27.1-zeta.0"
+  "version": "1.28.0-zeta.0"
 }

package/src/account/FederatedKeylessAccount.ts

@@ -2,97 +2,32 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { JwtPayload, jwtDecode } from "jwt-decode";
-import EventEmitter from "eventemitter3";
-import { EphemeralCertificateVariant, HexInput, SigningScheme } from "../types";
+import { HexInput } from "../types";
 import { AccountAddress, AccountAddressInput } from "../core/accountAddress";
-import { AnyPublicKey, AnySignature, KeylessSignature, EphemeralCertificate, ZeroKnowledgeSig } from "../core/crypto";
+import { ZeroKnowledgeSig } from "../core/crypto";
 
-import { Account } from "./Account";
 import { EphemeralKeyPair } from "./EphemeralKeyPair";
-import { Hex } from "../core/hex";
-import { AccountAuthenticatorSingleKey } from "../transactions/authenticator/account";
-import { Deserializer, Serializable, Serializer } from "../bcs";
-import { deriveTransactionType } from "../transactions/transactionBuilder/signingMessage";
-import { AnyRawTransaction } from "../transactions/types";
-import { base64UrlDecode } from "../utils/helpers";
+import { Deserializer, Serializer } from "../bcs";
 import { FederatedKeylessPublicKey } from "../core/crypto/federatedKeyless";
-import { KeylessAccount, ProofFetchCallback, ProofFetchEvents, TransactionAndProof } from "./KeylessAccount";
+import { KeylessAccountCommon, ProofFetchCallback } from "./KeylessAccountCommon";
 
 /**
- * Account implementation for the Keyless authentication scheme.
+ * Account implementation for the FederatedKeyless authentication scheme.
  *
- * Used to represent a Keyless based account and sign transactions with it.
+ * Used to represent a FederatedKeyless based account and sign transactions with it.
  *
- * Use KeylessAccount.fromJWTAndProof to instantiate a KeylessAccount with a JWT, proof and EphemeralKeyPair.
+ * Use FederatedKeylessAccount.fromJWTAndProof to instantiate a KeylessAccount with a JWT, proof, EphemeralKeyPair and the
+ * address the JWKs are installed that will be used to verify the JWT.
  *
  * When the proof expires or the JWT becomes invalid, the KeylessAccount must be instantiated again with a new JWT,
  * EphemeralKeyPair, and corresponding proof.
  */
-export class FederatedKeylessAccount extends Serializable implements Account {
-  static readonly PEPPER_LENGTH: number = 31;
-
+export class FederatedKeylessAccount extends KeylessAccountCommon {
   /**
-   * The KeylessPublicKey associated with the account
+   * The FederatedKeylessPublicKey associated with the account
    */
   readonly publicKey: FederatedKeylessPublicKey;
 
-  /**
-   * The EphemeralKeyPair used to generate sign.
-   */
-  readonly ephemeralKeyPair: EphemeralKeyPair;
-
-  /**
-   * The claim on the JWT to identify a user.  This is typically 'sub' or 'email'.
-   */
-  readonly uidKey: string;
-
-  /**
-   * The value of the uidKey claim on the JWT.  This intended to be a stable user identifier.
-   */
-  readonly uidVal: string;
-
-  /**
-   * The value of the 'aud' claim on the JWT, also known as client ID.  This is the identifier for the dApp's
-   * OIDC registration with the identity provider.
-   */
-  readonly aud: string;
-
-  /**
-   * A value contains 31 bytes of entropy that preserves privacy of the account. Typically fetched from a pepper provider.
-   */
-  readonly pepper: Uint8Array;
-
-  /**
-   * Account address associated with the account
-   */
-  readonly accountAddress: AccountAddress;
-
-  /**
-   * The zero knowledge signature (if ready) which contains the proof used to validate the EphemeralKeyPair.
-   */
-  proof: ZeroKnowledgeSig | undefined;
-
-  /**
-   * The proof of the EphemeralKeyPair or a promise that provides the proof.  This is used to allow for awaiting on
-   * fetching the proof.
-   */
-  readonly proofOrPromise: ZeroKnowledgeSig | Promise<ZeroKnowledgeSig>;
-
-  /**
-   * Signing scheme used to sign transactions
-   */
-  readonly signingScheme: SigningScheme;
-
-  /**
-   * The JWT token used to derive the account
-   */
-  readonly jwt: string;
-
-  /**
-   * An event emitter used to assist in handling asycronous proof fetching.
-   */
-  private readonly emitter: EventEmitter<ProofFetchEvents>;
-
   // Use the static constructor 'create' instead.
   private constructor(args: {
     address?: AccountAddress;
@@ -107,63 +42,19 @@ export class FederatedKeylessAccount extends Serializable implements Account {
     proofFetchCallback?: ProofFetchCallback;
     jwt: string;
   }) {
-    super();
-    const { address, ephemeralKeyPair, uidKey, uidVal, aud, pepper, proof, proofFetchCallback, jwt } = args;
-    this.ephemeralKeyPair = ephemeralKeyPair;
+    super(args);
     this.publicKey = FederatedKeylessPublicKey.create(args);
-    this.accountAddress = address ? AccountAddress.from(address) : this.publicKey.authKey().derivedAddress();
-    this.uidKey = uidKey;
-    this.uidVal = uidVal;
-    this.aud = aud;
-    this.jwt = jwt;
-    this.emitter = new EventEmitter<ProofFetchEvents>();
-    this.proofOrPromise = proof;
-    if (proof instanceof ZeroKnowledgeSig) {
-      this.proof = proof;
-    } else {
-      if (proofFetchCallback === undefined) {
-        throw new Error("Must provide callback for async proof fetch");
-      }
-      this.emitter.on("proofFetchFinish", async (status) => {
-        await proofFetchCallback(status);
-        this.emitter.removeAllListeners();
-      });
-      this.init(proof);
-    }
-    this.signingScheme = SigningScheme.SingleKey;
-    const pepperBytes = Hex.fromHexInput(pepper).toUint8Array();
-    if (pepperBytes.length !== KeylessAccount.PEPPER_LENGTH) {
-      throw new Error(`Pepper length in bytes should be ${KeylessAccount.PEPPER_LENGTH}`);
-    }
-    this.pepper = pepperBytes;
-  }
-
-  /**
-   * This initializes the asyncronous proof fetch
-   * @return
-   */
-  async init(promise: Promise<ZeroKnowledgeSig>) {
-    try {
-      this.proof = await promise;
-      this.emitter.emit("proofFetchFinish", { status: "Success" });
-    } catch (error) {
-      if (error instanceof Error) {
-        this.emitter.emit("proofFetchFinish", { status: "Failed", error: error.toString() });
-      } else {
-        this.emitter.emit("proofFetchFinish", { status: "Failed", error: "Unknown" });
-      }
-    }
   }
 
   serialize(serializer: Serializer): void {
+    if (this.proof === undefined) {
+      throw new Error("Connot serialize - proof undefined");
+    }
     serializer.serializeStr(this.jwt);
     serializer.serializeStr(this.uidKey);
     serializer.serializeFixedBytes(this.pepper);
     this.publicKey.jwkAddress.serialize(serializer);
     this.ephemeralKeyPair.serialize(serializer);
-    if (this.proof === undefined) {
-      throw new Error("Connot serialize - proof undefined");
-    }
     this.proof.serialize(serializer);
   }
 
@@ -184,112 +75,8 @@ export class FederatedKeylessAccount extends Serializable implements Account {
     });
   }
 
-  /**
-   * Checks if the proof is expired.  If so the account must be rederived with a new EphemeralKeyPair
-   * and JWT token.
-   * @return boolean
-   */
-  isExpired(): boolean {
-    return this.ephemeralKeyPair.isExpired();
-  }
-
-  /**
-   * Sign a message using Keyless.
-   * @param message the message to sign, as binary input
-   * @return the AccountAuthenticator containing the signature, together with the account's public key
-   */
-  signWithAuthenticator(message: HexInput): AccountAuthenticatorSingleKey {
-    const signature = new AnySignature(this.sign(message));
-    const publicKey = new AnyPublicKey(this.publicKey);
-    return new AccountAuthenticatorSingleKey(publicKey, signature);
-  }
-
-  /**
-   * Sign a transaction using Keyless.
-   * @param transaction the raw transaction
-   * @return the AccountAuthenticator containing the signature of the transaction, together with the account's public key
-   */
-  signTransactionWithAuthenticator(transaction: AnyRawTransaction): AccountAuthenticatorSingleKey {
-    const signature = new AnySignature(this.signTransaction(transaction));
-    const publicKey = new AnyPublicKey(this.publicKey);
-    return new AccountAuthenticatorSingleKey(publicKey, signature);
-  }
-
-  /**
-   * Waits for asyncronous proof fetching to finish.
-   * @return
-   */
-  async waitForProofFetch() {
-    if (this.proofOrPromise instanceof Promise) {
-      await this.proofOrPromise;
-    }
-  }
-
-  /**
-   * Sign the given message using Keyless.
-   * @param message in HexInput format
-   * @returns Signature
-   */
-  sign(data: HexInput): KeylessSignature {
-    const { expiryDateSecs } = this.ephemeralKeyPair;
-    if (this.isExpired()) {
-      throw new Error("EphemeralKeyPair is expired");
-    }
-    if (this.proof === undefined) {
-      throw new Error("Proof not defined");
-    }
-    const ephemeralPublicKey = this.ephemeralKeyPair.getPublicKey();
-    const ephemeralSignature = this.ephemeralKeyPair.sign(data);
-
-    return new KeylessSignature({
-      jwtHeader: base64UrlDecode(this.jwt.split(".")[0]),
-      ephemeralCertificate: new EphemeralCertificate(this.proof, EphemeralCertificateVariant.ZkProof),
-      expiryDateSecs,
-      ephemeralPublicKey,
-      ephemeralSignature,
-    });
-  }
-
-  /**
-   * Sign the given transaction with Keyless.
-   * Signs the transaction and proof to guard against proof malleability.
-   * @param transaction the transaction to be signed
-   * @returns KeylessSignature
-   */
-  signTransaction(transaction: AnyRawTransaction): KeylessSignature {
-    if (this.proof === undefined) {
-      throw new Error("Proof not found");
-    }
-    const raw = deriveTransactionType(transaction);
-    const txnAndProof = new TransactionAndProof(raw, this.proof.proof);
-    const signMess = txnAndProof.hash();
-    return this.sign(signMess);
-  }
-
-  /**
-   * Note - This function is currently incomplete and should only be used to verify ownership of the KeylessAccount
-   *
-   * Verifies a signature given the message.
-   *
-   * TODO: Groth16 proof verification
-   *
-   * @param args.message the message that was signed.
-   * @param args.signature the KeylessSignature to verify
-   * @returns boolean
-   */
-  verifySignature(args: { message: HexInput; signature: KeylessSignature }): boolean {
-    const { message, signature } = args;
-    if (this.isExpired()) {
-      return false;
-    }
-    if (!this.ephemeralKeyPair.getPublicKey().verifySignature({ message, signature: signature.ephemeralSignature })) {
-      return false;
-    }
-    return true;
-  }
-
-  static fromBytes(bytes: Uint8Array): KeylessAccount {
-    return KeylessAccount.deserialize(new Deserializer(bytes));
+  static fromBytes(bytes: Uint8Array): FederatedKeylessAccount {
+    return FederatedKeylessAccount.deserialize(new Deserializer(bytes));
   }
 
   static create(args: {