update to CiphertextValidityProofWithAuditorCiphertext

Author: samkim-crypto

token/confidential-transfer/proof-generation/src/burn.rs

@@ -1,7 +1,7 @@
 use {
     crate::{
         encryption::BurnAmountCiphertext, errors::TokenProofGenerationError,
-        try_combine_lo_hi_ciphertexts, try_split_u64, CiphertextValidityProofWithCiphertext,
+        try_combine_lo_hi_ciphertexts, try_split_u64, CiphertextValidityProofWithAuditorCiphertext,
     },
     solana_zk_sdk::{
         encryption::{
@@ -25,7 +25,8 @@ const RANGE_PROOF_PADDING_BIT_LENGTH: usize = 16;
 /// The proof data required for a confidential burn instruction
 pub struct BurnProofData {
     pub equality_proof_data: CiphertextCommitmentEqualityProofData,
-    pub ciphertext_validity_proof_data_with_ciphertext: CiphertextValidityProofWithCiphertext,
+    pub ciphertext_validity_proof_data_with_ciphertext:
+        CiphertextValidityProofWithAuditorCiphertext,
     pub range_proof_data: BatchedRangeProofU128Data,
 }
 
@@ -125,11 +126,12 @@ pub fn burn_split_proof_data(
         .try_extract_ciphertext(2)
         .map_err(|_| TokenProofGenerationError::CiphertextExtraction)?;
 
-    let ciphertext_validity_proof_data_with_ciphertext = CiphertextValidityProofWithCiphertext {
-        proof_data: ciphertext_validity_proof_data,
-        ciphertext_lo: burn_amount_auditor_ciphertext_lo,
-        ciphertext_hi: burn_amount_auditor_ciphertext_hi,
-    };
+    let ciphertext_validity_proof_data_with_ciphertext =
+        CiphertextValidityProofWithAuditorCiphertext {
+            proof_data: ciphertext_validity_proof_data,
+            ciphertext_lo: burn_amount_auditor_ciphertext_lo,
+            ciphertext_hi: burn_amount_auditor_ciphertext_hi,
+        };
 
     // generate range proof data
     let (padding_commitment, padding_opening) = Pedersen::new(0_u64);

token/confidential-transfer/proof-generation/src/lib.rs

@@ -96,13 +96,12 @@ pub fn try_combine_lo_hi_openings(
 /// ciphertexts.
 ///
 /// Ciphertext validity proof data contains grouped ElGamal ciphertexts (`lo`
-/// and `hi`) and a proof containing the
-/// validity of these ciphertexts. Token client-side logic often requires a
-/// function to extract specific forms of the grouped ElGamal ciphertexts. This
-/// type is a convenience type that contains the proof data and the extracted
-/// ciphertexts.
+/// and `hi`) and a proof containing the validity of these ciphertexts. Token
+/// client-side logic often requires a function to extract specific forms of
+/// the grouped ElGamal ciphertexts. This type is a convenience type that
+/// contains the proof data and the extracted ciphertexts.
 #[derive(Clone, Copy)]
-pub struct CiphertextValidityProofWithCiphertext {
+pub struct CiphertextValidityProofWithAuditorCiphertext {
     pub proof_data: BatchedGroupedCiphertext3HandlesValidityProofData,
     pub ciphertext_lo: PodElGamalCiphertext,
     pub ciphertext_hi: PodElGamalCiphertext,

token/confidential-transfer/proof-generation/src/mint.rs

@@ -1,7 +1,7 @@
 use {
     crate::{
         encryption::MintAmountCiphertext, errors::TokenProofGenerationError,
-        try_combine_lo_hi_ciphertexts, try_split_u64, CiphertextValidityProofWithCiphertext,
+        try_combine_lo_hi_ciphertexts, try_split_u64, CiphertextValidityProofWithAuditorCiphertext,
     },
     solana_zk_sdk::{
         encryption::{
@@ -25,7 +25,8 @@ const RANGE_PROOF_PADDING_BIT_LENGTH: usize = 16;
 /// The proof data required for a confidential mint instruction
 pub struct MintProofData {
     pub equality_proof_data: CiphertextCommitmentEqualityProofData,
-    pub ciphertext_validity_proof_data_with_ciphertext: CiphertextValidityProofWithCiphertext,
+    pub ciphertext_validity_proof_data_with_ciphertext:
+        CiphertextValidityProofWithAuditorCiphertext,
     pub range_proof_data: BatchedRangeProofU128Data,
     pub new_decryptable_supply: AeCiphertext,
 }
@@ -121,11 +122,12 @@ pub fn mint_split_proof_data(
         .try_extract_ciphertext(2)
         .map_err(|_| TokenProofGenerationError::CiphertextExtraction)?;
 
-    let ciphertext_validity_proof_data_with_ciphertext = CiphertextValidityProofWithCiphertext {
-        proof_data: ciphertext_validity_proof_data,
-        ciphertext_lo: mint_amount_auditor_ciphertext_lo,
-        ciphertext_hi: mint_amount_auditor_ciphertext_hi,
-    };
+    let ciphertext_validity_proof_data_with_ciphertext =
+        CiphertextValidityProofWithAuditorCiphertext {
+            proof_data: ciphertext_validity_proof_data,
+            ciphertext_lo: mint_amount_auditor_ciphertext_lo,
+            ciphertext_hi: mint_amount_auditor_ciphertext_hi,
+        };
 
     // generate range proof data
     let (padding_commitment, padding_opening) = Pedersen::new(0_u64);

token/confidential-transfer/proof-generation/src/transfer.rs

@@ -1,7 +1,7 @@
 use {
     crate::{
         encryption::TransferAmountCiphertext, errors::TokenProofGenerationError,
-        try_combine_lo_hi_ciphertexts, try_split_u64, CiphertextValidityProofWithCiphertext,
+        try_combine_lo_hi_ciphertexts, try_split_u64, CiphertextValidityProofWithAuditorCiphertext,
         REMAINING_BALANCE_BIT_LENGTH, TRANSFER_AMOUNT_HI_BITS, TRANSFER_AMOUNT_LO_BITS,
     },
     solana_zk_sdk::{
@@ -25,7 +25,8 @@ const RANGE_PROOF_PADDING_BIT_LENGTH: usize = 16;
 /// mint is not extended for fees
 pub struct TransferProofData {
     pub equality_proof_data: CiphertextCommitmentEqualityProofData,
-    pub ciphertext_validity_proof_data_with_ciphertext: CiphertextValidityProofWithCiphertext,
+    pub ciphertext_validity_proof_data_with_ciphertext:
+        CiphertextValidityProofWithAuditorCiphertext,
     pub range_proof_data: BatchedRangeProofU128Data,
 }
 
@@ -132,11 +133,12 @@ pub fn transfer_split_proof_data(
         .try_extract_ciphertext(2)
         .map_err(|_| TokenProofGenerationError::CiphertextExtraction)?;
 
-    let ciphertext_validity_proof_data_with_ciphertext = CiphertextValidityProofWithCiphertext {
-        proof_data: ciphertext_validity_proof_data,
-        ciphertext_lo: transfer_amount_auditor_ciphertext_lo,
-        ciphertext_hi: transfer_amount_auditor_ciphertext_hi,
-    };
+    let ciphertext_validity_proof_data_with_ciphertext =
+        CiphertextValidityProofWithAuditorCiphertext {
+            proof_data: ciphertext_validity_proof_data,
+            ciphertext_lo: transfer_amount_auditor_ciphertext_lo,
+            ciphertext_hi: transfer_amount_auditor_ciphertext_hi,
+        };
 
     // generate range proof data
     let (padding_commitment, padding_opening) = Pedersen::new(0_u64);

token/confidential-transfer/proof-generation/src/transfer_with_fee.rs

@@ -3,7 +3,7 @@ use {
         encryption::{FeeCiphertext, TransferAmountCiphertext},
         errors::TokenProofGenerationError,
         try_combine_lo_hi_ciphertexts, try_combine_lo_hi_commitments, try_combine_lo_hi_openings,
-        try_split_u64, CiphertextValidityProofWithCiphertext, TRANSFER_AMOUNT_HI_BITS,
+        try_split_u64, CiphertextValidityProofWithAuditorCiphertext, TRANSFER_AMOUNT_HI_BITS,
         TRANSFER_AMOUNT_LO_BITS,
     },
     curve25519_dalek::scalar::Scalar,
@@ -36,7 +36,7 @@ const DELTA_BIT_LENGTH: usize = 48;
 pub struct TransferWithFeeProofData {
     pub equality_proof_data: CiphertextCommitmentEqualityProofData,
     pub transfer_amount_ciphertext_validity_proof_data_with_ciphertext:
-        CiphertextValidityProofWithCiphertext,
+        CiphertextValidityProofWithAuditorCiphertext,
     pub percentage_with_cap_proof_data: PercentageWithCapProofData,
     pub fee_ciphertext_validity_proof_data: BatchedGroupedCiphertext2HandlesValidityProofData,
     pub range_proof_data: BatchedRangeProofU256Data,
@@ -152,7 +152,7 @@ pub fn transfer_with_fee_split_proof_data(
         .map_err(|_| TokenProofGenerationError::CiphertextExtraction)?;
 
     let transfer_amount_ciphertext_validity_proof_data_with_ciphertext =
-        CiphertextValidityProofWithCiphertext {
+        CiphertextValidityProofWithAuditorCiphertext {
             proof_data: transfer_amount_ciphertext_validity_proof_data,
             ciphertext_lo: transfer_amount_auditor_ciphertext_lo,
             ciphertext_hi: transfer_amount_auditor_ciphertext_hi,