diff --git a/docs/plans/ledger-close-status.md b/docs/plans/ledger-close-status.md index f91274982..e57473c11 100644 --- a/docs/plans/ledger-close-status.md +++ b/docs/plans/ledger-close-status.md @@ -33,3 +33,7 @@ Round 2 starting (four agents): `ledger-design` (D6 review, X17 design, D5 sched ## 23:10 UTC: ship state The 0.3.11 cut closed at 23bc2b2 before `fud-close` reached the ship order; `fud-close` heads the next cut (recorded by the Counter ASIC 2.0 coordinator in release-0.3.11.md). Checks on tip 647b08c: `tools/ci/commit-tz-check.sh` and `tools/ci/curl-header-check.sh` pass, the site build runs clean. Coupling for the next cut: the M28 worker change on `fud-close` (packfile.h kernel_sha256 check, host.c refusal of an unstamped pack) must ship with the fork's miner commit 3d4ec451 (`ledger-fixes`) that stamps the hash, or every worker refuses every pack. `ledger-fixes` still needs its rebase onto the 0.3.11 fork tip 89dfcb95 (two conflicting files); queued after round 2. Round 2's four branches are in progress and stay behind tonight. + +## 23:20 UTC: the fork rebase, sized + +A trial merge of the 0.3.11 fork tip 89dfcb95 into `ledger-fixes` (worktree `vendor/igneum-node-ledger0311`, branch `ledger-fixes-0311`, aborted and left clean) conflicts in two files. `protocol/flows/src/ibd/proof.rs`: two trivial test hunks (the tuple shape of `receive_pruning_point_proof`). `igneum/miner/src/main.rs`: seven hunks, substantive, because Counter ASIC 2.0 restructured `EpochSeeds` (class and era fields), made `template_seeds` return a value instead of the `Option` that X22's "no expect on the node's answers" introduced, and replaced the export path with `write_pack_checked`, inside which M28's `stamp_kernel_hashes` must now be called. That is a round-3 item for a fork agent with PC 2 suites (`ledger-rebase`), after `ledger-pc2` has finished on `ledger-fixes-2`, so the two fork branches rebase once.