debug updating forkid in disc server

Author: lakshya-sky

crates/networking/p2p/discv4/server.rs

@@ -15,7 +15,7 @@ use crate::{
 };
 use bytes::BytesMut;
 use ethrex_common::{H256, H512};
-use ethrex_storage::Store;
+use ethrex_storage::{Store, error::StoreError};
 use futures::StreamExt;
 use rand::rngs::OsRng;
 use secp256k1::SecretKey;
@@ -44,6 +44,7 @@ pub const INITIAL_LOOKUP_INTERVAL: Duration = Duration::from_millis(100); // 10
 pub const LOOKUP_INTERVAL: Duration = Duration::from_millis(600); // 100 per minute
 const CHANGE_FIND_NODE_MESSAGE_INTERVAL: Duration = Duration::from_secs(5);
 const PRUNE_INTERVAL: Duration = Duration::from_secs(5);
+const UPDATE_FORKID_INTERVAL: Duration = Duration::from_secs(5);
 
 #[derive(Debug, thiserror::Error)]
 pub enum DiscoveryServerError {
@@ -59,6 +60,8 @@ pub enum DiscoveryServerError {
     InvalidContact,
     #[error(transparent)]
     PeerTable(#[from] PeerTableError),
+    #[error(transparent)]
+    Store(#[from] StoreError),
 }
 
 #[derive(Debug, Clone)]
@@ -69,6 +72,7 @@ pub enum InMessage {
     EnrLookup,
     Prune,
     ChangeFindNodeMessage,
+    UpdateForkId,
     Shutdown,
 }
 
@@ -79,6 +83,7 @@ pub enum OutMessage {
 
 #[derive(Debug)]
 pub struct DiscoveryServer {
+    storage: Store,
     local_node: Node,
     local_node_record: NodeRecord,
     signer: SecretKey,
@@ -103,12 +108,14 @@ impl DiscoveryServer {
         let mut local_node_record = NodeRecord::from_node(&local_node, 1, &signer)
             .expect("Failed to create local node record");
         if let Ok(fork_id) = storage.get_fork_id().await {
+            trace!(fork_id=?fork_id, "Creating Initial ForkId");
             local_node_record
                 .set_fork_id(fork_id, &signer)
                 .expect("Failed to set fork_id on local node record");
         }
 
         let mut discovery_server = Self {
+            storage,
             local_node: local_node.clone(),
             local_node_record,
             signer,
@@ -508,6 +515,28 @@ impl DiscoveryServer {
         Ok(())
     }
 
+    async fn update_forkid(&mut self) -> Result<(), DiscoveryServerError> {
+        let latest_block_number = self.storage.get_latest_block_number().await?;
+        let block_header = self
+            .storage
+            .get_block_header(latest_block_number)?
+            .ok_or(StoreError::MissingLatestBlockNumber)?;
+
+        let mut pairs = self.local_node_record.decode_pairs();
+
+        trace!(fork_id=?&pairs.eth, latest_block_number=latest_block_number, latest_block_timestamp=block_header.timestamp, "Updating ForkId");
+
+        if let Some(fork_id) = pairs.eth
+            && fork_id.fork_next <= block_header.timestamp
+        {
+            let latest_fork_id = self.storage.get_fork_id().await?;
+            pairs.eth = Some(latest_fork_id);
+
+            self.local_node_record.pairs = pairs.into();
+        }
+        Ok(())
+    }
+
     async fn validate_contact(
         &mut self,
         sender_public_key: H512,
@@ -592,6 +621,11 @@ impl GenServer for DiscoveryServer {
             handle.clone(),
             InMessage::ChangeFindNodeMessage,
         );
+        send_interval(
+            UPDATE_FORKID_INTERVAL,
+            handle.clone(),
+            InMessage::UpdateForkId,
+        );
         let _ = handle.clone().cast(InMessage::Lookup).await;
         let _ = handle.clone().cast(InMessage::EnrLookup).await;
         send_message_on(handle.clone(), tokio::signal::ctrl_c(), InMessage::Shutdown);
@@ -638,6 +672,12 @@ impl GenServer for DiscoveryServer {
                 let interval = self.get_lookup_interval().await;
                 send_after(interval, handle.clone(), Self::CastMsg::EnrLookup);
             }
+            Self::CastMsg::UpdateForkId => {
+                trace!(received = "UpdateForkId");
+                let _ = self.update_forkid().await.inspect_err(
+                    |e| error!(error=?e, "Error updating forkid of local node record"),
+                );
+            }
             Self::CastMsg::Prune => {
                 trace!(received = "Prune");
                 let _ = self