remove ConfigureAccountWithRegistryInstructionData

Author: samkim-crypto

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

@@ -486,7 +486,9 @@ pub enum ConfidentialTransferInstruction {
     ///
     /// If the token account is not large enough to include the new
     /// cconfidential transfer extension, then optionally reallocate the
-    /// account to increase the data size.
+    /// account to increase the data size. To reallocate, a payer account to
+    /// fund the reallocation and the system account should be included in the
+    /// instruction.
     ///
     /// Accounts expected by this instruction:
     ///
@@ -499,7 +501,7 @@ pub enum ConfidentialTransferInstruction {
     ///   4. `[]` (Optional) System program for reallocation funding
     ///
     /// Data expected by this instruction:
-    ///   `ConfigureAccountWithRegistryInstructionData`
+    ///   None
     ConfigureAccountWithRegistry,
 }
 
@@ -676,17 +678,6 @@ pub struct TransferWithFeeInstructionData {
     pub range_proof_instruction_offset: i8,
 }
 
-/// Data expected by
-/// `ConfidentialTransferInstruction::ConfigureAccountWithRegistry`
-#[cfg_attr(feature = "serde-traits", derive(Serialize, Deserialize))]
-#[derive(Clone, Copy, Debug, PartialEq, Pod, Zeroable)]
-#[repr(C)]
-pub struct ConfigureAccountWithRegistryInstructionData {
-    /// Reallocate token account if it is not large enough for the
-    /// `ConfidentialTransfer` extension.
-    pub reallocate_account: PodBool,
-}
-
 /// Create a `InitializeMint` instruction
 pub fn initialize_mint(
     token_program_id: &Pubkey,
@@ -1756,21 +1747,16 @@ pub fn configure_account_with_registry(
         AccountMeta::new_readonly(*mint, false),
         AccountMeta::new_readonly(*elgamal_registry_account, false),
     ];
-    let reallocate_account = if let Some(payer) = payer {
+    if let Some(payer) = payer {
         accounts.push(AccountMeta::new(*payer, true));
         accounts.push(AccountMeta::new_readonly(system_program::id(), false));
-        true
-    } else {
-        false
-    };
+    }
 
     Ok(encode_instruction(
         token_program_id,
         accounts,
         TokenInstruction::ConfidentialTransferExtension,
         ConfidentialTransferInstruction::ConfigureAccountWithRegistry,
-        &ConfigureAccountWithRegistryInstructionData {
-            reallocate_account: reallocate_account.into(),
-        },
+        &(),
     ))
 }

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

@@ -107,7 +107,6 @@ enum ElGamalPubkeySource<'a> {
 fn process_configure_account_with_registry(
     program_id: &Pubkey,
     accounts: &[AccountInfo],
-    reallocate: bool,
 ) -> ProgramResult {
     let account_info_iter = &mut accounts.iter();
     let token_account_info = next_account_info(account_info_iter)?;
@@ -116,8 +115,8 @@ fn process_configure_account_with_registry(
 
     check_elgamal_registry_program_account(elgamal_registry_account.owner)?;
 
-    if reallocate {
-        let payer_info = next_account_info(account_info_iter)?;
+    // if a payer account for reallcation is provided, then reallocate
+    if let Ok(payer_info) = next_account_info(account_info_iter) {
         let system_program_info = next_account_info(account_info_iter)?;
         reallocate_for_configure_account_with_registry(
             token_account_info,
@@ -1341,13 +1340,7 @@ pub(crate) fn process_instruction(
         }
         ConfidentialTransferInstruction::ConfigureAccountWithRegistry => {
             msg!("ConfidentialTransferInstruction::ConfigureAccountWithRegistry");
-            let data =
-                decode_instruction_data::<ConfigureAccountWithRegistryInstructionData>(input)?;
-            process_configure_account_with_registry(
-                program_id,
-                accounts,
-                data.reallocate_account.into(),
-            )
+            process_configure_account_with_registry(program_id, accounts)
         }
     }
 }