Merge pull request #76 from evoskuil/version2

Add mempool consistency configuration setting.
libbitcoin · Dec 16, 2015 · c4b9df8 · c4b9df8
2 parents 587423a + 8ac8c64
commit c4b9df8
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 3 deletions.
diff --git a/data/bn.cfg b/data/bn.cfg
@@ -90,6 +90,8 @@ checkpoint = 0000000000000000086672a8c97ad666f89cf04736951791150015419810d586:36
 threads = 4
 # The maximum number of transactions in the pool, defaults to 2000.
 transaction_pool_capacity = 2000
+# Enforce consistency between the pool and the blockchain, defaults to false.
+transaction_pool_consistency = false
 # Persistent host:port to augment discovered hosts, multiple entries allowed.
 # peer = obelisk.airbitz.co:8333
 # IP address to disallow as a peer, multiple entries allowed.

diff --git a/include/bitcoin/node/config/settings.hpp b/include/bitcoin/node/config/settings.hpp
@@ -31,6 +31,7 @@ struct BCN_API settings
 {
     uint32_t threads;
     uint32_t transaction_pool_capacity;
+    bool transaction_pool_consistency;
     config::endpoint::list peers;
     config::authority::list blacklists;
 };

diff --git a/include/bitcoin/node/full_node.hpp b/include/bitcoin/node/full_node.hpp
@@ -41,6 +41,7 @@ namespace node {
 // [node]
 #define NODE_THREADS                        4
 #define NODE_TRANSACTION_POOL_CAPACITY      2000
+#define NODE_TRANSACTION_POOL_CONSISTENCY   false
 #define NODE_PEERS                          {}
 #define NODE_BLACKLISTS                     {}
 

diff --git a/src/full_node.cpp b/src/full_node.cpp
@@ -93,6 +93,7 @@ const settings_type full_node::defaults
     {
         NODE_THREADS,
         NODE_TRANSACTION_POOL_CAPACITY,
+        NODE_TRANSACTION_POOL_CONSISTENCY,
         NODE_PEERS,
         NODE_BLACKLISTS
     },
@@ -181,7 +182,8 @@ full_node::full_node(const settings_type& config)
     tx_pool_(
         memory_threads_,
         blockchain_,
-        config.node.transaction_pool_capacity),
+        config.node.transaction_pool_capacity,
+        config.node.transaction_pool_consistency),
     tx_indexer_(
         memory_threads_),
     poller_(

diff --git a/src/inventory.cpp b/src/inventory.cpp
@@ -360,6 +360,8 @@ bool inventory::handle_reorg(const std::error_code& ec, uint32_t fork_point,
     BITCOIN_ASSERT((bc::max_uint32 - fork_point) >= new_blocks.size());
     const auto height = static_cast<uint32_t>(fork_point + new_blocks.size());
 
+    // TODO: configure handshake with minimum_start_height so that it can
+    // disable relay from new peers until synced to the last checkpoint.
     handshake_.set_start_height(height, 
         std::bind(&inventory::handle_set_height,
             this, _1, height));

diff --git a/test/node.cpp b/test/node.cpp
@@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE(node_test__construct_getx_responder__does_not_throw)
 
     threadpool threads;
     blockchain_impl blockchain(threads, prefix);
-    transaction_pool transactions(threads, blockchain);
+    transaction_pool transactions(threads, blockchain, 2000, false);
     responder responder(blockchain, transactions, 0);
 
     blockchain.start();
@@ -127,7 +127,7 @@ BOOST_AUTO_TEST_CASE(node_test__construct_session__does_not_throw)
     handshake handshake(threads);
     protocol protocol(threads, hosts, handshake, network);
     blockchain_impl blockchain(threads, prefix);
-    transaction_pool transactions(threads, blockchain);
+    transaction_pool transactions(threads, blockchain, 2000, false);
     poller poller(threads, blockchain);
     responder responder(blockchain, transactions, 0);
     inventory inventory(handshake, blockchain, transactions, 0);