Merge pull request libbitcoin#1098 from evoskuil/master

Expose start time and channel counts to protocols.

Author: evoskuil

include/bitcoin/node/full_node.hpp

@@ -145,6 +145,9 @@ class BCN_API full_node
     /// The confirmed chain is confirmed to maximum height or is current.
     virtual bool is_recent() const NOEXCEPT;
 
+    /// Zulu time at which the node started.
+    virtual time_t start_time() const NOEXCEPT;
+
     /// Methods.
     /// -----------------------------------------------------------------------
 
@@ -180,6 +183,7 @@ class BCN_API full_node
 
     // These are thread safe.
     const configuration& config_;
+    const time_t start_time_;
     query& query_;
 
     // These are protected by strand.

include/bitcoin/node/protocols/protocol.hpp

@@ -68,6 +68,15 @@ class BCN_API protocol
     /// The candidate|confirmed chain is current.
     virtual bool is_current_chain(bool confirmed) const NOEXCEPT;
 
+    /// Zulu time at which the node started.
+    virtual time_t start_time() const NOEXCEPT;
+
+    /// The number of peer channels (counted, not quiet).
+    virtual size_t channel_count() const NOEXCEPT;
+
+    /// The number of inbound peer channels (counted, not quiet).
+    virtual size_t inbound_channel_count() const NOEXCEPT;
+
     /// Methods.
     /// -----------------------------------------------------------------------
 

include/bitcoin/node/sessions/session.hpp

@@ -109,6 +109,15 @@ class BCN_API session
     /// The confirmed chain is confirmed to maximum height or is current.
     virtual bool is_recent() const NOEXCEPT;
 
+    /// Zulu time at which the node started.
+    virtual time_t start_time() const NOEXCEPT;
+
+    /// The number of peer channels (counted, not quiet).
+    virtual size_t channel_count() const NOEXCEPT;
+
+    /// The number of inbound peer channels (counted, not quiet).
+    virtual size_t inbound_channel_count() const NOEXCEPT;
+
 protected:
 
     /// Constructors.

src/chasers/chaser_estimate.cpp

@@ -150,8 +150,9 @@ bool chaser_estimate::handle_chase(const code&, chase event_,
             {
                 BC_ASSERT(std::holds_alternative<header_t>(value));
                 POST(do_reorganized, std::get<header_t>(value));
-                break;
             }
+
+            break;
         }
         case chase::stop:
         {

src/full_node.cpp

@@ -39,6 +39,7 @@ full_node::full_node(query& query, const configuration& configuration,
     const logger& log) NOEXCEPT
   : net(configuration.network, log),
     config_(configuration),
+    start_time_(zulu_time()),
     query_(query),
     chaser_block_(*this),
     chaser_header_(*this),
@@ -431,13 +432,18 @@ bool full_node::is_current_header(const header_link& link) const NOEXCEPT
 
 bool full_node::is_recent() const NOEXCEPT
 {
-    if (is_nonzero(config_.node.maximum_height) && 
+    if (is_nonzero(config_.node.maximum_height) &&
         (query_.get_top_confirmed() >= config_.node.maximum_height))
         return true;
 
     return is_current_chain(true);
 }
 
+time_t full_node::start_time() const NOEXCEPT
+{
+    return start_time_;
+}
+
 // Methods.
 // ----------------------------------------------------------------------------
 

src/protocols/protocol.cpp

@@ -66,6 +66,21 @@ bool protocol::is_current_chain(bool confirmed) const NOEXCEPT
     return session_->is_current_chain(confirmed);
 }
 
+time_t protocol::start_time() const NOEXCEPT
+{
+    return session_->start_time();
+}
+
+size_t protocol::channel_count() const NOEXCEPT
+{
+    return session_->channel_count();
+}
+
+size_t protocol::inbound_channel_count() const NOEXCEPT
+{
+    return session_->inbound_channel_count();
+}
+
 // Methods.
 // ----------------------------------------------------------------------------
 

src/sessions/session.cpp

@@ -160,6 +160,21 @@ bool session::is_recent() const NOEXCEPT
     return node_.is_recent();
 }
 
+time_t session::start_time() const NOEXCEPT
+{
+    return node_.start_time();
+}
+
+size_t session::channel_count() const NOEXCEPT
+{
+    return node_.channel_count();
+}
+
+size_t session::inbound_channel_count() const NOEXCEPT
+{
+    return node_.inbound_channel_count();
+}
+
 BC_POP_WARNING()
 
 } // namespace node