add use selec_head to update startinfo and add some testing case

Cargo.toml

@@ -246,7 +246,7 @@ api-limiter = { path = "commons/api-limiter" }
 arc-swap = "1.5.1"
 arrayref = "0.3"
 ascii = "1.0.0"
-async-std = "1.12"
+async-std = { version = "1.12", features = ["attributes", "tokio1"] }
 async-trait = "0.1.53"
 asynchronous-codec = "0.5"
 atomic-counter = "1.0.1"
@@ -257,6 +257,9 @@ bcs-ext = { path = "commons/bcs_ext" }
 bech32 = "0.9"
 bencher = "0.1.5"
 bitflags = "1.3.2"
+faster-hex = "0.6"
+indexmap = "1.9.1"
+bincode = { version = "1", default-features = false }
 bs58 = "0.3.1"
 byteorder = "1.3.4"
 bytes = "1"

benchmarks/src/chain.rs

@@ -71,7 +71,7 @@ impl ChainBencher {
             let block = ConsensusStrategy::Dummy
                 .create_block(block_template, self.net.time_service().as_ref())
                 .unwrap();
-            self.chain.write().apply(block).unwrap();
+            self.chain.write().apply(block, None, &mut None).unwrap();
         }
     }
 

block-relayer/src/block_relayer.rs

@@ -78,14 +78,18 @@ impl BlockRelayer {
         &self,
         network: NetworkServiceRef,
         executed_block: Arc<ExecutedBlock>,
+        tips_header: Option<Vec<HashValue>>,
     ) {
         if !self.is_nearly_synced() {
             debug!("[block-relay] Ignore NewHeadBlock event because the node has not been synchronized yet.");
             return;
         }
         let compact_block = executed_block.block().clone().into();
-        let compact_block_msg =
-            CompactBlockMessage::new(compact_block, executed_block.block_info.clone());
+        let compact_block_msg = CompactBlockMessage::new(
+            compact_block,
+            executed_block.block_info.clone(),
+            tips_header,
+        );
         network.broadcast(NotificationMessage::CompactBlock(Box::new(
             compact_block_msg,
         )));
@@ -203,7 +207,9 @@ impl BlockRelayer {
         ctx: &mut ServiceContext<BlockRelayer>,
     ) -> Result<()> {
         let network = ctx.get_shared::<NetworkServiceRef>()?;
-        let block_connector_service = ctx.service_ref::<BlockConnectorService>()?.clone();
+        let block_connector_service = ctx
+            .service_ref::<BlockConnectorService<TxPoolService>>()?
+            .clone();
         let txpool = self.txpool.clone();
         let metrics = self.metrics.clone();
         let fut = async move {
@@ -238,7 +244,11 @@ impl BlockRelayer {
                 )
                 .await?;
 
-                block_connector_service.notify(PeerNewBlock::new(peer_id, block))?;
+                block_connector_service.notify(PeerNewBlock::new(
+                    peer_id,
+                    block,
+                    compact_block_msg.message.tips_header,
+                ))?;
             }
             Ok(())
         };
@@ -286,7 +296,7 @@ impl EventHandler<Self, NewHeadBlock> for BlockRelayer {
                 return;
             }
         };
-        self.broadcast_compact_block(network, event.0);
+        self.broadcast_compact_block(network, event.0, event.1);
     }
 }
 
@@ -303,7 +313,7 @@ impl EventHandler<Self, NewBranch> for BlockRelayer {
                 return;
             }
         };
-        self.broadcast_compact_block(network, event.0);
+        self.broadcast_compact_block(network, event.0, event.1);
     }
 }