Derive settings from node, use const, change listener setting.

Author: evoskuil

data/bs.cfg

@@ -5,10 +5,10 @@
 blockchain_path = blockchain
 # The minimum height of the history database, defaults to 0.
 history_height = 0
-# The peer cache file path, defaults to 'hosts'.
-hosts_file = hosts
-# Enable the listening for incoming connections, defaults to true.
-listener_enabled = true
+# The peer cache file path, defaults to 'peers'.
+hosts_file = peers
+# Set the port for incoming connections, set to 0 to disable listener, defaults to 8333 (18333 for testnet).
+# listen_port = 0
 # The maximum number of outgoing P2P network connections, defaults to 8.
 out_connections = 8
 # Enable the publisher, defaults to false.

include/bitcoin/server/config/settings.hpp

@@ -25,6 +25,7 @@
 #include <vector>
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
+#include <bitcoin/node.hpp>
 #include <bitcoin/server/config/endpoint.hpp>
 #include <bitcoin/server/define.hpp>
 
@@ -42,8 +43,11 @@
 namespace libbitcoin {
 namespace server {
 
-struct BCS_API settings_type
+class BCS_API settings_type
+  : public node::settings
 {
+public:
+
     // options
     bool help;
     bool initchain;
@@ -55,22 +59,16 @@ struct BCS_API settings_type
 
     // settings
     bool log_requests;
-    bool listener_enabled;
     bool publisher_enabled;
-    uint32_t tx_pool_capacity;
-    uint32_t out_connections;
-    uint32_t history_height;
     endpoint_type unique_name;
     endpoint_type service;
     endpoint_type heartbeat;
     endpoint_type tx_publish;
     endpoint_type block_publish;
-    boost::filesystem::path hosts_file;
     boost::filesystem::path debug_file;
     boost::filesystem::path error_file;
     boost::filesystem::path cert_file;
     boost::filesystem::path client_certs_path;
-    boost::filesystem::path blockchain_path;
     std::vector<endpoint_type> clients;
     std::vector<endpoint_type> peers;
 };

include/bitcoin/server/server_node.hpp

@@ -38,8 +38,8 @@ class BCS_API server_node
     typedef std::function<void (const bc::transaction_type&)>
         transaction_notify_callback;
 
-    server_node(settings_type& config);
-    bool start(settings_type& config);
+    server_node(const settings_type& config);
+    bool start(const settings_type& config);
 
     virtual void subscribe_blocks(block_notify_callback notify_block);
     virtual void subscribe_transactions(transaction_notify_callback notify_tx);
@@ -68,20 +68,20 @@ class BCS_API server_node
     bc::ofstream outfile_;
     bc::ofstream errfile_;
 
-    // Services.
-    bc::threadpool network_threads_;
-    bc::threadpool database_threads_;
-    bc::threadpool memory_threads_;
-    bc::network::hosts host_pool_;
-    bc::network::handshake handshake_;
-    bc::network::network network_;
-    bc::network::protocol protocol_;
-    bc::chain::blockchain_impl blockchain_;
-    bc::chain::transaction_pool tx_pool_;
-    bc::node::indexer tx_indexer_;
-    bc::node::poller poller_;
-    bc::node::session session_;
-    bc::node::responder responder_;
+    //// Services.
+    //bc::threadpool network_threads_;
+    //bc::threadpool database_threads_;
+    //bc::threadpool memory_threads_;
+    //bc::network::hosts host_pool_;
+    //bc::network::handshake handshake_;
+    //bc::network::network network_;
+    //bc::network::protocol protocol_;
+    //bc::chain::blockchain_impl blockchain_;
+    //bc::chain::transaction_pool tx_pool_;
+    //bc::node::indexer tx_indexer_;
+    //bc::node::poller poller_;
+    //bc::node::session session_;
+    //bc::node::responder responder_;
 
     // Timer.
     boost::asio::deadline_timer retry_start_timer_;

src/config/settings.cpp

@@ -19,6 +19,7 @@
  */
 #include <bitcoin/server/config/settings.hpp>
 
+#include <cstdint>
 #include <iostream>
 #include <string>
 #include <vector>
@@ -133,29 +134,29 @@ const options_description config_type::load_settings()
         value<bool>(&settings.log_requests)->default_value(false),
         "Write service requests to the log, impacts performance, defaults to false."
     )
-    (
-        "general.listener_enabled",
-        value<bool>(&settings.listener_enabled)->default_value(true),
-        "Enable the listening for incoming connections, defaults to true."
-    )
     (
         "general.publisher_enabled",
         value<bool>(&settings.publisher_enabled)->default_value(false),
         "Enable the publisher, defaults to false."
     )
+    (
+        "general.listen_port",
+        value<uint16_t>(&settings.listen_port)->default_value(BN_LISTEN_PORT),
+        "Set the port for incoming connections, set to 0 to disable listener, defaults to 8333 (18333 for testnet)."
+    )
     (
         "general.tx_pool_capacity",
-        value<uint32_t>(&settings.tx_pool_capacity)->default_value(2000),
+        value<uint32_t>(&settings.tx_pool_capacity)->default_value(BN_P2P_TX_POOL),
         "The maximum number of transactions in the pool, defaults to 2000."
     )
     (
         "general.out_connections",
-        value<uint32_t>(&settings.out_connections)->default_value(8),
+        value<uint32_t>(&settings.out_connections)->default_value(BN_P2P_OUTBOUND),
         "The maximum number of outgoing P2P network connections, defaults to 8."
     )
     (
         "general.history_height",
-        value<uint32_t>(&settings.history_height)->default_value(0),
+        value<uint32_t>(&settings.history_height)->default_value(BN_HISTORY_START_HEIGHT),
         "The minimum height of the history database, defaults to 0."
     )
     (
@@ -185,8 +186,8 @@ const options_description config_type::load_settings()
     )
     (
         "general.hosts_file",
-        value<path>(&settings.hosts_file)->default_value("hosts"),
-        "The peer cache file path, defaults to 'hosts'."
+        value<path>(&settings.hosts_file)->default_value(BN_HOSTS_FILENAME),
+        "The peer cache file path, defaults to 'peers'."
     )
     (
         "logging.debug_file",
@@ -210,7 +211,7 @@ const options_description config_type::load_settings()
     )
     (
         "general.blockchain_path",
-        value<path>(&settings.blockchain_path)->default_value("blockchain"),
+        value<path>(&settings.blockchain_path)->default_value(BN_DIRECTORY),
         "The blockchain directory, defaults to 'blockchain'."
     )
     (

src/server_node.cpp

@@ -38,32 +38,15 @@ using std::placeholders::_2;
 
 constexpr auto append = std::ofstream::out | std::ofstream::app;
 
-server_node::server_node(settings_type& config)
-  : outfile_(config.debug_file.string(), append), 
+server_node::server_node(const settings_type& config)
+  : full_node(config),
+    outfile_(config.debug_file.string(), append),
     errfile_(config.error_file.string(), append),
-    network_threads_(BN_THREADS_NETWORK, thread_priority::low),
-    database_threads_(BN_THREADS_DISK, thread_priority::low),
-    memory_threads_(BN_THREADS_MEMORY, thread_priority::low),
-    host_pool_(network_threads_, config.hosts_file, BN_P2P_HOST_POOL),
-    handshake_(network_threads_, BN_LISTEN_PORT),
-    network_(network_threads_),
-    protocol_(network_threads_, host_pool_, handshake_, network_,
-        network::protocol::default_seeds, 
-        (config.listener_enabled ? BN_LISTEN_PORT : 0),
-        config.out_connections),
-    blockchain_(database_threads_, config.blockchain_path.string(),
-        { config.history_height }, BN_P2P_ORPHAN_POOL),
-    tx_pool_(memory_threads_, blockchain_, config.tx_pool_capacity),
-    tx_indexer_(memory_threads_),
-    poller_(memory_threads_, blockchain_),
-    responder_(blockchain_, tx_pool_),
-    session_(network_threads_, handshake_, protocol_, blockchain_, poller_,
-        tx_pool_, responder_),
     retry_start_timer_(memory_threads_.service())
 {
 }
 
-bool server_node::start(settings_type& config)
+bool server_node::start(const settings_type& config)
 {
     // Set up logging for node background threads (add to config).
     const auto skip_log = if_else(config.log_requests, "", LOG_REQUEST);