Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

[token-2022] Remove unnecessary split proof generation logic #7164

Merged
merged 1 commit into from
Aug 19, 2024
Merged

[token-2022] Remove unnecessary split proof generation logic #7164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
180 changes: 116 additions & 64 deletions token/client/src/token.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2083,19 +2083,26 @@ where
WithdrawAccountInfo::new(confidential_transfer_account)
};

let WithdrawProofData {
equality_proof_data,
range_proof_data,
} = account_info
.generate_proof_data(withdraw_amount, elgamal_keypair, aes_key)
.map_err(|_| TokenError::ProofGeneration)?;

// if proof accounts are none, then proof data must be included as instruction
// data
let equality_proof_data = equality_proof_account
.is_none()
.then_some(equality_proof_data);
let range_proof_data = range_proof_account.is_none().then_some(range_proof_data);
let (equality_proof_data, range_proof_data) =
if equality_proof_account.is_some() && range_proof_account.is_some() {
(None, None)
} else {
let WithdrawProofData {
equality_proof_data,
range_proof_data,
} = account_info
.generate_proof_data(withdraw_amount, elgamal_keypair, aes_key)
.map_err(|_| TokenError::ProofGeneration)?;

// if proof accounts are none, then proof data must be included as instruction
// data
let equality_proof_data = equality_proof_account
.is_none()
.then_some(equality_proof_data);
let range_proof_data = range_proof_account.is_none().then_some(range_proof_data);

(equality_proof_data, range_proof_data)
};

// cannot panic as long as either `proof_data` or `proof_account` is `Some(..)`,
// which is guaranteed by the previous check
Expand Down Expand Up @@ -2165,29 +2172,46 @@ where
TransferAccountInfo::new(confidential_transfer_account)
};

let TransferProofData {
equality_proof_data,
ciphertext_validity_proof_data,
range_proof_data,
} = account_info
.generate_split_transfer_proof_data(
transfer_amount,
source_elgamal_keypair,
source_aes_key,
destination_elgamal_pubkey,
auditor_elgamal_pubkey,
let (equality_proof_data, ciphertext_validity_proof_data, range_proof_data) = if [
equality_proof_account,
ciphertext_validity_proof_account,
range_proof_account,
]
.iter()
.all(|proof_account| proof_account.is_some())
{
(None, None, None)
} else {
let TransferProofData {
equality_proof_data,
ciphertext_validity_proof_data,
range_proof_data,
} = account_info
.generate_split_transfer_proof_data(
transfer_amount,
source_elgamal_keypair,
source_aes_key,
destination_elgamal_pubkey,
auditor_elgamal_pubkey,
)
.map_err(|_| TokenError::ProofGeneration)?;

// if proof accounts are none, then proof data must be included as instruction
// data
let equality_proof_data = equality_proof_account
.is_none()
.then_some(equality_proof_data);
let ciphertext_validity_proof_data = ciphertext_validity_proof_account
.is_none()
.then_some(ciphertext_validity_proof_data);
let range_proof_data = range_proof_account.is_none().then_some(range_proof_data);

(
equality_proof_data,
ciphertext_validity_proof_data,
range_proof_data,
)
.map_err(|_| TokenError::ProofGeneration)?;

// if proof accounts are none, then proof data must be included as instruction
// data
let equality_proof_data = equality_proof_account
.is_none()
.then_some(equality_proof_data);
let ciphertext_validity_proof_data = ciphertext_validity_proof_account
.is_none()
.then_some(ciphertext_validity_proof_data);
let range_proof_data = range_proof_account.is_none().then_some(range_proof_data);
};

// cannot panic as long as either `proof_data` or `proof_account` is `Some(..)`,
// which is guaranteed by the previous check
Expand Down Expand Up @@ -2457,7 +2481,7 @@ where
source_authority: &Pubkey,
equality_proof_account: Option<&ProofAccount>,
transfer_amount_ciphertext_validity_proof_account: Option<&ProofAccount>,
fee_sigma_proof_account: Option<&ProofAccount>,
percentage_with_cap_proof_account: Option<&ProofAccount>,
fee_ciphertext_validity_proof_account: Option<&ProofAccount>,
range_proof_account: Option<&ProofAccount>,
transfer_amount: u64,
Expand All @@ -2483,39 +2507,67 @@ where
TransferAccountInfo::new(confidential_transfer_account)
};

let TransferWithFeeProofData {
let (
equality_proof_data,
transfer_amount_ciphertext_validity_proof_data,
percentage_with_cap_proof_data,
fee_ciphertext_validity_proof_data,
range_proof_data,
} = account_info
.generate_split_transfer_with_fee_proof_data(
transfer_amount,
source_elgamal_keypair,
source_aes_key,
destination_elgamal_pubkey,
auditor_elgamal_pubkey,
withdraw_withheld_authority_elgamal_pubkey,
fee_rate_basis_points,
maximum_fee,
)
.map_err(|_| TokenError::ProofGeneration)?;
) = if [
equality_proof_account,
transfer_amount_ciphertext_validity_proof_account,
percentage_with_cap_proof_account,
fee_ciphertext_validity_proof_account,
range_proof_account,
]
.iter()
.all(|proof_account| proof_account.is_some())
{
// is all proofs come from accounts, then skip proof generation
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit:

Suggested change
// is all proofs come from accounts, then skip proof generation
// if all proofs come from accounts, then skip proof generation

(None, None, None, None, None)
} else {
let TransferWithFeeProofData {
equality_proof_data,
transfer_amount_ciphertext_validity_proof_data,
percentage_with_cap_proof_data,
fee_ciphertext_validity_proof_data,
range_proof_data,
} = account_info
.generate_split_transfer_with_fee_proof_data(
transfer_amount,
source_elgamal_keypair,
source_aes_key,
destination_elgamal_pubkey,
auditor_elgamal_pubkey,
withdraw_withheld_authority_elgamal_pubkey,
fee_rate_basis_points,
maximum_fee,
)
.map_err(|_| TokenError::ProofGeneration)?;

let equality_proof_data = equality_proof_account
.is_none()
.then_some(equality_proof_data);
let transfer_amount_ciphertext_validity_proof_data =
transfer_amount_ciphertext_validity_proof_account
let equality_proof_data = equality_proof_account
.is_none()
.then_some(equality_proof_data);
let transfer_amount_ciphertext_validity_proof_data =
transfer_amount_ciphertext_validity_proof_account
.is_none()
.then_some(transfer_amount_ciphertext_validity_proof_data);
let percentage_with_cap_proof_data = percentage_with_cap_proof_account
.is_none()
.then_some(percentage_with_cap_proof_data);
let fee_ciphertext_validity_proof_data = fee_ciphertext_validity_proof_account
.is_none()
.then_some(transfer_amount_ciphertext_validity_proof_data);
let fee_sigma_proof_data = fee_sigma_proof_account
.is_none()
.then_some(percentage_with_cap_proof_data);
let fee_ciphertext_validity_proof_data = fee_ciphertext_validity_proof_account
.is_none()
.then_some(fee_ciphertext_validity_proof_data);
let range_proof_data = range_proof_account.is_none().then_some(range_proof_data);
.then_some(fee_ciphertext_validity_proof_data);
let range_proof_data = range_proof_account.is_none().then_some(range_proof_data);

(
equality_proof_data,
transfer_amount_ciphertext_validity_proof_data,
percentage_with_cap_proof_data,
fee_ciphertext_validity_proof_data,
range_proof_data,
)
};

// cannot panic as long as either `proof_data` or `proof_account` is `Some(..)`,
// which is guaranteed by the previous check
Expand All @@ -2533,8 +2585,8 @@ where
)
.unwrap();
let fee_sigma_proof_location = Self::confidential_transfer_create_proof_location(
fee_sigma_proof_data.as_ref(),
fee_sigma_proof_account,
percentage_with_cap_proof_data.as_ref(),
percentage_with_cap_proof_account,
3,
)
.unwrap();
Expand Down
Loading