dash(slice1): embedded compiling base — build-glue + web_server SSOT reconcile - #165
Merged
Conversation
master already absorbed the embedded web_server work via the S5/S6 slice campaign (hpp byte-identical; cpp diverged only on the coin-node seam API). Resolve the seam to master SSOT (set_coin_node/ICoinNode), and re-apply the one genuinely-additive embedded-only hunk (share_version per blockchain). Compiling base for the embedded S7/S8 source slices to land on.
This was referenced Jun 18, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
DASH Slice-1 — embedded compiling base (build-glue + web_server reconcile)
Gating slice for the ~06-23 / ~07-01 embedded re-land campaign. Branched off current master (
81fef6a0, a descendant ofd96eda60→ satisfiesd96eda60+).web_server 3-way reconcile (the named conflict) — DONE @
af37332eKey finding: master already absorbed the bulk of the embedded web_server work through the S5/S6 slice campaign. Concrete surface vs the merge-base premise:
web_server.hpp: byte-identical master↔embedded — zero reconcile.web_server.cpp: real divergence is only 51/-49 lines, and it is not a "+200/-29 preserve-both" merge — it is an API-direction divergence on the coin-node seam:set_coin_node(core::coin::ICoinNode*)set_coin_rpc(NodeRPC*,Node*)+set_embedded_node(CoinNodeInterface*)share_versionper blockchain). Compile-safe (references onlym_blockchain).build-glue — sequencing note (ETA work)
The
c2pool-dashexecutable target insrc/impl/dash/CMakeLists.txtreferences ~37 S7/S8 source files absent on master (master has 48 dash files, embedded 85). A fully-green configure needs build-glue + embedded source sequenced together (next slices), or the expanded target gated. The dependency-level glue (relic asm / dashbls CMakeLists,bitcoin_family, test harness) lands independently.CI:
dash-linux-only(#164) — Linux x86_64 + dash smoke.