cargo fmt

Author: samkim-crypto

token/client/src/token.rs

@@ -2090,7 +2090,8 @@ where
             .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
+        // 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);
@@ -2347,8 +2348,8 @@ where
         .await
     }
 
-    /// Create a context state account containing zero-knowledge proof needed for a confidential
-    /// transfer instruction.
+    /// Create a context state account containing zero-knowledge proof needed
+    /// for a confidential transfer instruction.
     pub async fn confidential_transfer_create_context_state_account<
         S: Signer,
         ZK: Pod + ZkProofData<U>,
@@ -2394,8 +2395,7 @@ where
             .map_err(TokenError::Client)?;
 
         let transaction = Transaction::new_signed_with_payer(
-            &[instruction_type
-                .encode_verify_proof(Some(context_state_info), proof_data)],
+            &[instruction_type.encode_verify_proof(Some(context_state_info), proof_data)],
             Some(&self.payer.pubkey()),
             &[self.payer.as_ref()],
             blockhash,

token/program-2022-test/tests/confidential_transfer.rs

@@ -1129,8 +1129,8 @@ async fn confidential_transfer_withdraw_with_option(option: ConfidentialTransfer
 //     let account_info = WithdrawAccountInfo::new(extension);
 //
 //     let withdraw_proof = account_info
-//         .generate_proof_data(42, &alice_meta.elgamal_keypair, &alice_meta.aes_key)
-//         .unwrap();
+//         .generate_proof_data(42, &alice_meta.elgamal_keypair,
+// &alice_meta.aes_key)         .unwrap();
 //
 //     let record_account = Keypair::new();
 //     let record_account_authority = Keypair::new();
@@ -3116,10 +3116,11 @@ async fn confidential_transfer_empty_account_with_proof_context() {
 //         let extension = state
 //             .get_extension::<ConfidentialTransferAccount>()
 //             .unwrap();
-//         let current_ciphertext = extension.available_balance.try_into().unwrap();
+//         let current_ciphertext =
+// extension.available_balance.try_into().unwrap();
 //
-//         let proof_data = confidential_transfer::instruction::WithdrawData::new(
-//             0,
+//         let proof_data =
+// confidential_transfer::instruction::WithdrawData::new(             0,
 //             &alice_meta.elgamal_keypair,
 //             42,
 //             &current_ciphertext,
@@ -3137,8 +3138,8 @@ async fn confidential_transfer_empty_account_with_proof_context() {
 //                 space as u64,
 //                 &zk_elgamal_proof_program::id(),
 //             ),
-//             instruction_type.encode_verify_proof(Some(context_state_info), &proof_data),
-//         ];
+//             instruction_type.encode_verify_proof(Some(context_state_info),
+// &proof_data),         ];
 //
 //         let last_blockhash = ctx.get_new_latest_blockhash().await.unwrap();
 //         let tx = Transaction::new_signed_with_payer(
@@ -3168,12 +3169,13 @@ async fn confidential_transfer_empty_account_with_proof_context() {
 //         .unwrap();
 //
 //     // attempt to create an account with a wrong proof type context state
-//     let bob_meta = ConfidentialTokenAccountMeta::new(&token, &bob, None, false, false).await;
-//     let context_state_account = Keypair::new();
+//     let bob_meta = ConfidentialTokenAccountMeta::new(&token, &bob, None,
+// false, false).await;     let context_state_account = Keypair::new();
 //
 //     {
 //         let context_state_authority = Keypair::new();
-//         let space = size_of::<ProofContextState<PubkeyValidityProofContext>>();
+//         let space =
+// size_of::<ProofContextState<PubkeyValidityProofContext>>();
 //
 //         let instruction_type = ProofInstruction::VerifyPubkeyValidity;
 //
@@ -3183,8 +3185,9 @@ async fn confidential_transfer_empty_account_with_proof_context() {
 //         };
 //
 //         let proof_data =
-//             confidential_transfer::instruction::PubkeyValidityData::new(&bob_meta.elgamal_keypair)
-//                 .unwrap();
+//
+// confidential_transfer::instruction::PubkeyValidityData::new(&bob_meta.
+// elgamal_keypair)                 .unwrap();
 //
 //         let mut ctx = context.context.lock().await;
 //         let rent = ctx.banks_client.get_rent().await.unwrap();
@@ -3197,8 +3200,8 @@ async fn confidential_transfer_empty_account_with_proof_context() {
 //                 space as u64,
 //                 &zk_elgamal_proof_program::id(),
 //             ),
-//             instruction_type.encode_verify_proof(Some(context_state_info), &proof_data),
-//         ];
+//             instruction_type.encode_verify_proof(Some(context_state_info),
+// &proof_data),         ];
 //
 //         let last_blockhash = ctx.get_new_latest_blockhash().await.unwrap();
 //         let tx = Transaction::new_signed_with_payer(
@@ -3230,7 +3233,7 @@ async fn confidential_transfer_empty_account_with_proof_context() {
 //     assert_eq!(
 //         err,
 //         TokenClientError::Client(Box::new(TransportError::TransactionError(
-//             TransactionError::InstructionError(0, InstructionError::InvalidArgument,)
-//         )))
+//             TransactionError::InstructionError(0,
+// InstructionError::InvalidArgument,)         )))
 //     );
 // }

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

@@ -270,8 +270,9 @@ impl TransferAccountInfo {
         .map_err(|e| -> TokenError { e.into() })
     }
 
-    /// Create a transfer proof data that is split into equality, ciphertext validity (transfer
-    /// amount), percentage-with-cap, ciphertext validity (fee), and range proofs.
+    /// Create a transfer proof data that is split into equality, ciphertext
+    /// validity (transfer amount), percentage-with-cap, ciphertext validity
+    /// (fee), and range proofs.
     pub fn generate_split_transfer_with_fee_proof_data(
         &self,
         transfer_amount: u64,

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

@@ -1,7 +1,6 @@
 pub use solana_zk_sdk::zk_elgamal_proof_program::{
     instruction::ProofInstruction, proof_data::*, state::ProofContextState,
 };
-
 #[cfg(feature = "serde-traits")]
 use {
     crate::serialization::aeciphertext_fromstr,
@@ -205,13 +204,14 @@ pub enum ConfidentialTransferInstruction {
     /// Withdraw SPL Tokens from the available balance of a confidential token
     /// account.
     ///
-    /// In order for this instruction to be successfully processed, it must be accompanied by the
-    /// following list of `zk_elgamal_proof` program instructions:
+    /// In order for this instruction to be successfully processed, it must be
+    /// accompanied by the following list of `zk_elgamal_proof` program
+    /// instructions:
     /// - `VerifyCiphertextCommitmentEquality`
     /// - `VerifyBatchedRangeProofU64`
-    /// These instructions can be accompanied in the same transaction or can be pre-verified into a
-    /// context state account, in which case, only their context state account address need to be
-    /// provided.
+    /// These instructions can be accompanied in the same transaction or can be
+    /// pre-verified into a context state account, in which case, only their
+    /// context state account address need to be provided.
     ///
     /// Fails if the source or destination accounts are frozen.
     /// Fails if the associated mint is extended as `NonTransferable`.
@@ -221,19 +221,25 @@ pub enum ConfidentialTransferInstruction {
     ///   * Single owner/delegate
     ///   0. `[writable]` The SPL Token account.
     ///   1. `[]` The token mint.
-    ///   2. `[]` (Optional) Instructions sysvar if at least one of the `zk_elgamal_proof`
-    ///      instructions are included in the same transaction.
-    ///   3. `[]` (Optional) Equality proof record account or context state account.
-    ///   4. `[]` (Optional) Range proof record account or context state account.
+    ///   2. `[]` (Optional) Instructions sysvar if at least one of the
+    ///      `zk_elgamal_proof` instructions are included in the same
+    ///      transaction.
+    ///   3. `[]` (Optional) Equality proof record account or context state
+    ///      account.
+    ///   4. `[]` (Optional) Range proof record account or context state
+    ///      account.
     ///   5. `[signer]` The single source account owner.
     ///
     ///   * Multisignature owner/delegate
     ///   0. `[writable]` The SPL Token account.
     ///   1. `[]` The token mint.
-    ///   2. `[]` (Optional) Instructions sysvar if at least one of the `zk_elgamal_proof`
-    ///      instructions are included in the same transaction.
-    ///   3. `[]` (Optional) Equality proof record account or context state account.
-    ///   4. `[]` (Optional) Range proof record account or context state account.
+    ///   2. `[]` (Optional) Instructions sysvar if at least one of the
+    ///      `zk_elgamal_proof` instructions are included in the same
+    ///      transaction.
+    ///   3. `[]` (Optional) Equality proof record account or context state
+    ///      account.
+    ///   4. `[]` (Optional) Range proof record account or context state
+    ///      account.
     ///   5. `[]` The multisig  source account owner.
     ///   6.. `[signer]` Required M signer accounts for the SPL Token Multisig
     /// account.
@@ -549,13 +555,14 @@ pub struct WithdrawInstructionData {
     /// The new decryptable balance if the withdrawal succeeds
     #[cfg_attr(feature = "serde-traits", serde(with = "aeciphertext_fromstr"))]
     pub new_decryptable_available_balance: DecryptableBalance,
-    /// Relative location of the `ProofInstruction::VerifyCiphertextCommitmentEquality` instruction
+    /// Relative location of the
+    /// `ProofInstruction::VerifyCiphertextCommitmentEquality` instruction
     /// to the `Withdraw` instruction in the transaction. If the offset is
     /// `0`, then use a context state account for the proof.
     pub equality_proof_instruction_offset: i8,
-    /// Relative location of the `ProofInstruction::BatchedRangeProofU64` instruction
-    /// to the `Withdraw` instruction in the transaction. If the offset is
-    /// `0`, then use a context state account for the proof.
+    /// Relative location of the `ProofInstruction::BatchedRangeProofU64`
+    /// instruction to the `Withdraw` instruction in the transaction. If the
+    /// offset is `0`, then use a context state account for the proof.
     pub range_proof_instruction_offset: i8,
 }
 

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

@@ -15,8 +15,8 @@ use {
     std::slice::Iter,
 };
 
-/// Verify zero-knowledge proofs needed for a [Withdraw] instruction and return the corresponding
-/// proof context.
+/// Verify zero-knowledge proofs needed for a [Withdraw] instruction and return
+/// the corresponding proof context.
 #[cfg(feature = "zk-ops")]
 pub fn verify_withdraw_proof(
     account_info_iter: &mut Iter<AccountInfo>,

token/program-2022/src/proof.rs

@@ -134,8 +134,8 @@ pub fn verify_and_extract_context<'a, T: Pod + ZkProofData<U>, U: Pod>(
     }
 }
 
-/// Converts a zk proof type to a corresponding ZK ElGamal proof program instruction that verifies
-/// the proof.
+/// Converts a zk proof type to a corresponding ZK ElGamal proof program
+/// instruction that verifies the proof.
 pub fn zk_proof_type_to_instruction(
     proof_type: ProofType,
 ) -> Result<ProofInstruction, ProgramError> {