Reduce common.hpp includes and extract endpoint_key

pwojcikdev · pwojcikdev · commit 5ed00520cf05 · 2026-04-09T23:01:25.000+02:00
Remove 7 unnecessary transitive includes from common.hpp:
- blake2.h, blockbuilders.hpp, config.hpp, object_stream.hpp,
  timer.hpp, utility.hpp, block_w_sideband.hpp

Extract endpoint_key into nano/secure/endpoint_key.hpp to remove
network_types.hpp (and its boost/asio/ip/tcp.hpp) from common.hpp.

Add explicit includes to .cpp files that relied on transitive
dependencies through common.hpp (blockbuilders.hpp, blake2.h,
network_types.hpp, etc.).
diff --git a/nano/core_test/active_elections.cpp b/nano/core_test/active_elections.cpp
@@ -6,6 +6,7 @@
 #include <nano/node/network.hpp>
 #include <nano/node/bootstrap/bootstrap_service.hpp>
 #include <nano/node/backlog_scan.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/jsonconfig.hpp>
 #include <nano/lib/vote.hpp>
diff --git a/nano/core_test/backlog.cpp b/nano/core_test/backlog.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/node/active_elections.hpp>
 #include <nano/node/backlog_scan.hpp>
diff --git a/nano/core_test/block.cpp b/nano/core_test/block.cpp
@@ -1,4 +1,5 @@
 #include <nano/lib/block_uniquer.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/stream.hpp>
 #include <nano/lib/work_version.hpp>
diff --git a/nano/core_test/block_rebroadcaster.cpp b/nano/core_test/block_rebroadcaster.cpp
@@ -3,6 +3,7 @@
 #include <nano/node/bootstrap/bootstrap_service.hpp>
 #include <nano/node/vote_rebroadcaster.hpp>
 #include <nano/node/local_block_broadcaster.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/node/active_elections.hpp>
 #include <nano/node/block_rebroadcaster.hpp>
diff --git a/nano/core_test/block_store.cpp b/nano/core_test/block_store.cpp
@@ -1,5 +1,6 @@
 #include <nano/crypto_lib/random_pool.hpp>
 #include <nano/lib/block_type.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/files.hpp>
 #include <nano/lib/lmdbconfig.hpp>
diff --git a/nano/core_test/bootstrap.cpp b/nano/core_test/bootstrap.cpp
@@ -3,6 +3,7 @@
 #include <nano/node/scheduler/optimistic.hpp>
 #include <nano/node/scheduler/hinted.hpp>
 #include <nano/node/backlog_scan.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/logging.hpp>
 #include <nano/lib/stats.hpp>
diff --git a/nano/core_test/cementing_set.cpp b/nano/core_test/cementing_set.cpp
@@ -1,5 +1,6 @@
 #include <nano/node/bootstrap/bootstrap_config.hpp>
 #include <nano/node/backlog_scan.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/logging.hpp>
 #include <nano/node/active_elections.hpp>
diff --git a/nano/core_test/confirmation_solicitor.cpp b/nano/core_test/confirmation_solicitor.cpp
@@ -1,4 +1,5 @@
 #include <nano/node/block_rebroadcaster.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/jsonconfig.hpp>
 #include <nano/node/active_elections.hpp>
diff --git a/nano/core_test/conflicts.cpp b/nano/core_test/conflicts.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/vote.hpp>
 #include <nano/node/active_elections.hpp>
diff --git a/nano/core_test/election.cpp b/nano/core_test/election.cpp
@@ -1,6 +1,7 @@
 #include <nano/node/repcrawler.hpp>
 #include <nano/node/network.hpp>
 #include <nano/node/backlog_scan.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/node/active_elections.hpp>
 #include <nano/node/election.hpp>
diff --git a/nano/core_test/election_scheduler.cpp b/nano/core_test/election_scheduler.cpp
@@ -2,6 +2,7 @@
 #include <nano/node/scheduler/hinted.hpp>
 #include <nano/node/cementing_set.hpp>
 #include <nano/node/backlog_scan.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/node/active_elections.hpp>
 #include <nano/node/election.hpp>
diff --git a/nano/core_test/ledger.cpp b/nano/core_test/ledger.cpp
@@ -1,4 +1,5 @@
 #include <nano/node/backlog_scan.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/files.hpp>
 #include <nano/lib/logging.hpp>
diff --git a/nano/core_test/ledger_cement.cpp b/nano/core_test/ledger_cement.cpp
@@ -1,5 +1,6 @@
 #include <nano/node/block_processor.hpp>
 #include <nano/node/backlog_scan.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/files.hpp>
 #include <nano/lib/logging.hpp>
diff --git a/nano/core_test/ledger_priority.cpp b/nano/core_test/ledger_priority.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/secure/common.hpp>
 #include <nano/secure/ledger.hpp>
diff --git a/nano/core_test/ledger_upgrades.cpp b/nano/core_test/ledger_upgrades.cpp
@@ -1,5 +1,6 @@
 #include <nano/lib/block_sideband.hpp>
 #include <nano/lib/block_type.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/files.hpp>
 #include <nano/lib/logging.hpp>
diff --git a/nano/core_test/message.cpp b/nano/core_test/message.cpp
@@ -1,4 +1,5 @@
 #include <nano/crypto_lib/random_pool.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/stream.hpp>
 #include <nano/lib/vote.hpp>
diff --git a/nano/core_test/message_deserializer.cpp b/nano/core_test/message_deserializer.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/numbers_templ.hpp>
 #include <nano/lib/vote.hpp>
diff --git a/nano/core_test/migrations.cpp b/nano/core_test/migrations.cpp
@@ -1,4 +1,5 @@
 #include <nano/lib/work.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/files.hpp>
 #include <nano/lib/logging.hpp>
diff --git a/nano/core_test/network.cpp b/nano/core_test/network.cpp
@@ -5,6 +5,7 @@
 #include <nano/node/peer_history.hpp>
 #include <nano/node/block_processor.hpp>
 #include <nano/node/wallet.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/files.hpp>
 #include <nano/node/election.hpp>
diff --git a/nano/core_test/network_filter.cpp b/nano/core_test/network_filter.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/network_filter.hpp>
 #include <nano/lib/stream.hpp>
diff --git a/nano/core_test/node.cpp b/nano/core_test/node.cpp
@@ -14,6 +14,7 @@
 #include <nano/node/bootstrap/bootstrap_config.hpp>
 #include <nano/node/block_processor.hpp>
 #include <nano/node/backlog_scan.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/config.hpp>
 #include <nano/lib/files.hpp>
diff --git a/nano/core_test/online_reps.cpp b/nano/core_test/online_reps.cpp
@@ -1,6 +1,7 @@
 #include <nano/node/vote_processor.hpp>
 #include <nano/node/repcrawler.hpp>
 #include <nano/node/active_elections.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/vote.hpp>
 #include <nano/node/election.hpp>
diff --git a/nano/core_test/priority_scheduler.cpp b/nano/core_test/priority_scheduler.cpp
@@ -1,4 +1,5 @@
 #include <nano/node/backlog_scan.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/thread_pool.hpp>
 #include <nano/node/active_elections.hpp>
diff --git a/nano/core_test/receivable.cpp b/nano/core_test/receivable.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/secure/common.hpp>
 #include <nano/store/ledger/pending.hpp>
 #include <nano/store/ledger_store.hpp>
diff --git a/nano/core_test/rep_crawler.cpp b/nano/core_test/rep_crawler.cpp
@@ -1,4 +1,5 @@
 #include <nano/node/network.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/config.hpp>
 #include <nano/lib/files.hpp>
diff --git a/nano/core_test/scheduler_buckets.cpp b/nano/core_test/scheduler_buckets.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/secure/common.hpp>
 
diff --git a/nano/core_test/system.cpp b/nano/core_test/system.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/thread_runner.hpp>
 #include <nano/lib/work_version.hpp>
diff --git a/nano/core_test/vote_rebroadcaster.cpp b/nano/core_test/vote_rebroadcaster.cpp
@@ -1,6 +1,7 @@
 #include <nano/node/scheduler/optimistic.hpp>
 #include <nano/node/scheduler/hinted.hpp>
 #include <nano/node/backlog_scan.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/numbers.hpp>
 #include <nano/lib/vote.hpp>
diff --git a/nano/core_test/vote_replier.cpp b/nano/core_test/vote_replier.cpp
@@ -2,6 +2,7 @@
 #include <nano/node/scheduler/optimistic.hpp>
 #include <nano/node/scheduler/hinted.hpp>
 #include <nano/node/backlog_scan.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/stats.hpp>
 #include <nano/messages/confirm.hpp>
diff --git a/nano/core_test/voting_policy.cpp b/nano/core_test/voting_policy.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/files.hpp>
 #include <nano/lib/vote.hpp>
diff --git a/nano/core_test/wallet.cpp b/nano/core_test/wallet.cpp
@@ -1,5 +1,6 @@
 #include <nano/node/backlog_scan.hpp>
 #include <nano/crypto_lib/random_pool.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/files.hpp>
 #include <nano/lib/thread_runner.hpp>
diff --git a/nano/core_test/wallets.cpp b/nano/core_test/wallets.cpp
@@ -1,4 +1,5 @@
 #include <nano/node/backlog_scan.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/node/active_elections.hpp>
 #include <nano/node/election.hpp>
diff --git a/nano/core_test/websocket.cpp b/nano/core_test/websocket.cpp
@@ -3,6 +3,7 @@
 #include <nano/node/scheduler/hinted.hpp>
 #include <nano/node/network.hpp>
 #include <nano/core_test/fakes/websocket_client.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/jsonconfig.hpp>
 #include <nano/lib/work_version.hpp>
diff --git a/nano/core_test/work_pool.cpp b/nano/core_test/work_pool.cpp
@@ -1,4 +1,5 @@
 #include <nano/crypto_lib/random_pool.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/files.hpp>
 #include <nano/lib/logging.hpp>
diff --git a/nano/lib/blocks.cpp b/nano/lib/blocks.cpp
@@ -1,10 +1,12 @@
+#include <nano/crypto/blake2/blake2.h>
 #include <nano/crypto_lib/random_pool.hpp>
 #include <nano/lib/block_type.hpp>
 #include <nano/lib/block_uniquer.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/enum_util.hpp>
 #include <nano/lib/memory.hpp>
 #include <nano/lib/numbers.hpp>
+#include <nano/lib/object_stream.hpp>
 #include <nano/lib/stream.hpp>
 #include <nano/lib/threading.hpp>
 #include <nano/lib/work_version.hpp>
diff --git a/nano/nano_node/entry.cpp b/nano/nano_node/entry.cpp
@@ -2,6 +2,7 @@
 #include <nano/boost/stacktrace.hpp>
 #include <nano/crypto_lib/random_pool.hpp>
 #include <nano/lib/block_type.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/cli.hpp>
 #include <nano/lib/files.hpp>
diff --git a/nano/node/endpoint.cpp b/nano/node/endpoint.cpp
@@ -1,3 +1,4 @@
+#include <nano/crypto/blake2/blake2.h>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/memory.hpp>
 #include <nano/lib/stream.hpp>
diff --git a/nano/node/endpoint.hpp b/nano/node/endpoint.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <nano/lib/network_types.hpp>
 #include <nano/secure/common.hpp>
 
 #include <cstdint>
diff --git a/nano/node/epoch_upgrader.cpp b/nano/node/epoch_upgrader.cpp
@@ -1,3 +1,4 @@
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/thread_pool.hpp>
 #include <nano/lib/threading.hpp>
diff --git a/nano/node/json_handler.cpp b/nano/node/json_handler.cpp
@@ -1,6 +1,7 @@
 #include <nano/lib/block_type.hpp>
-#include <nano/lib/stats.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
+#include <nano/lib/stats.hpp>
 #include <nano/lib/config.hpp>
 #include <nano/lib/json_error_response.hpp>
 #include <nano/lib/jsonconfig.hpp>
diff --git a/nano/rpc_test/receivable.cpp b/nano/rpc_test/receivable.cpp
@@ -1,4 +1,5 @@
 #include <nano/node/backlog_scan.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/node/ipc/ipc_server.hpp>
 #include <nano/node/nodeconfig.hpp>
diff --git a/nano/rpc_test/rpc.cpp b/nano/rpc_test/rpc.cpp
@@ -8,6 +8,7 @@
 #include <nano/boost/beast/http.hpp>
 #include <nano/crypto_lib/random_pool.hpp>
 #include <nano/lib/block_type.hpp>
+#include <nano/lib/blockbuilders.hpp>
 #include <nano/lib/blocks.hpp>
 #include <nano/lib/files.hpp>
 #include <nano/lib/jsonconfig.hpp>
diff --git a/nano/secure/CMakeLists.txt b/nano/secure/CMakeLists.txt
@@ -7,6 +7,8 @@ add_library(
   account_iterator_impl.hpp
   common.hpp
   common.cpp
+  endpoint_key.hpp
+  endpoint_key.cpp
   fwd.hpp
   generate_cache_flags.hpp
   ledger.hpp
diff --git a/nano/secure/common.cpp b/nano/secure/common.cpp
@@ -1,6 +1,7 @@
 #include <nano/boost/asio/ip/tcp.hpp>
 #include <nano/crypto_lib/random_pool.hpp>
 #include <nano/lib/blocks.hpp>
+#include <nano/secure/endpoint_key.hpp>
 #include <nano/lib/config.hpp>
 #include <nano/lib/enum_util.hpp>
 #include <nano/lib/env.hpp>
@@ -325,36 +326,6 @@ uint64_t nano::unchecked_info::modified () const
 	return modified_m;
 }
 
-/*
- * endpoint_key
- */
-
-nano::endpoint_key::endpoint_key (std::array<uint8_t, 16> const & address_a, uint16_t port_a) :
-	address (address_a),
-	network_port (boost::endian::native_to_big (port_a))
-{
-}
-
-nano::endpoint_key::endpoint_key (nano::endpoint const & endpoint_a) :
-	endpoint_key (endpoint_a.address ().to_v6 ().to_bytes (), endpoint_a.port ())
-{
-}
-
-std::array<uint8_t, 16> const & nano::endpoint_key::address_bytes () const
-{
-	return address;
-}
-
-uint16_t nano::endpoint_key::port () const
-{
-	return boost::endian::big_to_native (network_port);
-}
-
-nano::endpoint nano::endpoint_key::endpoint () const
-{
-	return { boost::asio::ip::address_v6 (address), port () };
-}
-
 /*
  * confirmation_height_info
  */
diff --git a/nano/secure/common.hpp b/nano/secure/common.hpp
@@ -1,54 +1,16 @@
 #pragma once
 
-#include <nano/crypto/blake2/blake2.h>
-#include <nano/lib/blockbuilders.hpp>
-#include <nano/lib/config.hpp>
 #include <nano/lib/constants.hpp>
 #include <nano/lib/epochs.hpp>
 #include <nano/lib/fwd.hpp>
 #include <nano/lib/keypair.hpp>
-#include <nano/lib/network_types.hpp>
 #include <nano/lib/numbers.hpp>
-#include <nano/lib/object_stream.hpp>
-#include <nano/lib/timer.hpp>
-#include <nano/lib/utility.hpp>
-#include <nano/store/block_w_sideband.hpp>
 
 #include <array>
-#include <unordered_map>
+#include <memory>
 
 namespace nano
 {
-class endpoint_key final
-{
-public:
-	endpoint_key () = default;
-	endpoint_key (nano::endpoint const &);
-
-	/*
-	 * @param address_a This should be in network byte order
-	 * @param port_a This should be in host byte order
-	 */
-	endpoint_key (std::array<uint8_t, 16> const & address_a, uint16_t port_a);
-
-	/*
-	 * @return The ipv6 address in network byte order
-	 */
-	std::array<uint8_t, 16> const & address_bytes () const;
-
-	/*
-	 * @return The port in host byte order
-	 */
-	uint16_t port () const;
-
-	nano::endpoint endpoint () const;
-
-private:
-	// Both stored internally in network byte order
-	std::array<uint8_t, 16> address;
-	uint16_t network_port{ 0 };
-};
-
 enum class no_value
 {
 	dummy
diff --git a/nano/secure/endpoint_key.cpp b/nano/secure/endpoint_key.cpp
diff --git a/nano/secure/endpoint_key.hpp b/nano/secure/endpoint_key.hpp
diff --git a/nano/slow_test/ledger.cpp b/nano/slow_test/ledger.cpp
diff --git a/nano/slow_test/node.cpp b/nano/slow_test/node.cpp
diff --git a/nano/slow_test/vote_cache.cpp b/nano/slow_test/vote_cache.cpp
diff --git a/nano/store/db_val.hpp b/nano/store/db_val.hpp
diff --git a/nano/store/ledger/peer.hpp b/nano/store/ledger/peer.hpp
diff --git a/nano/test_common/chains.cpp b/nano/test_common/chains.cpp
diff --git a/nano/test_common/ledger_context.cpp b/nano/test_common/ledger_context.cpp
diff --git a/nano/test_common/system.cpp b/nano/test_common/system.cpp
diff --git a/nano/test_common/system.hpp b/nano/test_common/system.hpp

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#include <nano/lib/blockbuilders.hpp>`
`1`	`2`	`#include <nano/lib/blocks.hpp>`
`2`	`3`	`#include <nano/node/active_elections.hpp>`
`3`	`4`	`#include <nano/node/backlog_scan.hpp>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include <nano/lib/block_uniquer.hpp>`
	`2`	`+#include <nano/lib/blockbuilders.hpp>`
`2`	`3`	`#include <nano/lib/blocks.hpp>`
`3`	`4`	`#include <nano/lib/stream.hpp>`
`4`	`5`	`#include <nano/lib/work_version.hpp>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include <nano/node/block_rebroadcaster.hpp>`
	`2`	`+#include <nano/lib/blockbuilders.hpp>`
`2`	`3`	`#include <nano/lib/blocks.hpp>`
`3`	`4`	`#include <nano/lib/jsonconfig.hpp>`
`4`	`5`	`#include <nano/node/active_elections.hpp>`