update program-2022 to use zk-sdk

Author: samkim-crypto

Cargo.lock

@@ -24,7 +24,7 @@ num-traits = "0.2"
 num_enum = "0.7.3"
 solana-program = "2.0.3"
 solana-security-txt = "1.1.1"
-solana-zk-token-sdk = "2.0.3"
+solana-zk-sdk = "2.0.3"
 spl-memo = { version = "5.0", path = "../../memo/program", features = [ "no-entrypoint" ] }
 spl-token = { version = "6.0",  path = "../program", features = ["no-entrypoint"] }
 spl-token-group-interface = { version = "0.3.0", path = "../../token-group/interface" }

token/program-2022/Cargo.toml

@@ -1,8 +1,7 @@
-#[cfg(not(target_os = "solana"))]
-use solana_zk_token_sdk::encryption::auth_encryption::AeCiphertext;
-pub use solana_zk_token_sdk::{
-    zk_token_proof_instruction::*, zk_token_proof_state::ProofContextState,
+pub use solana_zk_sdk::zk_elgamal_proof_program::{
+    instruction::ProofInstruction, proof_data::*, state::ProofContextState,
 };
+
 #[cfg(feature = "serde-traits")]
 use {
     crate::serialization::aeciphertext_fromstr,
@@ -638,7 +637,7 @@ pub fn initialize_mint(
     mint: &Pubkey,
     authority: Option<Pubkey>,
     auto_approve_new_accounts: bool,
-    auditor_elgamal_pubkey: Option<ElGamalPubkey>,
+    auditor_elgamal_pubkey: Option<PodElGamalPubkey>,
 ) -> Result<Instruction, ProgramError> {
     check_program_account(token_program_id)?;
     let accounts = vec![AccountMeta::new(*mint, false)];
@@ -663,7 +662,7 @@ pub fn update_mint(
     authority: &Pubkey,
     multisig_signers: &[&Pubkey],
     auto_approve_new_accounts: bool,
-    auditor_elgamal_pubkey: Option<ElGamalPubkey>,
+    auditor_elgamal_pubkey: Option<PodElGamalPubkey>,
 ) -> Result<Instruction, ProgramError> {
     check_program_account(token_program_id)?;
     let mut accounts = vec![
@@ -693,11 +692,11 @@ pub fn inner_configure_account(
     token_program_id: &Pubkey,
     token_account: &Pubkey,
     mint: &Pubkey,
-    decryptable_zero_balance: AeCiphertext,
+    decryptable_zero_balance: PodAeCiphertext,
     maximum_pending_balance_credit_counter: u64,
     authority: &Pubkey,
     multisig_signers: &[&Pubkey],
-    proof_data_location: ProofLocation<PubkeyValidityData>,
+    proof_data_location: ProofLocation<PubkeyValidityProofData>,
 ) -> Result<Instruction, ProgramError> {
     check_program_account(token_program_id)?;
 
@@ -748,11 +747,11 @@ pub fn configure_account(
     token_program_id: &Pubkey,
     token_account: &Pubkey,
     mint: &Pubkey,
-    decryptable_zero_balance: AeCiphertext,
+    decryptable_zero_balance: PodAeCiphertext,
     maximum_pending_balance_credit_counter: u64,
     authority: &Pubkey,
     multisig_signers: &[&Pubkey],
-    proof_data_location: ProofLocation<PubkeyValidityData>,
+    proof_data_location: ProofLocation<PubkeyValidityProofData>,
 ) -> Result<Vec<Instruction>, ProgramError> {
     let mut instructions = vec![inner_configure_account(
         token_program_id,
@@ -777,9 +776,8 @@ pub fn configure_account(
             return Err(TokenError::InvalidProofInstructionOffset.into());
         }
         match proof_data {
-            ProofData::InstructionData(data) => {
-                instructions.push(verify_pubkey_validity(None, data))
-            }
+            ProofData::InstructionData(data) => instructions
+                .push(ProofInstruction::VerifyPubkeyValidity.encode_verify_proof(None, data)),
             ProofData::RecordAccount(address, offset) => instructions.push(
                 ProofInstruction::VerifyPubkeyValidity
                     .encode_verify_proof_from_account(None, address, offset),
@@ -824,7 +822,7 @@ pub fn inner_empty_account(
     token_account: &Pubkey,
     authority: &Pubkey,
     multisig_signers: &[&Pubkey],
-    proof_data_location: ProofLocation<ZeroBalanceProofData>,
+    proof_data_location: ProofLocation<ZeroCiphertextProofData>,
 ) -> Result<Instruction, ProgramError> {
     check_program_account(token_program_id)?;
     let mut accounts = vec![AccountMeta::new(*token_account, false)];
@@ -869,7 +867,7 @@ pub fn empty_account(
     token_account: &Pubkey,
     authority: &Pubkey,
     multisig_signers: &[&Pubkey],
-    proof_data_location: ProofLocation<ZeroBalanceProofData>,
+    proof_data_location: ProofLocation<ZeroCiphertextProofData>,
 ) -> Result<Vec<Instruction>, ProgramError> {
     let mut instructions = vec![inner_empty_account(
         token_program_id,
@@ -891,9 +889,10 @@ pub fn empty_account(
             return Err(TokenError::InvalidProofInstructionOffset.into());
         }
         match proof_data {
-            ProofData::InstructionData(data) => instructions.push(verify_zero_balance(None, data)),
+            ProofData::InstructionData(data) => instructions
+                .push(ProofInstruction::VerifyZeroCiphertext.encode_verify_proof(None, data)),
             ProofData::RecordAccount(address, offset) => instructions.push(
-                ProofInstruction::VerifyZeroBalance
+                ProofInstruction::VerifyZeroCiphertext
                     .encode_verify_proof_from_account(None, address, offset),
             ),
         };
@@ -1002,7 +1001,7 @@ pub fn withdraw(
     mint: &Pubkey,
     amount: u64,
     decimals: u8,
-    new_decryptable_available_balance: AeCiphertext,
+    new_decryptable_available_balance: PodAeCiphertext,
     authority: &Pubkey,
     multisig_signers: &[&Pubkey],
     proof_data_location: ProofLocation<WithdrawData>,
@@ -1261,7 +1260,7 @@ pub fn apply_pending_balance(
     token_program_id: &Pubkey,
     token_account: &Pubkey,
     pending_balance_instructions: u64,
-    new_decryptable_available_balance: AeCiphertext,
+    new_decryptable_available_balance: PodAeCiphertext,
     authority: &Pubkey,
     multisig_signers: &[&Pubkey],
 ) -> Result<Instruction, ProgramError> {
@@ -1381,7 +1380,7 @@ pub fn inner_transfer_with_fee(
     transfer_amount_ciphertext_validity_proof_data_location: ProofLocation<
         BatchedGroupedCiphertext3HandlesValidityProofData,
     >,
-    fee_sigma_proof_data_location: ProofLocation<FeeSigmaProofData>,
+    fee_sigma_proof_data_location: ProofLocation<PercentageWithCapProofData>,
     fee_ciphertext_validity_proof_data_location: ProofLocation<
         BatchedGroupedCiphertext2HandlesValidityProofData,
     >,
@@ -1507,7 +1506,7 @@ pub fn transfer_with_fee(
     transfer_amount_ciphertext_validity_proof_data_location: ProofLocation<
         BatchedGroupedCiphertext3HandlesValidityProofData,
     >,
-    fee_sigma_proof_data_location: ProofLocation<FeeSigmaProofData>,
+    fee_sigma_proof_data_location: ProofLocation<PercentageWithCapProofData>,
     fee_ciphertext_validity_proof_data_location: ProofLocation<
         BatchedGroupedCiphertext2HandlesValidityProofData,
     >,
@@ -1574,11 +1573,10 @@ pub fn transfer_with_fee(
             return Err(TokenError::InvalidProofInstructionOffset.into());
         }
         match proof_data {
-            ProofData::InstructionData(data) => {
-                instructions.push(ProofInstruction::VerifyFeeSigma.encode_verify_proof(None, data))
-            }
+            ProofData::InstructionData(data) => instructions
+                .push(ProofInstruction::VerifyPercentageWithCap.encode_verify_proof(None, data)),
             ProofData::RecordAccount(address, offset) => instructions.push(
-                ProofInstruction::VerifyFeeSigma
+                ProofInstruction::VerifyPercentageWithCap
                     .encode_verify_proof_from_account(None, address, offset),
             ),
         };

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

@@ -5,7 +5,10 @@ use {
     },
     bytemuck::{Pod, Zeroable},
     solana_program::entrypoint::ProgramResult,
-    solana_zk_token_sdk::zk_token_elgamal::pod::{AeCiphertext, ElGamalCiphertext, ElGamalPubkey},
+    solana_zk_sdk::encryption::pod::{
+        auth_encryption::PodAeCiphertext,
+        elgamal::{PodElGamalCiphertext, PodElGamalPubkey},
+    },
     spl_pod::{
         optional_keys::{OptionalNonZeroElGamalPubkey, OptionalNonZeroPubkey},
         primitives::{PodBool, PodU64},
@@ -48,9 +51,9 @@ pub mod account_info;
 pub mod ciphertext_extraction;
 
 /// ElGamal ciphertext containing an account balance
-pub type EncryptedBalance = ElGamalCiphertext;
+pub type EncryptedBalance = PodElGamalCiphertext;
 /// Authenticated encryption containing an account balance
-pub type DecryptableBalance = AeCiphertext;
+pub type DecryptableBalance = PodAeCiphertext;
 
 /// Confidential transfer mint configuration
 #[repr(C)]
@@ -89,7 +92,7 @@ pub struct ConfidentialTransferAccount {
     pub approved: PodBool,
 
     /// The public key associated with ElGamal encryption
-    pub elgamal_pubkey: ElGamalPubkey,
+    pub elgamal_pubkey: PodElGamalPubkey,
 
     /// The low 16 bits of the pending balance (encrypted by `elgamal_pubkey`)
     pub pending_balance_lo: EncryptedBalance,

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

@@ -102,11 +102,10 @@ fn process_configure_account(
     let mint_info = next_account_info(account_info_iter)?;
 
     // zero-knowledge proof certifies that the supplied ElGamal public key is valid
-    let proof_context = verify_and_extract_context::<PubkeyValidityData, PubkeyValidityProofContext>(
-        account_info_iter,
-        proof_instruction_offset,
-        None,
-    )?;
+    let proof_context = verify_and_extract_context::<
+        PubkeyValidityProofData,
+        PubkeyValidityProofContext,
+    >(account_info_iter, proof_instruction_offset, None)?;
 
     let authority_info = next_account_info(account_info_iter)?;
     let authority_info_data_len = authority_info.data_len();
@@ -210,11 +209,10 @@ fn process_empty_account(
 
     // zero-knowledge proof certifies that the available balance ciphertext holds
     // the balance of 0.
-    let proof_context = verify_and_extract_context::<ZeroBalanceProofData, ZeroBalanceProofContext>(
-        account_info_iter,
-        proof_instruction_offset,
-        None,
-    )?;
+    let proof_context = verify_and_extract_context::<
+        ZeroCiphertextProofData,
+        ZeroCiphertextProofContext,
+    >(account_info_iter, proof_instruction_offset, None)?;
 
     let authority_info = next_account_info(account_info_iter)?;
     let authority_info_data_len = authority_info.data_len();

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

@@ -111,7 +111,7 @@ pub fn verify_transfer_with_fee_proof(
     )?;
 
     let fee_sigma_proof_context =
-        verify_and_extract_context::<FeeSigmaProofData, FeeSigmaProofContext>(
+        verify_and_extract_context::<PercentageWithCapProofData, PercentageWithCapProofContext>(
             account_info_iter,
             fee_sigma_proof_instruction_offset,
             sysvar_account_info,

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

@@ -8,15 +8,13 @@ use {
         check_program_account,
         error::TokenError,
         extension::confidential_transfer::{
-            instruction::{
-                verify_ciphertext_ciphertext_equality, CiphertextCiphertextEqualityProofData,
-            },
-            DecryptableBalance,
+            instruction::CiphertextCiphertextEqualityProofData, DecryptableBalance,
         },
         instruction::{encode_instruction, TokenInstruction},
         proof::{ProofData, ProofLocation},
-        solana_zk_token_sdk::{
-            zk_token_elgamal::pod::ElGamalPubkey, zk_token_proof_instruction::ProofInstruction,
+        solana_zk_sdk::{
+            encryption::pod::elgamal::PodElGamalPubkey,
+            zk_elgamal_proof_program::instruction::ProofInstruction,
         },
     },
     bytemuck::{Pod, Zeroable},
@@ -233,7 +231,7 @@ pub struct InitializeConfidentialTransferFeeConfigData {
 
     /// ElGamal public key used to encrypt withheld fees.
     #[cfg_attr(feature = "serde-traits", serde(with = "elgamalpubkey_fromstr"))]
-    pub withdraw_withheld_authority_elgamal_pubkey: ElGamalPubkey,
+    pub withdraw_withheld_authority_elgamal_pubkey: PodElGamalPubkey,
 }
 
 /// Data expected by
@@ -277,7 +275,7 @@ pub fn initialize_confidential_transfer_fee_config(
     token_program_id: &Pubkey,
     mint: &Pubkey,
     authority: Option<Pubkey>,
-    withdraw_withheld_authority_elgamal_pubkey: ElGamalPubkey,
+    withdraw_withheld_authority_elgamal_pubkey: PodElGamalPubkey,
 ) -> Result<Instruction, ProgramError> {
     check_program_account(token_program_id)?;
     let accounts = vec![AccountMeta::new(*mint, false)];
@@ -380,9 +378,10 @@ pub fn withdraw_withheld_tokens_from_mint(
             return Err(TokenError::InvalidProofInstructionOffset.into());
         }
         match proof_data {
-            ProofData::InstructionData(data) => {
-                instructions.push(verify_ciphertext_ciphertext_equality(None, data))
-            }
+            ProofData::InstructionData(data) => instructions.push(
+                ProofInstruction::VerifyCiphertextCiphertextEquality
+                    .encode_verify_proof(None, data),
+            ),
             ProofData::RecordAccount(address, offset) => instructions.push(
                 ProofInstruction::VerifyCiphertextCiphertextEquality
                     .encode_verify_proof_from_account(None, address, offset),
@@ -491,9 +490,10 @@ pub fn withdraw_withheld_tokens_from_accounts(
             return Err(TokenError::InvalidProofInstructionOffset.into());
         }
         match proof_data {
-            ProofData::InstructionData(data) => {
-                instructions.push(verify_ciphertext_ciphertext_equality(None, data))
-            }
+            ProofData::InstructionData(data) => instructions.push(
+                ProofInstruction::VerifyCiphertextCiphertextEquality
+                    .encode_verify_proof(None, data),
+            ),
             ProofData::RecordAccount(address, offset) => instructions.push(
                 ProofInstruction::VerifyCiphertextCiphertextEquality
                     .encode_verify_proof_from_account(None, address, offset),

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

@@ -5,7 +5,7 @@ use {
     },
     bytemuck::{Pod, Zeroable},
     solana_program::entrypoint::ProgramResult,
-    solana_zk_token_sdk::zk_token_elgamal::pod::{ElGamalCiphertext, ElGamalPubkey, FeeEncryption},
+    solana_zk_sdk::encryption::pod::elgamal::{PodElGamalCiphertext, PodElGamalPubkey},
     spl_pod::{optional_keys::OptionalNonZeroPubkey, primitives::PodBool},
 };
 
@@ -23,7 +23,7 @@ pub mod account_info;
 /// ElGamal ciphertext containing a transfer fee
 pub type EncryptedFee = FeeEncryption;
 /// ElGamal ciphertext containing a withheld fee in an account
-pub type EncryptedWithheldAmount = ElGamalCiphertext;
+pub type EncryptedWithheldAmount = PodElGamalCiphertext;
 
 /// Confidential transfer fee extension data for mints
 #[repr(C)]
@@ -38,7 +38,7 @@ pub struct ConfidentialTransferFeeConfig {
     /// key has the ability to decode any withheld fee amount that are
     /// associated with accounts. When combined with the fee parameters, the
     /// withheld fee amounts can reveal information about transfer amounts.
-    pub withdraw_withheld_authority_elgamal_pubkey: ElGamalPubkey,
+    pub withdraw_withheld_authority_elgamal_pubkey: PodElGamalPubkey,
 
     /// If `false`, the harvest of withheld tokens to mint is rejected.
     pub harvest_to_mint_enabled: PodBool,