diff --git a/base_layer/p2p/src/peer_seeds.rs b/base_layer/p2p/src/peer_seeds.rs
index c0dbc24601..8e628a9872 100644
--- a/base_layer/p2p/src/peer_seeds.rs
+++ b/base_layer/p2p/src/peer_seeds.rs
@@ -81,7 +81,7 @@ pub struct SeedPeer {
 
 impl SeedPeer {
     #[inline]
-    pub fn get_node_id(&self) -> NodeId {
+    pub fn derive_node_id(&self) -> NodeId {
         NodeId::from_public_key(&self.public_key)
     }
 }
@@ -105,8 +105,8 @@ impl FromStr for SeedPeer {
 
 impl From<SeedPeer> for Peer {
     fn from(seed: SeedPeer) -> Self {
-        let node_id = seed.get_node_id();
-        Self::new(
+        let node_id = seed.derive_node_id();
+        Peer::new(
             seed.public_key,
             node_id,
             seed.addresses.into(),
diff --git a/comms/dht/src/peer_validator.rs b/comms/dht/src/peer_validator.rs
index 6bec6e4f00..db17086443 100644
--- a/comms/dht/src/peer_validator.rs
+++ b/comms/dht/src/peer_validator.rs
@@ -103,9 +103,13 @@ impl<'a> PeerValidator<'a> {
                 }
 
                 debug!(target: LOG_TARGET, "Updating peer `{}`", new_peer.node_id);
-                current_peer.addresses.update_addresses(new_peer.addresses.into_vec());
-                current_peer.identity_signature = new_peer.identity_signature;
-                current_peer.set_offline(false);
+                current_peer
+                    .update_addresses(new_peer.addresses.into_vec())
+                    .set_features(new_peer.features)
+                    .set_offline(false);
+                if let Some(sig) = new_peer.identity_signature {
+                    current_peer.set_valid_identity_signature(sig);
+                }
                 self.peer_manager.add_peer(current_peer).await?;
 
                 Ok(false)
diff --git a/comms/src/peer_manager/peer.rs b/comms/src/peer_manager/peer.rs
index c2c3fee8f2..4f871922f0 100644
--- a/comms/src/peer_manager/peer.rs
+++ b/comms/src/peer_manager/peer.rs
@@ -266,13 +266,14 @@ impl Peer {
         self.banned_until.as_ref().filter(|dt| *dt > &Utc::now().naive_utc())
     }
 
-    /// Marks the peer as offline
-    pub fn set_offline(&mut self, is_offline: bool) {
+    /// Marks the peer as offline if true, or not offline if false
+    pub fn set_offline(&mut self, is_offline: bool) -> &mut Self {
         if is_offline {
             self.offline_at = Some(Utc::now().naive_utc());
         } else {
             self.offline_at = None;
         }
+        self
     }
 
     /// This will store metadata inside of the metadata field in the peer.
@@ -286,6 +287,28 @@ impl Peer {
         self.metadata.get(&key)
     }
 
+    /// Set the identity signature of the peer. WARNING: It is up to the caller to ensure that the signature is valid.
+    pub fn set_valid_identity_signature(&mut self, signature: IdentitySignature) -> &mut Self {
+        self.identity_signature = Some(signature);
+        self
+    }
+
+    /// Update the peer's addresses. This call will invalidate the identity signature.
+    pub fn update_addresses(&mut self, addresses: Vec<Multiaddr>) -> &mut Self {
+        self.addresses.update_addresses(addresses);
+        self.identity_signature = None;
+        self
+    }
+
+    /// Update the peer's features. This call will invalidate the identity signature if the features differ.
+    pub fn set_features(&mut self, features: PeerFeatures) -> &mut Self {
+        if self.features != features {
+            self.features = features;
+            self.identity_signature = None;
+        }
+        self
+    }
+
     pub fn to_short_string(&self) -> String {
         format!(
             "{}::{}",