remove single signature basic verify

Author: curiecrypt

mithril-stm/src/proof_system/concatenation.rs

@@ -44,10 +44,8 @@ impl<D: Clone + Digest + FixedOutput + Send + Sync> ConcatenationProof<D> {
             })
             .collect::<Vec<SingleSignatureWithRegisteredParty>>();
 
-        let avk = AggregateVerificationKey::from(&clerk.closed_reg);
-        let msgp = avk.get_merkle_tree_batch_commitment().concatenate_with_message(msg);
         let mut unique_sigs = clerk
-            .select_valid_signatures_for_k_indices(&msgp, &sig_reg_list)
+            .select_valid_signatures_for_k_indices(msg, &sig_reg_list)
             .with_context(
                 || "Failed to aggregate unique signatures during selection for the k indices.",
             )?;

mithril-stm/src/protocol/aggregate_signature/clerk.rs

@@ -163,15 +163,17 @@ impl<D: Digest + Clone + FixedOutput + Send + Sync> Clerk<D> {
         let mut removal_idx_by_vk: HashMap<&SingleSignatureWithRegisteredParty, Vec<Index>> =
             HashMap::new();
 
+        let avk = self.compute_aggregate_verification_key();
+
         for sig_reg in sigs.iter() {
             if sig_reg
                 .sig
-                .basic_verify(
+                .verify(
                     &self.params,
                     &sig_reg.reg_party.0,
                     &sig_reg.reg_party.1,
+                    &avk,
                     msg,
-                    &self.closed_reg.total_stake,
                 )
                 .is_err()
             {

mithril-stm/src/protocol/aggregate_signature/mod.rs

@@ -218,9 +218,8 @@ mod tests {
             })
             .collect::<Vec<SingleSignatureWithRegisteredParty>>();
 
-            let msgp = avk.get_merkle_tree_batch_commitment().concatenate_with_message(&msg);
             let dedup_result = clerk.select_valid_signatures_for_k_indices(
-                &msgp,
+                &msg,
                 &sig_reg_list,
             );
             assert!(dedup_result.is_ok(), "dedup failure {dedup_result:?}");

mithril-stm/src/protocol/single_signature/signature.rs

@@ -145,38 +145,6 @@ impl SingleSignature {
     pub fn cmp_stm_sig(&self, other: &Self) -> Ordering {
         Self::compare_signer_index(self, other)
     }
-
-    /// Verify a basic signature by checking that the lottery was won,
-    /// the indexes are in the desired range and the underlying multi signature validates.
-    pub(crate) fn basic_verify(
-        &self,
-        params: &Parameters,
-        pk: &VerificationKey,
-        stake: &Stake,
-        msg: &[u8],
-        total_stake: &Stake,
-    ) -> StmResult<()> {
-        self.sigma
-            .verify(msg, pk)
-            .with_context(|| "Basic verification of single signature failed.")?;
-        self.check_indices(params, stake, msg, total_stake)
-            .with_context(|| "Basic verification of single signature failed.")?;
-
-        Ok(())
-    }
-
-    /// Will be deprecated. Use `basic_verify` instead.
-    #[deprecated(since = "0.5.0", note = "Use `basic_verify` instead")]
-    pub fn core_verify(
-        &self,
-        params: &Parameters,
-        pk: &VerificationKey,
-        stake: &Stake,
-        msg: &[u8],
-        total_stake: &Stake,
-    ) -> StmResult<()> {
-        Self::basic_verify(self, params, pk, stake, msg, total_stake)
-    }
 }
 
 impl Hash for SingleSignature {