Merge master (22359c6) into dash/s8-poolnode-share-messages-leaf3 — refresh vs #582/#587/#592/#605 landings

ctest allowlist union: test_dash_poolnode_messages (from #582) + test_dash_share_messages.
Sources auto-merged; re-runs the stale (pre-runner-reset) CodeQL c-cpp.

Author: frstrtr

.github/workflows/build.yml

@@ -88,7 +88,7 @@ jobs:
                     test_threading test_weights \
                     test_header_chain test_mempool test_template_builder \
                     test_doge_chain test_compact_blocks test_dash_x11_kat \
-                    test_dash_header_chain test_dash_block_replay test_dash_conformance test_dash_subsidy test_dash_mempool test_dash_simplifiedmns test_dash_quorum test_dash_quorum_root test_dash_mn_state test_dash_embedded_gbt test_dash_smldiff test_dash_p2p_messages test_dash_p2p_connection test_dash_p2p_node test_dash_node_interface test_dash_config test_dash_broadcaster test_dash_broadcaster_full test_dash_share_hash_link test_dash_block_relay test_dash_rpc_request test_dash_rpc_conf test_dash_block_producer test_dash_embedded_relay_e2e test_dash_block_relay_plan test_dash_version_activation_latch test_dash_block_relay_binding test_dash_block_relay_dual_arm test_dash_coinbase_parity test_dash_donation_combined test_dash_g3_assembled test_dash_work_target test_dash_work_job_targets test_dash_cb_payee test_dash_share_messages \
+                    test_dash_header_chain test_dash_block_replay test_dash_conformance test_dash_subsidy test_dash_mempool test_dash_simplifiedmns test_dash_quorum test_dash_quorum_root test_dash_mn_state test_dash_embedded_gbt test_dash_smldiff test_dash_p2p_messages test_dash_p2p_connection test_dash_p2p_node test_dash_node_interface test_dash_config test_dash_broadcaster test_dash_broadcaster_full test_dash_share_hash_link test_dash_block_relay test_dash_rpc_request test_dash_rpc_conf test_dash_block_producer test_dash_embedded_relay_e2e test_dash_block_relay_plan test_dash_version_activation_latch test_dash_block_relay_binding test_dash_block_relay_dual_arm test_dash_coinbase_parity test_dash_donation_combined test_dash_g3_assembled test_dash_work_target test_dash_work_job_targets test_dash_cb_payee test_dash_poolnode_messages test_dash_share_messages \
                     test_multiaddress_pplns test_pplns_stress \
                     test_hash_link test_decay_pplns \
                     test_pplns_consensus \
@@ -100,7 +100,7 @@ jobs:
                     dgb_gentx_coinbase_test dgb_connection_coinbase_test dgb_pplns_payout_split_test nmc_auxpow_merkle_test nmc_template_builder_test nmc_auxpow_wire_test nmc_reconstruct_won_block_test nmc_mempool_name_test nmc_block_broadcast_test nmc_host_dualpath_test nmc_fallback_path_conformance_test dgb_gentx_share_path_test dgb_conn_pplns_producer_test dgb_other_tx_resolver_test \
                     dgb_other_tx_assembler_test dgb_reconstruct_won_block_test dgb_reconstruct_closure_test dgb_gentx_unpack_test dgb_work_source_test dgb_template_builder_test dgb_embedded_coin_node_test dgb_embedded_tx_select_test dgb_template_other_txs_test dgb_coinbase_value_parity_test dgb_submit_classify_test dgb_aux_parent_coinbase_parity_test dgb_template_capture_test dgb_aux_doge_db_commitment_bind_test dgb_aux_doge_mm_commitment_test dgb_aux_doge_dc_proof_test dgb_aux_doge_bind_parsers_test dgb_compact_blocks_bip152_parity_test dgb_aux_dual_target_select_test dgb_aux_broadcast_path_election_test \
                     rpc_request_test softfork_check_test genesis_check_test algo_select_test digishield_walk_test header_chain_test \
-                    dgb_coin_node_seam_test dgb_block_broadcast_test dgb_won_block_dispatch_test dgb_forced_won_share_dualpath_test dgb_scrypt_pow_test dgb_nonce_grinder_test dgb_regrind_block_test dgb_won_block_finalize_test dgb_share_target_genesis_test dgb_share_target_retarget_test dgb_share_bits_oracle_pin_test dgb_pool_msg_wire_test dgb_get_shares_walk_test dgb_download_stops_test dgb_think_p1_walk_bounds_test dgb_think_p1_desired_emit_test dgb_think_p6_desired_cutoff_test dgb_think_p4_head_keys_test dgb_think_p3_best_head_test dgb_g1_oracle_byte_parity_test dgb_think_p2_walk_bounds_test dgb_expected_time_to_block_test dgb_tail_score_endpoints_test dgb_pool_attempts_per_second_test dgb_pool_efficiency_test dgb_think_p5_best_share_punish_test dgb_auto_ratchet_tail_guard_test dgb_binomial_conf_interval_test dgb_desired_version_tally_test dgb_min_protocol_ratchet_test dgb_get_height_and_last_endpoints_test dgb_chain_walk_window_test dgb_redistribute_delegate_ghal_test dgb_share_weight_decay_test dgb_naughty_propagation_test dgb_hash_format_parity_test dgb_emergency_decay_saturation_test v37_test \
+                    dgb_coin_node_seam_test dgb_block_broadcast_test dgb_won_block_dispatch_test dgb_forced_won_share_dualpath_test dgb_scrypt_pow_test dgb_nonce_grinder_test dgb_regrind_block_test dgb_won_block_finalize_test dgb_share_target_genesis_test dgb_share_target_retarget_test dgb_share_bits_oracle_pin_test dgb_pool_msg_wire_test dgb_get_shares_walk_test dgb_download_stops_test dgb_think_p1_walk_bounds_test dgb_think_p1_desired_emit_test dgb_think_p6_desired_cutoff_test dgb_think_p4_head_keys_test dgb_think_p3_best_head_test dgb_g1_oracle_byte_parity_test dgb_think_p2_walk_bounds_test dgb_expected_time_to_block_test dgb_tail_score_endpoints_test dgb_pool_attempts_per_second_test dgb_pool_efficiency_test dgb_think_p5_best_share_punish_test dgb_auto_ratchet_tail_guard_test dgb_auto_ratchet_sim_test dgb_binomial_conf_interval_test dgb_desired_version_tally_test dgb_min_protocol_ratchet_test dgb_get_height_and_last_endpoints_test dgb_chain_walk_window_test dgb_redistribute_delegate_ghal_test dgb_share_weight_decay_test dgb_naughty_propagation_test dgb_hash_format_parity_test dgb_emergency_decay_saturation_test v37_test \
             -j8
 
       - name: Run tests
@@ -238,7 +238,7 @@ jobs:
                     test_threading test_weights \
                     test_header_chain test_mempool test_template_builder \
                     test_doge_chain test_compact_blocks test_dash_x11_kat \
-                    test_dash_header_chain test_dash_block_replay test_dash_conformance test_dash_subsidy test_dash_mempool test_dash_simplifiedmns test_dash_quorum test_dash_quorum_root test_dash_mn_state test_dash_embedded_gbt test_dash_smldiff test_dash_p2p_messages test_dash_p2p_connection test_dash_p2p_node test_dash_node_interface test_dash_config test_dash_broadcaster test_dash_broadcaster_full test_dash_share_hash_link test_dash_block_relay test_dash_rpc_request test_dash_rpc_conf test_dash_block_producer test_dash_embedded_relay_e2e test_dash_block_relay_plan test_dash_version_activation_latch test_dash_block_relay_binding test_dash_block_relay_dual_arm test_dash_coinbase_parity test_dash_donation_combined test_dash_g3_assembled test_dash_work_target test_dash_work_job_targets test_dash_cb_payee test_dash_share_messages \
+                    test_dash_header_chain test_dash_block_replay test_dash_conformance test_dash_subsidy test_dash_mempool test_dash_simplifiedmns test_dash_quorum test_dash_quorum_root test_dash_mn_state test_dash_embedded_gbt test_dash_smldiff test_dash_p2p_messages test_dash_p2p_connection test_dash_p2p_node test_dash_node_interface test_dash_config test_dash_broadcaster test_dash_broadcaster_full test_dash_share_hash_link test_dash_block_relay test_dash_rpc_request test_dash_rpc_conf test_dash_block_producer test_dash_embedded_relay_e2e test_dash_block_relay_plan test_dash_version_activation_latch test_dash_block_relay_binding test_dash_block_relay_dual_arm test_dash_coinbase_parity test_dash_donation_combined test_dash_g3_assembled test_dash_work_target test_dash_work_job_targets test_dash_cb_payee test_dash_poolnode_messages test_dash_share_messages \
                     test_hash_link test_decay_pplns \
                     test_pplns_consensus \
                     test_v36_script_sorting test_v36_cross_impl_refhash \
@@ -249,7 +249,7 @@ jobs:
                     dgb_gentx_coinbase_test dgb_connection_coinbase_test dgb_pplns_payout_split_test nmc_auxpow_merkle_test nmc_template_builder_test nmc_auxpow_wire_test nmc_reconstruct_won_block_test nmc_mempool_name_test nmc_block_broadcast_test nmc_host_dualpath_test nmc_fallback_path_conformance_test dgb_gentx_share_path_test dgb_conn_pplns_producer_test dgb_other_tx_resolver_test \
                     dgb_other_tx_assembler_test dgb_reconstruct_won_block_test dgb_reconstruct_closure_test dgb_gentx_unpack_test dgb_work_source_test dgb_template_builder_test dgb_embedded_coin_node_test dgb_embedded_tx_select_test dgb_template_other_txs_test dgb_coinbase_value_parity_test dgb_submit_classify_test dgb_aux_parent_coinbase_parity_test dgb_template_capture_test dgb_aux_doge_db_commitment_bind_test dgb_aux_doge_mm_commitment_test dgb_aux_doge_dc_proof_test dgb_aux_doge_bind_parsers_test dgb_compact_blocks_bip152_parity_test dgb_aux_dual_target_select_test dgb_aux_broadcast_path_election_test \
                     rpc_request_test softfork_check_test genesis_check_test algo_select_test digishield_walk_test header_chain_test \
-                    dgb_coin_node_seam_test dgb_block_broadcast_test dgb_won_block_dispatch_test dgb_forced_won_share_dualpath_test dgb_scrypt_pow_test dgb_nonce_grinder_test dgb_regrind_block_test dgb_won_block_finalize_test dgb_share_target_genesis_test dgb_share_target_retarget_test dgb_share_bits_oracle_pin_test dgb_pool_msg_wire_test dgb_get_shares_walk_test dgb_download_stops_test dgb_think_p1_walk_bounds_test dgb_think_p1_desired_emit_test dgb_think_p6_desired_cutoff_test dgb_think_p4_head_keys_test dgb_think_p3_best_head_test dgb_g1_oracle_byte_parity_test dgb_think_p2_walk_bounds_test dgb_expected_time_to_block_test dgb_tail_score_endpoints_test dgb_pool_attempts_per_second_test dgb_pool_efficiency_test dgb_think_p5_best_share_punish_test dgb_auto_ratchet_tail_guard_test dgb_binomial_conf_interval_test dgb_desired_version_tally_test dgb_min_protocol_ratchet_test dgb_get_height_and_last_endpoints_test dgb_chain_walk_window_test dgb_redistribute_delegate_ghal_test dgb_share_weight_decay_test dgb_naughty_propagation_test dgb_hash_format_parity_test dgb_emergency_decay_saturation_test test_coin_broadcaster test_multiaddress_pplns test_pplns_stress \
+                    dgb_coin_node_seam_test dgb_block_broadcast_test dgb_won_block_dispatch_test dgb_forced_won_share_dualpath_test dgb_scrypt_pow_test dgb_nonce_grinder_test dgb_regrind_block_test dgb_won_block_finalize_test dgb_share_target_genesis_test dgb_share_target_retarget_test dgb_share_bits_oracle_pin_test dgb_pool_msg_wire_test dgb_get_shares_walk_test dgb_download_stops_test dgb_think_p1_walk_bounds_test dgb_think_p1_desired_emit_test dgb_think_p6_desired_cutoff_test dgb_think_p4_head_keys_test dgb_think_p3_best_head_test dgb_g1_oracle_byte_parity_test dgb_think_p2_walk_bounds_test dgb_expected_time_to_block_test dgb_tail_score_endpoints_test dgb_pool_attempts_per_second_test dgb_pool_efficiency_test dgb_think_p5_best_share_punish_test dgb_auto_ratchet_tail_guard_test dgb_auto_ratchet_sim_test dgb_binomial_conf_interval_test dgb_desired_version_tally_test dgb_min_protocol_ratchet_test dgb_get_height_and_last_endpoints_test dgb_chain_walk_window_test dgb_redistribute_delegate_ghal_test dgb_share_weight_decay_test dgb_naughty_propagation_test dgb_hash_format_parity_test dgb_emergency_decay_saturation_test test_coin_broadcaster test_multiaddress_pplns test_pplns_stress \
                     v37_test \
             -j8
 

src/c2pool/CMakeLists.txt

@@ -238,6 +238,15 @@ add_executable(c2pool-bch
     ${CMAKE_SOURCE_DIR}/src/impl/bch/coin/p2p_node.cpp
     ${CMAKE_SOURCE_DIR}/src/impl/bch/coin/coin_node.cpp
     ${CMAKE_SOURCE_DIR}/src/impl/bch/coin/rpc.cpp
+    # M5 pool-node body TUs: NodeImpl out-of-line methods (node.cpp) + the two
+    # p2pool p2p protocol dispatchers (Legacy/Actual handle_message_* family) +
+    # the stratum work source. These define the previously-undefined NodeImpl::
+    # and protocol symbols so the --pool path LINKS. Per-coin isolation holds
+    # (src/impl/bch only); compiled directly into the target like the coin TUs.
+    ${CMAKE_SOURCE_DIR}/src/impl/bch/node.cpp
+    ${CMAKE_SOURCE_DIR}/src/impl/bch/protocol_actual.cpp
+    ${CMAKE_SOURCE_DIR}/src/impl/bch/protocol_legacy.cpp
+    ${CMAKE_SOURCE_DIR}/src/impl/bch/stratum/work_source.cpp
 )
 target_compile_definitions(c2pool-bch PRIVATE C2POOL_VERSION="${C2POOL_GIT_VERSION}")
 # --ibd RUN-LOOP slice (integrator 2026-06-18): the read-only headers-first IBD

src/core/factory.hpp

@@ -1,5 +1,6 @@
 #pragma once
 #include <boost/asio.hpp>
+#include <optional>
 
 #include <core/log.hpp>
 #include <core/socket.hpp>
@@ -19,7 +20,7 @@ class Server
 {
 private:
 	INetwork* m_node;
-	io::ip::tcp::acceptor m_acceptor;
+	std::optional<io::ip::tcp::acceptor> m_acceptor;
 
 protected:
 	void accept()
@@ -30,7 +31,7 @@ class Server
         // fall back to raw m_node (preserves prior behavior).
         auto weak_node = m_node->weak_from_this();
         bool was_managed = weak_node.lock() != nullptr;
-        m_acceptor.async_accept(
+        m_acceptor->async_accept(
 			[this, weak_node, was_managed](boost::system::error_code ec, io::ip::tcp::socket io_socket)
 			{
 				if (ec)
@@ -57,32 +58,43 @@ class Server
 
 public:
 	Server(io::io_context* context, INetwork* node, const std::string& /*label*/ = "")
-		: m_acceptor(*context), m_node(node)
+		: m_node(node)
 	{
+		// Rig-free / test construction (context == nullptr, e.g. a default-
+		// constructed BaseNode used for share-admit unit tests) leaves the
+		// acceptor unengaged so no null io_context is dereferenced. listen()
+		// is only valid once a real io_context has been wired in.
+		if (context)
+			m_acceptor.emplace(*context);
 	}
 
 	void listen(auto listen_port)
     {
+        if (!m_acceptor)
+        {
+            LOG_ERROR << "listen() called on a context-less Server";
+            return;
+        }
         io::ip::tcp::endpoint listen_ep(io::ip::tcp::v4(), listen_port);
 
-        m_acceptor.open(listen_ep.protocol());
-		m_acceptor.set_option(io::socket_base::reuse_address(true));
-		m_acceptor.bind(listen_ep);
-		m_acceptor.listen();
+        m_acceptor->open(listen_ep.protocol());
+		m_acceptor->set_option(io::socket_base::reuse_address(true));
+		m_acceptor->bind(listen_ep);
+		m_acceptor->listen();
 		accept();
 
 		LOG_INFO << "Factory started for port: " << listen_ep.port();
     }
 
-	uint16_t listen_port() const { return m_acceptor.local_endpoint().port(); }
+	uint16_t listen_port() const { return m_acceptor->local_endpoint().port(); }
 };
 
 class Client
 {
 private:
 	INetwork* m_node;
 	io::io_context* m_context;
-    io::ip::tcp::resolver m_resolver;
+    std::optional<io::ip::tcp::resolver> m_resolver;
     std::string m_label = "Net";  // chain/protocol label for log messages
 
 	void connect_socket(boost::asio::ip::tcp::resolver::results_type endpoints)
@@ -136,7 +148,12 @@ class Client
 		// only enforce the alive check when there WAS a shared owner to
 		// begin with.
 		bool was_managed = weak_node.lock() != nullptr;
-		m_resolver.async_resolve(addr.address(), addr.port_str(),
+		if (!m_resolver)
+		{
+			LOG_ERROR << "resolve() called on a context-less Client";
+			return;
+		}
+		m_resolver->async_resolve(addr.address(), addr.port_str(),
 			[this, weak_node, was_managed, addr = addr](const auto& ec, auto endpoints)
 			{
 				if (ec)
@@ -160,8 +177,13 @@ class Client
 
 public:
 	Client(io::io_context* context, INetwork* node, const std::string& label = "Net")
-		: m_context(context), m_resolver(*context), m_node(node), m_label(label)
+		: m_node(node), m_context(context), m_label(label)
 	{
+		// Rig-free / test construction (context == nullptr) defers the resolver
+		// so no null io_context is dereferenced; resolve()/connect() are only
+		// valid once a real io_context has been wired in.
+		if (context)
+			m_resolver.emplace(*context);
 	}
 
 	void connect(NetService addr)

src/impl/bch/CMakeLists.txt

@@ -5,8 +5,9 @@
 # TODO(M3): add_library(impl_bch ...) sources, link bitcoin_family shared base,
 # wire embedded BCHN daemon slice under daemon/. Stub only at M2.
 if(COIN_BCH)
-  message(STATUS "c2pool: BCH coin module enabled (skeleton)")
-  # add_subdirectory(coin)
+  message(STATUS "c2pool: BCH coin module enabled")
+  add_subdirectory(coin)
+  add_subdirectory(stratum)
   # add_subdirectory(daemon)
   add_subdirectory(test)
 endif()

src/impl/bch/coin/CMakeLists.txt

@@ -0,0 +1,40 @@
+
+# bch::coin library — c2pool-bch coin module (V36). Mirrors src/impl/btc/coin.
+# Built when -DCOIN_BCH=ON via the parent add_subdirectory(coin).
+# BCH-specific: SHA256d (BTC PoW family), NO SegWit, CashTokens transparent,
+# ABLA dynamic block-size, ASERT DAA. Embedded BCHN daemon body lives here.
+
+set(bch_coin_impl
+    rpc_data.hpp
+    rpc.hpp rpc.cpp
+    p2p_connection.hpp p2p_connection.cpp
+    p2p_node.cpp p2p_node.hpp
+    p2p_messages.hpp
+    node.hpp
+    coin_node.hpp coin_node.cpp
+)
+
+set(bch_coin_interface
+    txidcache.hpp
+    node_interface.hpp
+    block.hpp
+    transaction.hpp transaction.cpp
+    header_chain.hpp
+    mempool.hpp
+    template_builder.hpp
+)
+
+# BCH-specific consensus + embedded-daemon headers (header-only at this slice).
+set(bch_coin_bchn
+    abla.hpp abla_block_feed.hpp abla_runtime.hpp abla_tracker.hpp
+    asert.hpp softfork_check.hpp
+    merkle.hpp cashaddr.hpp regtest_block.hpp
+    header_sync.hpp block_download.hpp block_connector.hpp
+    compact_blocks.hpp block_broadcast_guard.hpp
+    bchn_anchor_record.hpp chain_seeds.hpp
+    embedded_daemon.hpp
+)
+
+add_library(bch_coin ${bch_coin_interface} ${bch_coin_impl} ${bch_coin_bchn})
+
+target_link_libraries(bch_coin core nlohmann_json::nlohmann_json)

src/impl/bch/coin/embedded_daemon.hpp

@@ -100,7 +100,7 @@ class EmbeddedDaemon {
     /// EmbeddedCoinNode::getwork() is the live in-process work source.
     void run() {
         m_chain.init();               // load genesis / fast-start checkpoint (network-free)
-        m_node.run();                 // init_rpc(): external BCHN-RPC fallback retained
+        m_node.run(/*embedded_primary=*/true); // init_rpc(): eager external GBT non-fatal (embedded-primary); RPC fallback retained
         assemble();                   // network-free seam + ABLA wiring (see below)
         wire_chain_ingest();          // new_headers --> HeaderChain (advances synced height)
         pin_cold_start_anchor();      // operator-APPROVED VM300 anchor (decisions@ 2026-06-18); floor-equivalent

src/impl/bch/coin/node.hpp

@@ -55,13 +55,30 @@ class Node : public bch::interfaces::Node
         m_p2p->connect(m_config->coin()->m_p2p.address);
     }
 
-    void init_rpc()
+    // embedded_primary: when the in-process embedded daemon is the PRIMARY work
+    // source (v36 external_fallback invariant), a dead / 0-peer external BCHN that
+    // cannot yet answer getblocktemplate must NOT abort bring-up -- the embedded
+    // source provides work and the external RPC is only the fallback sink. When the
+    // external RPC IS the work source (embedded_primary == false), a failure here
+    // stays fatal exactly as before.
+    void init_rpc(bool embedded_primary)
     {
         m_rpc = std::make_unique<NodeRPC>(m_context, this, m_config->m_testnet);
         m_rpc->connect(m_config->m_rpc.address, m_config->m_rpc.userpass);
 
-        // work
-        work.set(m_rpc->getwork());
+        // work (eager prime from external RPC)
+        if (embedded_primary) {
+            try {
+                work.set(m_rpc->getwork());
+            } catch (const std::exception& e) {
+                LOG_WARNING << "[EMB-BCH] init_rpc: external BCHN getwork() unavailable"
+                               " at bring-up (" << e.what() << "); embedded-primary ->"
+                               " deferring to embedded work source, RPC retained as"
+                               " fallback sink.";
+            }
+        } else {
+            work.set(m_rpc->getwork());
+        }
     }
 
 public:
@@ -70,10 +87,12 @@ class Node : public bch::interfaces::Node
     {
     }
 
-    void run()
+    // embedded_primary defaults false: an external-RPC-as-work-source config still
+    // hard-fails on a dead RPC at bring-up. The embedded daemon passes true.
+    void run(bool embedded_primary = false)
     {
         // RPC
-        init_rpc();
+        init_rpc(embedded_primary);
     }
 
     /// Start P2P connection to coin daemon for fast block relay.