make instruction constructor function parameters consistent

Author: samkim-crypto

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

@@ -26,7 +26,7 @@ use {
 #[cfg(not(target_os = "solana"))]
 use {
     solana_zk_sdk::{
-        encryption::{auth_encryption::AeCiphertext, elgamal::ElGamalPubkey},
+        encryption::elgamal::ElGamalPubkey,
         zk_elgamal_proof_program::{
             instruction::ProofInstruction,
             proof_data::{
@@ -291,8 +291,8 @@ pub struct BurnInstructionData {
 pub fn initialize_mint(
     token_program_id: &Pubkey,
     mint: &Pubkey,
-    supply_elgamal_pubkey: PodElGamalPubkey,
-    decryptable_supply: PodAeCiphertext,
+    supply_elgamal_pubkey: &PodElGamalPubkey,
+    decryptable_supply: &DecryptableBalance,
 ) -> Result<Instruction, ProgramError> {
     check_program_account(token_program_id)?;
     let accounts = vec![AccountMeta::new(*mint, false)];
@@ -303,8 +303,8 @@ pub fn initialize_mint(
         TokenInstruction::ConfidentialMintBurnExtension,
         ConfidentialMintBurnInstruction::InitializeMint,
         &InitializeMintData {
-            supply_elgamal_pubkey,
-            decryptable_supply,
+            supply_elgamal_pubkey: *supply_elgamal_pubkey,
+            decryptable_supply: *decryptable_supply,
         },
     ))
 }
@@ -317,7 +317,7 @@ pub fn rotate_supply_elgamal_pubkey(
     mint: &Pubkey,
     authority: &Pubkey,
     multisig_signers: &[&Pubkey],
-    new_supply_elgamal_pubkey: ElGamalPubkey,
+    new_supply_elgamal_pubkey: &PodElGamalPubkey,
     ciphertext_equality_proof: ProofLocation<CiphertextCiphertextEqualityProofData>,
 ) -> Result<Vec<Instruction>, ProgramError> {
     check_program_account(token_program_id)?;
@@ -349,7 +349,7 @@ pub fn rotate_supply_elgamal_pubkey(
         TokenInstruction::ConfidentialMintBurnExtension,
         ConfidentialMintBurnInstruction::RotateSupplyElGamalPubkey,
         &RotateSupplyElGamalPubkeyData {
-            new_supply_elgamal_pubkey: PodElGamalPubkey::from(new_supply_elgamal_pubkey),
+            new_supply_elgamal_pubkey: *new_supply_elgamal_pubkey,
             proof_instruction_offset,
         },
     )];
@@ -366,7 +366,7 @@ pub fn update_decryptable_supply(
     mint: &Pubkey,
     authority: &Pubkey,
     multisig_signers: &[&Pubkey],
-    new_decryptable_supply: AeCiphertext,
+    new_decryptable_supply: &DecryptableBalance,
 ) -> Result<Instruction, ProgramError> {
     check_program_account(token_program_id)?;
     let mut accounts = vec![
@@ -382,7 +382,7 @@ pub fn update_decryptable_supply(
         TokenInstruction::ConfidentialMintBurnExtension,
         ConfidentialMintBurnInstruction::UpdateDecryptableSupply,
         &UpdateDecryptableSupplyData {
-            new_decryptable_supply: new_decryptable_supply.into(),
+            new_decryptable_supply: *new_decryptable_supply,
         },
     ))
 }
@@ -417,7 +417,7 @@ pub fn confidential_mint_with_split_proofs(
         BatchedGroupedCiphertext3HandlesValidityProofData,
     >,
     range_proof_location: ProofLocation<BatchedRangeProofU128Data>,
-    new_decryptable_supply: AeCiphertext,
+    new_decryptable_supply: &DecryptableBalance,
 ) -> Result<Vec<Instruction>, ProgramError> {
     check_program_account(token_program_id)?;
     let mut accounts = vec![AccountMeta::new(*token_account, false)];
@@ -473,7 +473,7 @@ pub fn confidential_mint_with_split_proofs(
         TokenInstruction::ConfidentialMintBurnExtension,
         ConfidentialMintBurnInstruction::Mint,
         &MintInstructionData {
-            new_decryptable_supply: new_decryptable_supply.into(),
+            new_decryptable_supply: *new_decryptable_supply,
             mint_amount_auditor_ciphertext_lo: *mint_amount_auditor_ciphertext_lo,
             mint_amount_auditor_ciphertext_hi: *mint_amount_auditor_ciphertext_hi,
             equality_proof_instruction_offset,
@@ -495,7 +495,7 @@ pub fn confidential_burn_with_split_proofs(
     token_account: &Pubkey,
     mint: &Pubkey,
     supply_elgamal_pubkey: Option<ElGamalPubkey>,
-    new_decryptable_available_balance: DecryptableBalance,
+    new_decryptable_available_balance: &DecryptableBalance,
     burn_amount_auditor_ciphertext_lo: &PodElGamalCiphertext,
     burn_amount_auditor_ciphertext_hi: &PodElGamalCiphertext,
     authority: &Pubkey,
@@ -559,7 +559,7 @@ pub fn confidential_burn_with_split_proofs(
         TokenInstruction::ConfidentialMintBurnExtension,
         ConfidentialMintBurnInstruction::Burn,
         &BurnInstructionData {
-            new_decryptable_available_balance,
+            new_decryptable_available_balance: *new_decryptable_available_balance,
             burn_amount_auditor_ciphertext_lo: *burn_amount_auditor_ciphertext_lo,
             burn_amount_auditor_ciphertext_hi: *burn_amount_auditor_ciphertext_hi,
             equality_proof_instruction_offset,

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

@@ -760,7 +760,7 @@ pub fn inner_configure_account(
     token_program_id: &Pubkey,
     token_account: &Pubkey,
     mint: &Pubkey,
-    decryptable_zero_balance: PodAeCiphertext,
+    decryptable_zero_balance: &DecryptableBalance,
     maximum_pending_balance_credit_counter: u64,
     authority: &Pubkey,
     multisig_signers: &[&Pubkey],
@@ -802,7 +802,7 @@ pub fn inner_configure_account(
         TokenInstruction::ConfidentialTransferExtension,
         ConfidentialTransferInstruction::ConfigureAccount,
         &ConfigureAccountInstructionData {
-            decryptable_zero_balance,
+            decryptable_zero_balance: *decryptable_zero_balance,
             maximum_pending_balance_credit_counter: maximum_pending_balance_credit_counter.into(),
             proof_instruction_offset,
         },
@@ -815,7 +815,7 @@ pub fn configure_account(
     token_program_id: &Pubkey,
     token_account: &Pubkey,
     mint: &Pubkey,
-    decryptable_zero_balance: PodAeCiphertext,
+    decryptable_zero_balance: &DecryptableBalance,
     maximum_pending_balance_credit_counter: u64,
     authority: &Pubkey,
     multisig_signers: &[&Pubkey],
@@ -1013,7 +1013,7 @@ pub fn inner_withdraw(
     mint: &Pubkey,
     amount: u64,
     decimals: u8,
-    new_decryptable_available_balance: DecryptableBalance,
+    new_decryptable_available_balance: &DecryptableBalance,
     authority: &Pubkey,
     multisig_signers: &[&Pubkey],
     equality_proof_data_location: ProofLocation<CiphertextCommitmentEqualityProofData>,
@@ -1076,7 +1076,7 @@ pub fn inner_withdraw(
         &WithdrawInstructionData {
             amount: amount.into(),
             decimals,
-            new_decryptable_available_balance,
+            new_decryptable_available_balance: *new_decryptable_available_balance,
             equality_proof_instruction_offset,
             range_proof_instruction_offset,
         },
@@ -1091,7 +1091,7 @@ pub fn withdraw(
     mint: &Pubkey,
     amount: u64,
     decimals: u8,
-    new_decryptable_available_balance: PodAeCiphertext,
+    new_decryptable_available_balance: &DecryptableBalance,
     authority: &Pubkey,
     multisig_signers: &[&Pubkey],
     equality_proof_data_location: ProofLocation<CiphertextCommitmentEqualityProofData>,
@@ -1162,7 +1162,7 @@ pub fn inner_transfer(
     source_token_account: &Pubkey,
     mint: &Pubkey,
     destination_token_account: &Pubkey,
-    new_source_decryptable_available_balance: DecryptableBalance,
+    new_source_decryptable_available_balance: &DecryptableBalance,
     transfer_amount_auditor_ciphertext_lo: &PodElGamalCiphertext,
     transfer_amount_auditor_ciphertext_hi: &PodElGamalCiphertext,
     authority: &Pubkey,
@@ -1244,7 +1244,7 @@ pub fn inner_transfer(
         TokenInstruction::ConfidentialTransferExtension,
         ConfidentialTransferInstruction::Transfer,
         &TransferInstructionData {
-            new_source_decryptable_available_balance,
+            new_source_decryptable_available_balance: *new_source_decryptable_available_balance,
             transfer_amount_auditor_ciphertext_lo: *transfer_amount_auditor_ciphertext_lo,
             transfer_amount_auditor_ciphertext_hi: *transfer_amount_auditor_ciphertext_hi,
             equality_proof_instruction_offset,
@@ -1261,7 +1261,7 @@ pub fn transfer(
     source_token_account: &Pubkey,
     mint: &Pubkey,
     destination_token_account: &Pubkey,
-    new_source_decryptable_available_balance: DecryptableBalance,
+    new_source_decryptable_available_balance: &DecryptableBalance,
     transfer_amount_auditor_ciphertext_lo: &PodElGamalCiphertext,
     transfer_amount_auditor_ciphertext_hi: &PodElGamalCiphertext,
     authority: &Pubkey,
@@ -1359,7 +1359,7 @@ pub fn inner_apply_pending_balance(
     token_program_id: &Pubkey,
     token_account: &Pubkey,
     expected_pending_balance_credit_counter: u64,
-    new_decryptable_available_balance: DecryptableBalance,
+    new_decryptable_available_balance: &DecryptableBalance,
     authority: &Pubkey,
     multisig_signers: &[&Pubkey],
 ) -> Result<Instruction, ProgramError> {
@@ -1380,7 +1380,7 @@ pub fn inner_apply_pending_balance(
         ConfidentialTransferInstruction::ApplyPendingBalance,
         &ApplyPendingBalanceData {
             expected_pending_balance_credit_counter: expected_pending_balance_credit_counter.into(),
-            new_decryptable_available_balance,
+            new_decryptable_available_balance: *new_decryptable_available_balance,
         },
     ))
 }
@@ -1390,7 +1390,7 @@ pub fn apply_pending_balance(
     token_program_id: &Pubkey,
     token_account: &Pubkey,
     pending_balance_instructions: u64,
-    new_decryptable_available_balance: PodAeCiphertext,
+    new_decryptable_available_balance: &DecryptableBalance,
     authority: &Pubkey,
     multisig_signers: &[&Pubkey],
 ) -> Result<Instruction, ProgramError> {
@@ -1503,7 +1503,7 @@ pub fn inner_transfer_with_fee(
     source_token_account: &Pubkey,
     mint: &Pubkey,
     destination_token_account: &Pubkey,
-    new_source_decryptable_available_balance: DecryptableBalance,
+    new_source_decryptable_available_balance: &DecryptableBalance,
     transfer_amount_auditor_ciphertext_lo: &PodElGamalCiphertext,
     transfer_amount_auditor_ciphertext_hi: &PodElGamalCiphertext,
     authority: &Pubkey,
@@ -1618,7 +1618,7 @@ pub fn inner_transfer_with_fee(
         TokenInstruction::ConfidentialTransferExtension,
         ConfidentialTransferInstruction::TransferWithFee,
         &TransferWithFeeInstructionData {
-            new_source_decryptable_available_balance,
+            new_source_decryptable_available_balance: *new_source_decryptable_available_balance,
             transfer_amount_auditor_ciphertext_lo: *transfer_amount_auditor_ciphertext_lo,
             transfer_amount_auditor_ciphertext_hi: *transfer_amount_auditor_ciphertext_hi,
             equality_proof_instruction_offset,
@@ -1637,7 +1637,7 @@ pub fn transfer_with_fee(
     source_token_account: &Pubkey,
     mint: &Pubkey,
     destination_token_account: &Pubkey,
-    new_source_decryptable_available_balance: DecryptableBalance,
+    new_source_decryptable_available_balance: &DecryptableBalance,
     transfer_amount_auditor_ciphertext_lo: &PodElGamalCiphertext,
     transfer_amount_auditor_ciphertext_hi: &PodElGamalCiphertext,
     authority: &Pubkey,

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

@@ -275,7 +275,7 @@ pub fn initialize_confidential_transfer_fee_config(
     token_program_id: &Pubkey,
     mint: &Pubkey,
     authority: Option<Pubkey>,
-    withdraw_withheld_authority_elgamal_pubkey: PodElGamalPubkey,
+    withdraw_withheld_authority_elgamal_pubkey: &PodElGamalPubkey,
 ) -> Result<Instruction, ProgramError> {
     check_program_account(token_program_id)?;
     let accounts = vec![AccountMeta::new(*mint, false)];
@@ -287,7 +287,7 @@ pub fn initialize_confidential_transfer_fee_config(
         ConfidentialTransferFeeInstruction::InitializeConfidentialTransferFeeConfig,
         &InitializeConfidentialTransferFeeConfigData {
             authority: authority.try_into()?,
-            withdraw_withheld_authority_elgamal_pubkey,
+            withdraw_withheld_authority_elgamal_pubkey: *withdraw_withheld_authority_elgamal_pubkey,
         },
     ))
 }