update SDK to handle new EffectiveAuditorConfig (untested though)

Author: alinush

confidential-assets/src/api/confidentialAsset.ts

@@ -22,9 +22,6 @@ import {
   hasUserRegistered,
   isBalanceNormalized,
   isIncomingTransfersPaused,
-  getGlobalAuditorEpoch,
-  getAuditorEpochForAssetType,
-  getEffectiveAuditorEpoch,
 } from "../internal";
 
 // Constants
@@ -481,57 +478,6 @@ export class ConfidentialAsset {
     });
   }
 
-  /**
-   * Get the global auditor epoch counter.
-   *
-   * @param args.options - Optional ledger version for the view call
-   * @returns The global auditor epoch
-   */
-  async getGlobalAuditorEpoch(args?: { options?: LedgerVersionArg }): Promise<number> {
-    return getGlobalAuditorEpoch({
-      client: this.client(),
-      moduleAddress: this.moduleAddress(),
-      ...args,
-    });
-  }
-
-  /**
-   * Get the auditor epoch counter for a specific asset type.
-   *
-   * @param args.tokenAddress - The token address of the asset
-   * @param args.options - Optional ledger version for the view call
-   * @returns The asset-specific auditor epoch
-   */
-  async getAuditorEpochForAssetType(args: {
-    tokenAddress: AccountAddressInput;
-    options?: LedgerVersionArg;
-  }): Promise<number> {
-    return getAuditorEpochForAssetType({
-      client: this.client(),
-      moduleAddress: this.moduleAddress(),
-      ...args,
-    });
-  }
-
-  /**
-   * Get the effective auditor epoch: asset-specific epoch if the asset has an auditor,
-   * otherwise global auditor epoch.
-   *
-   * @param args.tokenAddress - The token address of the asset
-   * @param args.options - Optional ledger version for the view call
-   * @returns The effective auditor epoch
-   */
-  async getEffectiveAuditorEpoch(args: {
-    tokenAddress: AccountAddressInput;
-    options?: LedgerVersionArg;
-  }): Promise<number> {
-    return getEffectiveAuditorEpoch({
-      client: this.client(),
-      moduleAddress: this.moduleAddress(),
-      ...args,
-    });
-  }
-
   /**
    * Normalize a user's balance.
    *

confidential-assets/src/internal/confidentialAssetTxnBuilder.ts

@@ -268,17 +268,25 @@ export class ConfidentialAssetTransactionBuilder {
     tokenAddress: AccountAddressInput;
     options?: LedgerVersionArg;
   }): Promise<TwistedEd25519PublicKey | undefined> {
-    const [{ vec: effectiveAuditorPubKey }] = await this.client.view<[{ vec: { data: string }[] }]>({
+    // EffectiveAuditorConfig::V1 { is_global: bool, config: AuditorConfig::V1 { ek: Option<CompressedRistretto>, epoch: u64 } }
+    type EffectiveAuditorConfigResponse = {
+      is_global: boolean;
+      config: {
+        ek: { vec: { data: string }[] };
+        epoch: string;
+      };
+    };
+    const [{ config }] = await this.client.view<[EffectiveAuditorConfigResponse]>({
       options: args.options,
       payload: {
-        function: `${this.confidentialAssetModuleAddress}::${MODULE_NAME}::get_effective_auditor`,
+        function: `${this.confidentialAssetModuleAddress}::${MODULE_NAME}::get_effective_auditor_config`,
         functionArguments: [args.tokenAddress],
       },
     });
-    if (effectiveAuditorPubKey.length === 0) {
+    if (config.ek.vec.length === 0) {
       return undefined;
     }
-    return new TwistedEd25519PublicKey(effectiveAuditorPubKey[0].data);
+    return new TwistedEd25519PublicKey(config.ek.vec[0].data);
   }
 
   /**

confidential-assets/src/internal/viewFunctions.ts

@@ -284,79 +284,3 @@ export async function getEncryptionKey(
   }
 }
 
-type AuditorEpochViewFunctionParams = {
-  client: Aptos;
-  tokenAddress: AccountAddressInput;
-  options?: LedgerVersionArg;
-  moduleAddress?: string;
-};
-
-/**
- * Get the global auditor epoch counter.
- *
- * @param args.client - The Aptos client instance
- * @param args.options - Optional ledger version for the view call
- * @param args.moduleAddress - Optional module address
- * @returns The global auditor epoch as a number
- */
-export async function getGlobalAuditorEpoch(args: {
-  client: Aptos;
-  options?: LedgerVersionArg;
-  moduleAddress?: string;
-}): Promise<number> {
-  const { client, options, moduleAddress = DEFAULT_CONFIDENTIAL_COIN_MODULE_ADDRESS } = args;
-  const [epoch] = await client.view<[string]>({
-    payload: {
-      function: `${moduleAddress}::${MODULE_NAME}::get_global_auditor_epoch`,
-      typeArguments: [],
-      functionArguments: [],
-    },
-    options,
-  });
-  return Number(epoch);
-}
-
-/**
- * Get the auditor epoch counter for a specific asset type.
- *
- * @param args.client - The Aptos client instance
- * @param args.tokenAddress - The token address of the asset
- * @param args.options - Optional ledger version for the view call
- * @param args.moduleAddress - Optional module address
- * @returns The asset-specific auditor epoch as a number
- */
-export async function getAuditorEpochForAssetType(args: AuditorEpochViewFunctionParams): Promise<number> {
-  const { client, tokenAddress, options, moduleAddress = DEFAULT_CONFIDENTIAL_COIN_MODULE_ADDRESS } = args;
-  const [epoch] = await client.view<[string]>({
-    payload: {
-      function: `${moduleAddress}::${MODULE_NAME}::get_auditor_epoch_for_asset_type`,
-      typeArguments: [],
-      functionArguments: [tokenAddress],
-    },
-    options,
-  });
-  return Number(epoch);
-}
-
-/**
- * Get the effective auditor epoch: asset-specific epoch if the asset has an auditor,
- * otherwise global auditor epoch.
- *
- * @param args.client - The Aptos client instance
- * @param args.tokenAddress - The token address of the asset
- * @param args.options - Optional ledger version for the view call
- * @param args.moduleAddress - Optional module address
- * @returns The effective auditor epoch as a number
- */
-export async function getEffectiveAuditorEpoch(args: AuditorEpochViewFunctionParams): Promise<number> {
-  const { client, tokenAddress, options, moduleAddress = DEFAULT_CONFIDENTIAL_COIN_MODULE_ADDRESS } = args;
-  const [epoch] = await client.view<[string]>({
-    payload: {
-      function: `${moduleAddress}::${MODULE_NAME}::get_effective_auditor_epoch`,
-      typeArguments: [],
-      functionArguments: [tokenAddress],
-    },
-    options,
-  });
-  return Number(epoch);
-}