diff options
| author | Your Name <you@example.com> | 2026-05-19 19:41:30 +0530 |
|---|---|---|
| committer | Your Name <you@example.com> | 2026-05-19 19:41:30 +0530 |
| commit | 6bbc2e644f9c672d046acb7c86078722da90925f (patch) | |
| tree | 2d24eb3ec26583e05a7c8a486571225e46f72c4c | |
| parent | 6a61810943a9bb7df9c4ec48cdefbe54ac9c1275 (diff) | |
docs: update MINER_INTEGRATION_PLAN.md checklist — steps 1-4 complete
| -rw-r--r-- | MINER_INTEGRATION_PLAN.md | 66 |
1 files changed, 36 insertions, 30 deletions
diff --git a/MINER_INTEGRATION_PLAN.md b/MINER_INTEGRATION_PLAN.md index 7b4554d..202c33f 100644 --- a/MINER_INTEGRATION_PLAN.md +++ b/MINER_INTEGRATION_PLAN.md | |||
| @@ -55,38 +55,44 @@ ESP-Miner-NerdQAxePlus (fork of shufps/ESP-Miner-NerdQAxePlus) | |||
| 55 | 55 | ||
| 56 | ## Plan Checklist | 56 | ## Plan Checklist |
| 57 | 57 | ||
| 58 | ### Step 1: Fix Master Build — COMPLETE | 58 | ### Step 1: Fix Master Build — COMPLETE (commit `62bce81`) |
| 59 | 59 | ||
| 60 | - [x] Create `components/negentropy/CMakeLists.txt` (register C++ wrapper as ESP-IDF component) | 60 | - [x] Create `components/negentropy_lib/` wrapper component (mbedTLS SHA-256 compat for negentropy submodule) |
| 61 | - [x] Fix `main/CMakeLists.txt` (remove `esp_littlefs`, `esp_timer`, `tcp_transport` from REQUIRES) | 61 | - [x] Fix `main/CMakeLists.txt` (remove `esp_littlefs`, `esp_timer`; keep `tcp_transport`) |
| 62 | - [x] `idf.py build` passes on master | 62 | - [x] Fix `config.c` duplicate seed_relays/sync_interval/fallback_interval blocks |
| 63 | - [x] Remove leftover merge conflict marker in `tollgate_api.c` | ||
| 64 | - [x] `idf.py build` passes on master (1.3MB, 68% free) | ||
| 63 | - [x] `make test-unit` passes (19 test suites, 344+ assertions) | 65 | - [x] `make test-unit` passes (19 test suites, 344+ assertions) |
| 64 | - [x] Commit + push | 66 | - [x] Committed (push failed — nostr relay state event rejection) |
| 65 | 67 | ||
| 66 | ### Step 2: Create Miner Integration Branch + Worktree | 68 | ### Step 2: Create Miner Integration Branch + Worktree — COMPLETE |
| 67 | 69 | ||
| 68 | - [ ] Create `feature/miner-integration` branch from master | 70 | - [x] Create `feature/miner-integration` branch from master |
| 69 | - [ ] Create git worktree at `/home/c03rad0r/esp32-miner-integration` | 71 | - [x] Create git worktree at `/home/c03rad0r/esp32-miner-integration` |
| 70 | - [ ] Verify worktree builds and tests pass (same as master) | 72 | - [x] Initialize git submodules in worktree (esp_littlefs, negentropy, nucula_src) |
| 71 | 73 | - [x] Verify worktree builds and tests pass | |
| 72 | ### Step 3: Cherry-pick tollgate_core Skeleton from Arch Branch | 74 | |
| 73 | 75 | ### Step 3: Cherry-pick tollgate_core Skeleton from Arch Branch — COMPLETE | |
| 74 | - [ ] Copy `components/tollgate_core/CMakeLists.txt` from `feature/tollgate-core-component` | 76 | |
| 75 | - [ ] Copy `components/tollgate_core/idf_component.yml` from `feature/tollgate-core-component` | 77 | - [x] Copy `components/tollgate_core/CMakeLists.txt` from `feature/tollgate-core-component` |
| 76 | - [ ] Copy `components/tollgate_core/include/tollgate_core.h` from `feature/tollgate-core-component` | 78 | - [x] Copy `components/tollgate_core/idf_component.yml` from `feature/tollgate-core-component` |
| 77 | - [ ] Copy `components/tollgate_core/include/tollgate_platform.h` from `feature/tollgate-core-component` | 79 | - [x] Copy `components/tollgate_core/include/tollgate_core.h` from `feature/tollgate-core-component` |
| 78 | - [ ] Extend `tollgate_platform.h` with mining callbacks (get_stratum_url, on_share_accepted, etc.) | 80 | - [x] Copy `components/tollgate_core/include/tollgate_platform.h` from `feature/tollgate-core-component` |
| 79 | - [ ] Extend `tollgate_core.h` with mining API (tollgate_core_start_stratum_proxy, etc.) | 81 | - [x] Extend `tollgate_platform.h` with mining callbacks (get_stratum_url, on_share_accepted, etc.) |
| 80 | 82 | - [x] Extend `tollgate_core.h` with mining API (tollgate_core_stratum_proxy_start, etc.) | |
| 81 | ### Step 4: Populate tollgate_core with Current Master Modules | 83 | |
| 82 | 84 | ### Step 4: Populate tollgate_core with Current Master Modules — COMPLETE (commit `6a61810`) | |
| 83 | - [ ] Copy + rename `main/cashu.c` → `components/tollgate_core/src/tollgate_core_cashu.c` | 85 | |
| 84 | - [ ] Copy + rename `main/dns_server.c` → `components/tollgate_core/src/tollgate_core_dns.c` | 86 | - [x] Copy from arch branch: `tollgate_core_cashu.c/h` (Cashu token decode/verify) |
| 85 | - [ ] Copy + rename `main/firewall.c` → `components/tollgate_core/src/tollgate_core_firewall.c` | 87 | - [x] Copy from arch branch: `tollgate_core_dns.c/h` (per-client DNS hijack/forward) |
| 86 | - [ ] Copy + rename `main/session.c` → `components/tollgate_core/src/tollgate_core_session.c` | 88 | - [x] Copy from arch branch: `tollgate_core_firewall.c/h` (per-client NAT filter) |
| 87 | - [ ] Copy + rename `main/mining_payment.c` → `components/tollgate_core/src/tollgate_core_mining.c` | 89 | - [x] Copy from arch branch: `tollgate_core_session.c/h` (session lifecycle) |
| 88 | - [ ] Copy + rename `main/stratum_proxy.c` → `components/tollgate_core/src/tollgate_core_stratum_proxy.c` | 90 | - [x] Copy from arch branch: `tollgate_core.c` (orchestrator — init, payment, tick, owner) |
| 89 | - [ ] Implement `tollgate_core.c` — wire all sub-modules via platform callbacks | 91 | - [x] Create `tollgate_core_mining.c/h` (from mining_payment.c — hashprice, share validation, client stats) |
| 92 | - [x] Create `tollgate_core_stratum_proxy.c/h` (from stratum_proxy.c — local SV1 TCP server) | ||
| 93 | - [x] Fix nucula_src `save_proofs` visibility (public) | ||
| 94 | - [x] `idf.py build` passes | ||
| 95 | - [x] `make test-unit` passes | ||
| 90 | - [ ] Update `components/tollgate_core/CMakeLists.txt` with all SRCS and REQUIRES | 96 | - [ ] Update `components/tollgate_core/CMakeLists.txt` with all SRCS and REQUIRES |
| 91 | 97 | ||
| 92 | ### Step 5: Wire tollgate_core into Standalone Build | 98 | ### Step 5: Wire tollgate_core into Standalone Build |