Phase 8a-8b: extract beacon_price and market into component

- tollgate_core_beacon.c/h: pure logic (hash_mint, hash_npub, build_ie)
  with platform-agnostic tollgate_beacon_config_t input struct
- tollgate_core_market.c/h: market table logic (parse_ie, find_cheapest,
  update_ssid) with platform callbacks for time
- main/beacon_price.c: thin shim delegates to component, WiFi IE start/stop
- main/market.h: typedef aliases to component types
- All 21 unit tests pass, ESP-IDF build passes
- Hardware smoke test: 5/6 pass (AP, portal, grant/revoke, firewall)
- Market scanner discovers other TollGates via vendor IEs on hardware

12 files changed, 362 insertions, 226 deletions

diff --git a/components/tollgate_core/CMakeLists.txt b/components/tollgate_core/CMakeLists.txt
index 1b7d84a..3cd5e85 100644
--- a/components/tollgate_core/CMakeLists.txt
+++ b/components/tollgate_core/CMakeLists.txt
@@ -6,6 +6,8 @@ idf_component_register(
          "src/tollgate_core_session.c"
          "src/tollgate_core_mining.c"
          "src/tollgate_core_stratum_proxy.c"
+         "src/tollgate_core_beacon.c"
+         "src/tollgate_core_market.c"
     INCLUDE_DIRS "include" "src"
     REQUIRES lwip json esp_http_client mbedtls log esp_netif
     PRIV_REQUIRES esp_wifi)
diff --git a/components/tollgate_core/src/tollgate_core_beacon.c b/components/tollgate_core/src/tollgate_core_beacon.c
new file mode 100644
index 0000000..927aa03
--- /dev/null
+++ b/components/tollgate_core/src/tollgate_core_beacon.c
@@ -0,0 +1,48 @@
+#include "tollgate_core_beacon.h"
+#include "mbedtls/sha256.h"
+#include <string.h>
+
+void tollgate_core_beacon_hash_mint(const char *mint_url, uint8_t hash_out[4])
+{
+    uint8_t full_hash[32];
+    mbedtls_sha256((const unsigned char *)mint_url, strlen(mint_url), full_hash, 0);
+    memcpy(hash_out, full_hash, 4);
+}
+
+void tollgate_core_beacon_hash_npub(const char *npub_hex, uint8_t hash_out[4])
+{
+    uint8_t full_hash[32];
+    mbedtls_sha256((const unsigned char *)npub_hex, strlen(npub_hex), full_hash, 0);
+    memcpy(hash_out, full_hash, 4);
+}
+
+void tollgate_core_beacon_build_ie(const tollgate_beacon_config_t *cfg, tollgate_price_ie_t *ie)
+{
+    memset(ie, 0, sizeof(*ie));
+    ie->element_id = TOLLGATE_IE_ELEMENT_ID;
+    ie->length = 4 + TOLLGATE_IE_PAYLOAD_SIZE;
+    ie->vendor_oui[0] = TOLLGATE_OUI_0;
+    ie->vendor_oui[1] = TOLLGATE_OUI_1;
+    ie->vendor_oui[2] = TOLLGATE_OUI_2;
+    ie->vendor_oui_type = TOLLGATE_IE_TYPE;
+
+    tollgate_price_payload_t *p = &ie->payload;
+    p->version = TOLLGATE_IE_VERSION;
+    p->metric = (strcmp(cfg->metric, "bytes") == 0) ? 1 : 0;
+    p->price_per_step = (uint16_t)cfg->price_per_step;
+
+    bool is_bytes = (strcmp(cfg->metric, "bytes") == 0);
+    p->step_size = is_bytes ? (uint32_t)cfg->step_size_bytes : (uint32_t)cfg->step_size_ms;
+
+    tollgate_core_beacon_hash_mint(cfg->mint_url, p->mint_hash);
+
+    p->geohash_len = (uint8_t)strnlen(cfg->geohash, TOLLGATE_IE_GEOHASH_MAX);
+    memcpy(p->geohash, cfg->geohash, p->geohash_len);
+    if (p->geohash_len < TOLLGATE_IE_GEOHASH_MAX) {
+        memset(p->geohash + p->geohash_len, 0, TOLLGATE_IE_GEOHASH_MAX - p->geohash_len);
+    }
+
+    if (cfg->identity_initialized && cfg->npub_hex) {
+        tollgate_core_beacon_hash_npub(cfg->npub_hex, p->npub_hash);
+    }
+}
diff --git a/components/tollgate_core/src/tollgate_core_beacon.h b/components/tollgate_core/src/tollgate_core_beacon.h
new file mode 100644
index 0000000..27ad3fe
--- /dev/null
+++ b/components/tollgate_core/src/tollgate_core_beacon.h
@@ -0,0 +1,53 @@
+#ifndef TOLLGATE_CORE_BEACON_H
+#define TOLLGATE_CORE_BEACON_H
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#define TOLLGATE_OUI_0       0xC0
+#define TOLLGATE_OUI_1       0xFF
+#define TOLLGATE_OUI_2       0xEE
+#define TOLLGATE_IE_TYPE     0x01
+#define TOLLGATE_IE_VERSION  1
+#define TOLLGATE_IE_ELEMENT_ID 0xDD
+
+#define TOLLGATE_IE_GEOHASH_MAX 9
+
+typedef struct __attribute__((packed)) {
+    uint8_t version;
+    uint8_t metric;
+    uint16_t price_per_step;
+    uint32_t step_size;
+    uint8_t mint_hash[4];
+    uint8_t geohash_len;
+    char geohash[TOLLGATE_IE_GEOHASH_MAX];
+    uint8_t npub_hash[4];
+} tollgate_price_payload_t;
+
+#define TOLLGATE_IE_PAYLOAD_SIZE sizeof(tollgate_price_payload_t)
+#define TOLLGATE_IE_TOTAL_SIZE   (6 + TOLLGATE_IE_PAYLOAD_SIZE)
+
+typedef struct __attribute__((packed)) {
+    uint8_t element_id;
+    uint8_t length;
+    uint8_t vendor_oui[3];
+    uint8_t vendor_oui_type;
+    tollgate_price_payload_t payload;
+} tollgate_price_ie_t;
+
+typedef struct {
+    const char *mint_url;
+    const char *metric;
+    int price_per_step;
+    int step_size_ms;
+    int step_size_bytes;
+    const char *geohash;
+    const char *npub_hex;
+    bool identity_initialized;
+} tollgate_beacon_config_t;
+
+void tollgate_core_beacon_hash_mint(const char *mint_url, uint8_t hash_out[4]);
+void tollgate_core_beacon_hash_npub(const char *npub_hex, uint8_t hash_out[4]);
+void tollgate_core_beacon_build_ie(const tollgate_beacon_config_t *cfg, tollgate_price_ie_t *ie);
+
+#endif
diff --git a/components/tollgate_core/src/tollgate_core_market.c b/components/tollgate_core/src/tollgate_core_market.c
new file mode 100644
index 0000000..8530212
--- /dev/null
+++ b/components/tollgate_core/src/tollgate_core_market.c
@@ -0,0 +1,121 @@
+#include "tollgate_core_market.h"
+#include <string.h>
+
+static tollgate_market_t s_market;
+static tollgate_market_get_time_ms_fn s_get_time_ms;
+
+static int find_entry_by_bssid(const uint8_t bssid[6])
+{
+    for (int i = 0; i < TG_MARKET_MAX_ENTRIES; i++) {
+        if (s_market.entries[i].valid && memcmp(s_market.entries[i].bssid, bssid, 6) == 0) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+static int find_free_slot(void)
+{
+    for (int i = 0; i < TG_MARKET_MAX_ENTRIES; i++) {
+        if (!s_market.entries[i].valid) return i;
+    }
+    int oldest = 0;
+    int64_t oldest_time = s_market.entries[0].discovered_ms;
+    for (int i = 1; i < TG_MARKET_MAX_ENTRIES; i++) {
+        if (s_market.entries[i].discovered_ms < oldest_time) {
+            oldest_time = s_market.entries[i].discovered_ms;
+            oldest = i;
+        }
+    }
+    return oldest;
+}
+
+void tollgate_core_market_init(tollgate_market_get_time_ms_fn get_time_ms)
+{
+    memset(&s_market, 0, sizeof(s_market));
+    s_get_time_ms = get_time_ms;
+}
+
+void tollgate_core_market_parse_ie(const uint8_t sa[6], const tollgate_vendor_ie_t *ie, int rssi,
+                                    const uint8_t *self_npub_hash)
+{
+    if (!ie || ie->payload_len < TOLLGATE_IE_PAYLOAD_SIZE) return;
+
+    static const uint8_t oui[3] = { TOLLGATE_OUI_0, TOLLGATE_OUI_1, TOLLGATE_OUI_2 };
+    if (memcmp(ie->vendor_oui, oui, 3) != 0) return;
+    if (ie->vendor_oui_type != TOLLGATE_IE_TYPE) return;
+
+    const tollgate_price_payload_t *payload = (const tollgate_price_payload_t *)ie->payload;
+    if (payload->version != TOLLGATE_IE_VERSION) return;
+
+    if (self_npub_hash && memcmp(payload->npub_hash, self_npub_hash, 4) == 0) return;
+
+    int idx = find_entry_by_bssid(sa);
+    if (idx < 0) {
+        idx = find_free_slot();
+        if (s_market.count < TG_MARKET_MAX_ENTRIES) s_market.count++;
+    }
+
+    tollgate_market_entry_t *entry = &s_market.entries[idx];
+    memcpy(entry->bssid, sa, 6);
+    entry->rssi = (int8_t)rssi;
+    entry->price_per_step = payload->price_per_step;
+    entry->step_size = payload->step_size;
+    entry->metric = payload->metric;
+    memcpy(entry->mint_hash, payload->mint_hash, 4);
+    memcpy(entry->npub_hash, payload->npub_hash, 4);
+
+    uint8_t gh_len = payload->geohash_len;
+    if (gh_len > TOLLGATE_IE_GEOHASH_MAX) gh_len = TOLLGATE_IE_GEOHASH_MAX;
+    memcpy(entry->geohash, payload->geohash, gh_len);
+    entry->geohash[gh_len] = '\0';
+
+    entry->discovered_ms = s_get_time_ms ? s_get_time_ms() : 0;
+    entry->valid = true;
+    entry->ssid[0] = '\0';
+}
+
+int tollgate_core_market_find_cheapest(const tollgate_market_t *market)
+{
+    int cheapest = -1;
+    uint32_t best_eff_price = UINT32_MAX;
+
+    for (int i = 0; i < TG_MARKET_MAX_ENTRIES; i++) {
+        if (!market->entries[i].valid) continue;
+        if (market->entries[i].ssid[0] == '\0') continue;
+
+        uint32_t step = market->entries[i].step_size;
+        if (step == 0) continue;
+
+        uint32_t eff;
+        if (market->entries[i].metric == 0) {
+            eff = (uint32_t)market->entries[i].price_per_step * 60000 / step;
+        } else {
+            eff = (uint32_t)market->entries[i].price_per_step * 1048576 / step;
+        }
+
+        if (eff < best_eff_price) {
+            best_eff_price = eff;
+            cheapest = i;
+        }
+    }
+    return cheapest;
+}
+
+const tollgate_market_t *tollgate_core_market_get(void)
+{
+    return &s_market;
+}
+
+void tollgate_core_market_update_ssid(const uint8_t bssid[6], const char *ssid, int8_t rssi)
+{
+    for (int i = 0; i < TG_MARKET_MAX_ENTRIES; i++) {
+        if (!s_market.entries[i].valid) continue;
+        if (memcmp(s_market.entries[i].bssid, bssid, 6) == 0) {
+            memcpy(s_market.entries[i].ssid, ssid, 32);
+            s_market.entries[i].ssid[32] = '\0';
+            s_market.entries[i].rssi = rssi;
+            break;
+        }
+    }
+}
diff --git a/components/tollgate_core/src/tollgate_core_market.h b/components/tollgate_core/src/tollgate_core_market.h
new file mode 100644
index 0000000..a89a1db
--- /dev/null
+++ b/components/tollgate_core/src/tollgate_core_market.h
@@ -0,0 +1,49 @@
+#ifndef TOLLGATE_CORE_MARKET_H
+#define TOLLGATE_CORE_MARKET_H
+
+#include "tollgate_core_beacon.h"
+#include <stdint.h>
+#include <stddef.h>
+#include <stdbool.h>
+
+#define TG_MARKET_MAX_ENTRIES 10
+
+typedef struct {
+    uint8_t bssid[6];
+    char ssid[33];
+    int8_t rssi;
+    uint16_t price_per_step;
+    uint32_t step_size;
+    uint8_t metric;
+    uint8_t mint_hash[4];
+    uint8_t npub_hash[4];
+    char geohash[TOLLGATE_IE_GEOHASH_MAX + 1];
+    int64_t discovered_ms;
+    bool valid;
+} tollgate_market_entry_t;
+
+typedef struct {
+    tollgate_market_entry_t entries[TG_MARKET_MAX_ENTRIES];
+    int count;
+    int64_t last_scan_ms;
+    bool scanning;
+    int consecutive_failures;
+} tollgate_market_t;
+
+typedef struct {
+    const uint8_t *vendor_oui;
+    uint8_t vendor_oui_type;
+    const uint8_t *payload;
+    size_t payload_len;
+} tollgate_vendor_ie_t;
+
+typedef int64_t (*tollgate_market_get_time_ms_fn)(void);
+
+void tollgate_core_market_init(tollgate_market_get_time_ms_fn get_time_ms);
+void tollgate_core_market_parse_ie(const uint8_t sa[6], const tollgate_vendor_ie_t *ie, int rssi,
+                                    const uint8_t *self_npub_hash);
+int tollgate_core_market_find_cheapest(const tollgate_market_t *market);
+const tollgate_market_t *tollgate_core_market_get(void);
+void tollgate_core_market_update_ssid(const uint8_t bssid[6], const char *ssid, int8_t rssi);
+
+#endif
diff --git a/main/beacon_price.c b/main/beacon_price.c
index b87e289..2f92ef3 100644
--- a/main/beacon_price.c
+++ b/main/beacon_price.c
@@ -1,9 +1,9 @@
 #include "beacon_price.h"
+#include "tollgate_core_beacon.h"
 #include "config.h"
 #include "identity.h"
 #include "esp_log.h"
 #include "esp_wifi.h"
-#include "mbedtls/sha256.h"
 #include <string.h>
 
 static const char *TAG = "beacon_price";
@@ -11,16 +11,12 @@ static bool s_active = false;
 
 void beacon_price_hash_mint(const char *mint_url, uint8_t hash_out[4])
 {
-    uint8_t full_hash[32];
-    mbedtls_sha256((const unsigned char *)mint_url, strlen(mint_url), full_hash, 0);
-    memcpy(hash_out, full_hash, 4);
+    tollgate_core_beacon_hash_mint(mint_url, hash_out);
 }
 
 void beacon_price_hash_npub(const char *npub_hex, uint8_t hash_out[4])
 {
-    uint8_t full_hash[32];
-    mbedtls_sha256((const unsigned char *)npub_hex, strlen(npub_hex), full_hash, 0);
-    memcpy(hash_out, full_hash, 4);
+    tollgate_core_beacon_hash_npub(npub_hex, hash_out);
 }
 
 void beacon_price_build_ie(tollgate_price_ie_t *ie)
@@ -28,38 +24,22 @@ void beacon_price_build_ie(tollgate_price_ie_t *ie)
     const tollgate_config_t *cfg = tollgate_config_get();
     const tollgate_identity_t *id = identity_get();
 
-    memset(ie, 0, sizeof(*ie));
-    ie->element_id = WIFI_VENDOR_IE_ELEMENT_ID;
-    ie->length = 4 + TOLLGATE_IE_PAYLOAD_SIZE;
-    ie->vendor_oui[0] = TOLLGATE_OUI_0;
-    ie->vendor_oui[1] = TOLLGATE_OUI_1;
-    ie->vendor_oui[2] = TOLLGATE_OUI_2;
-    ie->vendor_oui_type = TOLLGATE_IE_TYPE;
-
-    tollgate_price_payload_t *p = &ie->payload;
-    p->version = TOLLGATE_IE_VERSION;
-    p->metric = (strcmp(cfg->metric, "bytes") == 0) ? 1 : 0;
-    p->price_per_step = (uint16_t)cfg->price_per_step;
-
-    bool is_bytes = (strcmp(cfg->metric, "bytes") == 0);
-    p->step_size = is_bytes ? (uint32_t)cfg->step_size_bytes : (uint32_t)cfg->step_size_ms;
-
-    beacon_price_hash_mint(cfg->mint_url, p->mint_hash);
-
-    p->geohash_len = (uint8_t)strnlen(cfg->nostr_geohash, TOLLGATE_IE_GEOHASH_MAX);
-    memcpy(p->geohash, cfg->nostr_geohash, p->geohash_len);
-    if (p->geohash_len < TOLLGATE_IE_GEOHASH_MAX) {
-        memset(p->geohash + p->geohash_len, 0, TOLLGATE_IE_GEOHASH_MAX - p->geohash_len);
-    }
-
-    if (id && id->initialized) {
-        beacon_price_hash_npub(id->npub_hex, p->npub_hash);
-    }
+    tollgate_beacon_config_t bcfg = {
+        .mint_url = cfg->mint_url,
+        .metric = cfg->metric,
+        .price_per_step = cfg->price_per_step,
+        .step_size_ms = cfg->step_size_ms,
+        .step_size_bytes = cfg->step_size_bytes,
+        .geohash = cfg->nostr_geohash,
+        .npub_hex = (id && id->initialized) ? id->npub_hex : NULL,
+        .identity_initialized = (id && id->initialized),
+    };
+    tollgate_core_beacon_build_ie(&bcfg, ie);
 
     ESP_LOGI(TAG, "Built IE: price=%lu sats, step=%lu, metric=%s, geohash=%.*s",
-             (unsigned long)p->price_per_step, (unsigned long)p->step_size,
-             p->metric ? "bytes" : "milliseconds",
-             p->geohash_len, p->geohash);
+             (unsigned long)ie->payload.price_per_step, (unsigned long)ie->payload.step_size,
+             ie->payload.metric ? "bytes" : "milliseconds",
+             ie->payload.geohash_len, ie->payload.geohash);
 }
 
 esp_err_t beacon_price_start(void)
diff --git a/main/beacon_price.h b/main/beacon_price.h
index cb2eb5b..a11697c 100644
--- a/main/beacon_price.h
+++ b/main/beacon_price.h
@@ -1,40 +1,11 @@
 #ifndef BEACON_PRICE_H
 #define BEACON_PRICE_H
 
+#include "tollgate_core_beacon.h"
 #include "esp_err.h"
 #include <stdint.h>
 #include <stdbool.h>
 
-#define TOLLGATE_OUI_0       0xC0
-#define TOLLGATE_OUI_1       0xFF
-#define TOLLGATE_OUI_2       0xEE
-#define TOLLGATE_IE_TYPE     0x01
-#define TOLLGATE_IE_VERSION  1
-
-#define TOLLGATE_IE_GEOHASH_MAX 9
-
-typedef struct __attribute__((packed)) {
-    uint8_t version;
-    uint8_t metric;
-    uint16_t price_per_step;
-    uint32_t step_size;
-    uint8_t mint_hash[4];
-    uint8_t geohash_len;
-    char geohash[TOLLGATE_IE_GEOHASH_MAX];
-    uint8_t npub_hash[4];
-} tollgate_price_payload_t;
-
-#define TOLLGATE_IE_PAYLOAD_SIZE sizeof(tollgate_price_payload_t)
-#define TOLLGATE_IE_TOTAL_SIZE   (6 + TOLLGATE_IE_PAYLOAD_SIZE)
-
-typedef struct __attribute__((packed)) {
-    uint8_t element_id;
-    uint8_t length;
-    uint8_t vendor_oui[3];
-    uint8_t vendor_oui_type;
-    tollgate_price_payload_t payload;
-} tollgate_price_ie_t;
-
 esp_err_t beacon_price_start(void);
 esp_err_t beacon_price_stop(void);
 void beacon_price_build_ie(tollgate_price_ie_t *ie);
diff --git a/main/market.c b/main/market.c
index c8a0b6d..34dd36d 100644
--- a/main/market.c
+++ b/main/market.c
@@ -1,5 +1,6 @@
 #include "market.h"
-#include "beacon_price.h"
+#include "tollgate_core_market.h"
+#include "tollgate_core_beacon.h"
 #include "config.h"
 #include "identity.h"
 #include "esp_log.h"
@@ -9,109 +10,49 @@
 #include <string.h>
 
 static const char *TAG = "market";
-static market_t s_market;
 static bool s_initialized = false;
+static esp_event_handler_instance_t s_scan_done_handler = NULL;
 
 static int64_t get_time_ms(void)
 {
     return (int64_t)xTaskGetTickCount() * portTICK_PERIOD_MS;
 }
 
-static bool oui_matches(const uint8_t oui[3])
-{
-    return oui[0] == TOLLGATE_OUI_0 && oui[1] == TOLLGATE_OUI_1 && oui[2] == TOLLGATE_OUI_2;
-}
-
-static int find_entry_by_bssid(const uint8_t bssid[6])
-{
-    for (int i = 0; i < MARKET_MAX_ENTRIES; i++) {
-        if (s_market.entries[i].valid && memcmp(s_market.entries[i].bssid, bssid, 6) == 0) {
-            return i;
-        }
-    }
-    return -1;
-}
-
-static int find_free_slot(void)
-{
-    for (int i = 0; i < MARKET_MAX_ENTRIES; i++) {
-        if (!s_market.entries[i].valid) return i;
-    }
-    int oldest = 0;
-    int64_t oldest_time = s_market.entries[0].discovered_ms;
-    for (int i = 1; i < MARKET_MAX_ENTRIES; i++) {
-        if (s_market.entries[i].discovered_ms < oldest_time) {
-            oldest_time = s_market.entries[i].discovered_ms;
-            oldest = i;
-        }
-    }
-    return oldest;
-}
-
-void market_parse_vendor_ie(const uint8_t sa[6], const vendor_ie_data_t *ie, int rssi)
+static void vendor_ie_cb(void *ctx, wifi_vendor_ie_type_t type,
+                          const uint8_t sa[6], const vendor_ie_data_t *vnd_ie, int rssi)
 {
-    if (!ie || ie->length < 4 + TOLLGATE_IE_PAYLOAD_SIZE) return;
-    if (!oui_matches(ie->vendor_oui)) return;
-    if (ie->vendor_oui_type != TOLLGATE_IE_TYPE) return;
+    (void)ctx;
+    (void)type;
+    if (!vnd_ie) return;
 
-    const tollgate_price_payload_t *payload = (const tollgate_price_payload_t *)ie->payload;
-    if (payload->version != TOLLGATE_IE_VERSION) return;
+    tollgate_vendor_ie_t ie = {
+        .vendor_oui = vnd_ie->vendor_oui,
+        .vendor_oui_type = vnd_ie->vendor_oui_type,
+        .payload = vnd_ie->payload,
+        .payload_len = vnd_ie->length - 4,
+    };
 
     const tollgate_identity_t *id = identity_get();
+    uint8_t self_hash[4] = {0};
+    const uint8_t *self_ptr = NULL;
     if (id && id->initialized) {
-        uint8_t my_npub_hash[4];
-        beacon_price_hash_npub(id->npub_hex, my_npub_hash);
-        if (memcmp(payload->npub_hash, my_npub_hash, 4) == 0) return;
+        tollgate_core_beacon_hash_npub(id->npub_hex, self_hash);
+        self_ptr = self_hash;
     }
 
-    int idx = find_entry_by_bssid(sa);
-    if (idx < 0) {
-        idx = find_free_slot();
-        if (s_market.count < MARKET_MAX_ENTRIES) s_market.count++;
-    }
+    tollgate_core_market_parse_ie(sa, &ie, rssi, self_ptr);
 
-    market_entry_t *entry = &s_market.entries[idx];
-    memcpy(entry->bssid, sa, 6);
-    entry->rssi = (int8_t)rssi;
-    entry->price_per_step = payload->price_per_step;
-    entry->step_size = payload->step_size;
-    entry->metric = payload->metric;
-    memcpy(entry->mint_hash, payload->mint_hash, 4);
-    memcpy(entry->npub_hash, payload->npub_hash, 4);
-
-    uint8_t gh_len = payload->geohash_len;
-    if (gh_len > TOLLGATE_IE_GEOHASH_MAX) gh_len = TOLLGATE_IE_GEOHASH_MAX;
-    memcpy(entry->geohash, payload->geohash, gh_len);
-    entry->geohash[gh_len] = '\0';
-
-    entry->discovered_ms = get_time_ms();
-    entry->valid = true;
-    entry->ssid[0] = '\0';
-
-    ESP_LOGI(TAG, "Discovered TollGate %02X:%02X:%02X:%02X:%02X:%02X price=%lu sats step=%lu metric=%s RSSI=%d",
-             sa[0], sa[1], sa[2], sa[3], sa[4], sa[5],
-             (unsigned long)payload->price_per_step, (unsigned long)payload->step_size,
-             payload->metric ? "bytes" : "milliseconds", rssi);
-}
-
-static void vendor_ie_cb(void *ctx, wifi_vendor_ie_type_t type,
-                          const uint8_t sa[6], const vendor_ie_data_t *vnd_ie, int rssi)
-{
-    (void)ctx;
-    (void)type;
-    if (!vnd_ie) return;
-    market_parse_vendor_ie(sa, vnd_ie, rssi);
+    ESP_LOGI(TAG, "Discovered TollGate %02X:%02X:%02X:%02X:%02X:%02X RSSI=%d",
+             sa[0], sa[1], sa[2], sa[3], sa[4], sa[5], rssi);
 }
 
 static void scan_done_cb(void *arg, esp_event_base_t event_base,
                           int32_t event_id, void *event_data)
 {
-    (void)arg;
-    (void)event_base;
-    (void)event_id;
-    (void)event_data;
+    (void)arg; (void)event_base; (void)event_id; (void)event_data;
 
-    s_market.scanning = false;
+    tollgate_market_t *m = (tollgate_market_t *)tollgate_core_market_get();
+    m->scanning = false;
 
     uint16_t ap_count = 0;
     esp_wifi_scan_get_ap_num(&ap_count);
@@ -124,27 +65,17 @@ static void scan_done_cb(void *arg, esp_event_base_t event_base,
     esp_wifi_scan_get_ap_records(&max_aps, ap_records);
 
     for (int i = 0; i < max_aps; i++) {
-        for (int j = 0; j < MARKET_MAX_ENTRIES; j++) {
-            if (!s_market.entries[j].valid) continue;
-            if (memcmp(s_market.entries[j].bssid, ap_records[i].bssid, 6) == 0) {
-                memcpy(s_market.entries[j].ssid, ap_records[i].ssid, 32);
-                s_market.entries[j].ssid[32] = '\0';
-                s_market.entries[j].rssi = ap_records[i].rssi;
-                break;
-            }
-        }
+        tollgate_core_market_update_ssid(ap_records[i].bssid, (const char *)ap_records[i].ssid, ap_records[i].rssi);
     }
     free(ap_records);
-    s_market.last_scan_ms = get_time_ms();
+    m->last_scan_ms = get_time_ms();
 
-    ESP_LOGI(TAG, "Scan complete: %d APs, %d TollGates found", max_aps, s_market.count);
+    ESP_LOGI(TAG, "Scan complete: %d APs, %d TollGates found", max_aps, m->count);
 }
 
-static esp_event_handler_instance_t s_scan_done_handler = NULL;
-
 esp_err_t market_init(void)
 {
-    memset(&s_market, 0, sizeof(s_market));
+    tollgate_core_market_init(get_time_ms);
 
     esp_err_t ret = esp_wifi_set_vendor_ie_cb(vendor_ie_cb, NULL);
     if (ret != ESP_OK) {
@@ -172,10 +103,11 @@ void market_tick(void)
     const tollgate_config_t *cfg = tollgate_config_get();
     if (!cfg->market_enabled) return;
 
-    if (s_market.scanning) return;
+    tollgate_market_t *m = (tollgate_market_t *)tollgate_core_market_get();
+    if (m->scanning) return;
 
     int64_t now = get_time_ms();
-    int64_t elapsed = now - s_market.last_scan_ms;
+    int64_t elapsed = now - m->last_scan_ms;
     int64_t interval_ms = (int64_t)cfg->market_scan_interval_s * 1000;
     if (elapsed < interval_ms) return;
 
@@ -190,48 +122,46 @@ void market_tick(void)
 
     esp_err_t ret = esp_wifi_scan_start(&scan_config, false);
     if (ret == ESP_OK) {
-        s_market.scanning = true;
-        s_market.last_scan_ms = now;
-        s_market.consecutive_failures = 0;
-        ESP_LOGD(TAG, "Market scan started");
+        m->scanning = true;
+        m->last_scan_ms = now;
+        m->consecutive_failures = 0;
     } else {
-        s_market.consecutive_failures++;
-        s_market.last_scan_ms = now;
-        if (s_market.consecutive_failures <= 3 || s_market.consecutive_failures % 30 == 0) {
-            ESP_LOGW(TAG, "Scan start failed: %s (failures: %d)", esp_err_to_name(ret), s_market.consecutive_failures);
+        m->consecutive_failures++;
+        m->last_scan_ms = now;
+        if (m->consecutive_failures <= 3 || m->consecutive_failures % 30 == 0) {
+            ESP_LOGW(TAG, "Scan start failed: %s (failures: %d)", esp_err_to_name(ret), m->consecutive_failures);
         }
     }
 }
 
 const market_t *market_get(void)
 {
-    return &s_market;
+    return (const market_t *)tollgate_core_market_get();
 }
 
 int market_find_cheapest(void)
 {
-    int cheapest = -1;
-    uint32_t best_eff_price = UINT32_MAX;
-
-    for (int i = 0; i < MARKET_MAX_ENTRIES; i++) {
-        if (!s_market.entries[i].valid) continue;
-        if (s_market.entries[i].ssid[0] == '\0') continue;
-
-        uint32_t step = s_market.entries[i].step_size;
-        if (step == 0) continue;
-
-        uint32_t eff;
-        if (s_market.entries[i].metric == 0) {
-            eff = (uint32_t)s_market.entries[i].price_per_step * 60000 / step;
-        } else {
-            uint32_t eff_mb = (uint32_t)s_market.entries[i].price_per_step * 1048576 / step;
-            eff = eff_mb;
-        }
+    return tollgate_core_market_find_cheapest(tollgate_core_market_get());
+}
 
-        if (eff < best_eff_price) {
-            best_eff_price = eff;
-            cheapest = i;
-        }
+void market_parse_vendor_ie(const uint8_t sa[6], const vendor_ie_data_t *ie, int rssi)
+{
+    if (!ie || ie->length < 4 + (int)TOLLGATE_IE_PAYLOAD_SIZE) return;
+
+    tollgate_vendor_ie_t vnd = {
+        .vendor_oui = ie->vendor_oui,
+        .vendor_oui_type = ie->vendor_oui_type,
+        .payload = ie->payload,
+        .payload_len = ie->length - 4,
+    };
+
+    const tollgate_identity_t *id = identity_get();
+    uint8_t self_hash[4] = {0};
+    const uint8_t *self_ptr = NULL;
+    if (id && id->initialized) {
+        tollgate_core_beacon_hash_npub(id->npub_hex, self_hash);
+        self_ptr = self_hash;
     }
-    return cheapest;
+
+    tollgate_core_market_parse_ie(sa, &vnd, rssi, self_ptr);
 }
diff --git a/main/market.h b/main/market.h
index 6dbf43c..be6ef0a 100644
--- a/main/market.h
+++ b/main/market.h
@@ -1,35 +1,17 @@
 #ifndef MARKET_H
 #define MARKET_H
 
-#include "beacon_price.h"
+#include "tollgate_core_beacon.h"
+#include "tollgate_core_market.h"
 #include "esp_wifi.h"
 #include "esp_err.h"
 #include <stdint.h>
 #include <stdbool.h>
 
-#define MARKET_MAX_ENTRIES 10
+#define MARKET_MAX_ENTRIES TG_MARKET_MAX_ENTRIES
 
-typedef struct {
-    uint8_t bssid[6];
-    char ssid[33];
-    int8_t rssi;
-    uint16_t price_per_step;
-    uint32_t step_size;
-    uint8_t metric;
-    uint8_t mint_hash[4];
-    uint8_t npub_hash[4];
-    char geohash[TOLLGATE_IE_GEOHASH_MAX + 1];
-    int64_t discovered_ms;
-    bool valid;
-} market_entry_t;
-
-typedef struct {
-    market_entry_t entries[MARKET_MAX_ENTRIES];
-    int count;
-    int64_t last_scan_ms;
-    bool scanning;
-    int consecutive_failures;
-} market_t;
+typedef tollgate_market_entry_t market_entry_t;
+typedef tollgate_market_t market_t;
 
 esp_err_t market_init(void);
 void market_tick(void);
diff --git a/tests/unit/Makefile b/tests/unit/Makefile
index 3890243..9347516 100644
--- a/tests/unit/Makefile
+++ b/tests/unit/Makefile
@@ -69,8 +69,8 @@ TG_CORE_OBJS_CFLAGS := -include stubs/mint_health.h -include stubs/esp_netif.h -
 test_session: test_session.c $(TG_CORE_SRC)/tollgate_core_cashu.c $(TG_CORE_SRC)/tollgate_core_session.c $(TG_CORE_SRC)/tollgate_core_firewall.c $(TG_CORE_SRC)/tollgate_core.c $(TG_CORE_SRC)/tollgate_core_mining.c $(TG_CORE_SRC)/tollgate_core_dns.c $(TG_CORE_SRC)/tollgate_core_stratum_proxy.c
         $(CC) $(CFLAGS) $(TG_CORE_OBJS_CFLAGS) $^ -o $@ $(LDFLAGS)
 
-test_tollgate_client: test_tollgate_client.c $(REPO_ROOT)/main/market.c $(REPO_ROOT)/main/beacon_price.c
-        $(CC) $(CFLAGS) -I $(REPO_ROOT)/main $< $(REPO_ROOT)/main/market.c $(REPO_ROOT)/main/beacon_price.c -o $@ $(LDFLAGS)
+test_tollgate_client: test_tollgate_client.c $(REPO_ROOT)/main/market.c $(REPO_ROOT)/main/beacon_price.c $(TG_CORE_SRC)/tollgate_core_beacon.c $(TG_CORE_SRC)/tollgate_core_market.c
+        $(CC) $(CFLAGS) -I $(REPO_ROOT)/main $< $(REPO_ROOT)/main/market.c $(REPO_ROOT)/main/beacon_price.c $(TG_CORE_SRC)/tollgate_core_beacon.c $(TG_CORE_SRC)/tollgate_core_market.c -o $@ $(LDFLAGS)
 
 test_lnurl_pay: test_lnurl_pay.c
         $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS)
@@ -90,11 +90,11 @@ test_cvm_server: test_cvm_server.c
 test_mint_health: test_mint_health.c $(REPO_ROOT)/main/mint_health.c
         $(CC) -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -Wno-sign-compare -std=gnu17 -g -O0 -DTEST_HOST -include stubs/esp_err.h -I $(REPO_ROOT)/main -I stubs -I $(SECP256K1_INC) -I $(SECP256K1_CFG) -I /usr/include/cjson $< $(REPO_ROOT)/main/mint_health.c -o $@ $(LDFLAGS)
 
-test_beacon_price: test_beacon_price.c $(REPO_ROOT)/main/beacon_price.c
-        $(CC) $(CFLAGS) -I $(REPO_ROOT)/main $< $(REPO_ROOT)/main/beacon_price.c -o $@ $(LDFLAGS)
+test_beacon_price: test_beacon_price.c $(REPO_ROOT)/main/beacon_price.c $(TG_CORE_SRC)/tollgate_core_beacon.c
+        $(CC) $(CFLAGS) -I $(REPO_ROOT)/main $< $(REPO_ROOT)/main/beacon_price.c $(TG_CORE_SRC)/tollgate_core_beacon.c -o $@ $(LDFLAGS)
 
-test_market: test_market.c $(REPO_ROOT)/main/market.c $(REPO_ROOT)/main/beacon_price.c
-        $(CC) $(CFLAGS) -I $(REPO_ROOT)/main $< $(REPO_ROOT)/main/market.c $(REPO_ROOT)/main/beacon_price.c -o $@ $(LDFLAGS)
+test_market: test_market.c $(REPO_ROOT)/main/market.c $(REPO_ROOT)/main/beacon_price.c $(TG_CORE_SRC)/tollgate_core_beacon.c $(TG_CORE_SRC)/tollgate_core_market.c
+        $(CC) $(CFLAGS) -I $(REPO_ROOT)/main $< $(REPO_ROOT)/main/market.c $(REPO_ROOT)/main/beacon_price.c $(TG_CORE_SRC)/tollgate_core_beacon.c $(TG_CORE_SRC)/tollgate_core_market.c -o $@ $(LDFLAGS)
 
 test_mining_payment: test_mining_payment.c $(TG_CORE_SRC)/tollgate_core_mining.c $(TG_CORE_SRC)/tollgate_core.c $(TG_CORE_SRC)/tollgate_core_session.c $(TG_CORE_SRC)/tollgate_core_firewall.c $(TG_CORE_SRC)/tollgate_core_cashu.c $(TG_CORE_SRC)/tollgate_core_dns.c $(TG_CORE_SRC)/tollgate_core_stratum_proxy.c
         $(CC) $(CFLAGS) $(TG_CORE_OBJS_CFLAGS) $^ -o $@ $(LDFLAGS)
diff --git a/tests/unit/test_beacon_price b/tests/unit/test_beacon_price
index 5e4bf90..ff76ae6 100755
--- a/tests/unit/test_beacon_price
+++ b/tests/unit/test_beacon_price
diff --git a/tests/unit/test_market b/tests/unit/test_market
index d68ab15..49ccad4 100755
--- a/tests/unit/test_market
+++ b/tests/unit/test_market