Fix build: random_shuffle removal, Windows daemon missing objects

- Replace random_shuffle (removed in C++17) with std::shuffle in wallet.cpp - Add -std=c++17 to makefile.mingw (Windows daemon was missing it) - Add lz4.o, tor_embed_hooks.o, tor_embedded.o to makefile.mingw OBJS - Add build rules for new objects in makefile.mingw - Simplify Tor embedded build to use aggregate libtor.a Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-19 13:47:42 -07:00
parent 6724dfc832
commit 39e244a11c
6 changed files with 67 additions and 42 deletions
@@ -11,7 +11,7 @@ trianglesd / triangles-qt
  ├── tor_embedded.cpp    ← calls tor_run_main() in a background thread
  ├── tor_process.cpp     ← fallback: launches external tor binary (already works)
  ├── onion_v3.cpp        ← V3 onion address generation / SOCKS5 proxy logic
-  └── libtor.a            ← static Tor library (built from official source)
+  └── libtor.a            ← aggregate static Tor library (built from official source)
 ```

 When compiled with `ENABLE_TOR_EMBEDDED`, the wallet calls `tor_run_main()` from
@@ -34,7 +34,7 @@ This puts the full Tor source at `src/tor/tor-src/`.
 Current imported checkout in this repo: `release-0.4.9` at commit `1442ca4`.
 There is also a helper build script at `src/tor/build-libtor.sh`.

-## Step 2: Build libtor.a (Linux)
+## Step 2: Build libtor.a

 Tor uses autotools. Build it as a static library:

@@ -71,10 +71,9 @@ Or from the repo root:
 ./src/tor/build-libtor.sh
 ```

-After building, the static libraries are in `src/tor/tor-src/src/`:
- `src/core/libtor-app.a`
+After building, the static libraries are in `src/tor/tor-src/`:
+- `libtor.a`
 - `src/lib/libtor-*.a` (multiple component libs)
- `src/trunnel/libor-trunnel.a`

 The header `src/feature/api/tor_api.h` provides the public C API:
 ```c
@@ -98,22 +97,14 @@ make -f makefile.unix \
 ```

 You may need to adjust the `-l` flags in the makefile depending on the exact
-library names Tor produces. Check `src/tor/tor-src/src/` after building:
+library names Tor produces. Check `src/tor/tor-src/` after building:

 ```bash
-find tor/tor-src/src -name '*.a' | sort
+find tor/tor-src -name '*.a' | sort
 ```

-Common libraries to link (order matters):
-```
-ltor-app -lor -lor-ctime -lor-evloop -lor-event -lor-compress
-lor-container -lor-crypt-ops -lor-encoding -lor-err -lor-fs
-lor-intmath -lor-lock -lor-log -lor-malloc -lor-math -lor-memarea
-lor-meminfo -lor-net -lor-osinfo -lor-process -lor-sandbox
-lor-smartlist-core -lor-string -lor-term -lor-thread -lor-time
-lor-tls -lor-trace -lor-version -lor-wallclock
-lor-trunnel
-```
+On the imported `release-0.4.9` checkout in this repo, the simplest working
+link path is the aggregate `libtor.a` plus the normal dependency libraries.

 ### Windows (triangles-qt.pro)

@@ -126,9 +117,14 @@ qmake "USE_TOR_EMBEDDED=1" \
 Both build systems now default to:
 - source root: `src/tor/tor-src`
 - include path: `src/tor/tor-src/src/feature/api`
- library paths: `src/tor/tor-src/src/core`, `src/tor/tor-src/src/lib`, `src/tor/tor-src/src/trunnel`
+- library path: `src/tor/tor-src`
+- embedded Tor library: `-ltor`

-Override `TOR_EMBEDDED_LIBS` if the actual Tor static library names differ on your platform/build.
+On Windows, the imported Tor `0.4.9.5` build also needed:
+- `-llzma`
+- `-lzstd`
+- `-liphlpapi`
+- `-lshlwapi` (already linked by Triangles)

 ## Step 4: Wire into init.cpp

@@ -182,10 +178,9 @@ The embedded Tor respects these command-line flags:
 src/tor/
 ├── tor-src/             ← git submodule (official Tor repo)
 │   └── src/
-│       ├── core/libtor-app.a
-│       ├── lib/libor-*.a
-│       ├── trunnel/libor-trunnel.a
+│       ├── lib/libtor-*.a
 │       └── feature/api/tor_api.h
+│   └── libtor.a
 ├── tor_embedded.h       ← CTorEmbedded class header
 ├── tor_embedded.cpp     ← implementation (calls tor_run_main)
 ├── tor_process.h        ← external Tor process manager (fallback)
@@ -213,11 +208,11 @@ object instead of raw `tor_main(int argc, char** argv)`.
 **Tor fails to bootstrap**: Check firewall rules. Tor needs outbound TCP to the
 Tor network (ports 80, 443, 9001, 9030).

-**Link errors with libtor**: The Tor static libraries must be linked in
-dependency order. If you get undefined symbols, reorder the `-l` flags or use
-`-Wl,--start-group ... -Wl,--end-group` to resolve circular deps:
+**Link errors with libtor**: Prefer the aggregate `libtor.a` from the top level
+of the Tor build tree. On the imported Windows/MSYS2 build in this repo, the
+minimal verified link set was:
 ```
-LIBS += -Wl,--start-group -ltor-app -lor -lor-ctime ... -Wl,--end-group
+-ltor -levent -lssl -lcrypto -lz -llzma -lzstd -lws2_32 -liphlpapi -lshlwapi
 ```

 **OpenSSL version mismatch**: Both Tor and Triangles must link against the same
@@ -74,7 +74,7 @@ HARDENING+=-D_FORTIFY_SOURCE=2

 DEBUGFLAGS=-g

-xCXXFLAGS=-O2 -pthread -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter \
+xCXXFLAGS=-O2 -std=c++17 -pthread -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter \
    -Wno-deprecated-declarations -Wno-reserved-user-defined-literal \
    -Wa,-mbig-obj \
    $(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS)
@@ -135,8 +135,11 @@ OBJS= \
    obj/scrypt-x86.o \
    obj/scrypt-x86_64.o \
    obj/smessage.o \
+    obj/lz4.o \
    obj/onion_v3.o \
-    obj/tor_process.o
+    obj/tor_process.o \
+    obj/tor_embed_hooks.o \
+    obj/tor_embedded.o

 all: trianglesd.exe

@@ -208,6 +211,27 @@ obj/tor_process.o: tor/tor_process.cpp
            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
 	rm -f $(@:%.o=%.d)

+obj/lz4.o: lz4/lz4.c
+	$(CXX) -c $(xCXXFLAGS) -fpermissive -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/tor_embed_hooks.o: tor_embed_hooks.cpp
+	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/tor_embedded.o: tor/tor_embedded.cpp
+	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
 obj/net_bootstrap.o: net_bootstrap.cpp
 	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
 	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
@@ -177,18 +177,18 @@ OBJS= \
    obj/tor_embedded.o

 # Embedded Tor support (optional)
-# Build with: make -f makefile.unix USE_TOR_EMBEDDED=1 TOR_LIB_PATH=/path/to/libtor
+# Build with: make -f makefile.unix USE_TOR_EMBEDDED=1 TOR_SOURCE_ROOT=/path/to/tor-src
 # Requires libtor.a built from official Tor source (see CODEX-TOR-GUIDE.md)
 TOR_SOURCE_ROOT ?= tor/tor-src
 TOR_INCLUDE_PATH ?= $(TOR_SOURCE_ROOT)/src/feature/api
-TOR_LIB_PATH ?= $(TOR_SOURCE_ROOT)/src/core $(TOR_SOURCE_ROOT)/src/lib $(TOR_SOURCE_ROOT)/src/trunnel
-TOR_EMBEDDED_LIBS ?= -ltor-app -lor -lor-ctime -lor-event -lor-trunnel
+TOR_LIB_PATH ?= $(TOR_SOURCE_ROOT)
+TOR_EMBEDDED_LIBS ?= -ltor
 ifdef USE_TOR_EMBEDDED
    DEFS += -DENABLE_TOR_EMBEDDED
    DEFS += $(addprefix -I,$(TOR_INCLUDE_PATH))
    LIBS += $(addprefix -L,$(TOR_LIB_PATH))
    LIBS += -Wl,--start-group $(TOR_EMBEDDED_LIBS) -Wl,--end-group
-    LIBS += -levent -levent_pthreads -lssl -lcrypto -lz -lm -lpthread
+    LIBS += -llzma -lzstd -lm -lpthread
 endif

 # ZMQ support (optional)
@@ -25,16 +25,18 @@ echo "Configuring Tor static library build from: $TOR_SRC_DIR"
  --disable-manpage \
  --disable-html-manual \
  --disable-unittests \
-  --disable-tool-name-check
+  --disable-tool-name-check \
+  --with-libevent-dir="${LIBEVENT_DIR:-/mingw64}" \
+  --with-openssl-dir="${OPENSSL_DIR:-/mingw64}" \
+  --with-zlib-dir="${ZLIB_DIR:-/mingw64}"

 echo "Building Tor"
 make -j"${NPROC:-$(getconf _NPROCESSORS_ONLN 2>/dev/null || echo 4)}"

 echo
 echo "Build finished. Inspect these locations for static libraries:"
-echo "  $TOR_SRC_DIR/src/core"
+echo "  $TOR_SRC_DIR"
 echo "  $TOR_SRC_DIR/src/lib"
-echo "  $TOR_SRC_DIR/src/trunnel"
 echo
 echo "Suggested next step for Triangles:"
-echo '  make -f src/makefile.unix USE_TOR_EMBEDDED=1'
+echo '  make -f src/makefile.unix USE_TOR_EMBEDDED=1 TOR_SOURCE_ROOT=src/tor/tor-src'
@@ -14,6 +14,7 @@
 #include "addressindex.h"
 #include <boost/algorithm/string/replace.hpp>
 #include <algorithm>
+#include <random>
 #include <deque>

 using namespace std;
@@ -1477,7 +1478,7 @@ bool CWallet::SelectCoinsMinConf(int64_t nTargetValue, unsigned int nSpendTime,
    vector<pair<int64_t, pair<const CWalletTx*,unsigned int> > > vValue;
    int64_t nTotalLower = 0;

-    random_shuffle(vCoins.begin(), vCoins.end(), GetRandInt);
+    std::shuffle(vCoins.begin(), vCoins.end(), std::mt19937(GetRandInt(std::numeric_limits<int>::max())));

    for (COutput output : vCoins)
    {
@@ -558,8 +558,7 @@ contains(USE_ZMQ, 1) {

 # Embedded Tor support (optional)
 # Build with:
-#   qmake "USE_TOR_EMBEDDED=1" "TOR_INCLUDE_PATH=src/tor/tor-src/src/feature/api" \
-#         "TOR_LIB_PATH=src/tor/tor-src/src/core src/tor/tor-src/src/lib src/tor/tor-src/src/trunnel"
+#   qmake "USE_TOR_EMBEDDED=1" "TOR_SOURCE_ROOT=src/tor/tor-src"
 contains(USE_TOR_EMBEDDED, 1) {
    message(Building with embedded Tor support)
    DEFINES += ENABLE_TOR_EMBEDDED
@@ -573,7 +572,7 @@ contains(USE_TOR_EMBEDDED, 1) {
    }

    isEmpty(TOR_LIB_PATH) {
-        TOR_LIB_PATH = $$TOR_SOURCE_ROOT/src/core $$TOR_SOURCE_ROOT/src/lib $$TOR_SOURCE_ROOT/src/trunnel
+        TOR_LIB_PATH = $$TOR_SOURCE_ROOT
    }

    !isEmpty(TOR_INCLUDE_PATH) {
@@ -584,10 +583,11 @@ contains(USE_TOR_EMBEDDED, 1) {
        LIBS += -L$$path
    }

-    # Default static library set for Tor 0.4.8/0.4.9 style builds.
+    # Default static library set for the imported Tor 0.4.9.x tree.
+    # A full upstream build emits a top-level libtor.a aggregator.
    # Override with TOR_EMBEDDED_LIBS from the qmake command line if needed.
    isEmpty(TOR_EMBEDDED_LIBS) {
-        TOR_EMBEDDED_LIBS = -ltor-app -lor -lor-ctime -lor-event -lor-trunnel
+        TOR_EMBEDDED_LIBS = -ltor
    }

    unix {
@@ -595,6 +595,9 @@ contains(USE_TOR_EMBEDDED, 1) {
    } else {
        LIBS += $$TOR_EMBEDDED_LIBS
    }
+
+    LIBS += -llzma -lzstd
+    windows:LIBS += -liphlpapi
 }

 system($$QMAKE_LRELEASE -silent $$_PRO_FILE_)