2 files changed, 147 insertions, 10 deletions

diff --git a/MINER_INTEGRATION_PLAN.md b/MINER_INTEGRATION_PLAN.md
index 646109b..00c4a0c 100644
--- a/MINER_INTEGRATION_PLAN.md
+++ b/MINER_INTEGRATION_PLAN.md
@@ -122,16 +122,25 @@ with existing main/ code. The component is ready for consumption by external pro
   - `main/main.cpp:307-313` — task creation (add tollgate tasks)
   - `components/connect/connect.c:162` — APSTA mode already supported
 
-### Step 7: Implement NerdQAxePlus TollGate Integration — IN PROGRESS
-
-- [ ] Create `main/tollgate_platform.cpp` — implements platform interface with NVS config + ASIC state
-- [ ] Create `main/boards/tollgate_board.h/cpp` — TollGateBoard extends NerdAxe (AP+STA WiFi)
-- [ ] Patch `main/tasks/asic_result_task.cpp` — `#ifdef TOLLGATE` hook on share accepted
-- [ ] Patch `main/main.cpp` — `#ifdef TOLLGATE` init block (AP, DNS, captive portal, stratum proxy)
-- [ ] Create `main/lwip_tollgate_hooks.h` — LWIP hook forwarding to tollgate_core
-- [ ] Update `main/CMakeLists.txt` — conditional TOLLGATE sources
-- [ ] Update top-level `CMakeLists.txt` — `-DTOLLGATE` compile definition when env var set
-- [ ] Build: `BOARD=NERDAXE TOLLGATE=1 idf.py build`
+### Step 7: Implement NerdQAxePlus TollGate Integration — COMPLETE (commit `83e09ab9`)
+
+- [x] Create `main/tollgate_platform.cpp` — implements platform interface with NVS config + ASIC state
+- [x] Create `main/tollgate_nerdqaxe.h` — init declarations for main.cpp/asic_result_task.cpp
+- [x] Patch `main/tasks/asic_result_task.cpp` — `#ifdef TOLLGATE` hook on share accepted
+- [x] Patch `main/main.cpp` — skip `wifi_softap_off()`, call `tollgate_nerdqaxe_init()` after mining starts
+- [x] Update `main/CMakeLists.txt` — conditional TOLLGATE sources via `$ENV{TOLLGATE}`
+- [x] Update top-level `CMakeLists.txt` — `-DTOLLGATE` compile definition when env var set
+- [x] Add TollGate NVS keys to `main/nvs_config.h`
+- [x] Symlink `components/tollgate_core` from esp32-miner-integration worktree
+- [x] Build: `BOARD=NERDAXE TOLLGATE=1 idf.py build` — PASS (2.9MB)
+- [x] Stock build: `BOARD=NERDAXE idf.py build` — PASS (unaffected)
+- [x] tollgate_core: extern "C" guards, stratum_proxy_init name fix, conditional NAPT
+- [x] `ngit init` NerdQAxePlus as separate nostr repo (`esp-miner-nerdqaxeplus-tollgate`)
+- [x] Push to `git.orangesync.tech` GRASP server
+- [x] Cross-reference documentation (REMOTES.md in both repos)
+
+Note: `main/boards/tollgate_board.h/cpp` and `main/lwip_tollgate_hooks.h` deferred —
+using simpler `#ifdef TOLLGATE` patches directly in existing files instead.
 
 ### Step 8: Hardware Testing on NerdAxe Ultra
 
diff --git a/REMOTES.md b/REMOTES.md
new file mode 100644
index 0000000..ed77001
--- /dev/null
+++ b/REMOTES.md
@@ -0,0 +1,128 @@
+# Git Remotes — esp32-tollgate
+
+## Nostr Identity
+
+- **npub:** `npub12m5exm2uk3xa674cc5r0hlyvccs5xxn7qv83ezuteefv5972nquq4j4szl`
+- **naddr coordinate:** `naddr1qq8x2umsxvez6ar0d3kxwct5v5pzq4hfjdk4edzdm4at33gxl07ge33pgvd8uqc0rj9chnjjegtu4xpcqvzqqqrhnyq3gamnwvaz7tmjv4kxz7fwdenkjapwv3jhv3t9utz`
+- **ngit version:** 2.3.0
+
+## Remotes
+
+| Name | URL | Type | Purpose |
+|------|-----|------|---------|
+| `origin` | `nostr://npub12m5.../relay.ngit.dev/esp32-tollgate` | nostr (ngit) | Primary ngit relay |
+| `orangesync` | `nostr://npub12m5.../ngit.orangesync.tech/esp32-tollgate` | nostr (ngit) | Self-hosted ngit relay |
+
+## Infrastructure
+
+| Service | URL | Role |
+|---------|-----|------|
+| GRASP (Git Server) | `https://git.orangesync.tech` | Git smart HTTP over Nostr (NIP-34) |
+| ngit Relay (Nostr) | `wss://ngit.orangesync.tech` | Nostr relay for git state events |
+| GitWorkshop | `https://workshop.orangesync.tech` | Web UI for browsing nostr git repos |
+| relay.ngit.dev | `wss://relay.ngit.dev` | Public ngit relay (secondary) |
+
+## GRASP Servers
+
+Configured in NIP-34 repo announcement:
+
+- `git.orangesync.tech` (self-hosted, primary)
+- `relay.anzenkodo.workers.dev`
+- `nostr.koning-degraaf.nl`
+- `relay.damus.io`
+- `nos.lol`
+
+## Additional Relays
+
+- `wss://ngit.orangesync.tech` (self-hosted, for state events)
+
+## Branches
+
+| Branch | HEAD | Status | Merged into master |
+|--------|------|--------|--------------------|
+| `master` | `62bce81` | Production | — |
+| `feature/miner-integration` | `e75c350` | Active — tollgate_core C++ compat + NerdQAxePlus integration | No |
+| `feature/tollgate-core-component` | `144b48f` | Active — original tollgate_core extraction + E2E fixes | No |
+| `feature/display-fix` | `565d6a7` | Stale — Playwright E2E test plan for /setup | No |
+| `feature/cvm-integration` | `2cd372c` | Merged to master | Yes (squashed) |
+| `feature/local-relay` | `25eb0c5` | Merged to master | Yes (squashed) |
+| `feature/mining-payment` | `ef9ae98` | Merged to master | Yes (squashed as `e366ceb`) |
+| `backup/multi-mint-support-pre-rebase` | `ef2de0f` | Backup only | N/A |
+
+## Local Worktrees
+
+| Path | Branch | Purpose |
+|------|--------|---------|
+| `/home/c03rad0r/esp32-tollgate` | `master` | Main repo (clean, for other LLM sessions) |
+| `/home/c03rad0r/esp32-miner-integration` | `feature/miner-integration` | tollgate_core + mining integration |
+| `/home/c03rad0r/esp32-tollgate-arch` | `feature/tollgate-core-component` | Architecture branch (original component extraction) |
+
+## Cross-Referenced Repositories
+
+### esp-miner-nerdqaxeplus-tollgate (NerdQAxePlus Fork)
+
+- **Identifier:** `esp-miner-nerdqaxeplus-tollgate`
+- **Clone:** `/home/c03rad0r/esp-miner-nerdqaxeplus`
+- **Branch:** `develop` (HEAD `83e09ab9`)
+- **Upstream:** `https://github.com/shufps/ESP-Miner-NerdQAxePlus`
+- **Dependency:** Uses `tollgate_core` component from `feature/miner-integration` branch (symlinked at `components/tollgate_core`)
+- **Build:** `BOARD=NERDAXE TOLLGATE=1 idf.py build`
+- **See:** `REMOTES.md` in that repo for full details
+
+### tollgate_core Component
+
+- **Source:** `components/tollgate_core/` on `feature/miner-integration` branch
+- **Files:** 7 C source files, 2 public headers, CMakeLists.txt, idf_component.yml
+- **Design doc:** `docs/TOLLGATE_CORE_DESIGN.md` on `feature/tollgate-core-component` branch
+
+## Backup Bundles
+
+| File | Contents | Size |
+|------|----------|------|
+| `/home/c03rad0r/mining-work-backup/feature-miner-integration-latest.bundle` | `feature/miner-integration` branch | ~950KB |
+| `/home/c03rad0r/mining-work-backup/feature-mining-payment.bundle` | `feature/mining-payment` branch | ~755KB |
+| `/home/c03rad0r/mining-work-backup/nerdqaxeplus-tollgate.bundle` | NerdQAxePlus `develop` branch | ~48MB |
+
+### Restore from bundle
+
+```bash
+# Clone from bundle
+git clone feature-miner-integration-latest.bundle -b feature/miner-integration esp32-tollgate-restored
+
+# Or fetch into existing repo
+git remote add bundle-src /home/c03rad0r/mining-work-backup/feature-miner-integration-latest.bundle
+git fetch bundle-src
+git checkout -b feature/miner-integration bundle-src/feature/miner-integration
+```
+
+## How to Push
+
+```bash
+# Push all branches to orangesync
+git push orangesync --all
+
+# Push specific branch
+git push orangesync feature/miner-integration
+
+# Push to both remotes
+git push origin master && git push orangesync master
+
+# Update repo metadata
+ngit repo edit -d -g git.orangesync.tech --relay wss://ngit.orangesync.tech
+
+# Sync (force GRASP servers to update)
+ngit sync -d -v
+```
+
+## Nostr Push Troubleshooting
+
+The "failed to list from https://..." messages during `git push` are **cosmetic noise** from third-party nostr relays that don't support git smart HTTP. The actual push succeeds — look for "Everything up-to-date" or "new state" from the primary relay in the output.
+
+Key pattern:
+```
+failed to list from https://nos.lol/...   ← cosmetic, ignore
+failed to list from https://relay.damus.io/...  ← cosmetic, ignore
+To nostr://npub.../ngit.orangesync.tech/esp32-tollgate
+ = [up to date]      master -> master     ← actual result
+Everything up-to-date
+```