Add last_tip_block_time to the peer info returned via node RPC. The "New peer accepted" log line now also includes the user agent and its version.

Author: ImplOfAnImpl

chainstate/src/detail/mod.rs

@@ -261,15 +261,13 @@ impl<S: BlockchainStorage, V: TransactionVerificationStrategy> Chainstate<S, V>
         Ok(())
     }
 
-    fn broadcast_new_tip_event(&mut self, new_block_index: &Option<BlockIndex>) {
-        if let Some(new_block_index) = new_block_index {
-            let new_height = new_block_index.block_height();
-            let new_id = *new_block_index.block_id();
-            let event = ChainstateEvent::NewTip(new_id, new_height);
-
-            self.rpc_events.broadcast(&event);
-            self.subsystem_events.broadcast(event);
-        }
+    fn broadcast_new_tip_event(&mut self, new_block_index: &BlockIndex) {
+        let new_height = new_block_index.block_height();
+        let new_id = *new_block_index.block_id();
+        let event = ChainstateEvent::NewTip(new_id, new_height);
+
+        self.rpc_events.broadcast(&event);
+        self.subsystem_events.broadcast(event);
     }
 
     /// Create a read-write transaction, call `main_action` on it and commit.
@@ -609,7 +607,11 @@ impl<S: BlockchainStorage, V: TransactionVerificationStrategy> Chainstate<S, V>
             None => result,
         };
 
-        self.broadcast_new_tip_event(&result);
+        if let Some(new_block_index) = &result {
+            self.broadcast_new_tip_event(new_block_index);
+        } else {
+            log::debug!("Stale block received: {block_id:x}");
+        }
 
         if let Some(ref bi) = result {
             let compact_target = match bi.block_header().consensus_data() {

node-daemon/docs/RPC.md

@@ -1089,6 +1089,9 @@ Returns:
     "ping_min": EITHER OF
          1) number
          2) null,
+    "last_tip_block_time": EITHER OF
+         1) number
+         2) null,
 }, .. ]
 ```
 

p2p/src/disconnection_reason.rs

@@ -28,6 +28,7 @@ use crate::{
 ///
 /// Note: we derive `thiserror::Error` here just for the convenience of implementing `Display`.
 /// But conceptually this enum is not an error and it's not supposed to be used with `Result`.
+// TODO: use `derive_more::Display` instead of `thiserror::Error`.
 #[derive(Error, Debug, Clone, PartialEq, Eq)]
 pub enum DisconnectionReason {
     #[error("Your address is banned")]
@@ -57,7 +58,7 @@ pub enum DisconnectionReason {
         remote_time: Time,
         accepted_peer_time: std::ops::RangeInclusive<Time>,
     },
-    #[error("Wrong network; out network is '{our_network}'")]
+    #[error("Wrong network; our network is '{our_network}'")]
     DifferentNetwork { our_network: MagicBytes },
     #[error("No common services")]
     NoCommonServices,

p2p/src/interface/types.rs

@@ -13,9 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use p2p_types::socket_address::SocketAddress;
 use serde::{Deserialize, Serialize};
 
+use p2p_types::socket_address::SocketAddress;
+
 use crate::{net::types::PeerRole, types::peer_id::PeerId};
 
 /// Helper type used to return information about a connected peer from RPC.
@@ -43,4 +44,7 @@ pub struct ConnectedPeer {
 
     /// Min time for a ping roundtrip, in milliseconds
     pub ping_min: Option<u64>,
+
+    /// Last time the peer has sent us a block that became our tip, in seconds since UNIX epoch
+    pub last_tip_block_time: Option<u64>,
 }

p2p/src/peer_manager/mod.rs

@@ -976,8 +976,13 @@ where
         self.peer_connectivity_handle.accept(peer_id)?;
 
         log::info!(
-            "New peer accepted, peer_id: {peer_id}, address: {peer_address:?}, role: {peer_role:?}, protocol_version: {:?}",
-            info.protocol_version
+            "New peer accepted, peer_id: {}, address: {:?}, role: {:?}, protocol_version: {:?}, user agent: {} v{}",
+            peer_id,
+            peer_address,
+            peer_role,
+            info.protocol_version,
+            info.user_agent,
+            info.software_version
         );
 
         if info.common_services.has_service(Service::PeerAddresses) {
@@ -1816,6 +1821,9 @@ where
                 ping_min: context.ping_min.map(|time| {
                     duration_to_int(&time).expect("valid timestamp expected (ping_min)")
                 }),
+                last_tip_block_time: context
+                    .last_tip_block_time
+                    .map(|time| time.as_secs_since_epoch()),
             })
             .collect()
     }

p2p/src/peer_manager/peer_context.rs

@@ -73,6 +73,7 @@ pub struct PeerContext {
     /// Can be set for outbound connections only.
     pub discovered_own_address: Option<SocketAddress>,
 
+    /// Last time the peer has sent us a block that became our tip.
     pub last_tip_block_time: Option<Time>,
 
     pub last_tx_time: Option<Time>,

wallet/wallet-rpc-daemon/docs/RPC.md

@@ -2777,6 +2777,9 @@ Returns:
     "ping_min": EITHER OF
          1) number
          2) null,
+    "last_tip_block_time": EITHER OF
+         1) number
+         2) null,
 }, .. ]
 ```