From 473b4d1108d8dc9264c44de587121e6886b08a5d Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 19 May 2026 12:55:28 +0530 Subject: fix: build errors in cvm_server, stratum_proxy, sw_miner + nucula visibility - cvm_server: replace esp_timer_get_time() with xTaskGetTickCount(), fix process_relay_message() call signature (3 args -> 2) - stratum_proxy: widen task_name buffer from 16 to 20 chars - sw_miner: add missing #include esp_random.h - nucula_src: save_proofs() moved to public in wallet.hpp - CMakeLists: ensure tcp_transport in REQUIRES - tollgate_main: add display.h, local_relay.h, relay_selector.h, sync_manager.h includes - Build now succeeds: 1.2MB binary, 70% partition free --- main/CMakeLists.txt | 8 +++++++- main/cvm_server.c | 6 +++--- main/stratum_proxy.c | 2 +- main/sw_miner.c | 1 + main/tollgate_main.c | 4 ++++ 5 files changed, 16 insertions(+), 5 deletions(-) (limited to 'main') diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index df52a3c..555cb74 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -16,6 +16,11 @@ 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" "mining_payment.c" "stratum_client.c" "stratum_proxy.c" @@ -24,5 +29,6 @@ idf_component_register(SRCS "tollgate_main.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 tcp_transport + nucula_lib secp256k1 axs15231b qrcode wisp_relay + esp_timer tcp_transport PRIV_REQUIRES esp-tls) diff --git a/main/cvm_server.c b/main/cvm_server.c index 644738b..9e22d53 100644 --- a/main/cvm_server.c +++ b/main/cvm_server.c @@ -556,7 +556,7 @@ static void cvm_relay_task(void *arg) return; } - int64_t last_ping_time = (int64_t)esp_timer_get_time() / 1000000; + int64_t last_ping_time = (int64_t)(xTaskGetTickCount() * portTICK_PERIOD_MS) / 1000; int consecutive_timeouts = 0; while (g_running) { @@ -576,7 +576,7 @@ static void cvm_relay_task(void *arg) char *text = parse_ws_text_frame(buf, rlen); if (text) { if (strlen(text) > 0) { - process_relay_message(tls, relay_url, text); + process_relay_message(relay_url, text); } free(text); } @@ -590,7 +590,7 @@ static void cvm_relay_task(void *arg) } } - int64_t now = (int64_t)esp_timer_get_time() / 1000000; + int64_t now = (int64_t)(xTaskGetTickCount() * portTICK_PERIOD_MS) / 1000; if (now - last_ping_time >= CVM_WS_PING_INTERVAL_S) { uint8_t ping[2] = {0x89, 0x00}; esp_tls_conn_write(tls, ping, 2); diff --git a/main/stratum_proxy.c b/main/stratum_proxy.c index 278f8f3..288c633 100644 --- a/main/stratum_proxy.c +++ b/main/stratum_proxy.c @@ -96,7 +96,7 @@ static void proxy_server_task(void *arg) if (client_fd < 0) continue; s_stats.active_miners++; - char task_name[16]; + char task_name[20]; snprintf(task_name, sizeof(task_name), "miner_%d", client_fd); xTaskCreate(proxy_client_handler, task_name, 4096, (void *)(intptr_t)client_fd, 3, NULL); } diff --git a/main/sw_miner.c b/main/sw_miner.c index b45e7c5..cdd98a0 100644 --- a/main/sw_miner.c +++ b/main/sw_miner.c @@ -4,6 +4,7 @@ #include "mining_payment.h" #include "config.h" #include "esp_log.h" +#include "esp_random.h" #include "mbedtls/sha256.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" diff --git a/main/tollgate_main.c b/main/tollgate_main.c index 30a63db..e4cea42 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" #include "stratum_client.h" #include "stratum_proxy.h" #include "sw_miner.h" -- cgit v1.2.3