Skip to content

dash(slice1): embedded compiling base — build-glue + web_server SSOT reconcile - #165

Merged
frstrtr merged 1 commit into
masterfrom
dash/embedded-base-slice1
Jun 18, 2026
Merged

dash(slice1): embedded compiling base — build-glue + web_server SSOT reconcile#165
frstrtr merged 1 commit into
masterfrom
dash/embedded-base-slice1

Conversation

@frstrtr

@frstrtr frstrtr commented Jun 18, 2026

Copy link
Copy Markdown
Owner

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 of d96eda60 → satisfies d96eda60+).

web_server 3-way reconcile (the named conflict) — DONE @ af37332e

Key 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:
    • master (SSOT): set_coin_node(core::coin::ICoinNode*)
    • embedded (older): set_coin_rpc(NodeRPC*,Node*) + set_embedded_node(CoinNodeInterface*)
  • Resolved to master SSOT (ICoinNode) per the version-gate-SSOT directive; re-applied the one genuinely-additive embedded-only hunk (share_version per blockchain). Compile-safe (references only m_blockchain).

build-glue — sequencing note (ETA work)

The c2pool-dash executable target in src/impl/dash/CMakeLists.txt references ~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.

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.
@frstrtr frstrtr added the dash-linux-only DASH slice PR: Linux-only CI (skip macOS/Windows) label Jun 18, 2026
@frstrtr frstrtr closed this Jun 18, 2026
@frstrtr frstrtr reopened this Jun 18, 2026
@frstrtr
frstrtr merged commit 7364408 into master Jun 18, 2026
33 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dash-linux-only DASH slice PR: Linux-only CI (skip macOS/Windows)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant