Use Signers to create range proofs

solana-labs · Oct 26, 2023 · eb7ef58 · eb7ef58
1 parent b8e7831
commit eb7ef58
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 33 deletions.
diff --git a/token/client/src/token.rs b/token/client/src/token.rs
@@ -2379,14 +2379,16 @@ where
                 &equality_and_ciphertext_signers,
             );
 
+        let mut range_proof_signers = vec![source_authority_keypair, range_proof_account_keypair];
+        if let Some(context_state_authority_keypair) = &context_state_authority_keypair {
+            range_proof_signers.push(context_state_authority_keypair);
+        }
         let transfer_with_range_proof = self
             .create_range_proof_context_state_for_transfer_parallel(
                 context_state_accounts,
                 &range_proof_data,
                 &transfer_instruction,
-                Some(source_authority_keypair),
-                range_proof_account_keypair,
-                context_state_authority_keypair,
+                &range_proof_signers,
             );
 
         try_join!(
@@ -2516,64 +2518,46 @@ where
     }
 
     /// Create a range proof context state account for a confidential transfer.
-    pub async fn create_range_proof_context_state_for_transfer<S: Signer>(
+    pub async fn create_range_proof_context_state_for_transfer<S: Signers>(
         &self,
         context_state_accounts: TransferSplitContextStateAccounts<'_>,
         range_proof_data: &BatchedRangeProofU128Data,
-        source_authority_keypair: Option<&S>,
-        range_proof_account_keypair: &S,
-        context_state_authority_keypair: Option<&S>,
+        signing_keypairs: &S,
     ) -> TokenResult<T::Output> {
         self.create_range_proof_context_state_with_optional_transfer(
             context_state_accounts,
             range_proof_data,
             None,
-            source_authority_keypair,
-            range_proof_account_keypair,
-            context_state_authority_keypair,
+            signing_keypairs,
         )
         .await
     }
 
     /// Create a range proof context state account with a confidential transfer instruction.
-    pub async fn create_range_proof_context_state_for_transfer_parallel<S: Signer>(
+    pub async fn create_range_proof_context_state_for_transfer_parallel<S: Signers>(
         &self,
         context_state_accounts: TransferSplitContextStateAccounts<'_>,
         range_proof_data: &BatchedRangeProofU128Data,
         transfer_instruction: &Instruction,
-        source_authority_keypair: Option<&S>,
-        range_proof_account_keypair: &S,
-        context_state_authority_keypair: Option<&S>,
+        signing_keypairs: &S,
     ) -> TokenResult<T::Output> {
         self.create_range_proof_context_state_with_optional_transfer(
             context_state_accounts,
             range_proof_data,
             Some(transfer_instruction),
-            source_authority_keypair,
-            range_proof_account_keypair,
-            context_state_authority_keypair,
+            signing_keypairs,
         )
         .await
     }
 
     /// Create a range proof context state account and an optional confidential transfer instruction.
-    async fn create_range_proof_context_state_with_optional_transfer<S: Signer>(
+    async fn create_range_proof_context_state_with_optional_transfer<S: Signers>(
         &self,
         context_state_accounts: TransferSplitContextStateAccounts<'_>,
         range_proof_data: &BatchedRangeProofU128Data,
         transfer_instruction: Option<&Instruction>,
-        source_authority_keypair: Option<&S>,
-        range_proof_account_keypair: &S,
-        context_state_authority_keypair: Option<&S>,
+        signing_keypairs: &S,
     ) -> TokenResult<T::Output> {
-        let mut signers = vec![range_proof_account_keypair];
-        if let Some(source_authority_keypair) = source_authority_keypair {
-            signers.push(source_authority_keypair);
-        }
-        if let Some(context_state_authority_keypair) = context_state_authority_keypair {
-            signers.push(context_state_authority_keypair);
-        }
-
         let instruction_type = ProofInstruction::VerifyBatchedRangeProofU128;
         let space = size_of::<ProofContextState<BatchedRangeProofContext>>();
         let rent = self
@@ -2602,7 +2586,7 @@ where
             instructions.push(transfer_instruction.clone());
         }
 
-        self.process_ixs(&instructions, &signers).await
+        self.process_ixs(&instructions, signing_keypairs).await
     }
 
     /// Close a ZK Token proof program context state

diff --git a/token/program-2022-test/tests/confidential_transfer.rs b/token/program-2022-test/tests/confidential_transfer.rs
@@ -2475,9 +2475,7 @@ async fn confidential_transfer_transfer_with_split_proof_context() {
         .create_range_proof_context_state_for_transfer(
             transfer_context_state_accounts,
             &range_proof_data,
-            None,
-            &range_proof_context_state_account,
-            None,
+            &[&range_proof_context_state_account],
         )
         .await
         .unwrap();