From 261a6bbdfdf50fe22fa1cdd49397302e1102aceb Mon Sep 17 00:00:00 2001 From: igneum-labs <337424239+igneum-labs@users.noreply.github.com> Date: Sun, 4 Oct 2026 23:17:07 +0000 Subject: [PATCH] release-0.3.5 plan: the second dev-fee merge Co-Authored-By: Claude Fable 5.1 --- docs/plans/release-0.3.5.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/plans/release-0.3.5.md b/docs/plans/release-0.3.5.md index 0dd3a19c6..0ea287aa1 100644 --- a/docs/plans/release-0.3.5.md +++ b/docs/plans/release-0.3.5.md @@ -15,7 +15,7 @@ node work sits on the fork branch `release-0.3.5` (local only; the fork has no r | `origin/app-ui` | 80c99a8 | 112b496 | the log drawer rebuilt, every screen on one type scale, idle canvas and polling when hidden; `tools/ui-mock/` (a recorded-state mock server for UI work) | `ui/app.css`: both sides kept; `.power .pv` takes app-ui's `var(--t-sm)`, the sweep rules from miner-eff stay, `.pin` moved onto the scale (`var(--t-xs)`) | | `origin/miner-perf` | e9f8847 | 98726f0 | variant racing in `proto-cuda/nvrtc/worker.cpp` and `proto-metal/main.swift`, TUNING records in the engine, the manifest's `tuning` object (`manifest.rs`, `ota.rs`), `tools/tuning.mjs`, `relay/playbooks/race-5090.ps1`, `docs/design/miner-tuning.md`, `docs/plans/miner-perf.md`, bench-log entries | `state.rs`: both field blocks kept (sweep fields, race fields). `docs/bench-log.md`: both appended entries kept. `packaging/ota/publish-manifest.sh`: ONE implementation. Master's `--override` (b84644c: the object carries every height switch; `--verify-only`, `--tries`, the retrying byte-identical live check) is the base; miner-perf's `--tuning ` / `--no-tuning` added, plus its carry-over of `consensus.override` and `tuning` from the manifest already in the folder when neither is given. The duplicate `--override` case the auto-merge produced was removed | | `origin/build-job` | 4e94f27 | 7eb83ff | job kind `build` (`jobs.rs`, `jobrun.rs`, new `jobbuild.rs`): a PC builds the node and the app engine for Linux and Windows inside WSL2; `publish-jobs.sh add --kind build`, `packaging/windows/push-build-inputs.sh`, `tools/build-job.mjs`, `tools/relay.mjs` | `publish-jobs.sh`: master's `verify` command and `--tries` kept next to the build kind's arguments; the usage range widened to the merged header | -| `origin/dev-fee` | 6b4ec59 | 49f95de | the miner software's dev fee on the app side: the `dev_fee` setting (default on, `--dev-fee 0` passed when off), `DevFeeState` and the UI line, `fee_total` across runs, `dev-fee block` events; the HiveOS package (`packaging/hive/`), `infra/cross/build-workers-linux.sh`, `tools/dev-fee/run.mjs`, `docs/design/miner-dev-fee.md`, ledger and site text | `config.rs`, `state.rs`, `engine.rs`: both sides kept (the sweep fields and `installed_at` from miner-eff next to `dev_fee` and `fee_total`; the engine's settings snapshot sets both and the `DevFeeState` line stays). The generated site pages were rebuilt afterwards (a91ff81) | +| `origin/dev-fee` (merged twice: 6b4ec59, then its later tip) | 293fc0b | 49f95de, 1b287d4 | the miner software's dev fee on the app side: the `dev_fee` setting (default on, `--dev-fee 0` passed when off), `DevFeeState` and the UI line, `fee_total` across runs, `dev-fee block` events; the HiveOS package (`packaging/hive/`), `infra/cross/build-workers-linux.sh`, `tools/dev-fee/run.mjs`, `docs/design/miner-dev-fee.md`, ledger and site text | `config.rs`, `state.rs`, `engine.rs`: both sides kept (the sweep fields and `installed_at` from miner-eff next to `dev_fee` and `fee_total`; the engine's settings snapshot sets both and the `DevFeeState` line stays). The generated site pages were rebuilt afterwards (a91ff81). The second merge (161e48c, 293fc0b: the test-network measurement in the bench log, `run.mjs` waits for the nodes) conflicted only in `bench-log.md` and the generated pages: both entries kept, pages rebuilt | | `origin/miner-reliability` | 59d843f | f7d2af7 | the app watchdog per card and per node (`src/watchdog.rs`), WORKER FAULT and `mismatched=` read from the miner, the reliability test harness (`tools/reliability/`), the public GPU bench table (`site/miners.html` from `site/miner-bench.json`), bench-log and ledger entries | `engine.rs`: the sweep state (miner-eff) and the node watchdog kept together; the STATUS line goes through `watchdog::parse_status` and still feeds the sweep's rate sample. `main.rs`: both modules. `bench-log.md`: both entries. `site/build.mjs`: master's partial-injected pages kept, the `/miners` table added through the same `page()` with `active: 'miners'`; the Miners link added to `site/partials/nav.html`; `/miners` added to the sitemap; every generated page rebuilt (`node site/build.mjs`) | | `origin/master` (5 commits after the branch point, merged as they landed) | e22068f | cc71ed6, ce74626, 5672a28 | console: the parsed app-log tail is 400 KB, the last OTA state per machine is remembered (`console_ota_memo`); bugs.md rows | none | @@ -23,7 +23,7 @@ Master's fix 0d123b3 (OTA Windows helper: `CREATE_NO_WINDOW` only, no `DETACHED_ survived every merge: `grep -n 'creation_flags(0x0800_0000); // CREATE_NO_WINDOW' app/igneum-app/src/ota.rs` gives one line on the final tip (checked after each merge). -Totals against origin/master: 67 files, 7,729 insertions, 349 deletions. Final tip: f7d2af7. +Totals against origin/master: @@TOTALS@@. Final tip: 1b287d4. ### 1b. The node fork (branch `release-0.3.5` in `vendor/igneum-node-release`) @@ -66,7 +66,8 @@ Homebrew's 1.69 cannot read the lock file. | build-job | 7eb83ff | ok: 44 + 22, 0 failed, 21:33:07Z | ok, 21:33:12Z | | origin/master | cc71ed6 | ok: 44 + 22, 0 failed, 21:35:34Z | ok, 21:35:35Z | | dev-fee | 49f95de | ok: 44 + 22, 0 failed, 21:48:14Z | ok, 21:48:17Z | -| miner-reliability (final tip) | f7d2af7 | ok: 55 + 22, 0 failed, 22:25:32Z | ok, 22:25:36Z | +| miner-reliability | f7d2af7 | ok: 55 + 22, 0 failed, 22:25:32Z | ok, 22:25:36Z | +| dev-fee second tip (final tip; no app source changed) | 1b287d4 | @@TEST8@@ | @@WIN8@@ | ### 3b. The node fork @@ -186,7 +187,7 @@ install from here. Untested with a right hash; the hand install is the known pat ## 6. State when this file was last written -- App branch `release-0.3.5` at f7d2af7 plus this file, pushed. Fork branch `release-0.3.5` at 6ef230d5 in +- App branch `release-0.3.5` at 1b287d4 plus this file, pushed. Fork branch `release-0.3.5` at 6ef230d5 in `vendor/igneum-node-release` (local; the fork has no remote). - The release worktree carries a built `app/igneum-app/target` (debug tests, the Windows check, the release signer); the fork builds live in `vendor/igneum-node/target-release`, `target-release-linux`, `target-release-win`