token-2022: Add mint close authority support everywhere (#2754)

* token-2022: Add mint close authority support everywhere

* Address feedback

Author: joncinque

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

@@ -96,6 +96,7 @@ fn process_configure_account(
     let token_account_info = next_account_info(account_info_iter)?;
     let mint_info = next_account_info(account_info_iter)?;
     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();
@@ -107,9 +108,9 @@ fn process_configure_account(
 
     Processor::validate_owner(
         program_id,
-        token_account_info.key,
         token_account_info.owner,
         authority_info,
+        authority_info_data_len,
         account_info_iter.as_slice(),
     )?;
 
@@ -195,16 +196,17 @@ fn process_empty_account(
     let token_account_info = next_account_info(account_info_iter)?;
     let instructions_sysvar_info = next_account_info(account_info_iter)?;
     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 = StateWithExtensionsMut::<Account>::unpack(token_account_data)?;
 
     Processor::validate_owner(
         program_id,
-        token_account_info.key,
         token_account_info.owner,
         authority_info,
+        authority_info_data_len,
         account_info_iter.as_slice(),
     )?;
 
@@ -246,6 +248,7 @@ fn process_deposit(
     let receiver_token_account_info = next_account_info(account_info_iter)?;
     let mint_info = next_account_info(account_info_iter)?;
     let authority_info = next_account_info(account_info_iter)?;
+    let authority_info_data_len = authority_info.data_len();
 
     check_program_account(mint_info.owner)?;
     let mint_data = &mint_info.data.borrow_mut();
@@ -263,9 +266,9 @@ fn process_deposit(
 
         Processor::validate_owner(
             program_id,
-            token_account_info.key,
             token_account_info.owner,
             authority_info,
+            authority_info_data_len,
             account_info_iter.as_slice(),
         )?;
 
@@ -345,6 +348,7 @@ fn process_withdraw(
     let mint_info = next_account_info(account_info_iter)?;
     let instructions_sysvar_info = next_account_info(account_info_iter)?;
     let authority_info = next_account_info(account_info_iter)?;
+    let authority_info_data_len = authority_info.data_len();
 
     check_program_account(mint_info.owner)?;
     let mint_data = &mint_info.data.borrow_mut();
@@ -370,9 +374,9 @@ fn process_withdraw(
 
         Processor::validate_owner(
             program_id,
-            token_account_info.key,
             token_account_info.owner,
             authority_info,
+            authority_info_data_len,
             account_info_iter.as_slice(),
         )?;
 
@@ -446,6 +450,7 @@ fn process_transfer(
     let mint_info = next_account_info(account_info_iter)?;
     let instructions_sysvar_info = next_account_info(account_info_iter)?;
     let authority_info = next_account_info(account_info_iter)?;
+    let authority_info_data_len = authority_info.data_len();
 
     check_program_account(mint_info.owner)?;
     let mint_data = &mint_info.data.borrow_mut();
@@ -471,9 +476,9 @@ fn process_transfer(
 
         Processor::validate_owner(
             program_id,
-            token_account_info.key,
             token_account_info.owner,
             authority_info,
+            authority_info_data_len,
             account_info_iter.as_slice(),
         )?;
 
@@ -595,16 +600,17 @@ fn process_apply_pending_balance(
     let account_info_iter = &mut accounts.iter();
     let token_account_info = next_account_info(account_info_iter)?;
     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 = StateWithExtensionsMut::<Account>::unpack(token_account_data)?;
 
     Processor::validate_owner(
         program_id,
-        token_account_info.key,
         token_account_info.owner,
         authority_info,
+        authority_info_data_len,
         account_info_iter.as_slice(),
     )?;
 
@@ -636,16 +642,17 @@ fn process_allow_balance_credits(
     let account_info_iter = &mut accounts.iter();
     let token_account_info = next_account_info(account_info_iter)?;
     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 = StateWithExtensionsMut::<Account>::unpack(token_account_data)?;
 
     Processor::validate_owner(
         program_id,
-        token_account_info.key,
         token_account_info.owner,
         authority_info,
+        authority_info_data_len,
         account_info_iter.as_slice(),
     )?;