[rust-legacy-client] Always assume that the supply ElGamal public key is set (#178)

always assume that the supply ElGamal public key is set

Author: samkim-crypto

clients/rust-legacy/src/token.rs

@@ -3410,7 +3410,6 @@ where
                 &self.program_id,
                 destination_account,
                 &self.pubkey,
-                Some(*supply_elgamal_keypair.pubkey()),
                 &mint_amount_auditor_ciphertext_lo,
                 &mint_amount_auditor_ciphertext_hi,
                 authority,
@@ -3548,7 +3547,6 @@ where
                 &self.program_id,
                 source_account,
                 &self.pubkey,
-                Some(*supply_elgamal_pubkey),
                 &new_decryptable_balance,
                 &burn_amount_auditor_ciphertext_lo,
                 &burn_amount_auditor_ciphertext_hi,

program/src/extension/confidential_mint_burn/instruction.rs

@@ -23,14 +23,11 @@ use {
 };
 #[cfg(not(target_os = "solana"))]
 use {
-    solana_zk_sdk::{
-        encryption::elgamal::ElGamalPubkey,
-        zk_elgamal_proof_program::{
-            instruction::ProofInstruction,
-            proof_data::{
-                BatchedGroupedCiphertext3HandlesValidityProofData, BatchedRangeProofU128Data,
-                CiphertextCiphertextEqualityProofData, CiphertextCommitmentEqualityProofData,
-            },
+    solana_zk_sdk::zk_elgamal_proof_program::{
+        instruction::ProofInstruction,
+        proof_data::{
+            BatchedGroupedCiphertext3HandlesValidityProofData, BatchedRangeProofU128Data,
+            CiphertextCiphertextEqualityProofData, CiphertextCommitmentEqualityProofData,
         },
     },
     spl_token_confidential_transfer_proof_extraction::instruction::{
@@ -112,8 +109,7 @@ pub enum ConfidentialMintBurnInstruction {
     ///
     ///   * Single authority
     ///   0. `[writable]` The SPL Token account.
-    ///   1. `[]` The SPL Token mint. `[writable]` if the mint has a non-zero
-    ///      supply elgamal-pubkey
+    ///   1. `[writable]` The SPL Token mint.
     ///   2. `[]` (Optional) Instructions sysvar if at least one of the
     ///      `zk_elgamal_proof` instructions are included in the same
     ///      transaction.
@@ -152,8 +148,7 @@ pub enum ConfidentialMintBurnInstruction {
     ///
     ///   * Single authority
     ///   0. `[writable]` The SPL Token account.
-    ///   1. `[]` The SPL Token mint. `[writable]` if the mint has a non-zero
-    ///      supply elgamal-pubkey
+    ///   1. `[writable]` The SPL Token mint.
     ///   2. `[]` (Optional) Instructions sysvar if at least one of the
     ///      `zk_elgamal_proof` instructions are included in the same
     ///      transaction.
@@ -421,7 +416,6 @@ pub fn confidential_mint_with_split_proofs(
     token_program_id: &Pubkey,
     token_account: &Pubkey,
     mint: &Pubkey,
-    supply_elgamal_pubkey: Option<ElGamalPubkey>,
     mint_amount_auditor_ciphertext_lo: &PodElGamalCiphertext,
     mint_amount_auditor_ciphertext_hi: &PodElGamalCiphertext,
     authority: &Pubkey,
@@ -434,14 +428,10 @@ pub fn confidential_mint_with_split_proofs(
     new_decryptable_supply: &DecryptableBalance,
 ) -> Result<Vec<Instruction>, ProgramError> {
     check_program_account(token_program_id)?;
-    let mut accounts = vec![AccountMeta::new(*token_account, false)];
-    // we only need write lock to adjust confidential suppy on
-    // mint if a value for supply_elgamal_pubkey has been set
-    if supply_elgamal_pubkey.is_some() {
-        accounts.push(AccountMeta::new(*mint, false));
-    } else {
-        accounts.push(AccountMeta::new_readonly(*mint, false));
-    }
+    let mut accounts = vec![
+        AccountMeta::new(*token_account, false),
+        AccountMeta::new(*mint, false),
+    ];
 
     let mut expected_instruction_offset = 1;
     let mut proof_instructions = vec![];
@@ -508,7 +498,6 @@ pub fn confidential_burn_with_split_proofs(
     token_program_id: &Pubkey,
     token_account: &Pubkey,
     mint: &Pubkey,
-    supply_elgamal_pubkey: Option<ElGamalPubkey>,
     new_decryptable_available_balance: &DecryptableBalance,
     burn_amount_auditor_ciphertext_lo: &PodElGamalCiphertext,
     burn_amount_auditor_ciphertext_hi: &PodElGamalCiphertext,
@@ -521,12 +510,10 @@ pub fn confidential_burn_with_split_proofs(
     range_proof_location: ProofLocation<BatchedRangeProofU128Data>,
 ) -> Result<Vec<Instruction>, ProgramError> {
     check_program_account(token_program_id)?;
-    let mut accounts = vec![AccountMeta::new(*token_account, false)];
-    if supply_elgamal_pubkey.is_some() {
-        accounts.push(AccountMeta::new(*mint, false));
-    } else {
-        accounts.push(AccountMeta::new_readonly(*mint, false));
-    }
+    let mut accounts = vec![
+        AccountMeta::new(*token_account, false),
+        AccountMeta::new(*mint, false),
+    ];
 
     let mut expected_instruction_offset = 1;
     let mut proof_instructions = vec![];