diff --git a/docs/plans/counter-asic-2-node.md b/docs/plans/counter-asic-2-node.md index 445d0302f..2011dd88c 100644 --- a/docs/plans/counter-asic-2-node.md +++ b/docs/plans/counter-asic-2-node.md @@ -172,6 +172,15 @@ The PC's test stage builds the fork's test binaries with the plan's feature set, | fork `cargo test -p kaspa-consensus-core` | 108 + 7: the switch rounding, the era clock, the params, digest and fast-time file tests | pass (Mac, fork 79bd8e10) | | PC 2 `build-job.mjs` suites | `kaspa-consensus-core igneum-exec kaspa-pow kaspa-consensus igneum-miner` + `igneum-app` | the coordinator publishes on its go | +## 6a. The integration merges for the ship (5 October 2026, 22:35Z to 22:45Z) + +| Merge | Commit | Conflicts, and how they were kept | +|---|---|---| +| readwidth 30ff674 (the OpenCL `__local` declaration rule, the read-width decision record, the per-watt rows) | 3566afd | `emit.rs` (2 hunks: the hot-table kernel arguments, HEAD's superset), `packbench.swift` (readwidth's resident-footprint lines added to HEAD's hot-aware RESULT line), `bench-log.md` (both entries), `read-width.md` add/add (readwidth's version, a pure superset of HEAD's) | +| origin/master 1f0d62c (the 0.3.10 merge) | 49c7e78 | `host.c` (one struct hunk: both fields, `dupOf` and `pci[32]`; master's topology, duplicate-platform and read-back code and ca2-v3's class/era tokens, `mh_word`, hot and mixer fields all auto-merged; `cc -fsyntax-only` clean), `bench-log.md` (both entries) | + +Checks after the merges: the igneum-pow suite, the packfile test, the CUDA emulation `emu/test.sh`, `proto-opencl/test-generic.sh` on Apple OpenCL, the fork's check: the result is in the final report and the status file. + ## 7. Unverified, and what is owed - The era walk for era >= 1 has never run (the devnet is 180 days from era 1); a pruning-proof sync past era 0 fails with `MissingEraSeed` until an era witness exists in the proof format.