Aggregate and verify changes

consensus/consensus-types/src/proof_of_store.rs

@@ -6,8 +6,7 @@ use anyhow::{bail, ensure, Context};
 use aptos_crypto::{bls12381, CryptoMaterialError, HashValue};
 use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher};
 use aptos_types::{
-    aggregate_signature::AggregateSignature, validator_signer::ValidatorSigner,
-    validator_verifier::ValidatorVerifier, PeerId,
+    aggregate_signature::AggregateSignature, ledger_info::SignatureWithStatus, validator_signer::ValidatorSigner, validator_verifier::ValidatorVerifier, PeerId
 };
 use mini_moka::sync::Cache;
 use rand::{seq::SliceRandom, thread_rng};
@@ -217,7 +216,7 @@ impl SignedBatchInfoMsg {
 pub struct SignedBatchInfo {
     info: BatchInfo,
     signer: PeerId,
-    signature: bls12381::Signature,
+    signature: SignatureWithStatus,
 }
 
 impl SignedBatchInfo {
@@ -230,7 +229,7 @@ impl SignedBatchInfo {
         Ok(Self {
             info: batch_info,
             signer: validator_signer.author(),
-            signature,
+            signature: SignatureWithStatus::from(signature),
         })
     }
 
@@ -239,7 +238,7 @@ impl SignedBatchInfo {
         Self {
             info: batch_info,
             signer,
-            signature: bls12381::Signature::dummy_signature(),
+            signature: SignatureWithStatus::from(bls12381::Signature::dummy_signature()),
         }
     }
 
@@ -269,10 +268,14 @@ impl SignedBatchInfo {
             );
         }
 
-        Ok(validator.verify(self.signer, &self.info, &self.signature)?)
+        Ok(validator.optimistic_verify(self.signer, &self.info, &self.signature)?)
     }
 
     pub fn signature(&self) -> &bls12381::Signature {
+        self.signature.signature()
+    }
+
+    pub fn signature_with_status(&self) -> &SignatureWithStatus {
         &self.signature
     }
 
@@ -300,7 +303,6 @@ pub enum SignedBatchInfoError {
     NoTimeStamps,
     UnableToAggregate,
     LowVotingPower,
-    InvalidAggregatedSignature,
 }
 
 #[derive(Deserialize, Serialize, Clone, Debug, PartialEq, Eq)]