5 files changed, 124 insertions, 2 deletions

diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index a041bc1..6408e14 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -16,8 +16,13 @@ idf_component_register(SRCS "tollgate_main.c"
                             "nip04.c"
                             "mcp_handler.c"
                             "cvm_server.c"
+                            "display.c"
+                            "font.c"
+                            "local_relay.c"
+                            "relay_selector.c"
+                            "sync_manager.c"
                     INCLUDE_DIRS "."
                     REQUIRES esp_wifi esp_event esp_netif nvs_flash esp_http_server
                              lwip json esp_http_client mbedtls esp-tls log spiffs
-                             nucula_lib secp256k1 esp_timer
+                             nucula_lib secp256k1 axs15231b qrcode wisp_relay
                     PRIV_REQUIRES esp-tls)
diff --git a/main/display.c b/main/display.c
index 2b6cc88..72b7686 100644
--- a/main/display.c
+++ b/main/display.c
@@ -42,7 +42,7 @@ static int qr_pixel_size(int len) {
     return 2;
 }
 
-static int escape_wifi_field(const char *src, char *dst, int dst_size) {
+int escape_wifi_field(const char *src, char *dst, int dst_size) {
     int si = 0, di = 0;
     while (src[si] && di < dst_size - 2) {
         char c = src[si];
diff --git a/main/negentropy_adapter.c b/main/negentropy_adapter.c
new file mode 100644
index 0000000..2939289
--- /dev/null
+++ b/main/negentropy_adapter.c
@@ -0,0 +1,78 @@
+#include "negentropy_adapter.h"
+#include "storage_engine.h"
+#include <stdlib.h>
+#include <string.h>
+#include "esp_log.h"
+
+static const char *TAG = "negentropy_adapter";
+
+struct negentropy_adapter {
+    void *storage;
+    negentropy_item_t *items;
+    size_t count;
+    size_t capacity;
+};
+
+negentropy_adapter_t *negentropy_adapter_from_storage(void *storage_engine)
+{
+    if (!storage_engine) return NULL;
+
+    negentropy_adapter_t *adapter = calloc(1, sizeof(negentropy_adapter_t));
+    if (!adapter) return NULL;
+
+    adapter->storage = storage_engine;
+    adapter->items = NULL;
+    adapter->count = 0;
+    adapter->capacity = 0;
+
+    return adapter;
+}
+
+esp_err_t negentropy_adapter_get_items(negentropy_adapter_t *adapter,
+                                       negentropy_item_t **items,
+                                       size_t *count)
+{
+    if (!adapter || !items || !count) return ESP_ERR_INVALID_ARG;
+
+    if (adapter->items) {
+        free(adapter->items);
+        adapter->items = NULL;
+    }
+    adapter->count = 0;
+    adapter->capacity = 0;
+
+    *items = adapter->items;
+    *count = adapter->count;
+
+    ESP_LOGI(TAG, "Adapter has %zu items", adapter->count);
+    return ESP_OK;
+}
+
+esp_err_t negentropy_adapter_insert_item(negentropy_adapter_t *adapter,
+                                          uint64_t created_at,
+                                          const uint8_t *id)
+{
+    if (!adapter || !id) return ESP_ERR_INVALID_ARG;
+
+    if (adapter->count >= adapter->capacity) {
+        size_t new_cap = adapter->capacity == 0 ? 64 : adapter->capacity * 2;
+        negentropy_item_t *new_items = realloc(adapter->items, new_cap * sizeof(negentropy_item_t));
+        if (!new_items) return ESP_ERR_NO_MEM;
+        adapter->items = new_items;
+        adapter->capacity = new_cap;
+    }
+
+    negentropy_item_t *item = &adapter->items[adapter->count];
+    item->created_at = created_at;
+    memcpy(item->id, id, 32);
+    adapter->count++;
+
+    return ESP_OK;
+}
+
+void negentropy_adapter_destroy(negentropy_adapter_t *adapter)
+{
+    if (!adapter) return;
+    if (adapter->items) free(adapter->items);
+    free(adapter);
+}
diff --git a/main/negentropy_adapter.h b/main/negentropy_adapter.h
new file mode 100644
index 0000000..1e8c0a8
--- /dev/null
+++ b/main/negentropy_adapter.h
@@ -0,0 +1,27 @@
+#ifndef NEGENTROPY_ADAPTER_H
+#define NEGENTROPY_ADAPTER_H
+
+#include "esp_err.h"
+#include <stdint.h>
+#include <stddef.h>
+
+typedef struct {
+    uint64_t created_at;
+    uint8_t id[32];
+} negentropy_item_t;
+
+typedef struct negentropy_adapter negentropy_adapter_t;
+
+negentropy_adapter_t *negentropy_adapter_from_storage(void *storage_engine);
+
+esp_err_t negentropy_adapter_get_items(negentropy_adapter_t *adapter,
+                                       negentropy_item_t **items,
+                                       size_t *count);
+
+esp_err_t negentropy_adapter_insert_item(negentropy_adapter_t *adapter,
+                                          uint64_t created_at,
+                                          const uint8_t *id);
+
+void negentropy_adapter_destroy(negentropy_adapter_t *adapter);
+
+#endif
diff --git a/main/tollgate_main.c b/main/tollgate_main.c
index fa7a692..4741765 100644
--- a/main/tollgate_main.c
+++ b/main/tollgate_main.c
@@ -23,6 +23,10 @@
 #include "tollgate_client.h"
 #include "lightning_payout.h"
 #include "cvm_server.h"
+#include "display.h"
+#include "local_relay.h"
+#include "relay_selector.h"
+#include "sync_manager.h"
 
 #define MAX_STA_RETRY 5
 static const char *TAG = "tollgate_main";
@@ -178,6 +182,11 @@ static void start_services(void)
     s_services_running = true;
     if (s_services_mutex) xSemaphoreGive(s_services_mutex);
     ESP_LOGI(TAG, "=== TollGate services started ===");
+
+    display_set_state(DISPLAY_READY);
+    char portal_url[128];
+    snprintf(portal_url, sizeof(portal_url), "http://%s/", cfg->ap_ip_str);
+    display_update(cfg->ap_ssid, 0, 0, portal_url);
 }
 
 static void stop_services(void)
@@ -261,6 +270,9 @@ void app_main(void)
 {
     ESP_LOGI(TAG, "=== TollGate ESP32 Starting ===");
 
+    display_init();
+    display_set_state(DISPLAY_BOOT);
+
     esp_err_t ret = nvs_flash_init();
     if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) {
         ESP_ERROR_CHECK(nvs_flash_erase());