fix registry and token account owner check

Author: samkim-crypto

token/client/src/token.rs

@@ -1980,7 +1980,6 @@ where
         &self,
         account: &Pubkey,
         elgamal_registry_account: &Pubkey,
-        authority: &Pubkey,
     ) -> TokenResult<T::Output> {
         self.process_ixs::<[&dyn Signer; 0]>(
             &[
@@ -1989,7 +1988,6 @@ where
                     account,
                     &self.pubkey,
                     elgamal_registry_account,
-                    authority,
                 )?,
             ],
             &[],

token/program-2022-test/tests/confidential_transfer.rs

@@ -2902,7 +2902,7 @@ async fn confidential_transfer_configure_token_account_with_registry() {
     token
         .create_auxiliary_token_account_with_extension_space(
             &alice_account_keypair,
-            &alice_token_account,
+            &alice.pubkey(),
             vec![ExtensionType::ConfidentialTransferAccount],
         )
         .await
@@ -2912,7 +2912,6 @@ async fn confidential_transfer_configure_token_account_with_registry() {
         .confidential_transfer_configure_token_account_with_registry(
             &alice_account_keypair.pubkey(),
             &elgamal_registry_address,
-            &alice.pubkey(),
         )
         .await
         .unwrap();

token/program-2022/src/extension/confidential_transfer/instruction.rs

@@ -490,7 +490,6 @@ pub enum ConfidentialTransferInstruction {
     ///   0. `[writable]` The SPL Token account.
     ///   1. `[]` The corresponding SPL Token mint.
     ///   2. `[]` The ElGamal registry account.
-    ///   3. `[]` The account owner.
     ///
     /// Data expected by this instruction:
     ///   None
@@ -1731,14 +1730,12 @@ pub fn configure_account_with_registry(
     token_account: &Pubkey,
     mint: &Pubkey,
     elgamal_registry_account: &Pubkey,
-    authority: &Pubkey,
 ) -> Result<Instruction, ProgramError> {
     check_program_account(token_program_id)?;
     let accounts = vec![
         AccountMeta::new(*token_account, false),
         AccountMeta::new_readonly(*mint, false),
         AccountMeta::new_readonly(*elgamal_registry_account, false),
-        AccountMeta::new_readonly(*authority, false),
     ];
 
     Ok(encode_instruction(

token/program-2022/src/extension/confidential_transfer/processor.rs

@@ -151,9 +151,6 @@ fn process_configure_account(
         }
     };
 
-    let authority_info = next_account_info(account_info_iter)?;
-    let authority_info_data_len = authority_info.data_len();
-
     check_program_account(token_account_info.owner)?;
     let token_account_data = &mut token_account_info.data.borrow_mut();
     let mut token_account = PodStateWithExtensionsMut::<PodAccount>::unpack(token_account_data)?;
@@ -164,6 +161,9 @@ fn process_configure_account(
 
     match elgamal_pubkey_source {
         ElGamalPubkeySource::ProofInstructionOffset(_) => {
+            let authority_info = next_account_info(account_info_iter)?;
+            let authority_info_data_len = authority_info.data_len();
+
             Processor::validate_owner(
                 program_id,
                 &token_account.base.owner,
@@ -176,7 +176,7 @@ fn process_configure_account(
             // if ElGamal registry was provided, then just verify that the owners of the
             // registry and token accounts match, then skip the signature
             // verification check
-            if elgamal_registry_account.owner != *authority_info.key {
+            if elgamal_registry_account.owner != token_account.base.owner {
                 return Err(TokenError::OwnerMismatch.into());
             }
         }