From cb75491b31af899be2446a3d7075983aebb132b9 Mon Sep 17 00:00:00 2001 From: igneum-labs <337424239+igneum-labs@users.noreply.github.com> Date: Tue, 6 Oct 2026 08:25:02 +0000 Subject: [PATCH] Counter ASIC 3.0 status: the marker guard exists in CI already --- docs/plans/counter-asic-3-status.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/plans/counter-asic-3-status.md b/docs/plans/counter-asic-3-status.md index ec5ba3297..27ed3dfcf 100644 --- a/docs/plans/counter-asic-3-status.md +++ b/docs/plans/counter-asic-3-status.md @@ -87,7 +87,7 @@ Step cost per family on the M5 Max as a ratio to the add-xor-rotate chain (881 G | Found by | What was wrong | Fixed | |---|---|---| | item 3 (43c3ead) | spec 01 section 1.13.1's era table and `docs/plans/mixer-x4.md` section 2 still said `mixer_mult = 4`; the code (`LoadClass::MX8`, `V3_CLASS`) and spec 1.8.5 say 8 | both lines corrected on ca3-coord, 6 October 2026 | -| the coordinator's merge of ca3-shadow | `git add -A docs` staged `docs/bench-log.md` with its conflict markers inside (a conflicted path is marked resolved by `git add`), so 45f3019 carried markers into HEAD; found at the ca3-reserve merge as nested markers | the three 6 October entries kept in order with every marker removed (fcce185); a tracked-file marker check added to CI (below) so the shape fails the build next time | +| the coordinator's merge of ca3-shadow | `git add -A docs` staged `docs/bench-log.md` with its conflict markers inside (a conflicted path is marked resolved by `git add`), so 45f3019 carried markers into HEAD; found at the ca3-reserve merge as nested markers | the three 6 October entries kept in order with every marker removed (fcce185); the class guard already exists, `tools/ci/no-conflict-markers.sh` in CI, and it would have failed the push; it passes on the merged tree | | the merge of ca3-derive and ca3-shadow | both added a field to `LoadClass` (`derive_len`, `shadow`); resolved as the union, every other literal spreads `..`; `cargo test -p igneum-pow` on the merged tree (cargo 1.99 at `~/.cargo/bin`; the Homebrew 1.69 on PATH cannot read the lock file): 59 + 7 + 4 + 19 + 7 = 96 passed, 0 failed, the pinned v2 and v3 packs byte for byte | merged 09:10 UTC | | item 3 | the mixer's op count: 144 integer ops per application as written in `memhard.rs` (128 with RC and rk hoisted) against the 130 the chip model prices (`chip-model-v3.md` section 1, from spec 1.8.4) | items 1 and 2 asked to state which figure their rows use and why; the status close carries the answer |