@aptos-labs/ts-sdk 1.17.0-zeta.1 → 1.18.0

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

@@ -25,7 +25,6 @@ type PepperFetchRequest = {
     derivation_path: string;
 };
 type PepperFetchResponse = {
-    signature: string;
     pepper: string;
     address: string;
 };

package/dist/esm/utils/index.mjs

@@ -1,2 +1,2 @@
-import"../chunk-GED6IT3S.mjs";import{a as q}from"../chunk-3RJZNUCQ.mjs";import"../chunk-FZY4PMEE.mjs";import"../chunk-GRHLQDHF.mjs";import"../chunk-7BW2N4IE.mjs";import"../chunk-FGGRPEQ3.mjs";import"../chunk-IBN7ETCB.mjs";import"../chunk-Q6LFIZ3L.mjs";import"../chunk-4WPQQPUF.mjs";import"../chunk-3IFR6T3V.mjs";import"../chunk-UMLUOYFK.mjs";import"../chunk-AOCNYMMX.mjs";import"../chunk-FBPNHF54.mjs";import"../chunk-56CNRT2K.mjs";import{a,b,c,d,e,f,g,h}from"../chunk-SCHZ67F3.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}from"../chunk-YE5B2S5L.mjs";import"../chunk-FVA2OPG4.mjs";export{m as APTOS_COIN,i as AptosApiType,j as DEFAULT_MAX_GAS_AMOUNT,k as DEFAULT_TXN_EXP_SEC_FROM_NOW,l as DEFAULT_TXN_TIMEOUT_SEC,f as Network,g as NetworkToChainId,c as NetworkToFaucetAPI,a as NetworkToIndexerAPI,h as NetworkToNetworkName,b as NetworkToNodeAPI,d as NetworkToPepperAPI,e as NetworkToProverAPI,p as ProcessorType,n as RAW_TRANSACTION_SALT,o as RAW_TRANSACTION_WITH_DATA_SALT,q as normalizeBundle};
+import"../chunk-GED6IT3S.mjs";import{a as q}from"../chunk-WV5AD4IE.mjs";import"../chunk-FZY4PMEE.mjs";import"../chunk-YJCZU6PR.mjs";import"../chunk-MS4MRLGA.mjs";import"../chunk-XAISUKMY.mjs";import"../chunk-6QGVRNV6.mjs";import"../chunk-DZXM2MQY.mjs";import"../chunk-Q6LFIZ3L.mjs";import"../chunk-4WPQQPUF.mjs";import"../chunk-HPZ2S4FE.mjs";import"../chunk-56CNRT2K.mjs";import"../chunk-BCUSI3N6.mjs";import"../chunk-LG7RJQ57.mjs";import{a,b,c,d,e,f,g,h}from"../chunk-SCHZ67F3.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}from"../chunk-YE5B2S5L.mjs";import"../chunk-FVA2OPG4.mjs";export{m as APTOS_COIN,i as AptosApiType,j as DEFAULT_MAX_GAS_AMOUNT,k as DEFAULT_TXN_EXP_SEC_FROM_NOW,l as DEFAULT_TXN_TIMEOUT_SEC,f as Network,g as NetworkToChainId,c as NetworkToFaucetAPI,a as NetworkToIndexerAPI,h as NetworkToNetworkName,b as NetworkToNodeAPI,d as NetworkToPepperAPI,e as NetworkToProverAPI,p as ProcessorType,n as RAW_TRANSACTION_SALT,o as RAW_TRANSACTION_WITH_DATA_SALT,q as normalizeBundle};
 //# sourceMappingURL=index.mjs.map

package/dist/esm/utils/normalizeBundle.mjs

@@ -1,2 +1,2 @@
-import{a}from"../chunk-3RJZNUCQ.mjs";import"../chunk-FZY4PMEE.mjs";import"../chunk-GRHLQDHF.mjs";import"../chunk-7BW2N4IE.mjs";import"../chunk-FGGRPEQ3.mjs";import"../chunk-IBN7ETCB.mjs";import"../chunk-Q6LFIZ3L.mjs";import"../chunk-4WPQQPUF.mjs";import"../chunk-3IFR6T3V.mjs";import"../chunk-UMLUOYFK.mjs";import"../chunk-AOCNYMMX.mjs";import"../chunk-FBPNHF54.mjs";import"../chunk-56CNRT2K.mjs";import"../chunk-FVA2OPG4.mjs";export{a as normalizeBundle};
+import{a}from"../chunk-WV5AD4IE.mjs";import"../chunk-FZY4PMEE.mjs";import"../chunk-YJCZU6PR.mjs";import"../chunk-MS4MRLGA.mjs";import"../chunk-XAISUKMY.mjs";import"../chunk-6QGVRNV6.mjs";import"../chunk-DZXM2MQY.mjs";import"../chunk-Q6LFIZ3L.mjs";import"../chunk-4WPQQPUF.mjs";import"../chunk-HPZ2S4FE.mjs";import"../chunk-56CNRT2K.mjs";import"../chunk-BCUSI3N6.mjs";import"../chunk-LG7RJQ57.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.17.0";
+declare const VERSION = "1.18.0";
 
 export { VERSION };

package/dist/esm/version.mjs

@@ -1,2 +1,2 @@
-import{a}from"./chunk-4BJA3QUQ.mjs";import"./chunk-FVA2OPG4.mjs";export{a as VERSION};
+import{a}from"./chunk-P2YIFHMW.mjs";import"./chunk-FVA2OPG4.mjs";export{a as VERSION};
 //# sourceMappingURL=version.mjs.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aptos-labs/ts-sdk",
   "description": "Aptos TypeScript SDK",
-  "packageManager": "pnpm@9.1.4",
+  "packageManager": "pnpm@8.9.0",
   "license": "Apache-2.0",
   "engines": {
     "node": ">=11.0.0"
@@ -55,7 +55,6 @@
     "@scure/bip39": "^1.3.0",
     "eventemitter3": "^5.0.1",
     "form-data": "^4.0.0",
-    "jose": "^5.1.3",
     "js-base64": "^3.7.7",
     "jwt-decode": "^4.0.0",
     "poseidon-lite": "^0.2.0"
@@ -92,5 +91,5 @@
     "typedoc": "^0.25.4",
     "typescript": "^5.3.3"
   },
-  "version": "1.17.0-zeta.1"
+  "version": "1.18.0"
 }

package/src/account/EphemeralKeyPair.ts

@@ -60,7 +60,11 @@ export class EphemeralKeyPair extends Serializable {
     // Generate the blinder if not provided
     this.blinder = blinder !== undefined ? Hex.fromHexInput(blinder).toUint8Array() : generateBlinder();
     // Calculate the nonce
-    this.nonce = this.generateNonce();
+    const fields = padAndPackBytesWithLen(this.publicKey.bcsToBytes(), 93);
+    fields.push(BigInt(this.expiryDateSecs));
+    fields.push(bytesToBigIntLE(this.blinder));
+    const nonceHash = poseidonHash(fields);
+    this.nonce = nonceHash.toString();
   }
 
   /**
@@ -124,18 +128,6 @@ export class EphemeralKeyPair extends Serializable {
     return new EphemeralKeyPair({ privateKey, expiryDateSecs: args?.expiryDateSecs });
   }
 
-  /**
-   * From the ephemeral public key, expiry timestamp, and blinder, calculate the nonce to be used at authentication via OIDC.
-   * @returns string
-   */
-  private generateNonce(): string {
-    const fields = padAndPackBytesWithLen(this.publicKey.bcsToBytes(), 93);
-    fields.push(BigInt(this.expiryDateSecs));
-    fields.push(bytesToBigIntLE(this.blinder));
-    const nonceHash = poseidonHash(fields);
-    return nonceHash.toString();
-  }
-
   /**
    * Sign the given message with the private key.
    * @param data in HexInput format

package/src/account/KeylessAccount.ts

@@ -21,9 +21,8 @@ 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 { deriveTransactionType, generateSigningMessage } from "../transactions/transactionBuilder/signingMessage";
 import { AnyRawTransaction, AnyRawTransactionInstance } from "../transactions/types";
-import { AptsoDomainSeparator, CryptoHashable } from "../core/crypto/cryptoHashable";
 import { base64UrlDecode } from "../utils/helpers";
 
 /**
@@ -101,7 +100,8 @@ export class KeylessAccount extends Serializable implements Account {
    */
   private readonly emitter: EventEmitter<ProofFetchEvents>;
 
-  constructor(args: {
+  // Use the static constructor 'create' instead.
+  private constructor(args: {
     address?: AccountAddress;
     ephemeralKeyPair: EphemeralKeyPair;
     iss: string;
@@ -109,12 +109,12 @@ export class KeylessAccount extends Serializable implements Account {
     uidVal: string;
     aud: string;
     pepper: HexInput;
-    proofOrFetcher: ZeroKnowledgeSig | Promise<ZeroKnowledgeSig>;
+    proof: ZeroKnowledgeSig | Promise<ZeroKnowledgeSig>;
     proofFetchCallback?: ProofFetchCallback;
     jwt: string;
   }) {
     super();
-    const { address, ephemeralKeyPair, uidKey, uidVal, aud, pepper, proofOrFetcher, proofFetchCallback, jwt } = args;
+    const { address, ephemeralKeyPair, uidKey, uidVal, aud, pepper, proof, proofFetchCallback, jwt } = args;
     this.ephemeralKeyPair = ephemeralKeyPair;
     this.publicKey = KeylessPublicKey.create(args);
     this.accountAddress = address ? AccountAddress.from(address) : this.publicKey.authKey().derivedAddress();
@@ -123,9 +123,9 @@ export class KeylessAccount extends Serializable implements Account {
     this.aud = aud;
     this.jwt = jwt;
     this.emitter = new EventEmitter<ProofFetchEvents>();
-    this.proofOrPromise = proofOrFetcher;
-    if (proofOrFetcher instanceof ZeroKnowledgeSig) {
-      this.proof = proofOrFetcher;
+    this.proofOrPromise = proof;
+    if (proof instanceof ZeroKnowledgeSig) {
+      this.proof = proof;
     } else {
       if (proofFetchCallback === undefined) {
         throw new Error("Must provide callback for async proof fetch");
@@ -134,7 +134,7 @@ export class KeylessAccount extends Serializable implements Account {
         await proofFetchCallback(status);
         this.emitter.removeAllListeners();
       });
-      this.init(proofOrFetcher);
+      this.init(proof);
     }
     this.signingScheme = SigningScheme.SingleKey;
     const pepperBytes = Hex.fromHexInput(pepper).toUint8Array();
@@ -279,6 +279,7 @@ export class KeylessAccount extends Serializable implements Account {
   }
 
   static create(args: {
+    address?: AccountAddress;
     proof: ZeroKnowledgeSig | Promise<ZeroKnowledgeSig>;
     jwt: string;
     ephemeralKeyPair: EphemeralKeyPair;
@@ -286,7 +287,7 @@ export class KeylessAccount extends Serializable implements Account {
     uidKey?: string;
     proofFetchCallback?: ProofFetchCallback;
   }): KeylessAccount {
-    const { proof, jwt, ephemeralKeyPair, pepper, uidKey = "sub", proofFetchCallback } = args;
+    const { address, proof, jwt, ephemeralKeyPair, pepper, uidKey = "sub", proofFetchCallback } = args;
 
     const jwtPayload = jwtDecode<JwtPayload & { [key: string]: string }>(jwt);
     const iss = jwtPayload.iss!;
@@ -296,7 +297,8 @@ export class KeylessAccount extends Serializable implements Account {
     const aud = jwtPayload.aud!;
     const uidVal = jwtPayload[uidKey];
     return new KeylessAccount({
-      proofOrFetcher: proof,
+      address,
+      proof,
       ephemeralKeyPair,
       iss,
       uidKey,
@@ -313,7 +315,7 @@ export class KeylessAccount extends Serializable implements Account {
  * A container class to hold a transaction and a proof.  It implements CryptoHashable which is used to create
  * the signing message for Keyless transactions.  We sign over the proof to ensure non-malleability.
  */
-export class TransactionAndProof extends CryptoHashable {
+class TransactionAndProof extends Serializable {
   /**
    * The transaction to sign.
    */
@@ -327,19 +329,27 @@ export class TransactionAndProof extends CryptoHashable {
   /**
    * The domain separator prefix used when hashing.
    */
-  domainSeparator: AptsoDomainSeparator;
+  readonly domainSeparator = "APTOS::TransactionAndProof";
 
   constructor(transaction: AnyRawTransactionInstance, proof?: ZkProof) {
     super();
     this.transaction = transaction;
     this.proof = proof;
-    this.domainSeparator = "APTOS::TransactionAndProof";
   }
 
   serialize(serializer: Serializer): void {
     serializer.serializeFixedBytes(this.transaction.bcsToBytes());
     serializer.serializeOption(this.proof);
   }
+
+  /**
+   * Hashes the bcs serialized from of the class. This is the typescript corollary to the BCSCryptoHash macro in aptos-core.
+   *
+   * @returns Uint8Array
+   */
+  hash(): Uint8Array {
+    return generateSigningMessage(this.bcsToBytes(), this.domainSeparator);
+  }
 }
 
 export type ProofFetchSuccess = {

package/src/account/MultiKeyAccount.ts

@@ -131,7 +131,8 @@ export class MultiKeyAccount implements Account {
    */
   async waitForProofFetch() {
     const keylessSigners = this.signers.filter((signer) => signer instanceof KeylessAccount) as KeylessAccount[];
-    await Promise.all(keylessSigners.filter((signer) => signer.proof instanceof Promise).map((signer) => signer.proof));
+    const promises = keylessSigners.map(async (signer) => signer.waitForProofFetch());
+    await Promise.all(promises);
   }
 
   /**

package/src/api/keyless.ts

@@ -2,7 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { EphemeralKeyPair, KeylessAccount, ProofFetchCallback } from "../account";
-import { deriveKeylessAccount, getPepper } from "../internal/keyless";
+import { ZeroKnowledgeSig } from "../core";
+import { deriveKeylessAccount, getPepper, getProof } from "../internal/keyless";
 import { HexInput } from "../types";
 import { AptosConfig } from "./aptosConfig";
 
@@ -20,14 +21,40 @@ export class Keyless {
    *
    * @param args.jwt JWT token
    * @param args.ephemeralKeyPair the EphemeralKeyPair used to generate the nonce in the JWT token
+   * @param args.derivationPath a derivation path used for creating multiple accounts per user via the BIP-44 standard. Defaults
+   * to "m/44'/637'/0'/0'/0".
    * @returns The pepper which is a Uint8Array of length 31.
    */
-  async getPepper(args: { jwt: string; ephemeralKeyPair: EphemeralKeyPair }): Promise<Uint8Array> {
+  async getPepper(args: {
+    jwt: string;
+    ephemeralKeyPair: EphemeralKeyPair;
+    derivationPath?: string;
+  }): Promise<Uint8Array> {
     return getPepper({ aptosConfig: this.config, ...args });
   }
 
   /**
-   * Fetches the pepper from the Aptos pepper service API.
+   * Fetches a proof from the Aptos prover service API.
+   *
+   * @param args.jwt JWT token
+   * @param args.ephemeralKeyPair the EphemeralKeyPair used to generate the nonce in the JWT token
+   * @param args.uidKey a key in the JWT token to use to set the uidVal in the IdCommitment
+   * @param args.pepper the pepper used for the account.  If not provided it will be fetched from the Aptos pepper service
+   *
+   * @returns The proof which is represented by a ZeroKnowledgeSig.
+   */
+  async getProof(args: {
+    jwt: string;
+    ephemeralKeyPair: EphemeralKeyPair;
+    pepper?: HexInput;
+    uidKey?: string;
+  }): Promise<ZeroKnowledgeSig> {
+    return getProof({ aptosConfig: this.config, ...args });
+  }
+
+  /**
+   * Derives the Keyless Account from the JWT token and corresponding EphemeralKeyPair.  It will lookup the pepper from
+   * the pepper service if not explicitly provided.  It will compute the proof via the proving service.  It will ch
    *
    * @param args.jwt JWT token
    * @param args.ephemeralKeyPair the EphemeralKeyPair used to generate the nonce in the JWT token

package/src/bcs/deserializer.ts

@@ -69,11 +69,8 @@ export class Deserializer {
    * ```
    */
   deserializeOptionStr(): string | undefined {
-    const exists = this.deserializeUleb128AsU32();
-    if (exists === 1) {
-      return this.deserializeStr();
-    }
-    return undefined;
+    const exists = this.deserializeBool();
+    return exists ? this.deserializeStr() : undefined;
   }
 
   /**
@@ -95,11 +92,8 @@ export class Deserializer {
    * @returns the deserialized value of class type T
    */
   deserializeOption<T>(cls: Deserializable<T>): T | undefined {
-    const exists = this.deserializeUleb128AsU32();
-    if (exists === 1) {
-      return this.deserialize(cls);
-    }
-    return undefined;
+    const exists = this.deserializeBool();
+    return exists ? this.deserialize(cls) : undefined;
   }
 
   /**

package/src/bcs/serializer.ts

@@ -336,10 +336,9 @@ export class Serializer {
    * ```
    */
   serializeOption<T extends Serializable>(value?: T): void {
-    if (value === undefined) {
-      this.serializeU32AsUleb128(0);
-    } else {
-      this.serializeU32AsUleb128(1);
+    const hasValue = value !== undefined;
+    this.serializeBool(hasValue);
+    if (hasValue) {
       value.serialize(this);
     }
   }

package/src/core/crypto/keyless.ts

@@ -155,7 +155,7 @@ export class KeylessPublicKey extends AccountPublicKey {
     return new KeylessPublicKey(args.iss, computeIdCommitment(args));
   }
 
-  static fromJWTAndPepper(args: { jwt: string; pepper: HexInput; uidKey?: string }): KeylessPublicKey {
+  static fromJwtAndPepper(args: { jwt: string; pepper: HexInput; uidKey?: string }): KeylessPublicKey {
     const { jwt, pepper, uidKey = "sub" } = args;
     const jwtPayload = jwtDecode<JwtPayload & { [key: string]: string }>(jwt);
     const iss = jwtPayload.iss!;

package/src/internal/keyless.ts

@@ -9,11 +9,20 @@
  */
 import { AptosConfig } from "../api/aptosConfig";
 import { postAptosPepperService, postAptosProvingService } from "../client";
-import { EphemeralSignature, Groth16Zkp, Hex, ZeroKnowledgeSig, ZkProof, getKeylessConfig } from "../core";
+import {
+  EphemeralSignature,
+  Groth16Zkp,
+  Hex,
+  KeylessPublicKey,
+  ZeroKnowledgeSig,
+  ZkProof,
+  getKeylessConfig,
+} from "../core";
 import { HexInput, ZkpVariant } from "../types";
 import { EphemeralKeyPair, KeylessAccount, ProofFetchCallback } from "../account";
 import { PepperFetchRequest, PepperFetchResponse, ProverRequest, ProverResponse } from "../types/keyless";
 import { nowInSeconds } from "../utils/helpers";
+import { lookupOriginalAccountAddress } from "./account";
 
 export async function getPepper(args: {
   aptosConfig: AptosConfig;
@@ -46,10 +55,13 @@ export async function getProof(args: {
   aptosConfig: AptosConfig;
   jwt: string;
   ephemeralKeyPair: EphemeralKeyPair;
-  pepper: HexInput;
+  pepper?: HexInput;
   uidKey?: string;
 }): Promise<ZeroKnowledgeSig> {
-  const { aptosConfig, jwt, ephemeralKeyPair, pepper, uidKey = "sub" } = args;
+  const { aptosConfig, jwt, ephemeralKeyPair, pepper = await getPepper(args), uidKey = "sub" } = args;
+  if (Hex.fromHexInput(pepper).toUint8Array().length !== KeylessAccount.PEPPER_LENGTH) {
+    throw new Error(`Pepper needs to be ${KeylessAccount.PEPPER_LENGTH} bytes`);
+  }
   const { maxExpHorizonSecs } = await getKeylessConfig({ aptosConfig });
   if (maxExpHorizonSecs < ephemeralKeyPair.expiryDateSecs - nowInSeconds()) {
     throw Error(`The EphemeralKeyPair is too long lived.  It's lifespan must be less than ${maxExpHorizonSecs}`);
@@ -95,18 +107,7 @@ export async function deriveKeylessAccount(args: {
   pepper?: HexInput;
   proofFetchCallback?: ProofFetchCallback;
 }): Promise<KeylessAccount> {
-  const { proofFetchCallback } = args;
-  let { pepper } = args;
-  if (pepper === undefined) {
-    pepper = await getPepper(args);
-  } else {
-    pepper = Hex.fromHexInput(pepper).toUint8Array();
-  }
-
-  if (pepper.length !== KeylessAccount.PEPPER_LENGTH) {
-    throw new Error(`Pepper needs to be ${KeylessAccount.PEPPER_LENGTH} bytes`);
-  }
-
+  const { aptosConfig, jwt, uidKey, proofFetchCallback, pepper = await getPepper(args) } = args;
   const proofPromise = getProof({ ...args, pepper });
   // If a callback is provided, pass in the proof as a promise to KeylessAccount.create.  This will make the proof be fetched in the
   // background and the callback will handle the outcome of the fetch.  This allows the developer to not have to block on the proof fetch
@@ -115,7 +116,14 @@ export async function deriveKeylessAccount(args: {
   // If no callback is provided, the just await the proof fetch and continue syncronously.
   const proof = proofFetchCallback ? proofPromise : await proofPromise;
 
-  const keylessAccount = KeylessAccount.create({ ...args, proof, pepper, proofFetchCallback });
+  // Look up the original address to handle key rotations
+  const publicKey = KeylessPublicKey.fromJwtAndPepper({ jwt, pepper, uidKey });
+  const address = await lookupOriginalAccountAddress({
+    aptosConfig,
+    authenticationKey: publicKey.authKey().derivedAddress(),
+  });
+
+  const keylessAccount = KeylessAccount.create({ ...args, address, proof, pepper, proofFetchCallback });
 
   return keylessAccount;
 }

package/src/internal/queries/getFungibleAssetMetadata.graphql

@@ -12,5 +12,7 @@ query getFungibleAssetMetadata($where_condition: fungible_asset_metadata_bool_ex
     name
     symbol
     token_standard
+    supply_v2
+    maximum_v2
   }
 }

package/src/transactions/transactionBuilder/signingMessage.ts

@@ -8,7 +8,7 @@ import { sha3_256 as sha3Hash } from "@noble/hashes/sha3";
 import { RAW_TRANSACTION_SALT, RAW_TRANSACTION_WITH_DATA_SALT } from "../../utils/const";
 import { FeePayerRawTransaction, MultiAgentRawTransaction } from "../instances";
 import { AnyRawTransaction, AnyRawTransactionInstance } from "../types";
-import { Serializable } from "../../bcs/serializer";
+import { Serializable } from "../../bcs";
 
 /**
  * Derive the raw transaction type - FeePayerRawTransaction or MultiAgentRawTransaction or RawTransaction
@@ -61,7 +61,7 @@ export function generateSigningMessage(bytes: Uint8Array, domainSeparator: strin
 }
 
 /**
- * @deprected
+ * @deprecated
  * Use CryptoHashable instead by having your class implement it and call hash() to get the signing message.
  *
  * Generates the 'signing message' form of a serilizable value. It bcs serializes the value and uses the name of

package/src/types/generated/operations.ts

@@ -49,13 +49,13 @@ export type CurrentTokenOwnershipFieldsFragment = {
     last_transaction_timestamp: any;
     last_transaction_version: any;
     maximum?: any | null;
-    supply: any;
+    supply?: any | null;
     token_data_id: string;
     token_name: string;
     token_properties: any;
     token_standard: string;
     token_uri: string;
-    decimals: any;
+    decimals?: any | null;
     current_collection?: {
       collection_id: string;
       collection_name: string;
@@ -206,13 +206,13 @@ export type GetAccountOwnedTokensQuery = {
       last_transaction_timestamp: any;
       last_transaction_version: any;
       maximum?: any | null;
-      supply: any;
+      supply?: any | null;
       token_data_id: string;
       token_name: string;
       token_properties: any;
       token_standard: string;
       token_uri: string;
-      decimals: any;
+      decimals?: any | null;
       current_collection?: {
         collection_id: string;
         collection_name: string;
@@ -262,13 +262,13 @@ export type GetAccountOwnedTokensByTokenDataQuery = {
       last_transaction_timestamp: any;
       last_transaction_version: any;
       maximum?: any | null;
-      supply: any;
+      supply?: any | null;
       token_data_id: string;
       token_name: string;
       token_properties: any;
       token_standard: string;
       token_uri: string;
-      decimals: any;
+      decimals?: any | null;
       current_collection?: {
         collection_id: string;
         collection_name: string;
@@ -318,13 +318,13 @@ export type GetAccountOwnedTokensFromCollectionQuery = {
       last_transaction_timestamp: any;
       last_transaction_version: any;
       maximum?: any | null;
-      supply: any;
+      supply?: any | null;
       token_data_id: string;
       token_name: string;
       token_properties: any;
       token_standard: string;
       token_uri: string;
-      decimals: any;
+      decimals?: any | null;
       current_collection?: {
         collection_id: string;
         collection_name: string;
@@ -496,6 +496,8 @@ export type GetFungibleAssetMetadataQuery = {
     name: string;
     symbol: string;
     token_standard: string;
+    supply_v2?: any | null;
+    maximum_v2?: any | null;
   }>;
 };
 
@@ -620,13 +622,13 @@ export type GetCurrentTokenOwnershipQuery = {
       last_transaction_timestamp: any;
       last_transaction_version: any;
       maximum?: any | null;
-      supply: any;
+      supply?: any | null;
       token_data_id: string;
       token_name: string;
       token_properties: any;
       token_standard: string;
       token_uri: string;
-      decimals: any;
+      decimals?: any | null;
       current_collection?: {
         collection_id: string;
         collection_name: string;
@@ -663,13 +665,13 @@ export type GetTokenDataQuery = {
     last_transaction_timestamp: any;
     last_transaction_version: any;
     maximum?: any | null;
-    supply: any;
+    supply?: any | null;
     token_data_id: string;
     token_name: string;
     token_properties: any;
     token_standard: string;
     token_uri: string;
-    decimals: any;
+    decimals?: any | null;
     current_collection?: {
       collection_id: string;
       collection_name: string;