[qs] introduce BatchInfoExt for Proofs and Signed infos

Author: ibalajiarun

consensus/consensus-types/src/common.rs

@@ -4,7 +4,7 @@
 
 use crate::{
     payload::{OptBatches, OptQuorumStorePayload, PayloadExecutionLimit, TxnAndGasLimits},
-    proof_of_store::{BatchInfo, ProofCache, ProofOfStore},
+    proof_of_store::{BatchInfo, BatchInfoExt, ProofCache, ProofOfStore, TBatchInfo},
 };
 use anyhow::ensure;
 use aptos_crypto::{
@@ -518,13 +518,13 @@ impl Payload {
     fn verify_with_cache(
         proofs: &[ProofOfStore<BatchInfo>],
         validator: &ValidatorVerifier,
-        proof_cache: &ProofCache<BatchInfo>,
+        proof_cache: &ProofCache,
     ) -> anyhow::Result<()> {
         let unverified: Vec<_> = proofs
             .iter()
             .filter(|proof| {
                 proof_cache
-                    .get(proof.info())
+                    .get(&BatchInfoExt::from(proof.info().clone()))
                     .is_none_or(|cached_proof| cached_proof != *proof.multi_signature())
             })
             .collect();
@@ -571,7 +571,7 @@ impl Payload {
     pub fn verify(
         &self,
         verifier: &ValidatorVerifier,
-        proof_cache: &ProofCache<BatchInfo>,
+        proof_cache: &ProofCache,
         quorum_store_enabled: bool,
     ) -> anyhow::Result<()> {
         match (quorum_store_enabled, self) {
@@ -741,7 +741,7 @@ impl BatchPayload {
 #[derive(Deserialize, Serialize, Clone, Debug, PartialEq, Eq)]
 pub enum PayloadFilter {
     DirectMempool(Vec<TransactionSummary>),
-    InQuorumStore(HashSet<BatchInfo>),
+    InQuorumStore(HashSet<BatchInfoExt>),
     Empty,
 }
 
@@ -772,35 +772,35 @@ impl From<&Vec<&Payload>> for PayloadFilter {
                 match payload {
                     Payload::InQuorumStore(proof_with_status) => {
                         for proof in &proof_with_status.proofs {
-                            exclude_batches.insert(proof.info().clone());
+                            exclude_batches.insert(proof.info().clone().into());
                         }
                     },
                     Payload::InQuorumStoreWithLimit(proof_with_status) => {
                         for proof in &proof_with_status.proof_with_data.proofs {
-                            exclude_batches.insert(proof.info().clone());
+                            exclude_batches.insert(proof.info().clone().into());
                         }
                     },
                     Payload::QuorumStoreInlineHybrid(inline_batches, proof_with_data, _)
                     | Payload::QuorumStoreInlineHybridV2(inline_batches, proof_with_data, _) => {
                         for proof in &proof_with_data.proofs {
-                            exclude_batches.insert(proof.info().clone());
+                            exclude_batches.insert(proof.info().clone().into());
                         }
                         for (batch_info, _) in inline_batches {
-                            exclude_batches.insert(batch_info.clone());
+                            exclude_batches.insert(batch_info.clone().into());
                         }
                     },
                     Payload::DirectMempool(_) => {
                         error!("DirectMempool payload in InQuorumStore filter");
                     },
                     Payload::OptQuorumStore(opt_qs_payload) => {
                         for batch in opt_qs_payload.inline_batches().iter() {
-                            exclude_batches.insert(batch.info().clone());
+                            exclude_batches.insert(batch.info().clone().into());
                         }
                         for batch_info in &opt_qs_payload.opt_batches().batch_summary {
-                            exclude_batches.insert(batch_info.clone());
+                            exclude_batches.insert(batch_info.clone().into());
                         }
                         for proof in &opt_qs_payload.proof_with_data().batch_summary {
-                            exclude_batches.insert(proof.info().clone());
+                            exclude_batches.insert(proof.info().clone().into());
                         }
                     },
                 }

consensus/consensus-types/src/opt_proposal_msg.rs

@@ -101,7 +101,7 @@ impl OptProposalMsg {
         &self,
         sender: Author,
         validator: &ValidatorVerifier,
-        proof_cache: &ProofCache<BatchInfo>,
+        proof_cache: &ProofCache,
         quorum_store_enabled: bool,
     ) -> Result<()> {
         ensure!(

consensus/consensus-types/src/payload.rs

@@ -1,7 +1,7 @@
 // Copyright (c) Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::proof_of_store::{BatchInfo, ProofOfStore};
+use crate::proof_of_store::{BatchInfo, BatchInfoExt, ProofOfStore};
 use anyhow::ensure;
 use aptos_types::{transaction::SignedTransaction, PeerId};
 use core::fmt;
@@ -15,6 +15,10 @@ pub type OptBatches = BatchPointer<BatchInfo>;
 
 pub type ProofBatches = BatchPointer<ProofOfStore<BatchInfo>>;
 
+pub type OptBatchesExt = BatchPointer<BatchInfoExt>;
+
+pub type ProofBatchesExt = BatchPointer<BatchInfoExt>;
+
 pub trait TDataInfo {
     fn num_txns(&self) -> u64;
 
@@ -290,7 +294,7 @@ pub struct OptQuorumStorePayloadV1 {
 }
 
 impl OptQuorumStorePayloadV1 {
-    pub fn get_all_batch_infos(self) -> Vec<BatchInfo> {
+    pub fn get_all_batch_infos(self) -> Vec<BatchInfoExt> {
         let Self {
             inline_batches,
             opt_batches,
@@ -303,6 +307,7 @@ impl OptQuorumStorePayloadV1 {
             .map(|batch| batch.batch_info)
             .chain(opt_batches)
             .chain(proofs.into_iter().map(|proof| proof.info().clone()))
+            .map(|info| info.into())
             .collect()
     }