cleanup

Author: abcalphabet

token/cli/src/clap_app.rs

@@ -859,30 +859,6 @@ pub fn app<'a, 'b>(
                         .takes_value(false)
                         .help("Enables group member configurations in the mint. The mint authority must initialize the member."),
                 )
-                .arg(
-                    Arg::with_name("enable_confidential_mint_burn")
-                        .long("enable-confidential-mint-burn")
-                        .takes_value(false)
-                        .help(
-                            "Enables minting of new tokens into confidential balance and burning of tokens directly from the confidential balance"
-                        ),
-                )
-                .arg(
-                    Arg::with_name("auditor_pubkey")
-                        .long("auditor-pubkey")
-                        .value_name("AUDITOR_PUBKEY")
-                        .takes_value(true)
-                        .help(
-                            "The auditor encryption public key for mints with the confidential \
-                            transfer extension enabled. The corresponding private key for \
-                            this auditor public key can be used to decrypt all confidential \
-                            transfers involving tokens from this mint. Currently, the auditor \
-                            public key can only be specified as a direct *base64* encoding of \
-                            an ElGamal public key. More methods of specifying the auditor public \
-                            key will be supported in a future version. To disable auditability \
-                            feature for the token, use \"none\"."
-                        )
-                )
                 .nonce_args(true)
                 .arg(memo_arg())
         )

token/cli/src/command.rs

@@ -69,8 +69,7 @@ use {
         token::{ComputeUnitLimit, ExtensionInitializationParams, ProofAccount, Token},
     },
     spl_token_confidential_transfer_proof_generation::{
-        transfer::TransferProofData,
-        withdraw::WithdrawProofData,
+        transfer::TransferProofData, withdraw::WithdrawProofData,
     },
     spl_token_group_interface::state::TokenGroup,
     spl_token_metadata_interface::state::{Field, TokenMetadata},
@@ -256,7 +255,6 @@ async fn command_create_token(
     enable_group: bool,
     enable_member: bool,
     bulk_signers: Vec<Arc<dyn Signer>>,
-    auditor_pubkey: ElGamalPubkeyOrNone,
 ) -> CommandResult {
     println_display(
         config,
@@ -316,7 +314,7 @@ async fn command_create_token(
         extensions.push(ExtensionInitializationParams::ConfidentialTransferMint {
             authority: Some(authority),
             auto_approve_new_accounts: auto_approve,
-            auditor_elgamal_pubkey: auditor_pubkey.into(),
+            auditor_elgamal_pubkey: None,
         });
         if transfer_fee.is_some() {
             // Deriving ElGamal key from default signer. Custom ElGamal keys
@@ -3234,7 +3232,7 @@ enum ConfidentialInstructionType {
 }
 
 #[allow(clippy::too_many_arguments)]
-async fn command_deposit_withdraw_mint_confidential_tokens(
+async fn command_deposit_withdraw_confidential_tokens(
     config: &Config<'_>,
     token_pubkey: Pubkey,
     owner: Pubkey,
@@ -3568,9 +3566,6 @@ pub async fn process_command<'a>(
                 .value_of("enable_confidential_transfers")
                 .map(|b| b == "auto");
 
-            let auditor_elgamal_pubkey =
-                elgamal_pubkey_or_none(arg_matches, "auditor_pubkey").unwrap();
-
             command_create_token(
                 config,
                 decimals,
@@ -3593,7 +3588,6 @@ pub async fn process_command<'a>(
                 arg_matches.is_present("enable_group"),
                 arg_matches.is_present("enable_member"),
                 bulk_signers,
-                auditor_elgamal_pubkey,
             )
             .await
         }
@@ -4583,7 +4577,7 @@ pub async fn process_command<'a>(
                 push_signer_with_dedup(owner_signer, &mut bulk_signers);
             }
 
-            command_deposit_withdraw_mint_confidential_tokens(
+            command_deposit_withdraw_confidential_tokens(
                 config,
                 token,
                 owner,

token/cli/src/encryption_keypair.rs

@@ -3,9 +3,12 @@
 //! NOTE: this module should be remoeved in the next Solana upgrade.
 
 use {
-    base64::{prelude::BASE64_STANDARD, Engine}, clap::ArgMatches, solana_sdk::signer::EncodableKey, spl_token_2022::solana_zk_sdk::encryption::{
-        auth_encryption::AeKey, elgamal::{ElGamalKeypair, ElGamalPubkey}, pod::elgamal::PodElGamalPubkey
-    }
+    base64::{prelude::BASE64_STANDARD, Engine},
+    clap::ArgMatches,
+    spl_token_2022::solana_zk_sdk::encryption::{
+        elgamal::{ElGamalKeypair, ElGamalPubkey},
+        pod::elgamal::PodElGamalPubkey,
+    },
 };
 
 const ELGAMAL_PUBKEY_MAX_BASE64_LEN: usize = 44;
@@ -29,9 +32,6 @@ pub(crate) fn elgamal_pubkey_or_none(
     matches: &ArgMatches,
     name: &str,
 ) -> Result<ElGamalPubkeyOrNone, String> {
-    if !matches.is_present(name) {
-        return Ok(ElGamalPubkeyOrNone::None);
-    }
     let arg_str = matches.value_of(name).unwrap();
     if arg_str == "none" {
         return Ok(ElGamalPubkeyOrNone::None);
@@ -65,14 +65,6 @@ pub(crate) fn elgamal_keypair_of(
     ElGamalKeypair::read_json_file(path).map_err(|e| e.to_string())
 }
 
-pub(crate) fn aes_key_of(
-    matches: &ArgMatches,
-    name: &str,
-) -> Result<AeKey, String> {
-    let path = matches.value_of(name).unwrap();
-    AeKey::read_from_file(path).map_err(|e| e.to_string())
-}
-
 fn elgamal_pubkey_from_str(s: &str) -> Option<PodElGamalPubkey> {
     if s.len() > ELGAMAL_PUBKEY_MAX_BASE64_LEN {
         return None;

token/client/src/token.rs

@@ -29,7 +29,6 @@ use {
     },
     spl_record::state::RecordData,
     spl_token_2022::{
-        error::TokenError as Token2022Error,
         extension::{
             confidential_transfer::{
                 self,
@@ -38,7 +37,7 @@ use {
                     WithdrawAccountInfo,
                 },
                 instruction::{ProofContextState, ZkProofData},
-                ConfidentialTransferAccount, ConfidentialTransferMint, DecryptableBalance,
+                ConfidentialTransferAccount, DecryptableBalance,
             },
             confidential_transfer_fee::{
                 self, account_info::WithheldTokensInfo, ConfidentialTransferFeeAmount,
@@ -110,14 +109,8 @@ pub enum TokenError {
     MissingDecimals,
     #[error("decimals specified, but incorrect")]
     InvalidDecimals,
-    #[error("TokenProgramError: {0}")]
-    TokenProgramError(String),
-}
-impl From<Token2022Error> for TokenError {
-    fn from(e: Token2022Error) -> Self {
-        Self::TokenProgramError(e.to_string())
-    }
 }
+
 impl PartialEq for TokenError {
     fn eq(&self, other: &Self) -> bool {
         match (self, other) {
@@ -3435,26 +3428,6 @@ where
         ));
         self.process_ixs(&instructions, signing_keypairs).await
     }
-
-    pub async fn auditor_elgamal_pubkey(&self) -> TokenResult<Option<ElGamalPubkey>> {
-        Ok(Into::<Option<PodElGamalPubkey>>::into(
-            self.get_mint_info()
-                .await?
-                .get_extension::<ConfidentialTransferMint>()?
-                .auditor_elgamal_pubkey,
-        )
-        .map(|pk| TryInto::<ElGamalPubkey>::try_into(pk).unwrap()))
-    }
-
-    pub async fn account_elgamal_pubkey(&self, account: &Pubkey) -> TokenResult<ElGamalPubkey> {
-        TryInto::<ElGamalPubkey>::try_into(
-            self.get_account_info(account)
-                .await?
-                .get_extension::<ConfidentialTransferAccount>()?
-                .elgamal_pubkey,
-        )
-        .map_err(|_| TokenError::Program(ProgramError::InvalidAccountData))
-    }
 }
 
 /// Calculates the maximum chunk size for a zero-knowledge proof record