fixing wrapper continues

Author: VorobyevIlya

crates/starfish/core/src/authority_service.rs

@@ -316,8 +316,11 @@ impl<C: CoreThreadDispatcher> NetworkService for AuthorityService<C> {
             .into_iter()
             .chain(ancestor_blocks)
             .flatten()
-            .map(|block| SerializedBlock::from(block))
-            .collect::<Vec<_>>();
+            .map(|block| {
+                let (serialized_block_header, serialized_transactions) = block.serialized();
+                (serialized_block_header.clone(), serialized_transactions.clone())
+            })
+            .unzip();
 
         Ok(result)
     }
@@ -326,7 +329,7 @@ impl<C: CoreThreadDispatcher> NetworkService for AuthorityService<C> {
         &self,
         _peer: AuthorityIndex,
         commit_range: CommitRange,
-    ) -> ConsensusResult<(Vec<TrustedCommit>, Vec<VerifiedBlockHeader>)> {
+    ) -> ConsensusResult<(Vec<TrustedCommit>, Vec<VerifiedBlock>)> {
         fail_point_async!("consensus-rpc-response");
 
         // Compute an inclusive end index and bound the maximum number of commits
@@ -366,7 +369,7 @@ impl<C: CoreThreadDispatcher> NetworkService for AuthorityService<C> {
         }
         let certifier_blocks = self
             .store
-            .read_block_headers(&certifier_block_refs)?
+            .read_blocks(&certifier_block_refs)?
             .into_iter()
             .flatten()
             .collect();

crates/starfish/core/src/commit_syncer.rs

@@ -631,7 +631,7 @@ impl<C: NetworkClient> CommitSyncer<C> {
         let mut fetched_blocks = BTreeMap::new();
         while let Some(result) = requests.next().await {
             for block in result? {
-                fetched_blocks.insert(block.reference(), block);
+                fetched_blocks.insert(block.reference(), block.verified_block_header);
             }
         }
 

crates/starfish/core/src/network/mod.rs

@@ -31,6 +31,7 @@ use serde::{Deserialize, Serialize};
 use starfish_config::{AuthorityIndex, NetworkKeyPair};
 
 use crate::{Round, VerifiedBlockHeader, block_header::{BlockRef, VerifiedBlock}, commit::{CommitRange, TrustedCommit}, context::Context, error::ConsensusResult};
+use crate::block_header::VerifiedTransactions;
 
 // Tonic generated RPC stubs.
 mod tonic_gen {
@@ -149,7 +150,7 @@ pub(crate) trait NetworkService: Send + Sync + 'static {
         &self,
         peer: AuthorityIndex,
         commit_range: CommitRange,
-    ) -> ConsensusResult<(Vec<TrustedCommit>, Vec<VerifiedBlockHeader>)>;
+    ) -> ConsensusResult<(Vec<TrustedCommit>, Vec<VerifiedBlock>)>;
 
     /// Handles the request to fetch the latest block for the provided
     /// `authorities`.

crates/starfish/core/src/network/tonic_network.rs

@@ -543,7 +543,7 @@ impl<S: NetworkService> ConsensusService for TonicServiceProxy<S> {
             return Err(tonic::Status::internal("PeerInfo not found"));
         };
         let request = request.into_inner();
-        let (commits, certifier_block_headers) = self
+        let (commits, certifier_blocks) = self
             .service
             .handle_fetch_commits(peer_index, (request.start..=request.end).into())
             .await
@@ -552,13 +552,19 @@ impl<S: NetworkService> ConsensusService for TonicServiceProxy<S> {
             .into_iter()
             .map(|c| c.serialized().clone())
             .collect();
-        let certifier_block_headers = certifier_block_headers
+        let mut certifier_block_headers = vec![];
+        let mut certifier_block_transactions = vec![];
+        certifier_blocks
             .into_iter()
-            .map(|b| b.serialized().clone())
-            .collect();
+            .map(|b| {
+                let (certifier_block_header, certifier_block_transaction) = b.serialized();
+                certifier_block_headers.push(certifier_block_header.clone());
+                certifier_block_transactions.push(certifier_block_transaction.clone());
+            });
         Ok(Response::new(FetchCommitsResponse {
             commits,
             certifier_block_headers,
+            certifier_block_transactions,
         }))
     }
 
@@ -1061,6 +1067,9 @@ pub(crate) struct FetchCommitsResponse {
     // Serialized SignedBlockHeader that certify the last commit from above.
     #[prost(bytes = "bytes", repeated, tag = "2")]
     certifier_block_headers: Vec<Bytes>,
+    #[prost(bytes = "bytes", repeated, tag = "3")]
+    certifier_block_transactions: Vec<Bytes>,
+
 }
 
 #[derive(Clone, prost::Message)]