fix(network): seed fork filter from DB head and update on each canonical block

src/node/network/block_import/service.rs

@@ -35,6 +35,7 @@ use reth_payload_builder_primitives::Events;
 use reth_payload_primitives::{BuiltPayload, EngineApiMessageVersion, PayloadTypes};
 use reth_primitives::NodePrimitives;
 use reth_primitives_traits::{AlloyBlockHeader, Block};
+use reth_chainspec::Head;
 use reth_provider::{BlockHashReader, BlockNumReader, BlockReaderIdExt, HeaderProvider};
 use std::{
     future::Future,
@@ -221,6 +222,20 @@ where
                             tracing::warn!(target: "bsc::block_import", "Failed to update fork choice: {}", e);
                         } else {
                             tracing::debug!(target: "bsc::block_import", "Succeed to update fork choice for new payload: number = {:?}, hash = {:?}", header.number, block_hash);
+                            if let Some(net) = crate::shared::get_network_handle() {
+                                let td = forkchoice_engine.provider
+                                    .header_td_by_number(header.number)
+                                    .ok()
+                                    .flatten()
+                                    .unwrap_or_default();
+                                net.update_status(Head {
+                                    number: header.number,
+                                    hash: block_hash,
+                                    timestamp: header.timestamp,
+                                    difficulty: header.difficulty,
+                                    total_difficulty: td,
+                                });
+                            }
                         }
                         Outcome { peer: peer_id, result: Ok(BlockValidation::ValidBlock { block }) }
                             .into()
@@ -435,6 +450,20 @@ where
                         block_hash = %block_hash,
                         "Succeeded to update fork choice for mined block"
                     );
+                    if let Some(net) = crate::shared::get_network_handle() {
+                        let td = forkchoice_engine.provider
+                            .header_td_by_number(header_for_fcu.number)
+                            .ok()
+                            .flatten()
+                            .unwrap_or_default();
+                        net.update_status(Head {
+                            number: header_for_fcu.number,
+                            hash: block_hash,
+                            timestamp: header_for_fcu.timestamp,
+                            difficulty: header_for_fcu.difficulty,
+                            total_difficulty: td,
+                        });
+                    }
                 }
             });
         }

src/node/network/mod.rs

@@ -310,10 +310,9 @@ impl BscNetworkBuilder {
             .unwrap();
         });
 
-        // TODO: update network with the latest canonical head, but has a fork id issue, can fix it later.
         let mut network_builder = network_builder
             .boot_nodes(ctx.chain_spec().bootnodes().unwrap_or_default())
-            .set_head(ctx.chain_spec().head())
+            .set_head(ctx.head())
             .with_pow()
             .block_import(Box::new(BscBlockImport::new(handle)))
             .eth_rlpx_handshake(Arc::new(BscHandshake::default()))
@@ -332,8 +331,6 @@ impl BscNetworkBuilder {
             &mut network_config.discovery_v4_config,
             ctx.chain_spec().bootnodes(),
         );
-        network_config.status.forkid = network_config.fork_filter.current();
-
         // Initialize BSC protocol registry with proxied peers from config
         // This mirrors the same functionality in the main peer manager
         let proxied_node_ids = network_config.peers_config.proxied_node_ids.clone();