Download range of headers during syncing

CHANGELOG.md

@@ -19,6 +19,7 @@ Description of the upcoming release here.
 - [#1302](https://github.com/FuelLabs/fuel-core/pull/1302): Removed the usage of flake and building of the bridge contract ABI.
     It simplifies the maintenance and updating of the events, requiring only putting the event definition into the codebase of the relayer.
 - [#1293](https://github.com/FuelLabs/fuel-core/issues/1293): Parallelized the `estimate_predicates` endpoint to utilize all available threads.
+- [#1270](https://github.com/FuelLabs/fuel-core/pull/1270): Modify the way block headers are retrieved from peers to be done in batches.
 
 #### Breaking
 - [#1279](https://github.com/FuelLabs/fuel-core/pull/1279): Added a new CLI flag to enable the Relayer service `--enable-relayer`, and disabled the Relayer service by default. When supplying the `--enable-relayer` flag, the `--relayer` argument becomes mandatory, and omitting it is an error. Similarly, providing a `--relayer` argument without the `--enable-relayer` flag is an error. Lastly, providing the `--keypair` or `--network` arguments will also produce an error if the `--enable-p2p` flag is not set.

bin/fuel-core/src/cli/run/p2p.rs

@@ -68,6 +68,10 @@ pub struct P2PArgs {
     #[clap(long = "max-block-size", default_value = MAX_RESPONSE_SIZE_STR, env)]
     pub max_block_size: usize,
 
+    /// Max number of headers in a single headers request response
+    #[clap(long = "max-headers-per-request", default_value = "100", env)]
+    pub max_headers_per_request: u32,
+
     /// Addresses of the bootstrap nodes
     /// They should contain PeerId within their `Multiaddr`
     #[clap(long = "bootstrap-nodes", value_delimiter = ',', env)]
@@ -175,12 +179,15 @@ pub struct P2PArgs {
 
 #[derive(Debug, Clone, Args)]
 pub struct SyncArgs {
-    /// The maximum number of get header requests to make in a single batch.
-    #[clap(long = "sync-max-get-header", default_value = "10", env)]
-    pub max_get_header_requests: usize,
     /// The maximum number of get transaction requests to make in a single batch.
     #[clap(long = "sync-max-get-txns", default_value = "10", env)]
     pub max_get_txns_requests: usize,
+    /// The maximum number of headers to request in a single batch.
+    #[clap(long = "sync-header-batch-size", default_value = "10", env)]
+    pub header_batch_size: u32,
+    /// The maximum number of header batch requests to have active at one time.
+    #[clap(long = "sync-max-header-batch-requests", default_value = "10", env)]
+    pub max_header_batch_requests: usize,
 }
 
 #[derive(Clone, Debug)]
@@ -211,8 +218,9 @@ impl KeypairArg {
 impl From<SyncArgs> for fuel_core::sync::Config {
     fn from(value: SyncArgs) -> Self {
         Self {
-            max_get_header_requests: value.max_get_header_requests,
             max_get_txns_requests: value.max_get_txns_requests,
+            header_batch_size: value.header_batch_size,
+            max_header_batch_requests: value.max_header_batch_requests,
         }
     }
 }
@@ -282,6 +290,7 @@ impl P2PArgs {
             public_address: self.public_address,
             tcp_port: self.peering_port,
             max_block_size: self.max_block_size,
+            max_headers_per_request: self.max_headers_per_request,
             bootstrap_nodes: self.bootstrap_nodes,
             reserved_nodes: self.reserved_nodes,
             reserved_nodes_only_mode: self.reserved_nodes_only_mode,

crates/fuel-core/src/database/sealed_block.rs

@@ -26,6 +26,7 @@ use fuel_core_types::{
     fuel_tx::Transaction,
     fuel_types::BlockHeight,
 };
+use std::ops::Range;
 
 impl DatabaseColumn for SealedBlockConsensus {
     fn column() -> Column {
@@ -93,6 +94,20 @@ impl Database {
         self.get_sealed_block_header(&block_id)
     }
 
+    pub fn get_sealed_block_headers(
+        &self,
+        block_height_range: Range<u32>,
+    ) -> StorageResult<Vec<SealedBlockHeader>> {
+        let headers = block_height_range
+            .map(BlockHeight::from)
+            .map(|height| self.get_sealed_block_header_by_height(&height))
+            .collect::<StorageResult<Vec<_>>>()?
+            .into_iter()
+            .flatten()
+            .collect();
+        Ok(headers)
+    }
+
     pub fn get_sealed_block_header(
         &self,
         block_id: &BlockId,

crates/fuel-core/src/service/adapters/p2p.rs

@@ -15,6 +15,7 @@ use fuel_core_types::{
     fuel_tx::Transaction,
     fuel_types::BlockHeight,
 };
+use std::ops::Range;
 
 impl P2pDb for Database {
     fn get_sealed_block(
@@ -31,6 +32,13 @@ impl P2pDb for Database {
         self.get_sealed_block_header_by_height(height)
     }
 
+    fn get_sealed_headers(
+        &self,
+        block_height_range: Range<u32>,
+    ) -> StorageResult<Vec<SealedBlockHeader>> {
+        self.get_sealed_block_headers(block_height_range)
+    }
+
     fn get_transactions(
         &self,
         block_id: &BlockId,

crates/fuel-core/src/service/adapters/sync.rs

@@ -20,8 +20,12 @@ use fuel_core_types::{
     },
     fuel_tx::Transaction,
     fuel_types::BlockHeight,
-    services::p2p::SourcePeer,
+    services::p2p::{
+        PeerId,
+        SourcePeer,
+    },
 };
+use std::ops::Range;
 
 #[async_trait::async_trait]
 impl PeerToPeerPort for P2PAdapter {
@@ -39,20 +43,27 @@ impl PeerToPeerPort for P2PAdapter {
         }
     }
 
-    async fn get_sealed_block_header(
+    async fn get_sealed_block_headers(
         &self,
-        height: BlockHeight,
-    ) -> anyhow::Result<Option<SourcePeer<SealedBlockHeader>>> {
+        block_range_height: Range<u32>,
+    ) -> anyhow::Result<Vec<SourcePeer<SealedBlockHeader>>> {
         if let Some(service) = &self.service {
             Ok(service
-                .get_sealed_block_header(height)
+                .get_sealed_block_headers(block_range_height)
                 .await?
-                .map(|(peer_id, header)| SourcePeer {
-                    peer_id: peer_id.into(),
-                    data: header,
-                }))
+                .map(|(peer_id, headers)| {
+                    let peer_id: PeerId = peer_id.into();
+                    headers
+                        .into_iter()
+                        .map(|header| SourcePeer {
+                            peer_id: peer_id.clone(),
+                            data: header,
+                        })
+                        .collect()
+                })
+                .unwrap_or(Vec::new()))
         } else {
-            Ok(None)
+            Ok(Vec::new())
         }
     }