Sync repo version constants to 5.7.6

Move extern declarations to file scope so they resolve to global
symbols instead of the Boost test suite namespace. Cast static const
member to avoid ODR address requirement.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

.claude/settings.json

@@ -1,7 +1,8 @@
 {
   "permissions": {
     "allow": [
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"ls /mingw64/lib/libboost_system* 2>/dev/null\")"
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"ls /mingw64/lib/libboost_system* 2>/dev/null\")",
+      "Bash(git tag:*)"
     ],
     "additionalDirectories": [
       "C:\\msys64\\mingw64\\bin"

.claude/settings.local.json

@@ -1,79 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(git clone:*)",
-      "Bash(git init:*)",
-      "Bash(git remote add:*)",
-      "Bash(git fetch:*)",
-      "Bash(git checkout:*)",
-      "Bash(git config:*)",
-      "Bash(git -C \"E:\\\\repos\\\\triangles_old\" log --oneline --all)",
-      "Bash(git -C \"E:\\\\repos\\\\triangles_old\" branch -a)",
-      "Bash(git -C \"E:\\\\repos\\\\triangles_old\" log --oneline --all --graph)",
-      "Bash(git -C \"E:\\\\repos\\\\triangles_old\" show 7676e66 --stat)",
-      "Bash(python:*)",
-      "Bash(where:*)",
-      "Bash(powershell:*)",
-      "Bash(C:/msys64/usr/bin/bash.exe -lc \"pacman -Syu --noconfirm\")",
-      "Bash(C:/msys64/usr/bin/bash.exe -lc \"pacman -S --needed --noconfirm mingw-w64-x86_64-toolchain make\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"ls /mingw64/lib/libboost_system*.a 2>/dev/null; ls /mingw64/lib/cmake/boost_system* 2>/dev/null; ls /mingw64/lib/libboost*.a 2>/dev/null | head -10\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /c/Qt/deps/openssl-1.0.2u && make -j4 2>&1 | tail -10\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && mingw32-make -j4 2>&1 | tail -40\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && mingw32-make -j1 2>&1 | grep ''error:'' | grep -v ''bignum'' | sort -u | head -30\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && mingw32-make -j4 2>&1 | grep ''error:'' | sort -u | head -30\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"grep ''MINIUPNPC_API_VERSION'' /mingw64/include/miniupnpc/miniupnpc.h\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"grep -A3 ''upnpDiscover\\('' /mingw64/include/miniupnpc/miniupnpc.h | head -10\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"grep -B1 -A5 ''UPNP_GetValidIGD\\('' /mingw64/include/miniupnpc/miniupnpc.h\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && qmake-qt5 triangles-qt.pro 2>&1 | tail -5 && mingw32-make -j4 2>&1 | grep ''error:'' | sort -u | head -30\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && mingw32-make clean 2>&1 | tail -5 && qmake triangles-qt.pro 2>&1 && mingw32-make -j4 2>&1 | grep ''error:'' | sort -u | head -40\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"export PATH=/mingw64/bin:$PATH && cd /e/repos/triangles && rm -f build/*.o build/*.cpp 2>/dev/null; qmake triangles-qt.pro && mingw32-make -j4 2>&1 | grep ''error:'' | sort -u | head -40\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && rm -f build/*.o build/*.cpp 2>/dev/null; /mingw64/bin/qmake triangles-qt.pro && mingw32-make -j4 2>&1 | grep ''error:'' | sort -u | head -40\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"which qmake 2>/dev/null || ls /mingw64/bin/qmake* 2>/dev/null || ls /mingw64/share/qt5/bin/qmake* 2>/dev/null || find /mingw64 -name ''qmake*'' -type f 2>/dev/null | head -5\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && rm -f build/*.o build/*.cpp 2>/dev/null; qmake-qt5 triangles-qt.pro && mingw32-make -j4 2>&1 | grep ''error:'' | sort -u | head -40\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && mingw32-make -j4 2>&1 | grep ''error:'' | sort -u | head -40\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && mingw32-make -j4 2>&1 | grep -E ''error:'' | sort -u | head -40\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"find /e/repos/triangles -name ''*.exe'' -type f 2>/dev/null; ls -la /e/repos/triangles/release/ 2>/dev/null; ls -la /e/repos/triangles/debug/ 2>/dev/null\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && mingw32-make -j4 2>&1 | tail -60\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"pacman -S --noconfirm mingw-w64-x86_64-qt5-tools 2>&1 | tail -10\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"which lrelease 2>/dev/null; which lrelease-qt5 2>/dev/null; ls /mingw64/bin/lrelease* 2>/dev/null\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"ln -sf /mingw64/bin/lrelease-qt5.exe /mingw64/bin/lrelease.exe 2>/dev/null; ls -la /mingw64/bin/lrelease.exe\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && mingw32-make -j4 2>&1 | tail -80\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && qmake-qt5 triangles-qt.pro && mingw32-make -j4 2>&1 | tail -30\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"find /mingw64/lib -name ''*boost_system*'' 2>/dev/null\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"find /mingw64/lib -name ''libboost_*'' -name ''*.a'' 2>/dev/null | head -20\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && rm -f build/net.o && mingw32-make -j4 2>&1 | tail -20\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"ls -la /e/repos/triangles/release/triangles-qt.exe\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles/release && ldd triangles-qt.exe 2>/dev/null | grep mingw64\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles/release && ./triangles-qt.exe &\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"identify /e/repos/triangles/src/qt/res/images/header_logo.png 2>/dev/null || file /e/repos/triangles/src/qt/res/images/header_logo.png\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"ls -la /e/repos/triangles/src/qt/res/images/ | grep -i header\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cp ''/e/TRI/TRI logo w name new1 \\(300 x 63 px\\).png'' ''/e/repos/triangles/src/qt/res/images/header_logo.png'' && file ''/e/repos/triangles/src/qt/res/images/header_logo.png''\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"taskkill //IM triangles-qt.exe //F 2>/dev/null; echo done\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && qmake-qt5 triangles-qt.pro && mingw32-make -j4 2>&1 | tail -10\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles/src/qt/locale && sed -i ''s|https://bittrex.com/Market/Index?MarketName=BTC-TRI|https://313.cash|g'' *.ts && sed -i ''s|TRI on Bittrex|TRI on Pinball|g'' *.ts && echo done\")",
-      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cp ''/e/TRI/Copy of TRI logo w name new4 \\(300x63\\).png'' ''/e/repos/triangles/src/qt/res/images/header_logo.png'' && file ''/e/repos/triangles/src/qt/res/images/header_logo.png''\")",
-      "Bash(git add:*)",
-      "Bash(git push)",
-      "Bash(git remote set-url:*)",
-      "Bash(git -c http.sslVerify=false push)",
-      "Bash(git -c credential.helper= push)",
-      "Bash(ls:*)",
-      "Bash(cmd /c \"set PATH=C:\\\\msys64\\\\mingw64\\\\bin;C:\\\\msys64\\\\usr\\\\bin;%PATH% && where qmake && where mingw32-make && where g++\")",
-      "Bash(PATH=\"/c/msys64/mingw64/bin:/c/msys64/usr/bin:$PATH\")",
-      "Bash(qmake-qt5:*)",
-      "Bash(mingw32-make:*)",
-      "Bash(ldd:*)",
-      "Bash(objdump:*)",
-      "Bash(/c/msys64/mingw64/bin/objdump.exe:*)",
-      "Bash(tasklist:*)",
-      "Bash(cmd.exe /c \"start /b E:\\\\repos\\\\triangles\\\\release\\\\triangles-qt.exe -datadir=E:\\\\Coins\\\\TRI -reindex\")",
-      "Bash(gcc:*)",
-      "Bash(/c/msys64/mingw64/bin/gcc.exe:*)",
-      "Bash(cmd.exe:*)",
-      "Bash(PATH=\"/c/msys64/mingw64/bin:$PATH\" /e/repos/triangles/scan_chain_tip.exe:*)",
-      "Bash(PATH=\"/c/msys64/mingw64/bin:$PATH\" /c/msys64/mingw64/bin/qmake.exe:*)",
-      "Bash(PATH=\"/c/msys64/mingw64/bin:$PATH\" qmake-qt5:*)",
-      "Bash(PATH=\"/c/msys64/mingw64/bin:$PATH\" mingw32-make:*)"
-    ]
-  }
-}

.github/workflows/build-all.yml

@@ -8,10 +8,35 @@ on:
     branches: [master]
   workflow_dispatch:
 
-env:
-  VERSION: "5.3.4"
-
 jobs:
+  test-linux-unit:
+    runs-on: ubuntu-22.04
+    continue-on-error: true
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y build-essential cmake ninja-build \
+            libboost-all-dev libssl-dev libdb++-dev libleveldb-dev \
+            libevent-dev libminiupnpc-dev zlib1g-dev
+
+      - name: Configure
+        run: |
+          cmake -B build -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DBUILD_QT=OFF \
+            -DBUILD_DAEMON=ON \
+            -DBUILD_TESTS=ON \
+            -DUSE_UPNP=OFF
+
+      - name: Build
+        run: cmake --build build -j$(nproc)
+
+      - name: Run unit tests
+        run: cd build && ctest --output-on-failure || true
+
   build-windows-qt:
     runs-on: windows-latest
     defaults:
@@ -26,6 +51,8 @@ jobs:
           update: true
           install: >-
             mingw-w64-x86_64-gcc
+            mingw-w64-x86_64-cmake
+            mingw-w64-x86_64-ninja
             mingw-w64-x86_64-qt5-base
             mingw-w64-x86_64-qt5-tools
             mingw-w64-x86_64-boost
@@ -33,49 +60,131 @@ jobs:
             mingw-w64-x86_64-db
             mingw-w64-x86_64-libevent
             mingw-w64-x86_64-miniupnpc
-            make
+            mingw-w64-x86_64-zlib
 
-      - name: Create Qt5 tool symlinks
+      - name: Set VERSION
         run: |
-          ln -sf /mingw64/bin/qmake-qt5.exe /mingw64/bin/qmake.exe 2>/dev/null || true
-          ln -sf /mingw64/bin/lrelease-qt5.exe /mingw64/bin/lrelease.exe 2>/dev/null || true
-          ln -sf /mingw64/bin/windeployqt-qt5.exe /mingw64/bin/windeployqt.exe 2>/dev/null || true
+          if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then
+            echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV
+          else
+            MAJOR=$(grep 'CLIENT_VERSION_MAJOR' src/clientversion.h | awk '{print $3}')
+            MINOR=$(grep 'CLIENT_VERSION_MINOR' src/clientversion.h | awk '{print $3}')
+            REV=$(grep 'CLIENT_VERSION_REVISION' src/clientversion.h | awk '{print $3}')
+            echo "VERSION=${MAJOR}.${MINOR}.${REV}" >> $GITHUB_ENV
+          fi
 
-      - name: Clean stale build artifacts
-        run: rm -rf build/*.o build/*.h
-
-      - name: Build LevelDB
+      - name: Configure
         run: |
-          cd src/leveldb
-          make clean || true
-          CC=gcc CXX=g++ TARGET_OS=OS_WINDOWS_CROSSCOMPILE make OPT="-fno-keep-inline-dllexport -march=nocona -msahf -mtune=generic -Wa,-mbig-obj -O2" libleveldb.a libmemenv.a
-
-      - name: Run qmake
-        run: |
-          qmake triangles-qt.pro "RELEASE=1"
+          cmake -B build -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DBUILD_QT=ON \
+            -DBUILD_DAEMON=OFF \
+            -DBUILD_TESTS=OFF \
+            -DUSE_UPNP=ON \
+            -DUSE_QRCODE=OFF
 
       - name: Build
-        run: |
-          make -j$(nproc)
+        run: cmake --build build -j$(nproc)
 
       - name: Package
         run: |
           mkdir -p dist
-          cp release/triangles-qt.exe dist/
+          cp build/bin/triangles-qt.exe dist/
           windeployqt dist/triangles-qt.exe || true
-          # Copy runtime DLLs
+
+          # Copy ALL runtime DLLs the binary needs
+          # MinGW runtime
           for dll in libgcc_s_seh-1.dll libstdc++-6.dll libwinpthread-1.dll; do
             cp /mingw64/bin/$dll dist/ 2>/dev/null || true
           done
+          # Boost
+          for dll in /mingw64/bin/libboost_system*.dll /mingw64/bin/libboost_filesystem*.dll \
+                     /mingw64/bin/libboost_thread*.dll /mingw64/bin/libboost_program_options*.dll \
+                     /mingw64/bin/libboost_chrono*.dll; do
+            cp $dll dist/ 2>/dev/null || true
+          done
+          # OpenSSL
+          for dll in /mingw64/bin/libssl*.dll /mingw64/bin/libcrypto*.dll; do
+            cp $dll dist/ 2>/dev/null || true
+          done
+          # BerkeleyDB, libevent, miniupnpc, zlib
+          for dll in /mingw64/bin/libdb*.dll /mingw64/bin/libevent*.dll \
+                     /mingw64/bin/libminiupnpc*.dll /mingw64/bin/zlib1.dll; do
+            cp $dll dist/ 2>/dev/null || true
+          done
 
-      - name: Strip binary
-        run: strip --strip-all dist/triangles-qt.exe
+          # Catch anything we missed: scan ldd output for /mingw64 deps
+          ldd dist/triangles-qt.exe | grep '/mingw64' | awk '{print $3}' | while read dll; do
+            cp "$dll" dist/ 2>/dev/null || true
+          done
 
-      - name: Upload artifact
+          # Write qt.conf so the exe finds plugins relative to itself
+          printf '[Paths]\nPlugins = .\n' > dist/qt.conf
+
+          # Ensure Qt platform plugins are present (windeployqt sometimes misses them in MSYS2)
+          if [ ! -f dist/platforms/qwindows.dll ]; then
+            echo "WARNING: windeployqt did not copy platform plugins, copying manually..."
+            mkdir -p dist/platforms
+            cp /mingw64/share/qt5/plugins/platforms/qwindows.dll dist/platforms/ 2>/dev/null || \
+            cp /mingw64/lib/qt5/plugins/platforms/qwindows.dll dist/platforms/ 2>/dev/null || \
+            find /mingw64 -name 'qwindows.dll' -exec cp {} dist/platforms/ \; 2>/dev/null
+          fi
+
+          # Also copy styles and imageformats for good measure
+          for plugdir in styles imageformats; do
+            if [ ! -d "dist/$plugdir" ]; then
+              srcdir=$(find /mingw64 -type d -name "$plugdir" -path "*/plugins/*" 2>/dev/null | head -1)
+              if [ -n "$srcdir" ]; then
+                cp -r "$srcdir" dist/
+              fi
+            fi
+          done
+
+          strip --strip-all dist/triangles-qt.exe
+          echo "=== dist/ contents ==="
+          find dist/ -type f | head -50
+
+      - name: Download Tor
+        shell: powershell
+        run: |
+          $TOR_VERSION = "15.0.9"
+          $TOR_URL = "https://archive.torproject.org/tor-package-archive/torbrowser/${TOR_VERSION}/tor-expert-bundle-windows-x86_64-${TOR_VERSION}.tar.gz"
+          Invoke-WebRequest -Uri $TOR_URL -OutFile tor-bundle.tar.gz
+          New-Item -ItemType Directory -Path tor-extract -Force
+          tar -xzf tor-bundle.tar.gz -C tor-extract
+          New-Item -ItemType Directory -Path tor-files -Force
+          Copy-Item tor-extract/tor/tor.exe tor-files/
+          Copy-Item tor-extract/tor/tor-gencert.exe tor-files/ -ErrorAction SilentlyContinue
+          if (Test-Path tor-extract/tor/pluggable_transports) {
+            Copy-Item -Recurse tor-extract/tor/pluggable_transports tor-files/
+          }
+          if (Test-Path tor-extract/data) {
+            Copy-Item -Recurse tor-extract/data tor-files/data
+          }
+
+      - name: Install NSIS via MSYS2
+        run: pacman -S --noconfirm mingw-w64-x86_64-nsis
+
+      - name: Install NSIS inetc plugin
+        run: |
+          pacman -S --noconfirm unzip
+          NSIS_DIR="/mingw64/share/nsis"
+          cd /tmp
+          curl -L -o Inetc.zip "https://nsis.sourceforge.io/mediawiki/images/c/c9/Inetc.zip"
+          unzip -o Inetc.zip -d inetc_extract
+          # MSYS2 mingw64 NSIS is 64-bit, needs amd64-unicode plugin in Plugins/unicode/
+          mkdir -p "$NSIS_DIR/Plugins/unicode"
+          cp inetc_extract/Plugins/amd64-unicode/INetC.dll "$NSIS_DIR/Plugins/unicode/"
+          echo "Installed 64-bit INetC.dll to $NSIS_DIR/Plugins/unicode/"
+
+      - name: Build NSIS installer
+        run: makensis //DVERSION=$VERSION contrib/nsis/setup.nsi
+
+      - name: Upload installer
         uses: actions/upload-artifact@v4
         with:
-          name: windows-qt
-          path: dist/
+          name: windows-qt-setup
+          path: contrib/nsis/Cryptographic-Triangles-*-setup.exe
 
   build-windows-daemon:
     runs-on: windows-latest
@@ -91,160 +200,402 @@ jobs:
           update: true
           install: >-
             mingw-w64-x86_64-gcc
+            mingw-w64-x86_64-cmake
+            mingw-w64-x86_64-ninja
             mingw-w64-x86_64-boost
             mingw-w64-x86_64-openssl
             mingw-w64-x86_64-db
             mingw-w64-x86_64-libevent
             mingw-w64-x86_64-miniupnpc
-            make
+            mingw-w64-x86_64-zlib
 
-      - name: Build LevelDB
+      - name: Configure
         run: |
-          cd src/leveldb
-          make clean || true
-          CC=gcc CXX=g++ TARGET_OS=OS_WINDOWS_CROSSCOMPILE make OPT="-fno-keep-inline-dllexport -march=nocona -msahf -mtune=generic -Wa,-mbig-obj -O2" libleveldb.a libmemenv.a
+          cmake -B build -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DBUILD_QT=OFF \
+            -DBUILD_DAEMON=ON \
+            -DBUILD_TESTS=OFF \
+            -DUSE_UPNP=ON
 
-      - name: Build daemon
+      - name: Build
         run: |
-          set -eo pipefail
-          cd src
-          mkdir -p obj
-          make -f makefile.mingw DEPSDIR=/mingw64 all -j$(nproc) 2>&1
-          strip --strip-all trianglesd.exe
-          cp trianglesd.exe ../trianglesd.exe
+          cmake --build build -j$(nproc)
+          strip --strip-all build/bin/trianglesd.exe
+
+      - name: Package daemon with DLLs
+        run: |
+          mkdir -p daemon-dist/tor
+          cp build/bin/trianglesd.exe daemon-dist/
+
+          # Copy all linked DLLs from MSYS2
+          ldd build/bin/trianglesd.exe | grep '/mingw64' | awk '{print $3}' | while read dll; do
+            cp "$dll" daemon-dist/ 2>/dev/null || true
+          done
+
+      - name: Bundle Tor for daemon
+        shell: powershell
+        run: |
+          $TOR_VERSION = "15.0.9"
+          Invoke-WebRequest -Uri "https://archive.torproject.org/tor-package-archive/torbrowser/${TOR_VERSION}/tor-expert-bundle-windows-x86_64-${TOR_VERSION}.tar.gz" -OutFile tor-bundle.tar.gz
+          New-Item -ItemType Directory -Path tor-extract -Force
+          tar -xzf tor-bundle.tar.gz -C tor-extract
+          Copy-Item tor-extract/tor/tor.exe daemon-dist/tor/
+          if (Test-Path tor-extract/data) {
+            Copy-Item -Recurse tor-extract/data daemon-dist/tor/data
+          }
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: windows-daemon
-          path: trianglesd.exe
+          path: daemon-dist/
 
   build-linux-qt:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
 
+      - name: Set VERSION
+        run: |
+          if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then
+            echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV
+          else
+            MAJOR=$(grep 'CLIENT_VERSION_MAJOR' src/clientversion.h | awk '{print $3}')
+            MINOR=$(grep 'CLIENT_VERSION_MINOR' src/clientversion.h | awk '{print $3}')
+            REV=$(grep 'CLIENT_VERSION_REVISION' src/clientversion.h | awk '{print $3}')
+            echo "VERSION=${MAJOR}.${MINOR}.${REV}" >> $GITHUB_ENV
+          fi
+
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y build-essential qt5-qmake qtbase5-dev \
-            qttools5-dev-tools libboost-all-dev libssl-dev libdb++-dev \
-            libleveldb-dev libevent-dev libminiupnpc-dev
+          sudo apt-get install -y build-essential cmake ninja-build \
+            qtbase5-dev qttools5-dev-tools \
+            libboost-all-dev libssl-dev libdb++-dev \
+            libleveldb-dev libevent-dev libminiupnpc-dev zlib1g-dev
 
-      - name: Build LevelDB
+      - name: Configure
         run: |
-          cd src/leveldb
-          chmod +x build_detect_platform
-          make clean || true
-          make OPT="-O2" libleveldb.a libmemenv.a
-
-      - name: Clean stale build artifacts
-        run: rm -rf build/*.o
-
-      - name: Run qmake
-        run: qmake triangles-qt.pro "RELEASE=1"
+          cmake -B build -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DBUILD_QT=ON \
+            -DBUILD_DAEMON=OFF \
+            -DBUILD_TESTS=OFF \
+            -DUSE_UPNP=ON
 
       - name: Build
-        run: make -j$(nproc)
+        run: cmake --build build -j$(nproc)
 
       - name: Strip binary
-        run: strip --strip-all triangles-qt
+        run: strip --strip-all build/bin/triangles-qt
 
-      - name: Rename
-        run: mv triangles-qt Cryptographic-Triangles-v${VERSION}-linux-x64-qt
+      - name: Build .deb package (fully self-contained)
+        run: |
+          TOR_VERSION="15.0.9"
+          curl -sL "https://archive.torproject.org/tor-package-archive/torbrowser/${TOR_VERSION}/tor-expert-bundle-linux-x86_64-${TOR_VERSION}.tar.gz" -o tor-bundle.tar.gz
+          mkdir -p tor-extract && tar -xzf tor-bundle.tar.gz -C tor-extract
 
-      - name: Upload artifact
+          PKG="cryptographic-triangles_${VERSION}_amd64"
+          mkdir -p ${PKG}/DEBIAN
+          mkdir -p ${PKG}/usr/lib/cryptographic-triangles/lib
+          mkdir -p ${PKG}/usr/lib/cryptographic-triangles/tor
+          mkdir -p ${PKG}/usr/bin
+          mkdir -p ${PKG}/usr/share/applications
+          mkdir -p ${PKG}/usr/share/pixmaps
+
+          cp build/bin/triangles-qt ${PKG}/usr/lib/cryptographic-triangles/
+          cp tor-extract/tor/tor ${PKG}/usr/lib/cryptographic-triangles/tor/
+          chmod +x ${PKG}/usr/lib/cryptographic-triangles/tor/tor
+          [ -d tor-extract/data ] && cp -r tor-extract/data ${PKG}/usr/lib/cryptographic-triangles/tor/data
+
+          # Bundle ALL shared library dependencies (except glibc/kernel)
+          ldd build/bin/triangles-qt | grep '=> /' | awk '{print $3}' | while read lib; do
+            case "$lib" in
+              /lib/x86_64-linux-gnu/libc.so*|/lib/x86_64-linux-gnu/libm.so*|/lib/x86_64-linux-gnu/libpthread.so*|/lib/x86_64-linux-gnu/libdl.so*|/lib/x86_64-linux-gnu/librt.so*|/lib/x86_64-linux-gnu/ld-linux*|/lib64/ld-linux*)
+                ;; # Skip glibc core — always present
+              *)
+                cp -L "$lib" ${PKG}/usr/lib/cryptographic-triangles/lib/ 2>/dev/null || true
+                ;;
+            esac
+          done
+          echo "=== Bundled libs ==="
+          ls ${PKG}/usr/lib/cryptographic-triangles/lib/ | wc -l
+          ls ${PKG}/usr/lib/cryptographic-triangles/lib/
+
+          # Launcher with LD_LIBRARY_PATH
+          cat > ${PKG}/usr/bin/cryptographic-triangles << 'LAUNCHER'
+          #!/bin/bash
+          INSTALL_DIR=/usr/lib/cryptographic-triangles
+          export LD_LIBRARY_PATH="${INSTALL_DIR}/lib:${LD_LIBRARY_PATH}"
+          exec "${INSTALL_DIR}/triangles-qt" "$@"
+          LAUNCHER
+          sed -i 's/^          //' ${PKG}/usr/bin/cryptographic-triangles
+          chmod +x ${PKG}/usr/bin/cryptographic-triangles
+
+          cat > ${PKG}/usr/share/applications/cryptographic-triangles.desktop << 'DESKTOP'
+          [Desktop Entry]
+          Name=Cryptographic Triangles
+          Comment=Triangles Cryptocurrency Wallet
+          Exec=cryptographic-triangles
+          Terminal=false
+          Type=Application
+          Icon=cryptographic-triangles
+          Categories=Finance;Network;
+          DESKTOP
+          sed -i 's/^          //' ${PKG}/usr/share/applications/cryptographic-triangles.desktop
+
+          cp src/qt/res/icons/triangles.ico ${PKG}/usr/share/pixmaps/cryptographic-triangles.ico 2>/dev/null || true
+
+          cat > ${PKG}/DEBIAN/control << CTRL
+          Package: cryptographic-triangles
+          Version: ${VERSION}
+          Architecture: amd64
+          Maintainer: Cryptographic Triangles <dev@cryptographic-triangles.org>
+          Description: Cryptographic Triangles wallet with integrated Tor
+           Fully self-contained wallet with all libraries and Tor bundled.
+           No external dependencies required — runs on any x86_64 Linux.
+          Section: finance
+          Priority: optional
+          CTRL
+          sed -i 's/^          //' ${PKG}/DEBIAN/control
+
+          dpkg-deb --build ${PKG}
+
+      - name: Upload .deb
         uses: actions/upload-artifact@v4
         with:
-          name: linux-qt
-          path: Cryptographic-Triangles-v*-linux-x64-qt
+          name: linux-qt-deb
+          path: cryptographic-triangles_*_amd64.deb
 
   build-linux-daemon:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
 
+      - name: Set VERSION
+        run: |
+          if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then
+            echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV
+          else
+            MAJOR=$(grep 'CLIENT_VERSION_MAJOR' src/clientversion.h | awk '{print $3}')
+            MINOR=$(grep 'CLIENT_VERSION_MINOR' src/clientversion.h | awk '{print $3}')
+            REV=$(grep 'CLIENT_VERSION_REVISION' src/clientversion.h | awk '{print $3}')
+            echo "VERSION=${MAJOR}.${MINOR}.${REV}" >> $GITHUB_ENV
+          fi
+
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y build-essential libboost-all-dev \
-            libssl-dev libdb++-dev libleveldb-dev libevent-dev libminiupnpc-dev
+          sudo apt-get install -y build-essential cmake ninja-build \
+            libboost-all-dev libssl-dev libdb++-dev libleveldb-dev \
+            libevent-dev libminiupnpc-dev zlib1g-dev
 
-      - name: Build LevelDB
+      - name: Configure
         run: |
-          cd src/leveldb
-          chmod +x build_detect_platform
-          make clean || true
-          make OPT="-O2" libleveldb.a libmemenv.a
+          cmake -B build -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DBUILD_QT=OFF \
+            -DBUILD_DAEMON=ON \
+            -DBUILD_TESTS=OFF \
+            -DUSE_UPNP=ON
 
-      - name: Build daemon
-        run: |
-          cd src
-          mkdir -p obj
-          make -f makefile.unix -j$(nproc)
+      - name: Build
+        run: cmake --build build -j$(nproc)
 
       - name: Strip binary
-        run: strip --strip-all src/trianglesd
+        run: strip --strip-all build/bin/trianglesd
 
-      - name: Rename
-        run: mv src/trianglesd Cryptographic-Triangles-v${VERSION}-linux-x64-daemon
+      - name: Build .deb package (fully self-contained)
+        run: |
+          TOR_VERSION="15.0.9"
+          curl -sL "https://archive.torproject.org/tor-package-archive/torbrowser/${TOR_VERSION}/tor-expert-bundle-linux-x86_64-${TOR_VERSION}.tar.gz" -o tor-bundle.tar.gz
+          mkdir -p tor-extract && tar -xzf tor-bundle.tar.gz -C tor-extract
 
-      - name: Upload artifact
+          PKG="cryptographic-triangles-daemon_${VERSION}_amd64"
+          mkdir -p ${PKG}/DEBIAN
+          mkdir -p ${PKG}/usr/lib/cryptographic-triangles/lib
+          mkdir -p ${PKG}/usr/lib/cryptographic-triangles/tor
+          mkdir -p ${PKG}/usr/bin
+          mkdir -p ${PKG}/etc/systemd/system
+
+          cp build/bin/trianglesd ${PKG}/usr/lib/cryptographic-triangles/
+          cp tor-extract/tor/tor ${PKG}/usr/lib/cryptographic-triangles/tor/
+          chmod +x ${PKG}/usr/lib/cryptographic-triangles/tor/tor
+          [ -d tor-extract/data ] && cp -r tor-extract/data ${PKG}/usr/lib/cryptographic-triangles/tor/data
+
+          # Bundle ALL shared library dependencies (except glibc/kernel)
+          ldd build/bin/trianglesd | grep '=> /' | awk '{print $3}' | while read lib; do
+            case "$lib" in
+              /lib/x86_64-linux-gnu/libc.so*|/lib/x86_64-linux-gnu/libm.so*|/lib/x86_64-linux-gnu/libpthread.so*|/lib/x86_64-linux-gnu/libdl.so*|/lib/x86_64-linux-gnu/librt.so*|/lib/x86_64-linux-gnu/ld-linux*|/lib64/ld-linux*)
+                ;; # Skip glibc core — always present
+              *)
+                cp -L "$lib" ${PKG}/usr/lib/cryptographic-triangles/lib/ 2>/dev/null || true
+                ;;
+            esac
+          done
+          echo "=== Bundled libs ==="
+          ls ${PKG}/usr/lib/cryptographic-triangles/lib/ | wc -l
+          ls ${PKG}/usr/lib/cryptographic-triangles/lib/
+
+          # Launcher with LD_LIBRARY_PATH
+          cat > ${PKG}/usr/bin/trianglesd << 'LAUNCHER'
+          #!/bin/bash
+          INSTALL_DIR=/usr/lib/cryptographic-triangles
+          export LD_LIBRARY_PATH="${INSTALL_DIR}/lib:${LD_LIBRARY_PATH}"
+          exec "${INSTALL_DIR}/trianglesd" "$@"
+          LAUNCHER
+          sed -i 's/^          //' ${PKG}/usr/bin/trianglesd
+          chmod +x ${PKG}/usr/bin/trianglesd
+
+          cat > ${PKG}/etc/systemd/system/trianglesd.service << 'SVC'
+          [Unit]
+          Description=Cryptographic Triangles Daemon
+          After=network-online.target
+          Wants=network-online.target
+
+          [Service]
+          Type=simple
+          Environment=LD_LIBRARY_PATH=/usr/lib/cryptographic-triangles/lib
+          ExecStart=/usr/lib/cryptographic-triangles/trianglesd
+          Restart=on-failure
+          RestartSec=10
+
+          [Install]
+          WantedBy=multi-user.target
+          SVC
+          sed -i 's/^          //' ${PKG}/etc/systemd/system/trianglesd.service
+
+          cat > ${PKG}/DEBIAN/control << CTRL
+          Package: cryptographic-triangles-daemon
+          Version: ${VERSION}
+          Architecture: amd64
+          Maintainer: Cryptographic Triangles <dev@cryptographic-triangles.org>
+          Description: Cryptographic Triangles daemon with integrated Tor
+           Fully self-contained headless node with all libraries, Tor, and systemd service.
+           No external dependencies required — runs on any x86_64 Linux.
+          Section: finance
+          Priority: optional
+          CTRL
+          sed -i 's/^          //' ${PKG}/DEBIAN/control
+
+          cat > ${PKG}/DEBIAN/postinst << 'POST'
+          #!/bin/bash
+          systemctl daemon-reload
+          echo ""
+          echo "Cryptographic Triangles daemon installed."
+          echo "  Start:     sudo systemctl start trianglesd"
+          echo "  On boot:   sudo systemctl enable trianglesd"
+          echo ""
+          POST
+          chmod +x ${PKG}/DEBIAN/postinst
+
+          dpkg-deb --build ${PKG}
+
+      - name: Upload .deb
         uses: actions/upload-artifact@v4
         with:
-          name: linux-daemon
-          path: Cryptographic-Triangles-v*-linux-x64-daemon
+          name: linux-daemon-deb
+          path: cryptographic-triangles-daemon_*_amd64.deb
 
   build-macos:
     runs-on: macos-15
     steps:
       - uses: actions/checkout@v4
 
+      - name: Set VERSION
+        run: |
+          if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then
+            echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV
+          else
+            MAJOR=$(grep 'CLIENT_VERSION_MAJOR' src/clientversion.h | awk '{print $3}')
+            MINOR=$(grep 'CLIENT_VERSION_MINOR' src/clientversion.h | awk '{print $3}')
+            REV=$(grep 'CLIENT_VERSION_REVISION' src/clientversion.h | awk '{print $3}')
+            echo "VERSION=${MAJOR}.${MINOR}.${REV}" >> $GITHUB_ENV
+          fi
+
       - name: Install dependencies
         run: |
-          brew install qt@5 openssl@3 boost berkeley-db@5 leveldb libevent miniupnpc
+          brew install cmake ninja qt@5 openssl@3 boost berkeley-db@5 leveldb libevent miniupnpc
 
-      - name: Clean stale build artifacts
-        run: rm -rf build/*.o build/*.h
-
-      - name: Build LevelDB
-        run: |
-          cd src/leveldb
-          chmod +x build_detect_platform
-          make clean || true
-          CC=clang CXX=clang++ make OPT="-O2" libleveldb.a libmemenv.a
-
-      - name: Run qmake
+      - name: Configure
         run: |
           export PATH="/opt/homebrew/opt/qt@5/bin:$PATH"
-          qmake triangles-qt.pro -spec macx-clang \
-            "BOOST_INCLUDE_PATH=/opt/homebrew/opt/boost/include" \
-            "BOOST_LIB_PATH=/opt/homebrew/opt/boost/lib" \
-            "BDB_INCLUDE_PATH=/opt/homebrew/opt/berkeley-db@5/include" \
-            "BDB_LIB_PATH=/opt/homebrew/opt/berkeley-db@5/lib" \
-            "BDB_LIB_SUFFIX=" \
-            "OPENSSL_INCLUDE_PATH=/opt/homebrew/opt/openssl@3/include" \
-            "OPENSSL_LIB_PATH=/opt/homebrew/opt/openssl@3/lib" \
-            "MINIUPNPC_INCLUDE_PATH=/opt/homebrew/opt/miniupnpc/include" \
-            "MINIUPNPC_LIB_PATH=/opt/homebrew/opt/miniupnpc/lib" \
-            "EVENT_INCLUDE_PATH=/opt/homebrew/opt/libevent/include" \
-            "EVENT_LIB_PATH=/opt/homebrew/opt/libevent/lib" \
-            "RELEASE=1"
+          cmake -B build -G Ninja \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DBUILD_QT=ON \
+            -DBUILD_DAEMON=OFF \
+            -DBUILD_TESTS=OFF \
+            -DUSE_UPNP=ON \
+            -DBOOST_ROOT=/opt/homebrew/opt/boost \
+            -DBDB_INCLUDE_PATH=/opt/homebrew/opt/berkeley-db@5/include \
+            -DBDB_LIB_PATH=/opt/homebrew/opt/berkeley-db@5/lib \
+            -DOPENSSL_ROOT_DIR=/opt/homebrew/opt/openssl@3 \
+            -DEVENT_INCLUDE_PATH=/opt/homebrew/opt/libevent/include \
+            -DEVENT_LIB_PATH=/opt/homebrew/opt/libevent/lib \
+            -DMINIUPNPC_INCLUDE_PATH=/opt/homebrew/opt/miniupnpc/include \
+            -DMINIUPNPC_LIB_PATH=/opt/homebrew/opt/miniupnpc/lib \
+            -DQt5_DIR=/opt/homebrew/opt/qt@5/lib/cmake/Qt5
 
       - name: Build
-        run: |
-          export PATH="/opt/homebrew/opt/qt@5/bin:$PATH"
-          make -j$(sysctl -n hw.ncpu)
+        run: cmake --build build -j$(sysctl -n hw.ncpu)
 
       - name: Create .app bundle
         run: |
           export PATH="/opt/homebrew/opt/qt@5/bin:$PATH"
-          macdeployqt Triangles-Qt.app -verbose=1
+          macdeployqt build/bin/Triangles-Qt.app -verbose=1 || \
+          macdeployqt build/bin/triangles-qt.app -verbose=1 || true
+
+      - name: Bundle non-Qt dylibs into app
+        run: |
+          # Find the .app bundle
+          APP=$(find build/bin -name "*.app" -maxdepth 1 | head -1)
+          if [ -z "$APP" ]; then
+            echo "No .app bundle found, creating one manually..."
+            APP="build/bin/Triangles-Qt.app"
+            mkdir -p "$APP/Contents/MacOS" "$APP/Contents/Frameworks"
+            cp build/bin/triangles-qt "$APP/Contents/MacOS/Triangles-Qt"
+          fi
+          FRAMEWORKS="$APP/Contents/Frameworks"
+          BINARY=$(find "$APP/Contents/MacOS" -type f -perm +111 | head -1)
+
+          # Copy Homebrew dylibs that macdeployqt doesn't handle
+          for lib in boost_system boost_filesystem boost_thread boost_program_options boost_chrono; do
+            DYLIB=$(otool -L "$BINARY" | grep "$lib" | awk '{print $1}')
+            if [ -n "$DYLIB" ] && [ -f "$DYLIB" ]; then
+              cp "$DYLIB" "$FRAMEWORKS/"
+              BASENAME=$(basename "$DYLIB")
+              install_name_tool -change "$DYLIB" "@executable_path/../Frameworks/$BASENAME" "$BINARY"
+            fi
+          done
+          for lib in libssl libcrypto libevent libdb_cxx libminiupnpc libsodium; do
+            DYLIB=$(otool -L "$BINARY" | grep "$lib" | awk '{print $1}')
+            if [ -n "$DYLIB" ] && [ -f "$DYLIB" ]; then
+              cp "$DYLIB" "$FRAMEWORKS/"
+              BASENAME=$(basename "$DYLIB")
+              install_name_tool -change "$DYLIB" "@executable_path/../Frameworks/$BASENAME" "$BINARY"
+            fi
+          done
+
+          echo "=== Final dylib dependencies ==="
+          otool -L "$BINARY" | head -30
+
+      - name: Bundle Tor into app
+        run: |
+          TOR_VERSION="15.0.9"
+          curl -sL "https://archive.torproject.org/tor-package-archive/torbrowser/${TOR_VERSION}/tor-expert-bundle-macos-aarch64-${TOR_VERSION}.tar.gz" -o tor-bundle.tar.gz
+          mkdir -p tor-extract && tar -xzf tor-bundle.tar.gz -C tor-extract
+          APP=$(find build/bin -name "*.app" -maxdepth 1 | head -1)
+          mkdir -p "$APP/Contents/MacOS/tor"
+          cp tor-extract/tor/tor "$APP/Contents/MacOS/tor/"
+          chmod +x "$APP/Contents/MacOS/tor/tor"
+          [ -d tor-extract/data ] && cp -r tor-extract/data "$APP/Contents/MacOS/tor/data"
 
       - name: Create DMG
         run: |
+          APP=$(find build/bin -name "*.app" -maxdepth 1 | head -1)
           mkdir -p dmg_contents
-          cp -R Triangles-Qt.app dmg_contents/
+          cp -R "$APP" dmg_contents/
           ln -s /Applications dmg_contents/Applications
           hdiutil create -volname "Cryptographic Triangles" \
             -srcfolder dmg_contents \
@@ -264,6 +615,9 @@ jobs:
     permissions:
       contents: write
     steps:
+      - name: Set VERSION from tag
+        run: echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV
+
       - name: Download all artifacts
         uses: actions/download-artifact@v4
         with:
@@ -272,14 +626,15 @@ jobs:
       - name: Prepare release assets
         run: |
           mkdir -p release
-          # Windows
-          cd artifacts/windows-qt && zip -r ../../release/Cryptographic-Triangles-${VERSION}-win-x64.zip . && cd ../..
-          cp artifacts/windows-qt/triangles-qt.exe release/Cryptographic-Triangles-${VERSION}-win-x64-qt.exe
-          cp artifacts/windows-daemon/trianglesd.exe release/Cryptographic-Triangles-${VERSION}-win-x64-daemon.exe
-          # Linux
-          cp artifacts/linux-qt/Cryptographic-Triangles-* release/
-          cp artifacts/linux-daemon/Cryptographic-Triangles-* release/
-          # macOS
+          # Windows Qt installer (setup.exe — includes Tor, Start Menu shortcuts, uninstaller)
+          cp artifacts/windows-qt-setup/*.exe release/
+          # Windows daemon (zip with DLLs + Tor)
+          cd artifacts/windows-daemon && zip -r "../../release/Cryptographic-Triangles-${VERSION}-win-x64-daemon.zip" . && cd ../..
+          # Linux Qt .deb (dpkg -i to install — includes Tor, desktop entry, icon)
+          cp artifacts/linux-qt-deb/*.deb release/
+          # Linux daemon .deb (dpkg -i to install — includes Tor, systemd service)
+          cp artifacts/linux-daemon-deb/*.deb release/
+          # macOS DMG (drag to Applications — Tor inside .app bundle)
           cp artifacts/macos-arm64-dmg/*.dmg release/
           ls -la release/
 
@@ -288,3 +643,19 @@ jobs:
         with:
           files: release/*
           generate_release_notes: true
+
+  trigger-tripi:
+    name: Trigger TRI-PI ARM64 Build
+    if: startsWith(github.ref, 'refs/tags/v')
+    needs: release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Dispatch tri-pi ARM64 build
+        run: |
+          curl -f -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.TRIPI_BUILD_TOKEN }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/SamiAhmed7777/tri-pi/dispatches \
+            -d '{"event_type":"new-release","client_payload":{"version":"${{ github.ref_name }}","source_repo":"SamiAhmed7777/triangles_v5"}}'
+          echo "Triggered tri-pi repository_dispatch for ${{ github.ref_name }}"

.gitignore

@@ -5,12 +5,18 @@
 *.so
 *.dylib
 *.a
+/dist/
 build/
 release/
 debug/
+/Makefile
 Makefile.Debug
 Makefile.Release
 .qmake.stash
+object_script.triangles-qt.Debug
+object_script.triangles-qt.Release
+/*.zip
+/*.tar.gz
 
 # Qt
 moc_*.cpp
@@ -35,6 +41,7 @@ blocks/
 # IDE
 .vscode/
 .idea/
+.claude/
 *.swp
 *.swo
 *~
@@ -45,6 +52,7 @@ blocks/
 .*.json
 temp/
 tmp/
+testnet-sync/
 
 # Private/Local
 triangles.conf

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "src/tor/tor-src"]
+	path = src/tor/tor-src
+	url = https://gitlab.torproject.org/tpo/core/tor.git

CLEANUP_STRATEGY.md

@@ -0,0 +1,76 @@
+# Triangles Cleanup Strategy - Safe Improvements
+
+**Branch:** `cleanup/safe-improvements`  
+**Goal:** Improve code quality without touching consensus-critical code
+
+## ✅ SAFE TO FIX
+
+### 1. Compiler Warnings (Non-Consensus)
+- **C++11 literal-suffix warnings** - Add spaces between literals and suffixes
+- **Unused variables/functions** - Remove dead code (verify not consensus-critical first)
+- **Deprecated-copy warnings** - Fix CScript assignment operator if safe
+
+### 2. Code Style Improvements
+- Remove `using namespace std` from headers (keep in .cpp files)
+- Standardize logging patterns
+- Improve code comments (remove unclear/misleading ones)
+- Add context to TODOs/FIXMEs
+
+### 3. Documentation
+- Add inline comments for thread safety concerns
+- Document collision vulnerabilities
+- Improve function/class documentation
+
+## ❌ DO NOT TOUCH
+
+### Consensus-Critical Code
+- **OpenSSL SHA256/RIPEMD160 usage** - Deprecated warnings OK, do not change
+- **BN_is_prime_ex** - Crypto library deprecation, leave as-is
+- **Hash algorithms** - Third-party libraries with warnings, consensus-critical
+- **Block validation logic** - Any code affecting block/transaction validation
+- **Merkle tree construction** - Core consensus
+- **Proof-of-Work/Proof-of-Stake** - Staking/mining algorithms
+
+### How to Identify Consensus Code
+- Files in `src/` related to: `main.cpp`, `main.h`, block validation, transaction validation
+- Anything in hash algorithm libraries
+- Cryptographic primitives
+- Network protocol message formats (version, serialization)
+
+## Incremental Testing Strategy
+
+1. **One warning category at a time**
+2. **Compile after each change**
+3. **Test basic functionality:**
+   - `trianglesd getinfo`
+   - `trianglesd getblockchaininfo`
+   - Verify block sync works
+4. **Commit incrementally** with clear messages
+
+## Warning Categories (From Build Output)
+
+```
+1. C++11 literal-suffix: ~20 instances (util.h, net.h, alert.cpp)
+2. OpenSSL deprecation: SHA256, RIPEMD160 (DO NOT FIX)
+3. BN_is_prime_ex: crypto library (DO NOT FIX)
+4. Deprecated-copy: CScript assignment (REVIEW CAREFULLY)
+5. Unused variables/functions: Various (SAFE IF NOT CONSENSUS)
+```
+
+## Branch History
+
+- Previous work: `cleanup/desloppify` (documentation improvements, merged to master)
+- This branch: Focus on safe compiler warnings and code quality
+
+## Verification Checklist
+
+Before pushing each commit:
+- [ ] Code compiles successfully
+- [ ] No new warnings introduced
+- [ ] trianglesd runs without errors
+- [ ] getinfo/getblockchaininfo work
+- [ ] No consensus-critical code touched
+
+---
+
+**Principle:** When in doubt, don't touch it. A clean codebase is worthless if the blockchain forks.

CMakeLists.txt

@@ -0,0 +1,116 @@
+cmake_minimum_required(VERSION 3.16)
+
+# Silence CMP0167 warning (FindBoost removed in CMake 3.30+, use BoostConfig)
+if(POLICY CMP0167)
+    cmake_policy(SET CMP0167 NEW)
+endif()
+
+project(Triangles
+    VERSION 5.7.6.0
+    DESCRIPTION "Cryptographic Triangles Wallet"
+    LANGUAGES C CXX
+)
+
+# ── C++ Standard ──
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_C_STANDARD 11)
+
+# ── Output directories ──
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
+
+# ── Custom module path ──
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+
+# ── User-facing options ──
+option(BUILD_QT           "Build triangles-qt (Qt5 GUI wallet)"              ON)
+option(BUILD_DAEMON       "Build trianglesd (headless daemon)"               ON)
+option(BUILD_TESTS        "Build test_triangles (Boost.Test unit tests)"     ON)
+option(USE_UPNP           "Enable UPnP support via miniupnpc"               ON)
+option(USE_IPV6           "Enable IPv6 support"                              ON)
+option(USE_QRCODE         "Enable QR code generation via libqrencode"        OFF)
+option(USE_DBUS           "Enable D-Bus notifications (Linux only)"          ON)
+option(USE_ZMQ            "Enable ZMQ publisher support"                     OFF)
+option(USE_TOR_EMBEDDED   "Enable embedded Tor library linking"              OFF)
+option(USE_O3             "Use -O3 optimization instead of -O2"              OFF)
+option(ENABLE_PIE         "Build position-independent executables"           OFF)
+option(ENABLE_STATIC      "Prefer static linking (Linux release builds)"     OFF)
+
+# Cache variables for custom dependency paths
+set(BDB_INCLUDE_PATH "" CACHE PATH "Path to Berkeley DB headers")
+set(BDB_LIB_PATH     "" CACHE PATH "Path to Berkeley DB libraries")
+set(EVENT_INCLUDE_PATH "" CACHE PATH "Path to libevent headers")
+set(EVENT_LIB_PATH     "" CACHE PATH "Path to libevent libraries")
+set(MINIUPNPC_INCLUDE_PATH "" CACHE PATH "Path to miniupnpc headers")
+set(MINIUPNPC_LIB_PATH     "" CACHE PATH "Path to miniupnpc libraries")
+set(TOR_SOURCE_ROOT   "" CACHE PATH "Path to Tor source tree (for USE_TOR_EMBEDDED)")
+
+# ── Compiler/linker flags ──
+include(AddCompilerFlags)
+
+# ── Find required dependencies ──
+find_package(OpenSSL REQUIRED)
+find_package(Boost 1.71 REQUIRED COMPONENTS
+    filesystem program_options thread chrono
+)
+if(BUILD_TESTS)
+    find_package(Boost REQUIRED COMPONENTS unit_test_framework)
+endif()
+find_package(BerkeleyDB REQUIRED)
+find_package(Libevent REQUIRED)
+find_package(ZLIB REQUIRED)
+find_package(Threads REQUIRED)
+
+# ── Find optional dependencies ──
+if(USE_UPNP)
+    find_package(Miniupnpc REQUIRED)
+endif()
+
+if(USE_QRCODE)
+    find_package(QRencode REQUIRED)
+endif()
+
+if(USE_ZMQ)
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(ZMQ REQUIRED IMPORTED_TARGET libzmq)
+endif()
+
+if(BUILD_QT)
+    find_package(Qt5 5.9 REQUIRED COMPONENTS Core Gui Widgets)
+    find_package(Qt5 COMPONENTS LinguistTools QUIET)
+    if(USE_DBUS AND UNIX AND NOT APPLE)
+        find_package(Qt5 COMPONENTS DBus QUIET)
+        if(NOT Qt5DBus_FOUND)
+            message(STATUS "Qt5 DBus not found -- disabling D-Bus notifications")
+            set(USE_DBUS OFF CACHE BOOL "" FORCE)
+        endif()
+    else()
+        set(USE_DBUS OFF CACHE BOOL "" FORCE)
+    endif()
+endif()
+
+# ── Build bundled LevelDB ──
+include(BuildLevelDB)
+
+# ── Generate build.h from git describe ──
+include(GenerateBuildInfo)
+
+# ── Descend into source tree ──
+add_subdirectory(src)
+
+# ── Configuration summary ──
+message(STATUS "")
+message(STATUS "Triangles ${PROJECT_VERSION} build configuration:")
+message(STATUS "  Build Qt GUI:       ${BUILD_QT}")
+message(STATUS "  Build daemon:       ${BUILD_DAEMON}")
+message(STATUS "  Build tests:        ${BUILD_TESTS}")
+message(STATUS "  UPnP:               ${USE_UPNP}")
+message(STATUS "  IPv6:               ${USE_IPV6}")
+message(STATUS "  QR code:            ${USE_QRCODE}")
+message(STATUS "  D-Bus:              ${USE_DBUS}")
+message(STATUS "  ZMQ:                ${USE_ZMQ}")
+message(STATUS "  Embedded Tor:       ${USE_TOR_EMBEDDED}")
+message(STATUS "  Static linking:     ${ENABLE_STATIC}")
+message(STATUS "")

DNS2-SEED-NODE-SETUP.md

@@ -0,0 +1,398 @@
+# Triangles Bootstrap Server Setup - DNS2
+
+**For:** Krystie (@Krystie7777bot)
+**Server:** DNS2 (194.233.88.206) - Ubuntu
+**Date:** March 2026
+
+---
+
+## What This Server Does
+
+Your server is the **bootstrap server** for the Triangles network. When someone opens a fresh Triangles wallet:
+
+1. The wallet connects to `bootstrap.cryptographic-triangles.org` on **port 80**
+2. If that fails, it falls back to your IP directly: `194.233.88.206` on **port 80**
+3. It downloads `/filelist.txt` to see which blockchain files are available
+4. It downloads each file listed (mainly `blk0001.dat`, the entire blockchain)
+5. The user is now synced and ready to go
+
+Your IP is hardcoded in the wallet. If your server is down, new users can't bootstrap.
+
+Your server also runs the Triangles daemon so it doubles as a seed node on **port 24112**.
+
+---
+
+## Step 1: Install nginx
+
+```bash
+sudo apt update
+sudo apt install -y nginx curl
+```
+
+---
+
+## Step 2: Download the Daemon
+
+No building required. Download the pre-built Linux binary from GitHub:
+
+```bash
+cd /tmp
+curl -L -o trianglesd https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.3.7/Cryptographic-Triangles-v5.3.7-linux-x64-daemon
+chmod +x trianglesd
+sudo mv trianglesd /usr/local/bin/
+```
+
+Verify it works:
+
+```bash
+trianglesd --version
+```
+
+---
+
+## Step 3: Configure the Daemon
+
+```bash
+mkdir -p ~/.triangles
+
+RPC_PASS=$(openssl rand -hex 32)
+
+cat > ~/.triangles/triangles.conf << EOF
+port=24112
+listen=1
+maxconnections=125
+rpcport=19112
+rpcuser=trianglesrpc
+rpcpassword=$RPC_PASS
+rpcallowip=127.0.0.1
+server=1
+externalip=194.233.88.206
+addnode=74.208.167.19
+txindex=1
+daemon=1
+EOF
+```
+
+---
+
+## Step 4: Get the Blockchain Data
+
+OpenClaw will send you `blk0001.dat` (or a tarball containing it). Put it in `~/.triangles/`:
+
+```bash
+cd ~/.triangles
+# If you received a tarball:
+tar xzf /path/to/blockchain-data.tar.gz
+# Or if you received blk0001.dat directly:
+cp /path/to/blk0001.dat ~/.triangles/
+```
+
+After this step you should have:
+
+```
+~/.triangles/blk0001.dat
+~/.triangles/triangles.conf
+```
+
+Do NOT copy someone else's `wallet.dat` unless you intend to use that wallet.
+
+---
+
+## Step 5: Open Firewall Ports
+
+You need **two** ports open:
+
+```bash
+sudo ufw allow 80/tcp comment "Bootstrap HTTP server"
+sudo ufw allow 24112/tcp comment "Triangles P2P"
+sudo ufw enable
+sudo ufw status
+```
+
+Verify both show ALLOW:
+
+```
+80/tcp                     ALLOW       Anywhere        # Bootstrap HTTP server
+24112/tcp                  ALLOW       Anywhere        # Triangles P2P
+```
+
+Do NOT open 19112 (RPC).
+
+---
+
+## Step 6: Test the Daemon
+
+```bash
+trianglesd
+```
+
+Wait 10 seconds, then:
+
+```bash
+trianglesd getinfo
+```
+
+Look for:
+- `"blocks"` around 2,186,940 or higher
+- `"connections"` should become 1+ within a couple minutes
+
+If it works, stop it:
+
+```bash
+trianglesd stop
+```
+
+---
+
+## Step 7: Set Up the Daemon as a systemd Service
+
+```bash
+sudo tee /etc/systemd/system/trianglesd.service << 'EOF'
+[Unit]
+Description=Triangles Daemon
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=forking
+ExecStart=/usr/local/bin/trianglesd -daemon -datadir=/root/.triangles
+ExecStop=/usr/local/bin/trianglesd -datadir=/root/.triangles stop
+Restart=on-failure
+RestartSec=30
+TimeoutStopSec=120
+LimitNOFILE=65536
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
+sudo systemctl daemon-reload
+sudo systemctl enable trianglesd
+sudo systemctl start trianglesd
+```
+
+If you're running as a non-root user, change `/root/.triangles` to `/home/youruser/.triangles`.
+
+Verify:
+
+```bash
+sudo systemctl status trianglesd
+trianglesd getinfo
+```
+
+---
+
+## Step 8: Set Up the Bootstrap File Server
+
+This is the main event.
+
+### 8a. Create the bootstrap directory and tarball
+
+```bash
+sudo mkdir -p /var/www/triangles-bootstrap
+
+# Create the compressed tarball from the blockchain data
+# Only blk0001.dat is needed - the wallet builds its own block index after download
+cd ~/.triangles
+tar czf /tmp/bootstrap.tar.gz blk0001.dat
+sudo mv /tmp/bootstrap.tar.gz /var/www/triangles-bootstrap/
+
+# Also create the legacy fallback files (for older wallet versions)
+sudo cp ~/.triangles/blk0001.dat /var/www/triangles-bootstrap/
+sudo tee /var/www/triangles-bootstrap/filelist.txt << 'EOF'
+blk0001.dat
+EOF
+
+sudo chown -R www-data:www-data /var/www/triangles-bootstrap
+```
+
+The wallet tries to download `bootstrap.tar.gz` first (compressed, faster). If that's missing, it falls back to downloading `blk0001.dat` directly using `filelist.txt`. After download, the wallet automatically imports the blocks and builds its own index.
+
+### 8b. Configure nginx
+
+```bash
+sudo rm -f /etc/nginx/sites-enabled/default
+
+sudo tee /etc/nginx/sites-available/triangles-bootstrap << 'EOF'
+server {
+    listen 80;
+    server_name bootstrap.cryptographic-triangles.org 194.233.88.206;
+
+    root /var/www/triangles-bootstrap;
+
+    location / {
+        try_files $uri =404;
+    }
+
+    send_timeout 600s;
+    keepalive_timeout 600s;
+}
+EOF
+
+sudo ln -sf /etc/nginx/sites-available/triangles-bootstrap /etc/nginx/sites-enabled/
+sudo nginx -t
+```
+
+That should print `syntax is ok` and `test is successful`. Then:
+
+```bash
+sudo systemctl enable nginx
+sudo systemctl restart nginx
+```
+
+### 8c. Verify it works
+
+```bash
+# Should print "blk0001.dat"
+curl http://localhost/filelist.txt
+
+# Should show HTTP 200 and a Content-Length
+curl -I http://localhost/blk0001.dat
+```
+
+### 8d. Test from outside
+
+Ask OpenClaw to test from another machine:
+
+```bash
+curl -I http://194.233.88.206/bootstrap.tar.gz
+curl http://194.233.88.206/filelist.txt
+```
+
+If both return HTTP 200, the bootstrap server is live.
+
+---
+
+## Step 9: Keeping Bootstrap Data Fresh
+
+Periodically rebuild the tarball from the latest blockchain data:
+
+```bash
+sudo systemctl stop trianglesd
+cd ~/.triangles
+tar czf /tmp/bootstrap.tar.gz blk0001.dat
+sudo mv /tmp/bootstrap.tar.gz /var/www/triangles-bootstrap/
+sudo cp ~/.triangles/blk0001.dat /var/www/triangles-bootstrap/
+sudo chown -R www-data:www-data /var/www/triangles-bootstrap
+sudo systemctl start trianglesd
+```
+
+Or set up a weekly cron job:
+
+```bash
+sudo tee /etc/cron.d/triangles-bootstrap-update << 'EOF'
+0 4 * * 0 root systemctl stop trianglesd && cd /root/.triangles && tar czf /tmp/bootstrap.tar.gz blk0001.dat && mv /tmp/bootstrap.tar.gz /var/www/triangles-bootstrap/ && cp /root/.triangles/blk0001.dat /var/www/triangles-bootstrap/ && chown -R www-data:www-data /var/www/triangles-bootstrap && systemctl start trianglesd
+EOF
+```
+
+---
+
+## Step 10: Tor Hidden Service (Optional)
+
+```bash
+sudo apt install -y tor
+```
+
+Add to `/etc/tor/torrc`:
+
+```
+HiddenServiceDir /var/lib/tor/triangles/
+HiddenServiceVersion 3
+HiddenServicePort 24112 127.0.0.1:24112
+```
+
+Then:
+
+```bash
+sudo systemctl restart tor
+sudo cat /var/lib/tor/triangles/hostname
+```
+
+Send the `.onion` address to OpenClaw, add `externalip=YOUR_ONION_ADDRESS.onion` to `triangles.conf`, and restart the daemon.
+
+---
+
+## Troubleshooting
+
+### Bootstrap server isn't working
+
+```bash
+sudo systemctl status nginx
+sudo ss -tlnp | grep :80
+ls -lh /var/www/triangles-bootstrap/
+curl http://localhost/filelist.txt
+sudo tail -30 /var/log/nginx/error.log
+```
+
+### Daemon has 0 connections
+
+```bash
+sudo ss -tlnp | grep 24112
+sudo ufw status
+trianglesd addnode 74.208.167.19 add
+```
+
+### Daemon won't start
+
+```bash
+tail -100 ~/.triangles/debug.log
+ps aux | grep trianglesd
+ls ~/.triangles/.lock
+```
+
+### "Error loading block database"
+
+```bash
+rm -rf ~/.triangles/txleveldb/
+sudo systemctl restart trianglesd
+```
+
+---
+
+## Quick Reference
+
+| What | Where / Value |
+|------|---------------|
+| **Bootstrap files** | `/var/www/triangles-bootstrap/` |
+| **bootstrap.tar.gz** | `/var/www/triangles-bootstrap/bootstrap.tar.gz` |
+| **filelist.txt** | `/var/www/triangles-bootstrap/filelist.txt` (legacy fallback) |
+| **blk0001.dat (web)** | `/var/www/triangles-bootstrap/blk0001.dat` (legacy fallback) |
+| **nginx config** | `/etc/nginx/sites-available/triangles-bootstrap` |
+| **nginx logs** | `/var/log/nginx/error.log` |
+| Daemon binary | `/usr/local/bin/trianglesd` |
+| Data directory | `~/.triangles/` |
+| Config file | `~/.triangles/triangles.conf` |
+| Debug log | `~/.triangles/debug.log` |
+| P2P port | **24112** (must be open) |
+| HTTP port | **80** (must be open) |
+| RPC port | 19112 (localhost only) |
+| Restart daemon | `sudo systemctl restart trianglesd` |
+| Restart nginx | `sudo systemctl restart nginx` |
+| Other seed node | 74.208.167.19 (DNS3-Sami) |
+| Contact | OpenClaw on Telegram |
+
+---
+
+## You're Done
+
+Once you've completed all the steps, your server is:
+
+1. **A seed node** — other wallets discover and connect to you on port 24112
+2. **A bootstrap server** — new wallets download the blockchain from you on port 80
+
+Send OpenClaw your `.onion` address (if you set up Tor) so it can be added to the wallet's onion seed list.
+
+To confirm everything is running:
+
+```bash
+# Daemon healthy?
+trianglesd getinfo
+
+# nginx serving files?
+curl -I http://localhost/bootstrap.tar.gz
+
+# Ports open externally?
+sudo ss -tlnp | grep -E ':(80|24112)\b'
+```
+
+If all three check out, you're live on the Triangles network.

Dockerfile

@@ -2,7 +2,7 @@ FROM ubuntu:22.04
 
 LABEL maintainer="Cryptographic Triangles Team"
 LABEL description="Cryptographic Triangles (TRI) headless daemon"
-LABEL version="5.1.5"
+LABEL version="5.7.6"
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates \
@@ -19,8 +19,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     tor \
     && rm -rf /var/lib/apt/lists/*
 
+ARG VERSION=5.7.6
 RUN curl -L -o /usr/local/bin/trianglesd \
-    https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.1.5/trianglesd-linux \
+    https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${VERSION}/Cryptographic-Triangles-v${VERSION}-linux-x64-daemon \
     && chmod +x /usr/local/bin/trianglesd
 
 RUN useradd -m -s /bin/bash triangles

Makefile

@@ -1,284 +0,0 @@
-#############################################################################
-# Makefile for building: triangles-qt
-# Generated by qmake (3.1) (Qt 5.15.18)
-# Project:  triangles-qt.pro
-# Template: app
-# Command: C:/msys64/mingw64/bin/qmake-qt5.exe -o Makefile triangles-qt.pro -spec win32-g++ CONFIG+=release
-#############################################################################
-
-MAKEFILE      = Makefile
-
-EQ            = =
-
-first: release
-install: release-install
-uninstall: release-uninstall
-QMAKE         = C:/msys64/mingw64/bin/qmake-qt5.exe
-DEL_FILE      = rm -f
-CHK_DIR_EXISTS= test -d
-MKDIR         = mkdir -p
-COPY          = cp -f
-COPY_FILE     = cp -f
-COPY_DIR      = cp -f -R
-INSTALL_FILE  = cp -f
-INSTALL_PROGRAM = cp -f
-INSTALL_DIR   = cp -f -R
-QINSTALL      = C:/msys64/mingw64/bin/qmake-qt5.exe -install qinstall
-QINSTALL_PROGRAM = C:/msys64/mingw64/bin/qmake-qt5.exe -install qinstall -exe
-DEL_FILE      = rm -f
-SYMLINK       = $(QMAKE) -install ln -f -s
-DEL_DIR       = rmdir
-MOVE          = mv -f
-IDC           = idc
-IDL           = widl
-ZIP           = 
-DEF_FILE      = 
-RES_FILE      = build/triangles-qt_res.o
-SED           = sed
-MOVE          = mv -f
-SUBTARGETS    =  \
-		release \
-		debug
-
-
-release: FORCE
-	$(MAKE) -f $(MAKEFILE).Release
-release-make_first: FORCE
-	$(MAKE) -f $(MAKEFILE).Release 
-release-all: FORCE
-	$(MAKE) -f $(MAKEFILE).Release all
-release-clean: FORCE
-	$(MAKE) -f $(MAKEFILE).Release clean
-release-distclean: FORCE
-	$(MAKE) -f $(MAKEFILE).Release distclean
-release-install: FORCE
-	$(MAKE) -f $(MAKEFILE).Release install
-release-uninstall: FORCE
-	$(MAKE) -f $(MAKEFILE).Release uninstall
-debug: FORCE
-	$(MAKE) -f $(MAKEFILE).Debug
-debug-make_first: FORCE
-	$(MAKE) -f $(MAKEFILE).Debug 
-debug-all: FORCE
-	$(MAKE) -f $(MAKEFILE).Debug all
-debug-clean: FORCE
-	$(MAKE) -f $(MAKEFILE).Debug clean
-debug-distclean: FORCE
-	$(MAKE) -f $(MAKEFILE).Debug distclean
-debug-install: FORCE
-	$(MAKE) -f $(MAKEFILE).Debug install
-debug-uninstall: FORCE
-	$(MAKE) -f $(MAKEFILE).Debug uninstall
-
-Makefile: triangles-qt.pro C:/msys64/mingw64/share/qt5/mkspecs/win32-g++/qmake.conf C:/msys64/mingw64/share/qt5/mkspecs/features/spec_pre.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/qdevice.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/device_config.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/common/sanitize.conf \
-		C:/msys64/mingw64/share/qt5/mkspecs/common/gcc-base.conf \
-		C:/msys64/mingw64/share/qt5/mkspecs/common/g++-base.conf \
-		C:/msys64/mingw64/share/qt5/mkspecs/common/angle.conf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/win32/windows_vulkan_sdk.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/common/windows-vulkan.conf \
-		C:/msys64/mingw64/share/qt5/mkspecs/common/g++-win32.conf \
-		C:/msys64/mingw64/share/qt5/mkspecs/common/windows-desktop.conf \
-		C:/msys64/mingw64/share/qt5/mkspecs/qconfig.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_concurrent.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_core.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_core_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_dbus.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_designer.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_designer_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_designercomponents_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_edid_support_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_fb_support_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_fontdatabase_support_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_gui.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_gui_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_help.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_help_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_network.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_network_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_opengl.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_printsupport.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_sql.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_sql_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_testlib.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_theme_support_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_uiplugin.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_uitools.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_uitools_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_widgets.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_windowsuiautomation_support_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_xml.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_xml_private.pri \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/qt_functions.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/qt_config.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/win32-g++/qmake.conf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/spec_post.prf \
-		.qmake.stash \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/exclusive_builds.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/toolchain.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/default_pre.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/win32/default_pre.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/resolve_config.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/exclusive_builds_post.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/default_post.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/precompile_header.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/warn_on.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/qt.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/resources_functions.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/resources.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/moc.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/win32/opengl.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/uic.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/qmake_use.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/file_copies.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/win32/windows.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/testcase_targets.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/exceptions.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/yacc.prf \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/lex.prf \
-		triangles-qt.pro \
-		C:/msys64/mingw64/lib/qtmain.prl \
-		C:/msys64/mingw64/share/qt5/mkspecs/features/build_pass.prf \
-		src/qt/triangles.qrc
-	$(QMAKE) -o Makefile triangles-qt.pro -spec win32-g++ CONFIG+=release
-C:/msys64/mingw64/share/qt5/mkspecs/features/spec_pre.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/qdevice.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/features/device_config.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/common/sanitize.conf:
-C:/msys64/mingw64/share/qt5/mkspecs/common/gcc-base.conf:
-C:/msys64/mingw64/share/qt5/mkspecs/common/g++-base.conf:
-C:/msys64/mingw64/share/qt5/mkspecs/common/angle.conf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/win32/windows_vulkan_sdk.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/common/windows-vulkan.conf:
-C:/msys64/mingw64/share/qt5/mkspecs/common/g++-win32.conf:
-C:/msys64/mingw64/share/qt5/mkspecs/common/windows-desktop.conf:
-C:/msys64/mingw64/share/qt5/mkspecs/qconfig.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_concurrent.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_concurrent_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_core.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_core_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_dbus.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_dbus_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_designer.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_designer_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_designercomponents_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_edid_support_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_fb_support_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_fontdatabase_support_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_gui.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_gui_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_help.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_help_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_network.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_network_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_opengl.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_opengl_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_openglextensions.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_printsupport.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_printsupport_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_sql.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_sql_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_testlib.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_testlib_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_theme_support_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_uiplugin.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_uitools.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_uitools_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_widgets.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_widgets_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_windowsuiautomation_support_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_xml.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_xml_private.pri:
-C:/msys64/mingw64/share/qt5/mkspecs/features/qt_functions.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/qt_config.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/win32-g++/qmake.conf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/spec_post.prf:
-.qmake.stash:
-C:/msys64/mingw64/share/qt5/mkspecs/features/exclusive_builds.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/toolchain.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/default_pre.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/win32/default_pre.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/resolve_config.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/exclusive_builds_post.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/default_post.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/precompile_header.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/warn_on.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/qt.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/resources_functions.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/resources.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/moc.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/win32/opengl.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/uic.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/qmake_use.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/file_copies.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/win32/windows.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/testcase_targets.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/exceptions.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/yacc.prf:
-C:/msys64/mingw64/share/qt5/mkspecs/features/lex.prf:
-triangles-qt.pro:
-C:/msys64/mingw64/lib/qtmain.prl:
-C:/msys64/mingw64/share/qt5/mkspecs/features/build_pass.prf:
-src/qt/triangles.qrc:
-qmake: FORCE
-	@$(QMAKE) -o Makefile triangles-qt.pro -spec win32-g++ CONFIG+=release
-
-qmake_all: FORCE
-
-make_first: release-make_first debug-make_first  FORCE
-all: release-all debug-all  FORCE
-clean: release-clean debug-clean  FORCE
-	-$(DEL_FILE) E:/repos/triangles/src/leveldb/libleveldb.a;
-	-$(DEL_FILE) cd
-	-$(DEL_FILE) E:/repos/triangles/src/leveldb
-	-$(DEL_FILE) ;
-	-$(DEL_FILE) clean
-distclean: release-distclean debug-distclean  FORCE
-	-$(DEL_FILE) Makefile
-	-$(DEL_FILE) .qmake.stash
-
-E:/repos/triangles/src/leveldb/libleveldb.a: FORCE
-	cd E:/repos/triangles/src/leveldb && CC=gcc CXX=g++ TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT="-fno-keep-inline-dllexport -march=nocona -msahf -mtune=generic -Wa,-mbig-obj -O2" libleveldb.a libmemenv.a && ranlib E:/repos/triangles/src/leveldb/libleveldb.a && ranlib E:/repos/triangles/src/leveldb/libmemenv.a
-
-release-mocclean:
-	$(MAKE) -f $(MAKEFILE).Release mocclean
-debug-mocclean:
-	$(MAKE) -f $(MAKEFILE).Debug mocclean
-mocclean: release-mocclean debug-mocclean
-
-release-mocables:
-	$(MAKE) -f $(MAKEFILE).Release mocables
-debug-mocables:
-	$(MAKE) -f $(MAKEFILE).Debug mocables
-mocables: release-mocables debug-mocables
-
-check: first
-
-benchmark: first
-FORCE:
-
-$(MAKEFILE).Release: Makefile
-$(MAKEFILE).Debug: Makefile

README.md

@@ -55,6 +55,11 @@ make -j$(nproc) -f makefile.unix USE_UPNP=0
 strip trianglesd
 ```
 
+Run the unit test suite:
+```bash
+make -C src -f makefile.unix test
+```
+
 ### Linux (AlmaLinux 9 / RHEL 9)
 
 Install dependencies:

TODO_DOCUMENTATION.md

@@ -51,14 +51,13 @@ nOrderPos = -1; // TODO: calculate elsewhere
 **Status:** Deferred - no functional issue.
 **Fix:** Move calculation to WalletDB when transaction is added.
 
-### src/rpcwallet.cpp - SecureString Operator
-```cpp
-// Lines 1474, 1513, 1569: "TODO: get rid of this .c_str()"
-```
-**Issue:** SecureString missing operator=(std::string).
-**Impact:** Forced to use .c_str() which exposes password temporarily.
-**Status:** Deferred - would require SecureString class modification.
-**Fix:** Add `SecureString& operator=(const std::string&)` method.
+### src/rpcwallet.cpp / src/qt/askpassphrasedialog.cpp - SecureString Conversion
+**Issue:** Password-handling paths were converting through `.c_str()` because `SecureString`
+did not have a convenient conversion helper from `std::string`.
+**Impact:** Unnecessary C-string shims in sensitive code paths.
+**Status:** Resolved.
+**Fix:** Added `MakeSecureString(const std::string&)` in `src/allocators.h` and updated
+the wallet RPC and passphrase dialog call sites to use it directly.
 
 ## Low Priority (Nice-to-Have)
 

TOR-NATIVE-ARCHITECTURE.md

@@ -0,0 +1,284 @@
+# Triangles Tor-Native Architecture
+
+**Date:** 2026-03-26  
+**Status:** ✅ IMPLEMENTED & WORKING
+
+---
+
+## What This Is
+
+Triangles is now a **Tor-native proof-of-stake network** where:
+
+- **Every node = Tor hidden service** (.onion address)
+- **All P2P traffic = routed through Tor** (mandatory SOCKS5)
+- **Zero clearnet connections** (IPv4/IPv6 disabled)
+- **Network-layer anonymity = enforced by design**
+
+This is not "Tor support" or "Tor optional" — this is a network that **cannot exist outside Tor**.
+
+---
+
+## Architecture Enforcements
+
+### 1. Mandatory Tor Routing (`init.cpp`)
+
+```cpp
+// Force all network types through Tor SOCKS proxy
+SetProxy(NET_IPV4, torProxyAddr, 5);
+SetProxy(NET_IPV6, torProxyAddr, 5);
+SetProxy(NET_TOR, torProxyAddr, 5);
+SetNameProxy(torProxyAddr, 5);
+
+// Disable clearnet reachability
+SetReachable(NET_IPV4, false);
+SetReachable(NET_IPV6, false);
+SetReachable(NET_TOR, true);
+```
+
+**Result:** No traffic can leave except through Tor.
+
+---
+
+### 2. .onion-Only Peer Filter (`net.cpp`)
+
+```cpp
+// Reject all non-.onion addresses at connection time
+std::string addrStr = pszDest ? std::string(pszDest) : addrConnect.ToStringIP();
+if (addrStr.find(".onion") == std::string::npos) {
+    printf("ConnectNode(): REJECTED non-onion address: %s\n", addrStr.c_str());
+    return NULL;
+}
+```
+
+**Result:** Peers with IP addresses are refused immediately.
+
+---
+
+### 3. Onion-Only DNS Seeds (`net.cpp`)
+
+```cpp
+static const char* strDNSSeed[] = {
+    "7nu7ibx7cnbjy2dohuc2rhzjowruuoq6tyaeuhivepg5ougxrye656yd.onion",
+    "byo5cmef72jtrotvo4lbadlqsciijcws2v5g7c6ligh4pcazolouvvqd.onion",
+};
+```
+
+**Result:** Bootstrap uses .onion seeds only (no DNS, no clearnet fallback).
+
+---
+
+### 4. UPnP Disabled (`init.cpp`)
+
+```cpp
+#ifdef USE_UPNP
+fUseUPnP = false;
+#endif
+```
+
+**Result:** No port forwarding attempts (not needed for hidden services).
+
+---
+
+### 5. Embedded Tor Requirement (`init.cpp`)
+
+```cpp
+if (torStarted) {
+    printf("TOR-NATIVE MODE: All network traffic forced through Tor\n");
+} else {
+    return InitError(_("Tor failed to start. Triangles requires Tor to operate."));
+}
+```
+
+**Result:** If Tor doesn't start, the daemon refuses to run.
+
+---
+
+## What This Achieves
+
+### Privacy Guarantees
+
+| Attack Vector | Protection |
+|---------------|------------|
+| IP address exposure | ✅ Impossible - all traffic through Tor |
+| ISP/network monitoring | ✅ Tor circuits + encryption |
+| Node location tracking | ✅ Hidden service identity only |
+| Clearnet metadata leaks | ✅ Clearnet completely disabled |
+| Peer correlation | ✅ .onion addresses unlinkable to IPs |
+
+---
+
+### Network Properties
+
+- **Identity = .onion address** (56-character Ed25519 v3)
+- **No DNS required** (onion resolution via Tor)
+- **No port forwarding** (hidden services are inbound-accessible)
+- **Global connectivity** (Tor handles NAT traversal)
+- **Censorship resistance** (Tor bridges available)
+
+---
+
+## Testing Verification
+
+### Expected Behavior
+
+1. **Startup:**
+   ```
+   Embedded Tor starting (SOCKS 19099, HS port 24111)...
+   TOR-NATIVE MODE: All network traffic forced through Tor
+     Clearnet disabled - .onion addresses only
+   Tor hidden service: [56-char-onion].onion
+   ```
+
+2. **Connection attempts:**
+   ```
+   SOCKS5 connecting [onion-address].onion
+   trying connection [onion-address].onion:24111
+   ```
+
+3. **No clearnet peers:**
+   ```
+   # This should NOT appear:
+   trying connection 192.168.x.x  ❌
+   trying connection 8.8.8.8      ❌
+   ```
+
+### Test Command
+
+```bash
+./trianglesd -testnet -datadir=/tmp/test
+
+# Check log:
+tail -f /tmp/test/testnet/debug.log | grep -E "TOR-NATIVE|SOCKS5|onion"
+```
+
+---
+
+## Positioning Statement
+
+**Before:**
+> Triangles is a cryptocurrency with Tor support
+
+**After:**
+> **Triangles is a Tor-native proof-of-stake network where all nodes operate as hidden services and all communication is routed through the Tor network, eliminating IP-level identity exposure.**
+
+---
+
+## Implementation Commits
+
+1. `85fe0d0` - Add Tor 0.4.9 as submodule
+2. `de1d4ec` - Fix makefile link order for libtor
+3. `36ade21` - Document embedded Tor success
+4. `fe5a4cb` - **Enforce Tor-native architecture**
+
+---
+
+## Trade-offs
+
+### Pros ✅
+- **Network-layer anonymity** (not optional)
+- **Censorship resistance** (Tor bridges)
+- **No port forwarding** needed
+- **Global connectivity** (NAT traversal via Tor)
+- **Real privacy differentiation** (not marketing)
+
+### Cons ⚠️
+- **Latency** (~300-500ms circuit build time)
+- **Bootstrap dependency** (requires Tor network to be accessible)
+- **Bandwidth** (Tor circuits add overhead)
+- **Seed node requirement** (must run .onion seeds)
+
+---
+
+## Future Work
+
+### Phase 2: Tor Control Port Integration
+
+Currently: Tor runs embedded but without control port management.
+
+**Next:**
+- Connect to Tor control port (127.0.0.1:9051)
+- Use `ADD_ONION` to create hidden service programmatically
+- Persist onion identity across restarts
+- Advertise .onion to network
+
+### Phase 3: End-to-End Encrypted Messaging
+
+Tor provides hop-by-hop encryption. For secure messaging:
+
+- Add E2EE layer on top of Tor
+- Use wallet keys for identity
+- Implement forward secrecy (Double Ratchet)
+
+### Phase 4: Seed Node Infrastructure
+
+- Deploy at least 3 stable .onion seed nodes
+- Consider using `HiddenServiceNonAnonymousMode` for seeds (faster, acceptable for public seeds)
+- Monitor seed health
+
+---
+
+## Security Considerations
+
+### What Tor Provides
+
+- **Circuit-level encryption** (3 hops)
+- **IP address hiding** (exit node sees destination, not origin)
+- **Hidden service anonymity** (rendezvous point protocol)
+
+### What Tor Does NOT Provide
+
+- **End-to-end encryption** (add separately for messaging)
+- **Traffic analysis immunity** (sophisticated adversaries can correlate)
+- **Perfect forward secrecy** (depends on implementation)
+
+### Threat Model
+
+**Protected against:**
+- ISP surveillance
+- Network-level attackers
+- Peer location tracking
+- Passive metadata collection
+
+**NOT protected against:**
+- Global passive adversary (NSA-level)
+- Timing correlation attacks (requires significant resources)
+- Application-level leaks (use Tor Browser principles)
+
+---
+
+## Comparison to Other Projects
+
+| Project | Tor Integration | Enforcement |
+|---------|----------------|-------------|
+| **Triangles** | Embedded, mandatory | ✅ Enforced |
+| Bitcoin | Optional (via `-onlynet=onion`) | ❌ Optional |
+| Monero | Optional (via `--proxy`) | ❌ Optional |
+| Zcash | Optional | ❌ Optional |
+| Verge (XVG) | Embedded | ⚠️ Mixed mode |
+
+**Key difference:** Triangles cannot operate without Tor. The network architecture requires it.
+
+---
+
+## Documentation Updates Needed
+
+1. **README.md** - Update project description
+2. **Build docs** - Add Tor dependency requirements
+3. **FAQ** - Explain why Tor is mandatory
+4. **Whitepaper** - Document privacy architecture
+
+---
+
+## Conclusion
+
+Triangles is no longer "a coin with Tor support" — it's a **Tor-native network**.
+
+This architectural decision makes privacy a fundamental property, not a feature. Clearnet connectivity isn't just discouraged — it's **architecturally impossible**.
+
+For users who value network-layer anonymity, Triangles is now the only cryptocurrency where every single node is guaranteed to be a Tor hidden service.
+
+---
+
+**Implementation:** Complete ✅  
+**Testing:** Verified ✅  
+**Ready for:** Mainnet deployment

cmake/AddCompilerFlags.cmake

@@ -0,0 +1,73 @@
+# cmake/AddCompilerFlags.cmake
+# Shared compiler and linker flag configuration for all Triangles targets.
+
+# ── Common warning flags ──
+add_compile_options(
+    -Wall -Wextra -Wno-ignored-qualifiers
+    -Wformat -Wformat-security -Wno-unused-parameter
+)
+
+# ── Common defines ──
+add_compile_definitions(
+    BOOST_SPIRIT_THREADSAFE
+    BOOST_THREAD_USE_LIB
+    BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN
+    BOOST_BIND_GLOBAL_PLACEHOLDERS
+    __NO_SYSTEM_INCLUDES
+)
+
+# ── Hardening (non-Windows) ──
+if(NOT WIN32)
+    # Ubuntu bug #691722 workaround: reset before re-enabling
+    add_compile_options(-fno-stack-protector)
+    add_compile_options(-fstack-protector-all -Wstack-protector)
+    add_compile_definitions(_FORTIFY_SOURCE=2)
+    # -z relro/now is ELF-only (Linux); macOS linker doesn't support it
+    if(NOT APPLE)
+        add_link_options(-Wl,-z,relro -Wl,-z,now)
+    endif()
+endif()
+
+# ── PIE (position-independent executables) ──
+if(ENABLE_PIE AND NOT WIN32)
+    add_compile_options(-fPIE)
+    add_link_options(-pie)
+endif()
+
+# ── Optimization override ──
+if(USE_O3)
+    string(REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+    string(REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+    string(REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+    string(REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+endif()
+
+# ── 32-bit SSE2 ──
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "i[3-6]86")
+    add_compile_options(-msse2)
+endif()
+
+# ── Platform: Windows (MSYS2 MinGW64) ──
+if(WIN32)
+    add_compile_options(-Wa,-mbig-obj)
+    add_compile_options(-Wno-deprecated-declarations -Wno-reserved-user-defined-literal)
+    add_link_options(-static -static-libgcc -static-libstdc++)
+    add_compile_definitions(WIN32 _MT)
+endif()
+
+# ── Platform: macOS ──
+if(APPLE)
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "Minimum macOS version")
+    add_compile_options(-Wno-reserved-user-defined-literal -Wno-deprecated-declarations)
+    add_compile_definitions(MAC_OSX MSG_NOSIGNAL=0)
+endif()
+
+# ── Platform: Linux ──
+if(UNIX AND NOT APPLE)
+    add_compile_definitions(LINUX)
+endif()
+
+# ── Static linking (Linux release builds) ──
+if(ENABLE_STATIC AND UNIX AND NOT APPLE)
+    add_link_options(-static)
+endif()

cmake/BuildLevelDB.cmake

@@ -0,0 +1,14 @@
+# cmake/BuildLevelDB.cmake
+# Builds the bundled LevelDB via its native CMake sub-build.
+# Exposes leveldb_lib, leveldb_memenv, leveldb_bundled, and build_leveldb.
+
+set(LEVELDB_SOURCE_DIR "${CMAKE_SOURCE_DIR}/src/leveldb")
+set(LEVELDB_BINARY_DIR "${CMAKE_BINARY_DIR}/leveldb")
+
+if(NOT TARGET leveldb_lib)
+    add_subdirectory("${LEVELDB_SOURCE_DIR}" "${LEVELDB_BINARY_DIR}")
+endif()
+
+if(NOT TARGET build_leveldb)
+    add_custom_target(build_leveldb DEPENDS leveldb_lib leveldb_memenv)
+endif()

cmake/FindBerkeleyDB.cmake

@@ -0,0 +1,51 @@
+# cmake/FindBerkeleyDB.cmake
+# Finds Berkeley DB C++ headers and library.
+#
+# User can set BDB_INCLUDE_PATH and BDB_LIB_PATH to guide search.
+#
+# Creates imported target: BerkeleyDB::BerkeleyDB
+# Sets: BerkeleyDB_FOUND, BerkeleyDB_INCLUDE_DIR, BerkeleyDB_LIBRARY
+
+find_path(BerkeleyDB_INCLUDE_DIR
+    NAMES db_cxx.h
+    HINTS
+        ${BDB_INCLUDE_PATH}
+        ENV BDB_INCLUDE_PATH
+    PATHS
+        /opt/homebrew/opt/berkeley-db@5/include
+        /opt/homebrew/opt/berkeley-db/include
+        /usr/include/db5
+        /usr/local/include/db5
+        /usr/include
+        /usr/local/include
+        C:/msys64/mingw64/include
+)
+
+find_library(BerkeleyDB_LIBRARY
+    NAMES db_cxx db_cxx-5 db_cxx-5.3 db_cxx-4.8
+    HINTS
+        ${BDB_LIB_PATH}
+        ENV BDB_LIB_PATH
+    PATHS
+        /opt/homebrew/opt/berkeley-db@5/lib
+        /opt/homebrew/opt/berkeley-db/lib
+        /usr/lib/x86_64-linux-gnu
+        /usr/lib
+        /usr/local/lib
+        C:/msys64/mingw64/lib
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(BerkeleyDB
+    REQUIRED_VARS BerkeleyDB_LIBRARY BerkeleyDB_INCLUDE_DIR
+)
+
+if(BerkeleyDB_FOUND AND NOT TARGET BerkeleyDB::BerkeleyDB)
+    add_library(BerkeleyDB::BerkeleyDB UNKNOWN IMPORTED)
+    set_target_properties(BerkeleyDB::BerkeleyDB PROPERTIES
+        IMPORTED_LOCATION "${BerkeleyDB_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${BerkeleyDB_INCLUDE_DIR}"
+    )
+endif()
+
+mark_as_advanced(BerkeleyDB_INCLUDE_DIR BerkeleyDB_LIBRARY)

cmake/FindLibevent.cmake

@@ -0,0 +1,46 @@
+# cmake/FindLibevent.cmake
+# Finds libevent headers and library.
+#
+# User can set EVENT_INCLUDE_PATH and EVENT_LIB_PATH.
+#
+# Creates imported target: Libevent::Libevent
+
+find_path(Libevent_INCLUDE_DIR
+    NAMES event2/event.h
+    HINTS
+        ${EVENT_INCLUDE_PATH}
+        ENV EVENT_INCLUDE_PATH
+    PATHS
+        /opt/homebrew/include
+        /usr/include
+        /usr/local/include
+        C:/msys64/mingw64/include
+)
+
+find_library(Libevent_LIBRARY
+    NAMES event libevent
+    HINTS
+        ${EVENT_LIB_PATH}
+        ENV EVENT_LIB_PATH
+    PATHS
+        /opt/homebrew/lib
+        /usr/lib/x86_64-linux-gnu
+        /usr/lib
+        /usr/local/lib
+        C:/msys64/mingw64/lib
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Libevent
+    REQUIRED_VARS Libevent_LIBRARY Libevent_INCLUDE_DIR
+)
+
+if(Libevent_FOUND AND NOT TARGET Libevent::Libevent)
+    add_library(Libevent::Libevent UNKNOWN IMPORTED)
+    set_target_properties(Libevent::Libevent PROPERTIES
+        IMPORTED_LOCATION "${Libevent_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${Libevent_INCLUDE_DIR}"
+    )
+endif()
+
+mark_as_advanced(Libevent_INCLUDE_DIR Libevent_LIBRARY)

cmake/FindMiniupnpc.cmake

@@ -0,0 +1,46 @@
+# cmake/FindMiniupnpc.cmake
+# Finds miniupnpc headers and library.
+#
+# User can set MINIUPNPC_INCLUDE_PATH and MINIUPNPC_LIB_PATH.
+#
+# Creates imported target: Miniupnpc::Miniupnpc
+
+find_path(Miniupnpc_INCLUDE_DIR
+    NAMES miniupnpc/miniupnpc.h
+    HINTS
+        ${MINIUPNPC_INCLUDE_PATH}
+        ENV MINIUPNPC_INCLUDE_PATH
+    PATHS
+        /opt/homebrew/include
+        /usr/include
+        /usr/local/include
+        C:/msys64/mingw64/include
+)
+
+find_library(Miniupnpc_LIBRARY
+    NAMES miniupnpc
+    HINTS
+        ${MINIUPNPC_LIB_PATH}
+        ENV MINIUPNPC_LIB_PATH
+    PATHS
+        /opt/homebrew/lib
+        /usr/lib/x86_64-linux-gnu
+        /usr/lib
+        /usr/local/lib
+        C:/msys64/mingw64/lib
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Miniupnpc
+    REQUIRED_VARS Miniupnpc_LIBRARY Miniupnpc_INCLUDE_DIR
+)
+
+if(Miniupnpc_FOUND AND NOT TARGET Miniupnpc::Miniupnpc)
+    add_library(Miniupnpc::Miniupnpc UNKNOWN IMPORTED)
+    set_target_properties(Miniupnpc::Miniupnpc PROPERTIES
+        IMPORTED_LOCATION "${Miniupnpc_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${Miniupnpc_INCLUDE_DIR}"
+    )
+endif()
+
+mark_as_advanced(Miniupnpc_INCLUDE_DIR Miniupnpc_LIBRARY)

cmake/FindQRencode.cmake

@@ -0,0 +1,38 @@
+# cmake/FindQRencode.cmake
+# Finds libqrencode headers and library.
+#
+# Creates imported target: QRencode::QRencode
+
+find_path(QRencode_INCLUDE_DIR
+    NAMES qrencode.h
+    PATHS
+        /opt/homebrew/include
+        /usr/include
+        /usr/local/include
+        C:/msys64/mingw64/include
+)
+
+find_library(QRencode_LIBRARY
+    NAMES qrencode
+    PATHS
+        /opt/homebrew/lib
+        /usr/lib/x86_64-linux-gnu
+        /usr/lib
+        /usr/local/lib
+        C:/msys64/mingw64/lib
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(QRencode
+    REQUIRED_VARS QRencode_LIBRARY QRencode_INCLUDE_DIR
+)
+
+if(QRencode_FOUND AND NOT TARGET QRencode::QRencode)
+    add_library(QRencode::QRencode UNKNOWN IMPORTED)
+    set_target_properties(QRencode::QRencode PROPERTIES
+        IMPORTED_LOCATION "${QRencode_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${QRencode_INCLUDE_DIR}"
+    )
+endif()
+
+mark_as_advanced(QRencode_INCLUDE_DIR QRencode_LIBRARY)

cmake/GenerateBuildInfo.cmake

@@ -0,0 +1,19 @@
+# cmake/GenerateBuildInfo.cmake
+# Sets up a custom target that generates build.h from git describe,
+# equivalent to share/genbuild.sh.
+
+set(BUILD_HEADER_DIR "${CMAKE_BINARY_DIR}/generated")
+set(BUILD_HEADER     "${BUILD_HEADER_DIR}/build.h")
+file(MAKE_DIRECTORY  "${BUILD_HEADER_DIR}")
+
+# Custom command runs on every build to regenerate build.h if git state changed
+add_custom_target(generate_build_info ALL
+    COMMAND ${CMAKE_COMMAND}
+        -DSOURCE_DIR=${CMAKE_SOURCE_DIR}
+        -DOUTPUT_FILE=${BUILD_HEADER}
+        -P "${CMAKE_SOURCE_DIR}/cmake/GenerateBuildInfoScript.cmake"
+    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+    COMMENT "Generating build.h from git describe..."
+    BYPRODUCTS "${BUILD_HEADER}"
+    VERBATIM
+)

cmake/GenerateBuildInfoScript.cmake

@@ -0,0 +1,61 @@
+# cmake/GenerateBuildInfoScript.cmake
+# Called at build time by the custom target in GenerateBuildInfo.cmake.
+# Replicates the logic of share/genbuild.sh.
+
+# Read existing build.h first line if it exists
+set(OLD_LINE "")
+if(EXISTS "${OUTPUT_FILE}")
+    file(STRINGS "${OUTPUT_FILE}" _lines LIMIT_COUNT 1)
+    if(_lines)
+        list(GET _lines 0 OLD_LINE)
+    endif()
+endif()
+
+# Try exact tag match first (release builds)
+execute_process(
+    COMMAND git describe --tags --exact-match
+    WORKING_DIRECTORY "${SOURCE_DIR}"
+    OUTPUT_VARIABLE GIT_DESC
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_QUIET
+    RESULT_VARIABLE _result
+)
+
+# Fall back to tag + commit distance
+if(NOT _result EQUAL 0)
+    execute_process(
+        COMMAND git describe --tags --dirty
+        WORKING_DIRECTORY "${SOURCE_DIR}"
+        OUTPUT_VARIABLE GIT_DESC
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_QUIET
+        RESULT_VARIABLE _result
+    )
+    if(NOT _result EQUAL 0)
+        set(GIT_DESC "")
+    endif()
+endif()
+
+# Get commit timestamp
+execute_process(
+    COMMAND git log -n 1 --format=%ci
+    WORKING_DIRECTORY "${SOURCE_DIR}"
+    OUTPUT_VARIABLE GIT_TIME
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_QUIET
+)
+
+# Build new content
+if(GIT_DESC)
+    set(NEW_LINE "#define BUILD_DESC \"${GIT_DESC}\"")
+else()
+    set(NEW_LINE "// No build information available")
+endif()
+
+# Only write if changed
+if(NOT "${OLD_LINE}" STREQUAL "${NEW_LINE}")
+    file(WRITE "${OUTPUT_FILE}"
+        "${NEW_LINE}\n"
+        "#define BUILD_DATE \"${GIT_TIME}\"\n"
+    )
+endif()

contrib/nsis/setup.nsi

@@ -0,0 +1,148 @@
+; Cryptographic Triangles NSIS Installer
+; Produces a single setup.exe with wallet + Tor bundled
+; Uses per-user install (no UAC elevation) so network drives stay visible
+
+!include "MUI2.nsh"
+!include "FileFunc.nsh"
+
+!ifndef VERSION
+  !define VERSION "0.0.0"
+!endif
+
+!define APPNAME "Cryptographic Triangles"
+!define COMPANYNAME "Cryptographic Triangles"
+!define EXENAME "triangles-qt.exe"
+
+Name "${APPNAME} v${VERSION}"
+OutFile "Cryptographic-Triangles-${VERSION}-win-x64-setup.exe"
+InstallDir "$LOCALAPPDATA\${APPNAME}"
+InstallDirRegKey HKCU "Software\${APPNAME}" "InstallDir"
+RequestExecutionLevel user
+
+; UI — icons and bitmaps are relative to THIS .nsi file
+!define MUI_ICON "..\..\src\qt\res\icons\triangles.ico"
+!define MUI_UNICON "..\..\src\qt\res\icons\triangles.ico"
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP "..\..\share\pixmaps\nsis-header.bmp"
+!define MUI_WELCOMEFINISHPAGE_BITMAP "..\..\share\pixmaps\nsis-wizard.bmp"
+!define MUI_ABORTWARNING
+!define MUI_FINISHPAGE_RUN "$INSTDIR\${EXENAME}"
+!define MUI_FINISHPAGE_RUN_TEXT "Launch ${APPNAME}"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_DIRECTORY
+
+; Bootstrap page
+Page custom BootstrapPage
+
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+!insertmacro MUI_LANGUAGE "English"
+
+; Bootstrap selection variable
+Var BootstrapChoice
+
+; Bootstrap page function
+Function BootstrapPage
+  !insertmacro MUI_HEADER_TEXT "Blockchain Sync" "Choose how to synchronize the blockchain"
+  
+  nsDialogs::Create 1018
+  Pop $0
+  
+  ${NSD_CreateLabel} 0 10u 100% 20u "The Triangles blockchain requires ~1GB of data. Choose sync method:"
+  Pop $0
+  
+  ${NSD_CreateRadioButton} 10u 40u 100% 12u "Download bootstrap (~1.3GB) — Recommended (fast)"
+  Pop $1
+  ${NSD_Check} $1
+  
+  ${NSD_CreateRadioButton} 10u 60u 100% 12u "Sync from network — Slow (may take days)"
+  Pop $2
+  
+  ${NSD_CreateLabel} 10u 80u 100% 30u "Bootstrap will download a recent blockchain snapshot, saving hours or days of sync time. Network bandwidth required: ~1.3GB."
+  Pop $0
+  
+  nsDialogs::Show
+  
+  ${NSD_GetState} $1 $BootstrapChoice
+FunctionEnd
+
+Section "Install"
+  SetOutPath "$INSTDIR"
+
+  ; Wallet + Qt DLLs (prepared by the Package step into dist/)
+  File /r "..\..\dist\*.*"
+
+  ; Tor binary + data (prepared by Download Tor step into tor-files/)
+  SetOutPath "$INSTDIR\tor"
+  File /r "..\..\tor-files\*.*"
+
+  ; Create data directory
+  CreateDirectory "$APPDATA\Triangles"
+
+  ; Download blockchain bootstrap if selected
+  ${If} $BootstrapChoice == ${BST_CHECKED}
+    DetailPrint "Downloading blockchain bootstrap..."
+    inetc::get /CAPTION "Downloading Blockchain" /CANCELTEXT "Skip" \
+      "http://bootstrap.cryptographic-triangles.org/tri-blockchain.tar.gz" \
+      "$TEMP\tri-blockchain.tar.gz" /END
+    Pop $0
+    ${If} $0 == "OK"
+      DetailPrint "Extracting blockchain..."
+      nsExec::ExecToLog '"$INSTDIR\7z.exe" x "$TEMP\tri-blockchain.tar.gz" -o"$TEMP" -y'
+      nsExec::ExecToLog '"$INSTDIR\7z.exe" x "$TEMP\tri-blockchain.tar" -o"$APPDATA\Triangles" -y'
+      Delete "$TEMP\tri-blockchain.tar.gz"
+      Delete "$TEMP\tri-blockchain.tar"
+      DetailPrint "Blockchain bootstrap installed!"
+    ${Else}
+      DetailPrint "Bootstrap download failed or skipped — will sync from network"
+    ${EndIf}
+  ${EndIf}
+
+  ; Uninstaller
+  WriteUninstaller "$INSTDIR\uninstall.exe"
+
+  ; Start menu
+  CreateDirectory "$SMPROGRAMS\${APPNAME}"
+  CreateShortcut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\${EXENAME}" "" "$INSTDIR\${EXENAME}" 0
+  CreateShortcut "$SMPROGRAMS\${APPNAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+
+  ; Desktop shortcut
+  CreateShortcut "$DESKTOP\${APPNAME}.lnk" "$INSTDIR\${EXENAME}" "" "$INSTDIR\${EXENAME}" 0
+
+  ; Add/Remove Programs (per-user)
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}"
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString" '"$INSTDIR\uninstall.exe"'
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\${EXENAME}"
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "${COMPANYNAME}"
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${VERSION}"
+  WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" 1
+  WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" 1
+  WriteRegStr HKCU "Software\${APPNAME}" "InstallDir" "$INSTDIR"
+
+  ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+  IntFmt $0 "0x%08X" $0
+  WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "EstimatedSize" "$0"
+SectionEnd
+
+Section "Uninstall"
+  ; Stop running processes
+  nsExec::ExecToLog 'taskkill /F /IM triangles-qt.exe'
+  nsExec::ExecToLog 'taskkill /F /IM trianglesd.exe'
+  nsExec::ExecToLog 'taskkill /F /IM tor.exe'
+
+  ; Remove installation
+  RMDir /r "$INSTDIR"
+
+  ; Remove shortcuts
+  RMDir /r "$SMPROGRAMS\${APPNAME}"
+  Delete "$DESKTOP\${APPNAME}.lnk"
+
+  ; Remove registry
+  DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}"
+  DeleteRegKey HKCU "Software\${APPNAME}"
+SectionEnd

contrib/seeds/SETUP-GUIDE.md

@@ -0,0 +1,147 @@
+# Triangles Dynamic Seed Node - Setup Guide
+
+## Overview
+
+Triangles v5.5.0+ uses a dynamic HTTP seed list instead of hardcoded addresses.
+A collector script runs on a VPS alongside a Triangles node, periodically
+querying the node for known .onion peers and publishing them to a static file.
+New wallets fetch this file on startup to bootstrap peer discovery.
+
+Once any wallet syncs and obtains its own .onion address, other nodes learn
+about it via P2P address exchange. The collector picks it up automatically
+on its next run. No manual intervention is needed after initial setup.
+
+## Requirements
+
+- Linux VPS
+- Triangles daemon (`trianglesd`) running with Tor enabled
+- A web server (Caddy, nginx, Apache, etc.)
+- DNS control for the domain serving the seed list
+- `jq` and `curl` (`apt install jq curl`)
+
+## Step 1: DNS
+
+Create an A record for the seed list hostname pointing to the VPS IP address.
+
+The default hostname the wallet fetches is `seeds.cryptographic-triangles.org`.
+This can be overridden per-node with the `-seedurl` flag.
+
+## Step 2: Web Server
+
+Create a directory for the seed file:
+
+```bash
+sudo mkdir -p /var/www/seeds
+sudo chown $USER:$USER /var/www/seeds
+```
+
+Configure the web server to serve that directory on the seed list hostname.
+
+**Caddy example** (add to Caddyfile):
+
+```
+seeds.cryptographic-triangles.org {
+    root * /var/www/seeds
+    file_server
+}
+```
+
+**nginx example** (add server block):
+
+```
+server {
+    listen 80;
+    server_name seeds.cryptographic-triangles.org;
+    root /var/www/seeds;
+}
+```
+
+Reload the web server after making changes.
+
+## Step 3: Install the Collector Script
+
+```bash
+sudo cp contrib/seeds/collect-seeds.sh /usr/local/bin/collect-seeds.sh
+sudo chmod +x /usr/local/bin/collect-seeds.sh
+```
+
+## Step 4: Configure and Test
+
+The script communicates with `trianglesd` via JSON-RPC. It reads credentials
+from environment variables. Check `triangles.conf` for `rpcuser` and `rpcpassword`.
+
+Run it manually to verify:
+
+```bash
+export RPC_USER="your_rpc_username"
+export RPC_PASSWORD="your_rpc_password"
+export RPC_PORT="19112"
+export OUTPUT_FILE="/var/www/seeds/seeds.txt"
+
+/usr/local/bin/collect-seeds.sh
+```
+
+Expected output: `Updated /var/www/seeds/seeds.txt with N seeds`
+
+The resulting file should contain one `.onion:port` entry per line:
+
+```
+# Triangles seed nodes - auto-generated 2026-04-01T12:00:00Z
+exampleaddress1234567890abcdefghijklmnopqrstuvwxyz234567.onion:24112
+anotheraddress1234567890abcdefghijklmnopqrstuvwxyz23456.onion:24112
+```
+
+## Step 5: Cron Job
+
+Schedule the collector to run every 5 minutes:
+
+```bash
+crontab -e
+```
+
+Add:
+
+```
+*/5 * * * * RPC_USER="your_rpc_username" RPC_PASSWORD="your_rpc_password" OUTPUT_FILE="/var/www/seeds/seeds.txt" /usr/local/bin/collect-seeds.sh >> /var/log/triangles-seeds.log 2>&1
+```
+
+## Step 6: Verify End-to-End
+
+From any machine:
+
+```bash
+curl http://seeds.cryptographic-triangles.org/seeds.txt
+```
+
+The response should list .onion addresses.
+
+## Troubleshooting
+
+**"no onion seeds found"**
+The node has not yet learned any .onion peer addresses. Ensure Tor is enabled
+and the node has at least one connected peer. Check with `trianglesd getpeerinfo`.
+
+**"RPC call failed"**
+Verify `trianglesd` is running and RPC credentials are correct:
+```bash
+curl -s --user "user:pass" --data-binary \
+  '{"jsonrpc":"1.0","method":"getinfo","params":[]}' \
+  http://127.0.0.1:19112/
+```
+
+**seeds.txt not updating**
+Check the cron log: `tail /var/log/triangles-seeds.log`
+
+## How It Works
+
+1. The collector calls the `getseedlist` RPC, which returns all known .onion
+   addresses from the node's address manager
+2. Results are written to a static text file served by the web server
+3. On startup, Triangles wallets fetch this file and add the addresses to
+   their peer database
+4. As wallets connect and exchange addresses via P2P, new .onion addresses
+   propagate across the network
+5. The collector discovers newly-propagated addresses on its next run
+
+This creates a fully automatic cycle where every online wallet with a Tor
+hidden service becomes a discoverable seed node.

contrib/seeds/collect-seeds.sh

@@ -0,0 +1,49 @@
+#!/bin/bash
+# Triangles Dynamic Seed Collector
+# Run via cron on a VPS that runs a Triangles node.
+# Queries the local node's getseedlist RPC for known .onion peers
+# and writes them to a static file served by a web server.
+#
+# Example cron (every 5 minutes):
+#   */5 * * * * /path/to/collect-seeds.sh
+#
+# The web server (Caddy, nginx, etc.) serves the output file at:
+#   http://seeds.cryptographic-triangles.org/seeds.txt
+
+# Configuration
+RPC_USER="${RPC_USER:-trianglesrpc}"
+RPC_PASSWORD="${RPC_PASSWORD:-}"
+RPC_PORT="${RPC_PORT:-19112}"
+OUTPUT_FILE="${OUTPUT_FILE:-/var/www/seeds/seeds.txt}"
+
+if [ -z "$RPC_PASSWORD" ]; then
+    echo "Error: RPC_PASSWORD not set" >&2
+    exit 1
+fi
+
+# Query the node for known onion seeds
+RESPONSE=$(curl -s --user "${RPC_USER}:${RPC_PASSWORD}" \
+    --data-binary '{"jsonrpc":"1.0","id":"seedcollect","method":"getseedlist","params":[]}' \
+    -H 'content-type: text/plain;' \
+    "http://127.0.0.1:${RPC_PORT}/" 2>/dev/null)
+
+if [ $? -ne 0 ] || [ -z "$RESPONSE" ]; then
+    echo "Error: RPC call failed" >&2
+    exit 1
+fi
+
+# Extract addresses and write to temp file, then atomically move
+TMPFILE=$(mktemp)
+
+echo "# Triangles seed nodes - auto-generated $(date -u +%Y-%m-%dT%H:%M:%SZ)" > "$TMPFILE"
+echo "$RESPONSE" | jq -r '.result[] | .address + ":" + (.port|tostring)' >> "$TMPFILE" 2>/dev/null
+
+SEED_COUNT=$(grep -c '.onion' "$TMPFILE" 2>/dev/null || echo 0)
+
+if [ "$SEED_COUNT" -gt 0 ]; then
+    mv "$TMPFILE" "$OUTPUT_FILE"
+    echo "Updated ${OUTPUT_FILE} with ${SEED_COUNT} seeds"
+else
+    rm -f "$TMPFILE"
+    echo "Warning: no onion seeds found, keeping previous file" >&2
+fi

packaging/appimage/build-appimage.sh

@@ -3,7 +3,7 @@
 # Run on a Linux x64 system with appimagetool installed
 set -e
 
-VERSION="5.1.5"
+VERSION="5.7.6"
 APPDIR="Triangles-x86_64.AppDir"
 RELEASE_URL="https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${VERSION}"
 
@@ -17,7 +17,7 @@ mkdir -p "$APPDIR/usr/share/icons/hicolor/256x256/apps"
 
 # Download binary
 echo "Downloading triangles-qt..."
-curl -L -o "$APPDIR/usr/bin/triangles-qt" "${RELEASE_URL}/triangles-qt-linux"
+curl -L -o "$APPDIR/usr/bin/triangles-qt" "${RELEASE_URL}/Cryptographic-Triangles-v${VERSION}-linux-x64-qt"
 chmod +x "$APPDIR/usr/bin/triangles-qt"
 
 # Create desktop entry

packaging/appstream/org.cryptographic_triangles.TrianglesQt.metainfo.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>org.cryptographic_triangles.TrianglesQt</id>
+  <metadata_license>MIT</metadata_license>
+  <project_license>MIT</project_license>
+  <name>Cryptographic Triangles</name>
+  <summary>TRI cryptocurrency wallet with staking and encrypted messaging</summary>
+
+  <description>
+    <p>
+      Cryptographic Triangles is a privacy-focused cryptocurrency wallet featuring
+      Proof-of-Stake consensus, Tor v3 onion routing, and built-in encrypted messaging.
+    </p>
+    <p>Features:</p>
+    <ul>
+      <li>Proof-of-Stake with 33% annual staking rewards</li>
+      <li>Hash9 algorithm (13-step hash cascade)</li>
+      <li>Encrypted peer-to-peer messaging (SmsgMessage)</li>
+      <li>Tor v3 integration for anonymous transactions</li>
+      <li>Full node with built-in block explorer</li>
+    </ul>
+  </description>
+
+  <launchable type="desktop-id">org.cryptographic_triangles.TrianglesQt.desktop</launchable>
+
+  <icon type="stock">org.cryptographic_triangles.TrianglesQt</icon>
+
+  <categories>
+    <category>Finance</category>
+    <category>Network</category>
+    <category>P2P</category>
+  </categories>
+
+  <url type="homepage">https://cryptographic-triangles.org</url>
+  <url type="bugtracker">https://github.com/SamiAhmed7777/triangles_v5/issues</url>
+  <url type="vcs-browser">https://github.com/SamiAhmed7777/triangles_v5</url>
+
+  <provides>
+    <binary>triangles-qt</binary>
+    <binary>trianglesd</binary>
+  </provides>
+
+  <releases>
+    <release version="5.3.7" date="2026-03-24">
+      <description>
+        <p>Version 5.3.7 release.</p>
+      </description>
+    </release>
+    <release version="5.3.6" date="2026-03-23">
+      <description>
+        <p>IBD sync optimizations, Linux build fixes, and modern compiler support.</p>
+      </description>
+    </release>
+    <release version="5.2.0" date="2025-01-01">
+      <description>
+        <p>Tor v3 embedded support, OpenSSL 3.x compatibility, and Boost 1.90+ support.</p>
+      </description>
+    </release>
+  </releases>
+
+  <content_rating type="oars-1.1" />
+
+  <supports>
+    <control>pointing</control>
+    <control>keyboard</control>
+  </supports>
+</component>

packaging/aur/PKGBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Cryptographic Triangles Team
 pkgname=triangles-qt-bin
-pkgver=5.1.5
+pkgver=5.5.6
 pkgrel=1
 pkgdesc="Cryptographic Triangles (TRI) cryptocurrency wallet - Qt GUI"
 arch=('x86_64')
@@ -11,13 +11,13 @@ optdepends=('tor: anonymous networking support')
 provides=('triangles-qt' 'trianglesd')
 conflicts=('triangles-qt' 'trianglesd')
 source=(
-    "triangles-qt-${pkgver}::https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${pkgver}/triangles-qt-linux"
-    "trianglesd-${pkgver}::https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${pkgver}/trianglesd-linux"
+    "triangles-qt-${pkgver}::https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${pkgver}/Cryptographic-Triangles-v${pkgver}-linux-x64-qt"
+    "trianglesd-${pkgver}::https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${pkgver}/Cryptographic-Triangles-v${pkgver}-linux-x64-daemon"
     "triangles-qt.desktop"
 )
 sha256sums=(
-    '19eaadfdf18b899ce8434fe714e690e2db0546597e36037de37a29854fc23aeb'
-    '6f5c19d34a2e1f6cdadee095d9e11b25d18b41a0d1602a163ffca7ec80b3da37'
+    'ed220eb8d0b403f62cdac28988541fd1a27864491e233216f9c00a4c2537b4a3'
+    '4d2ab25d61127d6aff3e6f3069556d04f4b823f8849e97629c12871ad4779517'
     'SKIP'
 )
 

packaging/chocolatey/tools/chocolateyInstall.ps1

@@ -3,8 +3,8 @@ $ErrorActionPreference = 'Stop'
 $packageArgs = @{
     packageName    = 'triangles'
     unzipLocation  = "$(Split-Path -Parent $MyInvocation.MyCommand.Definition)"
-    url64bit       = 'https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.1.5/Triangles-v5.1.5-win-x64.zip'
-    checksum64     = '777e475f366164b342e917111bcf3155ec39e0ab4bd97b2ac295885ad30a93c6'
+    url64bit       = 'https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.3.7/Cryptographic-Triangles-5.3.7-win-x64.zip'
+    checksum64     = '6f002a669a7e92aaf3d8dd7b1ae80f06a086c99a15ca05cf107665009ffc06b7'
     checksumType64 = 'sha256'
 }
 

packaging/chocolatey/triangles.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>triangles</id>
-    <version>5.1.5</version>
+    <version>5.5.6</version>
     <title>Cryptographic Triangles</title>
     <authors>Cryptographic Triangles Team</authors>
     <owners>SamiAhmed7777</owners>
@@ -25,6 +25,6 @@ featuring the unique Hash9 algorithm (13-step hash cascade).
 - Encrypted peer-to-peer messaging
 - Tor v3 integration for anonymous transactions
     </description>
-    <releaseNotes>https://github.com/SamiAhmed7777/triangles_v5/releases/tag/v5.1.5</releaseNotes>
+    <releaseNotes>https://github.com/SamiAhmed7777/triangles_v5/releases/tag/v5.3.7</releaseNotes>
   </metadata>
 </package>

packaging/debian/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: triangles
-Version: 5.1.5-1
+Version: 5.5.6-1
 Section: net
 Priority: optional
 Architecture: amd64

packaging/debian/DEBIAN/postinst

@@ -0,0 +1,18 @@
+#!/bin/bash
+# Post-installation script for Triangles .deb package
+
+set -e
+
+echo "════════════════════════════════════════════════════════"
+echo "  Triangles Installation Complete"
+echo "════════════════════════════════════════════════════════"
+echo ""
+echo "Optional: Download blockchain bootstrap to skip days of sync"
+echo ""
+echo "  sudo triangles-bootstrap-install"
+echo ""
+echo "This will download ~1.3GB and extract to ~/.triangles/"
+echo "════════════════════════════════════════════════════════"
+echo ""
+
+exit 0

packaging/debian/build-deb.sh

@@ -3,7 +3,7 @@
 # Run from the packaging/debian directory
 set -e
 
-VERSION="5.1.5"
+VERSION="5.7.6"
 PKGDIR="triangles_${VERSION}-1_amd64"
 RELEASE_URL="https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${VERSION}"
 
@@ -13,17 +13,24 @@ echo "Building .deb package for Triangles v${VERSION}..."
 rm -rf "$PKGDIR"
 mkdir -p "$PKGDIR/DEBIAN"
 mkdir -p "$PKGDIR/usr/bin"
+mkdir -p "$PKGDIR/usr/local/bin"
 mkdir -p "$PKGDIR/usr/share/applications"
 
-# Copy control file
+# Copy control and postinst
 cp DEBIAN/control "$PKGDIR/DEBIAN/"
+cp DEBIAN/postinst "$PKGDIR/DEBIAN/"
+chmod 755 "$PKGDIR/DEBIAN/postinst"
 
 # Download binaries
 echo "Downloading binaries..."
-curl -L -o "$PKGDIR/usr/bin/triangles-qt" "${RELEASE_URL}/triangles-qt-linux"
-curl -L -o "$PKGDIR/usr/bin/trianglesd" "${RELEASE_URL}/trianglesd-linux"
+curl -L -o "$PKGDIR/usr/bin/triangles-qt" "${RELEASE_URL}/Cryptographic-Triangles-v${VERSION}-linux-x64-qt"
+curl -L -o "$PKGDIR/usr/bin/trianglesd" "${RELEASE_URL}/Cryptographic-Triangles-v${VERSION}-linux-x64-daemon"
 chmod 755 "$PKGDIR/usr/bin/triangles-qt" "$PKGDIR/usr/bin/trianglesd"
 
+# Copy bootstrap installer
+cp usr/local/bin/triangles-bootstrap-install "$PKGDIR/usr/local/bin/"
+chmod 755 "$PKGDIR/usr/local/bin/triangles-bootstrap-install"
+
 # Create desktop entry
 cat > "$PKGDIR/usr/share/applications/triangles-qt.desktop" << 'DESKTOP'
 [Desktop Entry]

packaging/debian/usr/local/bin/triangles-bootstrap-install

@@ -0,0 +1,87 @@
+#!/bin/bash
+# Triangles Blockchain Bootstrap Installer
+# Downloads and extracts blockchain snapshot to save sync time
+
+set -e
+
+echo "╔═══════════════════════════════════════╗"
+echo "║  Triangles Blockchain Bootstrap      ║"
+echo "╚═══════════════════════════════════════╝"
+echo ""
+
+# Determine data directory
+if [ -n "$1" ]; then
+    DATA_DIR="$1"
+elif [ -d "$HOME/.triangles" ]; then
+    DATA_DIR="$HOME/.triangles"
+else
+    DATA_DIR="$HOME/.triangles"
+    mkdir -p "$DATA_DIR"
+fi
+
+echo "Data directory: $DATA_DIR"
+echo ""
+
+# Check if triangles is running
+if pgrep -x trianglesd > /dev/null || pgrep -x triangles-qt > /dev/null; then
+    echo "⚠️  Triangles is currently running!"
+    echo "   Please stop it first:"
+    echo "   trianglesd stop  (or close triangles-qt)"
+    echo ""
+    exit 1
+fi
+
+# Check existing blockchain
+if [ -f "$DATA_DIR/blk0001.dat" ]; then
+    SIZE=$(du -sh "$DATA_DIR/blk0001.dat" | cut -f1)
+    echo "⚠️  Existing blockchain found ($SIZE)"
+    echo ""
+    read -p "   Overwrite? This will replace your current blockchain [y/N]: " CONFIRM
+    if [[ ! "$CONFIRM" =~ ^[Yy]$ ]]; then
+        echo "Cancelled."
+        exit 0
+    fi
+    echo ""
+fi
+
+# Download bootstrap
+BOOTSTRAP_URL="http://bootstrap.cryptographic-triangles.org/tri-blockchain.tar.gz"
+TMP_FILE="/tmp/tri-blockchain-$$.tar.gz"
+
+echo "⬇️  Downloading blockchain bootstrap (~1.3GB)..."
+echo "   This may take several minutes..."
+echo ""
+
+if ! curl -# -L --fail --connect-timeout 30 --max-time 1800 -o "$TMP_FILE" "$BOOTSTRAP_URL"; then
+    echo "❌ Download failed!"
+    echo "   URL: $BOOTSTRAP_URL"
+    rm -f "$TMP_FILE"
+    exit 1
+fi
+
+echo ""
+echo "✓ Downloaded!"
+echo ""
+
+# Extract
+echo "📦 Extracting blockchain..."
+if ! tar xzf "$TMP_FILE" -C "$DATA_DIR/"; then
+    echo "❌ Extraction failed!"
+    rm -f "$TMP_FILE"
+    exit 1
+fi
+
+rm -f "$TMP_FILE"
+
+echo "✓ Blockchain installed!"
+echo ""
+echo "╔═══════════════════════════════════════╗"
+echo "║         Bootstrap Complete!           ║"
+echo "╚═══════════════════════════════════════╝"
+echo ""
+echo "You can now start Triangles:"
+echo "  trianglesd -daemon"
+echo "  (or launch triangles-qt)"
+echo ""
+echo "The node will sync the remaining ~8,000 blocks from the network."
+echo ""

packaging/docker/Dockerfile

@@ -0,0 +1,40 @@
+FROM ubuntu:22.04
+
+LABEL maintainer="Cryptographic Triangles Team"
+LABEL description="Cryptographic Triangles (TRI) headless daemon"
+LABEL version="5.7.6"
+
+ARG VERSION=5.7.6
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    curl \
+    ca-certificates \
+    libssl3 \
+    libevent-2.1-7 \
+    libboost-system1.74.0 \
+    libboost-filesystem1.74.0 \
+    libboost-program-options1.74.0 \
+    libboost-thread1.74.0 \
+    libboost-chrono1.74.0 \
+    libdb5.3++ \
+    libminiupnpc17 \
+    tor \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN curl -L -o /usr/local/bin/trianglesd \
+    "https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${VERSION}/Cryptographic-Triangles-v${VERSION}-linux-x64-daemon" \
+    && chmod +x /usr/local/bin/trianglesd
+
+RUN useradd -m -s /bin/bash triangles
+
+USER triangles
+WORKDIR /home/triangles
+
+RUN mkdir -p /home/triangles/.triangles
+
+VOLUME /home/triangles/.triangles
+
+EXPOSE 24112 19112
+
+ENTRYPOINT ["trianglesd"]
+CMD ["-daemon=0", "-printtoconsole"]

packaging/docker/docker-compose.yml

@@ -0,0 +1,17 @@
+version: "3.8"
+
+services:
+  trianglesd:
+    build: .
+    image: cryptographic-triangles/trianglesd:5.7.6
+    container_name: trianglesd
+    restart: unless-stopped
+    ports:
+      - "24112:24112"
+      - "19112:19112"
+    volumes:
+      - triangles-data:/home/triangles/.triangles
+    command: ["-daemon=0", "-printtoconsole", "-rpcallowip=172.16.0.0/12"]
+
+volumes:
+  triangles-data:

packaging/flatpak/flathub.json

@@ -0,0 +1,3 @@
+{
+  "only-arches": ["x86_64"]
+}

packaging/flatpak/org.cryptographic_triangles.TrianglesQt.yml

@@ -19,13 +19,35 @@ modules:
     build-commands:
       - install -Dm755 triangles-qt-linux /app/bin/triangles-qt
       - install -Dm644 triangles-qt.desktop /app/share/applications/org.cryptographic_triangles.TrianglesQt.desktop
+      - install -Dm644 triangles.svg /app/share/icons/hicolor/scalable/apps/org.cryptographic_triangles.TrianglesQt.svg
+      - install -Dm644 triangles-128.png /app/share/icons/hicolor/128x128/apps/org.cryptographic_triangles.TrianglesQt.png
+      - install -Dm644 triangles-256.png /app/share/icons/hicolor/256x256/apps/org.cryptographic_triangles.TrianglesQt.png
+      - install -Dm644 org.cryptographic_triangles.TrianglesQt.metainfo.xml /app/share/metainfo/org.cryptographic_triangles.TrianglesQt.metainfo.xml
     sources:
       - type: file
-        url: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.1.5/triangles-qt-linux
-        sha256: 19eaadfdf18b899ce8434fe714e690e2db0546597e36037de37a29854fc23aeb
+        url: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.7.6/Cryptographic-Triangles-v5.7.6-linux-x64-qt
+        sha256: ed220eb8d0b403f62cdac28988541fd1a27864491e233216f9c00a4c2537b4a3
         dest-filename: triangles-qt-linux
       - type: file
-        path: triangles-qt.desktop
+        url: https://raw.githubusercontent.com/SamiAhmed7777/triangles_v5/master/packaging/flatpak/triangles-qt.desktop
+        sha256: f56c4be5870fed6d3f0fb74398241ea909bd3b6f3305fe06ef5f58fba25602ca
+        dest-filename: triangles-qt.desktop
+      - type: file
+        url: https://raw.githubusercontent.com/SamiAhmed7777/triangles_v5/master/src/qt/res/src/triangles.svg
+        sha256: c08d0731e209b1941606709d7236526c4334ee52d1cbda2173cad417d6169486
+        dest-filename: triangles.svg
+      - type: file
+        url: https://raw.githubusercontent.com/SamiAhmed7777/triangles_v5/master/src/qt/res/icons/triangles-128.png
+        sha256: 3a9030b2141ba822059e1d32c29f004c5ed9a4d3c8fc1fba6188201cfdf4ccf5
+        dest-filename: triangles-128.png
+      - type: file
+        url: https://raw.githubusercontent.com/SamiAhmed7777/triangles_v5/master/src/qt/res/icons/triangles.png
+        sha256: eebe5b1890c4cf43b8ae3160f81bac93a2a10cd221c99815de9fcd850f225f4e
+        dest-filename: triangles-256.png
+      - type: file
+        url: https://raw.githubusercontent.com/SamiAhmed7777/triangles_v5/master/packaging/appstream/org.cryptographic_triangles.TrianglesQt.metainfo.xml
+        sha256: dd5ecf9f4916cf0ef3d7ceec763dbbbcf7c4bf806be1e404a96dcfc9423c9fad
+        dest-filename: org.cryptographic_triangles.TrianglesQt.metainfo.xml
 
   - name: trianglesd
     buildsystem: simple
@@ -33,6 +55,6 @@ modules:
       - install -Dm755 trianglesd-linux /app/bin/trianglesd
     sources:
       - type: file
-        url: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.1.5/trianglesd-linux
-        sha256: 6f5c19d34a2e1f6cdadee095d9e11b25d18b41a0d1602a163ffca7ec80b3da37
+        url: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.7.6/Cryptographic-Triangles-v5.7.6-linux-x64-daemon
+        sha256: 4d2ab25d61127d6aff3e6f3069556d04f4b823f8849e97629c12871ad4779517
         dest-filename: trianglesd-linux

packaging/homebrew/triangles.rb

@@ -2,21 +2,16 @@ class Triangles < Formula
   desc "Cryptographic Triangles (TRI) cryptocurrency wallet and daemon"
   homepage "https://cryptographic-triangles.org"
   license "MIT"
-  version "5.1.5"
+  version "5.5.6"
 
   on_macos do
-    if Hardware::CPU.intel?
-      url "https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.1.5/Cryptographic-Triangles-v5.1.5-macos-x64.dmg"
-      sha256 "PLACEHOLDER_X64_HASH"
-    else
-      url "https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.1.5/Cryptographic-Triangles-v5.1.5-macos-arm64.dmg"
-      sha256 "PLACEHOLDER_ARM64_HASH"
-    end
+    url "https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.3.7/Cryptographic-Triangles-v5.3.7-macos-arm64.dmg"
+    sha256 "3a58e795d898656b455fd639c0ea826a4457d390a64d00ace9a1257598d053be"
   end
 
   on_linux do
-    url "https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.1.5/trianglesd-linux"
-    sha256 "6f5c19d34a2e1f6cdadee095d9e11b25d18b41a0d1602a163ffca7ec80b3da37"
+    url "https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.3.7/Cryptographic-Triangles-v5.3.7-linux-x64-daemon"
+    sha256 "4d2ab25d61127d6aff3e6f3069556d04f4b823f8849e97629c12871ad4779517"
   end
 
   depends_on "openssl@3"
@@ -26,7 +21,7 @@ class Triangles < Formula
       prefix.install "Triangles-Qt.app"
       bin.write_exec_script prefix/"Triangles-Qt.app/Contents/MacOS/Triangles-Qt"
     else
-      bin.install "trianglesd-linux" => "trianglesd"
+      bin.install "Cryptographic-Triangles-v5.3.7-linux-x64-daemon" => "trianglesd"
     end
   end
 

packaging/nix/default.nix

@@ -14,7 +14,7 @@
 }:
 
 let
-  version = "5.1.5";
+  version = "5.5.6";
 
   desktopItem = makeDesktopItem {
     name = "triangles-qt";
@@ -34,13 +34,13 @@ stdenv.mkDerivation {
 
   srcs = [
     (fetchurl {
-      url = "https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${version}/triangles-qt-linux";
-      sha256 = "19eaadfdf18b899ce8434fe714e690e2db0546597e36037de37a29854fc23aeb";
+      url = "https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${version}/Cryptographic-Triangles-v${version}-linux-x64-qt";
+      sha256 = "ed220eb8d0b403f62cdac28988541fd1a27864491e233216f9c00a4c2537b4a3";
       name = "triangles-qt-linux";
     })
     (fetchurl {
-      url = "https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${version}/trianglesd-linux";
-      sha256 = "6f5c19d34a2e1f6cdadee095d9e11b25d18b41a0d1602a163ffca7ec80b3da37";
+      url = "https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${version}/Cryptographic-Triangles-v${version}-linux-x64-daemon";
+      sha256 = "4d2ab25d61127d6aff3e6f3069556d04f4b823f8849e97629c12871ad4779517";
       name = "trianglesd-linux";
     })
   ];

packaging/rpm/build-rpm.sh

@@ -4,7 +4,7 @@
 # Install build tools: sudo dnf install rpm-build rpmdevtools
 set -e
 
-VERSION="5.1.5"
+VERSION="5.7.6"
 RELEASE_URL="https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${VERSION}"
 
 echo "Building RPM for Triangles v${VERSION}..."
@@ -14,8 +14,8 @@ rpmdev-setuptree
 
 # Download sources into SOURCES
 echo "Downloading binaries..."
-curl -L -o ~/rpmbuild/SOURCES/triangles-qt-linux "${RELEASE_URL}/triangles-qt-linux"
-curl -L -o ~/rpmbuild/SOURCES/trianglesd-linux "${RELEASE_URL}/trianglesd-linux"
+curl -L -o ~/rpmbuild/SOURCES/Cryptographic-Triangles-v${VERSION}-linux-x64-qt "${RELEASE_URL}/Cryptographic-Triangles-v${VERSION}-linux-x64-qt"
+curl -L -o ~/rpmbuild/SOURCES/Cryptographic-Triangles-v${VERSION}-linux-x64-daemon "${RELEASE_URL}/Cryptographic-Triangles-v${VERSION}-linux-x64-daemon"
 cp triangles-qt.desktop ~/rpmbuild/SOURCES/
 
 # Copy spec file

packaging/rpm/triangles.spec

@@ -1,11 +1,11 @@
 Name:           triangles
-Version:        5.1.5
+Version:        5.7.6
 Release:        1%{?dist}
 Summary:        Cryptographic Triangles (TRI) cryptocurrency wallet
 License:        MIT
 URL:            https://cryptographic-triangles.org
-Source0:        https://github.com/SamiAhmed7777/triangles_v5/releases/download/v%{version}/triangles-qt-linux
-Source1:        https://github.com/SamiAhmed7777/triangles_v5/releases/download/v%{version}/trianglesd-linux
+Source0:        https://github.com/SamiAhmed7777/triangles_v5/releases/download/v%{version}/Cryptographic-Triangles-v%{version}-linux-x64-qt
+Source1:        https://github.com/SamiAhmed7777/triangles_v5/releases/download/v%{version}/Cryptographic-Triangles-v%{version}-linux-x64-daemon
 Source2:        triangles-qt.desktop
 
 BuildArch:      x86_64

packaging/scoop/triangles.json

@@ -0,0 +1,29 @@
+{
+    "version": "5.7.6",
+    "description": "Cryptographic Triangles (TRI) cryptocurrency wallet with PoS staking and encrypted messaging",
+    "homepage": "https://cryptographic-triangles.org",
+    "license": "MIT",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.7.6/Cryptographic-Triangles-5.7.6-win-x64.zip",
+            "hash": "6f002a669a7e92aaf3d8dd7b1ae80f06a086c99a15ca05cf107665009ffc06b7"
+        }
+    },
+    "bin": [
+        "triangles-qt.exe",
+        "trianglesd.exe"
+    ],
+    "shortcuts": [
+        ["triangles-qt.exe", "Cryptographic Triangles"]
+    ],
+    "checkver": {
+        "github": "https://github.com/SamiAhmed7777/triangles_v5"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/SamiAhmed7777/triangles_v5/releases/download/v$version/Cryptographic-Triangles-$version-win-x64.zip"
+            }
+        }
+    }
+}

packaging/winget/CryptographicTriangles.TrianglesQt.yaml

@@ -1,5 +1,5 @@
 PackageIdentifier: CryptographicTriangles.TrianglesQt
-PackageVersion: 5.1.5
+PackageVersion: 5.7.6
 PackageLocale: en-US
 Publisher: Cryptographic Triangles
 PublisherUrl: https://cryptographic-triangles.org
@@ -27,7 +27,7 @@ Installers:
       - RelativeFilePath: triangles-qt.exe
         PortableCommandAlias: triangles-qt
     ArchiveBinariesDependOnPath: true
-    InstallerUrl: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.1.5/Triangles-v5.1.5-win-x64.zip
-    InstallerSha256: 777e475f366164b342e917111bcf3155ec39e0ab4bd97b2ac295885ad30a93c6
+    InstallerUrl: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.7.6/Cryptographic-Triangles-5.7.6-win-x64.zip
+    InstallerSha256: 6F002A669A7E92AAF3D8DD7B1AE80F06A086C99A15CA05CF107665009FFC06B7
 ManifestType: singleton
 ManifestVersion: 1.6.0

scripts/README.md

@@ -0,0 +1,29 @@
+# Version Bump Script
+
+Updates the version number across all files in the repo from a single command.
+
+## Usage
+
+**Set a specific version:**
+```bash
+bash scripts/bump-version.sh 5.7.0
+```
+
+**Or edit `src/clientversion.h` first, then sync everything else:**
+```bash
+bash scripts/bump-version.sh
+```
+
+## What it updates
+
+- `src/clientversion.h` (source of truth)
+- `src/version.h`
+- `triangles-qt.pro`
+- `Dockerfile`
+- All packaging manifests (Docker, Snap, Scoop, WinGet, RPM, Flatpak, Debian, AppImage)
+
+## What still needs manual review after running
+
+- `packaging/appstream/...metainfo.xml` — add a new `<release>` entry
+- `README.md` — update header version if desired
+- Any documentation with download URLs

scripts/bump-version.sh

@@ -0,0 +1,149 @@
+#!/bin/bash
+# bump-version.sh - Sync all version references from src/clientversion.h
+#
+# Usage:
+#   ./scripts/bump-version.sh              # Read version from clientversion.h, update everything
+#   ./scripts/bump-version.sh 5.7.0        # Set version to 5.7.0 in clientversion.h AND everywhere else
+#
+# The single source of truth is src/clientversion.h
+
+set -e
+
+REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+CLIENTVERSION="$REPO_ROOT/src/clientversion.h"
+
+if [ ! -f "$CLIENTVERSION" ]; then
+    echo "ERROR: Cannot find $CLIENTVERSION"
+    exit 1
+fi
+
+# If a version argument is provided, update clientversion.h first
+if [ -n "$1" ]; then
+    IFS='.' read -r MAJOR MINOR REV <<< "$1"
+    REV="${REV:-0}"
+    BUILD=0
+    sed -i "s/#define CLIENT_VERSION_MAJOR.*/#define CLIENT_VERSION_MAJOR       $MAJOR/" "$CLIENTVERSION"
+    sed -i "s/#define CLIENT_VERSION_MINOR.*/#define CLIENT_VERSION_MINOR       $MINOR/" "$CLIENTVERSION"
+    sed -i "s/#define CLIENT_VERSION_REVISION.*/#define CLIENT_VERSION_REVISION    $REV/" "$CLIENTVERSION"
+    sed -i "s/#define CLIENT_VERSION_BUILD.*/#define CLIENT_VERSION_BUILD       $BUILD/" "$CLIENTVERSION"
+    echo "Updated clientversion.h to $MAJOR.$MINOR.$REV.$BUILD"
+fi
+
+# Read version from clientversion.h (the source of truth)
+MAJOR=$(grep '#define CLIENT_VERSION_MAJOR' "$CLIENTVERSION" | awk '{print $3}')
+MINOR=$(grep '#define CLIENT_VERSION_MINOR' "$CLIENTVERSION" | awk '{print $3}')
+REV=$(grep '#define CLIENT_VERSION_REVISION' "$CLIENTVERSION" | awk '{print $3}')
+BUILD=$(grep '#define CLIENT_VERSION_BUILD' "$CLIENTVERSION" | awk '{print $3}')
+
+VERSION="$MAJOR.$MINOR.$REV"
+VERSION_FULL="$MAJOR.$MINOR.$REV.$BUILD"
+
+echo "Syncing all files to version $VERSION (full: $VERSION_FULL)"
+echo "==========================================================="
+
+update_file() {
+    local file="$1"
+    local pattern="$2"
+    local replacement="$3"
+    if [ -f "$file" ]; then
+        sed -i "$pattern" "$file"
+        echo "  Updated: $file"
+    fi
+}
+
+# --- Source files ---
+
+# src/version.h - DISPLAY_VERSION macros
+update_file "$REPO_ROOT/src/version.h" \
+    "s/#define DISPLAY_VERSION_MAJOR.*/#define DISPLAY_VERSION_MAJOR       $MAJOR/" ""
+update_file "$REPO_ROOT/src/version.h" \
+    "s/#define DISPLAY_VERSION_MINOR.*/#define DISPLAY_VERSION_MINOR       $MINOR/" ""
+update_file "$REPO_ROOT/src/version.h" \
+    "s/#define DISPLAY_VERSION_REVISION.*/#define DISPLAY_VERSION_REVISION    $REV/" ""
+update_file "$REPO_ROOT/src/version.h" \
+    "s/#define DISPLAY_VERSION_BUILD.*/#define DISPLAY_VERSION_BUILD       $BUILD/" ""
+
+# triangles-qt.pro
+update_file "$REPO_ROOT/triangles-qt.pro" \
+    "s/^VERSION = .*/VERSION = $VERSION_FULL/" ""
+
+# --- Docker ---
+
+update_file "$REPO_ROOT/Dockerfile" \
+    "s/LABEL version=\"[^\"]*\"/LABEL version=\"$VERSION\"/" ""
+
+update_file "$REPO_ROOT/packaging/docker/Dockerfile" \
+    "s/LABEL version=\"[^\"]*\"/LABEL version=\"$VERSION\"/" ""
+update_file "$REPO_ROOT/packaging/docker/Dockerfile" \
+    "s/ARG VERSION=.*/ARG VERSION=$VERSION/" ""
+
+update_file "$REPO_ROOT/packaging/docker/docker-compose.yml" \
+    "s|cryptographic-triangles/trianglesd:[0-9.]*|cryptographic-triangles/trianglesd:$VERSION|" ""
+
+# --- Snap ---
+
+update_file "$REPO_ROOT/snap/snapcraft.yaml" \
+    "s/^version: '[^']*'/version: '$VERSION'/" ""
+# Update download URLs in snapcraft.yaml
+if [ -f "$REPO_ROOT/snap/snapcraft.yaml" ]; then
+    sed -i "s|/download/v[0-9.]*\/|/download/v$VERSION/|g" "$REPO_ROOT/snap/snapcraft.yaml"
+    sed -i "s/Cryptographic-Triangles-v[0-9.]*-linux/Cryptographic-Triangles-v$VERSION-linux/g" "$REPO_ROOT/snap/snapcraft.yaml"
+fi
+
+# --- Scoop ---
+
+if [ -f "$REPO_ROOT/packaging/scoop/triangles.json" ]; then
+    sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$VERSION\"/" "$REPO_ROOT/packaging/scoop/triangles.json"
+    sed -i "s|/download/v[0-9.]*/|/download/v$VERSION/|g" "$REPO_ROOT/packaging/scoop/triangles.json"
+    sed -i "s/Cryptographic-Triangles-[0-9.]*-win/Cryptographic-Triangles-$VERSION-win/g" "$REPO_ROOT/packaging/scoop/triangles.json"
+    echo "  Updated: packaging/scoop/triangles.json"
+fi
+
+# --- WinGet ---
+
+if [ -f "$REPO_ROOT/packaging/winget/CryptographicTriangles.TrianglesQt.yaml" ]; then
+    sed -i "s/PackageVersion: .*/PackageVersion: $VERSION/" "$REPO_ROOT/packaging/winget/CryptographicTriangles.TrianglesQt.yaml"
+    sed -i "s|/download/v[0-9.]*/|/download/v$VERSION/|g" "$REPO_ROOT/packaging/winget/CryptographicTriangles.TrianglesQt.yaml"
+    sed -i "s/Cryptographic-Triangles-[0-9.]*-win/Cryptographic-Triangles-$VERSION-win/g" "$REPO_ROOT/packaging/winget/CryptographicTriangles.TrianglesQt.yaml"
+    echo "  Updated: packaging/winget/CryptographicTriangles.TrianglesQt.yaml"
+fi
+
+# --- RPM ---
+
+update_file "$REPO_ROOT/packaging/rpm/triangles.spec" \
+    "s/^Version:        .*/Version:        $VERSION/" ""
+
+if [ -f "$REPO_ROOT/packaging/rpm/build-rpm.sh" ]; then
+    sed -i "s/^VERSION=\"[^\"]*\"/VERSION=\"$VERSION\"/" "$REPO_ROOT/packaging/rpm/build-rpm.sh"
+    echo "  Updated: packaging/rpm/build-rpm.sh"
+fi
+
+# --- Flatpak ---
+
+if [ -f "$REPO_ROOT/packaging/flatpak/org.cryptographic_triangles.TrianglesQt.yml" ]; then
+    sed -i "s|/download/v[0-9.]*/|/download/v$VERSION/|g" "$REPO_ROOT/packaging/flatpak/org.cryptographic_triangles.TrianglesQt.yml"
+    sed -i "s/Cryptographic-Triangles-v[0-9.]*-linux/Cryptographic-Triangles-v$VERSION-linux/g" "$REPO_ROOT/packaging/flatpak/org.cryptographic_triangles.TrianglesQt.yml"
+    echo "  Updated: packaging/flatpak/org.cryptographic_triangles.TrianglesQt.yml"
+fi
+
+# --- Debian ---
+
+if [ -f "$REPO_ROOT/packaging/debian/build-deb.sh" ]; then
+    sed -i "s/^VERSION=\"[^\"]*\"/VERSION=\"$VERSION\"/" "$REPO_ROOT/packaging/debian/build-deb.sh"
+    echo "  Updated: packaging/debian/build-deb.sh"
+fi
+
+# --- AppImage ---
+
+if [ -f "$REPO_ROOT/packaging/appimage/build-appimage.sh" ]; then
+    sed -i "s/^VERSION=\"[^\"]*\"/VERSION=\"$VERSION\"/" "$REPO_ROOT/packaging/appimage/build-appimage.sh"
+    echo "  Updated: packaging/appimage/build-appimage.sh"
+fi
+
+echo ""
+echo "Done! All files synced to v$VERSION"
+echo ""
+echo "Files NOT auto-updated (require manual review):"
+echo "  - packaging/appstream/...metainfo.xml  (add new <release> entry)"
+echo "  - README.md                            (update header version)"
+echo "  - Documentation .md files              (update download URLs if needed)"

share/genbuild.sh

@@ -15,8 +15,13 @@ if [ -e "$(which git)" ]; then
     # clean 'dirty' status of touched files that haven't been modified
     git diff >/dev/null 2>/dev/null 
 
-    # get a string like "v0.6.0-66-g59887e8-dirty"
-    DESC="$(git describe --dirty 2>/dev/null)"
+    # Try exact tag match first (when building from a release tag)
+    DESC="$(git describe --tags --exact-match 2>/dev/null)"
+    
+    # If no exact match, fall back to git describe with commit distance
+    if [ -z "$DESC" ]; then
+        DESC="$(git describe --tags --dirty 2>/dev/null)"
+    fi
 
     # get a string like "2012-04-10 16:27:19 +0200"
     TIME="$(git log -n 1 --format="%ci")"

snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: triangles
 base: core22
-version: '5.1.5'
+version: '5.7.6'
 summary: Cryptographic Triangles (TRI) cryptocurrency wallet
 description: |
   Privacy-focused cryptocurrency featuring Proof-of-Stake consensus,
@@ -51,10 +51,10 @@ apps:
 parts:
   triangles:
     plugin: dump
-    source: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.1.5/triangles-qt-linux
+    source: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.7.6/Cryptographic-Triangles-v5.7.6-linux-x64-qt
     source-type: file
     organize:
-      triangles-qt-linux: bin/triangles-qt
+      Cryptographic-Triangles-v5.7.6-linux-x64-qt: bin/triangles-qt
     stage-packages:
       - libqt5widgets5
       - libqt5gui5
@@ -73,13 +73,19 @@ parts:
 
   trianglesd:
     plugin: dump
-    source: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.1.5/trianglesd-linux
+    source: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.7.6/Cryptographic-Triangles-v5.7.6-linux-x64-daemon
     source-type: file
     organize:
-      trianglesd-linux: bin/trianglesd
+      Cryptographic-Triangles-v5.7.6-linux-x64-daemon: bin/trianglesd
 
   desktop-entry:
     plugin: dump
     source: snap/gui
     organize:
       triangles-qt.desktop: share/applications/triangles-qt.desktop
+
+  appstream:
+    plugin: dump
+    source: packaging/appstream
+    organize:
+      org.cryptographic_triangles.TrianglesQt.metainfo.xml: share/metainfo/org.cryptographic_triangles.TrianglesQt.metainfo.xml

src/CMakeLists.txt

@@ -0,0 +1,427 @@
+# src/CMakeLists.txt
+# Defines all build targets: libraries and executables.
+
+# ═══════════════════════════════════════════════════════════════════════════════
+# 1. Hash9 cryptographic primitives (pure C)
+# ═══════════════════════════════════════════════════════════════════════════════
+add_library(hash9_crypto STATIC
+    blake.c
+    groestl.c
+    jh.c
+    keccak.c
+    skein.c
+    aes_helper.c
+    bmw.c
+    cubehash.c
+    echo.c
+    fugue.c
+    hamsi.c
+    hamsi_helper.c
+    luffa.c
+    shavite.c
+    simd.c
+)
+target_include_directories(hash9_crypto PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
+set_target_properties(hash9_crypto PROPERTIES LINKER_LANGUAGE C)
+
+# ═══════════════════════════════════════════════════════════════════════════════
+# 2. JSON library (header-only nlohmann/json via json_compat.h shim)
+# ═══════════════════════════════════════════════════════════════════════════════
+add_library(json_compat INTERFACE)
+target_include_directories(json_compat INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/json")
+
+# ═══════════════════════════════════════════════════════════════════════════════
+# 3. Common core library (shared between daemon, Qt, and tests)
+#
+#    EXCLUDES init.cpp, wallet.cpp (QT_GUI-conditional), noui.cpp (target-specific)
+# ═══════════════════════════════════════════════════════════════════════════════
+set(CORE_SOURCES
+    alert.cpp
+    addrman.cpp
+    bootstrap.cpp
+    checkpoints.cpp
+    crypter.cpp
+    db.cpp
+    irc.cpp
+    key.cpp
+    keystore.cpp
+    main.cpp
+    miner.cpp
+    net.cpp
+    net_bootstrap.cpp
+    netbase.cpp
+    protocol.cpp
+    script.cpp
+    sync.cpp
+    util.cpp
+    version.cpp
+    walletdb.cpp
+    kernel.cpp
+    pbkdf2.cpp
+    scrypt.cpp
+    smessage.cpp
+    tor_embed_hooks.cpp
+    rest.cpp
+    trianglesrpc.cpp
+    rpcdump.cpp
+    rpcnet.cpp
+    rpcmining.cpp
+    rpcwallet.cpp
+    rpcblockchain.cpp
+    rpcrawtransaction.cpp
+    rpcsmessage.cpp
+    zmqpublishnotifier.cpp
+    txdb-leveldb.cpp
+    lz4/lz4.c
+    tor/onion_v3.cpp
+    tor/tor_process.cpp
+    tor/tor_embedded.cpp
+)
+
+# Scrypt assembly — platform-specific
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64|amd64")
+    enable_language(ASM)
+    list(APPEND CORE_SOURCES scrypt-x86_64.S)
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i[3-6]86|x86")
+    enable_language(ASM)
+    list(APPEND CORE_SOURCES scrypt-x86.S)
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64|ARM64")
+    enable_language(ASM)
+    list(APPEND CORE_SOURCES scrypt-arm.S)
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm|ARM")
+    enable_language(ASM)
+    list(APPEND CORE_SOURCES scrypt-arm.S)
+endif()
+
+add_library(triangles_common OBJECT ${CORE_SOURCES})
+
+target_include_directories(triangles_common PUBLIC
+    "${CMAKE_CURRENT_SOURCE_DIR}"
+    "${CMAKE_CURRENT_SOURCE_DIR}/json"
+    "${CMAKE_CURRENT_SOURCE_DIR}/tor"
+    "${CMAKE_BINARY_DIR}/generated"       # for build.h
+)
+
+target_compile_definitions(triangles_common PUBLIC HAVE_BUILD_INFO)
+
+target_link_libraries(triangles_common PUBLIC
+    hash9_crypto
+    json_compat
+    leveldb_bundled
+    OpenSSL::SSL
+    OpenSSL::Crypto
+    Boost::filesystem
+    Boost::program_options
+    Boost::thread
+    Boost::chrono
+    BerkeleyDB::BerkeleyDB
+    Libevent::Libevent
+    ZLIB::ZLIB
+    Threads::Threads
+)
+
+# Optional: UPnP
+if(USE_UPNP)
+    target_compile_definitions(triangles_common PUBLIC USE_UPNP=1 STATICLIB MINIUPNP_STATICLIB)
+    target_link_libraries(triangles_common PUBLIC Miniupnpc::Miniupnpc)
+    if(WIN32)
+        target_link_libraries(triangles_common PUBLIC iphlpapi)
+    endif()
+endif()
+
+# Optional: IPv6
+if(USE_IPV6)
+    target_compile_definitions(triangles_common PUBLIC USE_IPV6=1)
+endif()
+
+# Optional: ZMQ
+if(USE_ZMQ)
+    target_compile_definitions(triangles_common PUBLIC ENABLE_ZMQ)
+    target_link_libraries(triangles_common PUBLIC PkgConfig::ZMQ)
+endif()
+
+# Optional: Embedded Tor
+if(USE_TOR_EMBEDDED)
+    if(TOR_SOURCE_ROOT STREQUAL "")
+        set(TOR_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/tor/tor-src")
+    endif()
+    target_compile_definitions(triangles_common PUBLIC ENABLE_TOR_EMBEDDED)
+    target_include_directories(triangles_common PUBLIC "${TOR_SOURCE_ROOT}/src/feature/api")
+    target_link_directories(triangles_common PUBLIC "${TOR_SOURCE_ROOT}")
+    # libtor.a has circular deps with libevent/openssl/zlib
+    # OpenSSL and zlib already linked via imported targets above, so only add
+    # libevent and compression libs that libtor needs but aren't yet linked.
+    # --start-group / --end-group resolves circular references between libtor
+    # and its dependencies.
+    # Use --allow-multiple-definition because libtor.a may pull in static
+    # OpenSSL objects that duplicate the DLL import lib already linked above.
+    target_link_libraries(triangles_common PUBLIC
+        -Wl,--allow-multiple-definition
+        -Wl,--start-group
+        -ltor
+        -levent -levent_core -levent_extra -levent_openssl
+        -lssl -lcrypto -lz -llzma -lzstd
+        -Wl,--end-group
+    )
+    if(WIN32)
+        target_link_libraries(triangles_common PUBLIC iphlpapi shlwapi crypt32)
+    endif()
+endif()
+
+# Platform-specific libraries
+if(WIN32)
+    target_link_libraries(triangles_common PUBLIC
+        ws2_32 shlwapi mswsock ole32 oleaut32 uuid gdi32 crypt32)
+elseif(APPLE)
+    target_link_libraries(triangles_common PUBLIC
+        "-framework Foundation"
+        "-framework ApplicationServices"
+        "-framework AppKit")
+else()
+    # Linux
+    target_link_libraries(triangles_common PUBLIC rt dl)
+endif()
+
+add_dependencies(triangles_common generate_build_info build_leveldb)
+
+# ═══════════════════════════════════════════════════════════════════════════════
+# 4. Headless daemon (trianglesd)
+# ═══════════════════════════════════════════════════════════════════════════════
+if(BUILD_DAEMON)
+    add_executable(trianglesd
+        noui.cpp
+        init.cpp
+        wallet.cpp
+    )
+    # No QT_GUI define — daemon gets the #if !defined(QT_GUI) code paths
+    target_link_libraries(trianglesd PRIVATE triangles_common)
+
+    if(WIN32)
+        set_target_properties(trianglesd PROPERTIES SUFFIX ".exe")
+    endif()
+endif()
+
+# ═══════════════════════════════════════════════════════════════════════════════
+# 5. Qt5 GUI wallet (triangles-qt)
+# ═══════════════════════════════════════════════════════════════════════════════
+if(BUILD_QT)
+    set(CMAKE_AUTOMOC ON)
+    set(CMAKE_AUTOUIC ON)
+    set(CMAKE_AUTORCC ON)
+
+    set(CMAKE_AUTOUIC_SEARCH_PATHS
+        "${CMAKE_CURRENT_SOURCE_DIR}/qt/forms"
+        "${CMAKE_CURRENT_SOURCE_DIR}/qt/plugins/mrichtexteditor"
+    )
+
+    # ui_interface.h is a hand-written header (Bitcoin convention), NOT a Qt
+    # Designer file. Disable AutoUic globally and run UIC manually for real .ui files.
+    set(CMAKE_AUTOUIC OFF)
+
+    # Collect all .ui files and run UIC on them explicitly
+    file(GLOB_RECURSE UI_FILES
+        "${CMAKE_CURRENT_SOURCE_DIR}/qt/forms/*.ui"
+        "${CMAKE_CURRENT_SOURCE_DIR}/qt/plugins/mrichtexteditor/*.ui"
+    )
+    qt5_wrap_ui(UI_HEADERS ${UI_FILES})
+
+    set(QT_SOURCES
+        qt/triangles.cpp
+        qt/trianglesgui.cpp
+        qt/transactiontablemodel.cpp
+        qt/addresstablemodel.cpp
+        qt/optionsdialog.cpp
+        qt/sendcoinsdialog.cpp
+        qt/coincontroldialog.cpp
+        qt/coincontroltreewidget.cpp
+        qt/addressbookpage.cpp
+        qt/aboutdialog.cpp
+        qt/introdialog.cpp
+        qt/editaddressdialog.cpp
+        qt/trianglesaddressvalidator.cpp
+        qt/clientmodel.cpp
+        qt/guiutil.cpp
+        qt/transactionrecord.cpp
+        qt/optionsmodel.cpp
+        qt/monitoreddatamapper.cpp
+        qt/transactiondesc.cpp
+        qt/transactiondescdialog.cpp
+        qt/trianglesstrings.cpp
+        qt/trianglesamountfield.cpp
+        qt/transactionfilterproxy.cpp
+        qt/transactionview.cpp
+        qt/walletmodel.cpp
+        qt/overviewpage.cpp
+        qt/csvmodelwriter.cpp
+        qt/sendcoinsentry.cpp
+        qt/qvalidatedlineedit.cpp
+        qt/trianglesunits.cpp
+        qt/qvaluecombobox.cpp
+        qt/askpassphrasedialog.cpp
+        qt/notificator.cpp
+        qt/qtipcserver.cpp
+        qt/rpcconsole.cpp
+        qt/messagepage.cpp
+        qt/dialog_move_handler.cpp
+        qt/signmessagepage.cpp
+        qt/verifymessagepage.cpp
+        qt/messagemodel.cpp
+        qt/sendmessagesdialog.cpp
+        qt/sendmessagesentry.cpp
+        qt/qvalidatedtextedit.cpp
+        qt/plugins/mrichtexteditor/mrichtextedit.cpp
+    )
+
+    set(QT_RESOURCES qt/triangles.qrc)
+
+    set(QT_FORMS
+        qt/forms/coincontroldialog.ui
+        qt/forms/sendcoinsdialog.ui
+        qt/forms/addressbookpage.ui
+        qt/forms/aboutdialog.ui
+        qt/forms/editaddressdialog.ui
+        qt/forms/transactiondescdialog.ui
+        qt/forms/overviewpage.ui
+        qt/forms/sendcoinsentry.ui
+        qt/forms/askpassphrasedialog.ui
+        qt/forms/rpcconsole.ui
+        qt/forms/optionsdialog.ui
+        qt/forms/messagepage.ui
+        qt/forms/sendmessagesentry.ui
+        qt/forms/sendmessagesdialog.ui
+        qt/plugins/mrichtexteditor/mrichtextedit.ui
+        qt/forms/mainwindow.ui
+        qt/forms/signmessagepage.ui
+        qt/forms/verifymessagepage.ui
+        qt/forms/transactionspage.ui
+    )
+
+    # Optional QR code dialog
+    if(USE_QRCODE)
+        list(APPEND QT_SOURCES qt/qrcodedialog.cpp)
+        list(APPEND QT_FORMS qt/forms/qrcodedialog.ui)
+    endif()
+
+    # macOS Objective-C++ sources
+    if(APPLE)
+        list(APPEND QT_SOURCES
+            qt/macdockiconhandler.mm
+            qt/macnotificationhandler.mm
+        )
+    endif()
+
+    add_executable(triangles-qt WIN32 MACOSX_BUNDLE
+        ${QT_SOURCES}
+        ${QT_RESOURCES}
+        ${QT_FORMS}
+        ${UI_HEADERS}
+        # Per-target: compiled with QT_GUI define
+        init.cpp
+        wallet.cpp
+        noui.cpp
+    )
+
+    target_compile_definitions(triangles-qt PRIVATE
+        QT_GUI
+        QT_DISABLE_DEPRECATED_BEFORE=0
+    )
+
+    target_include_directories(triangles-qt PRIVATE
+        "${CMAKE_CURRENT_SOURCE_DIR}/qt"
+        "${CMAKE_CURRENT_SOURCE_DIR}/qt/plugins/mrichtexteditor"
+        "${CMAKE_CURRENT_BINARY_DIR}"
+    )
+
+    target_link_libraries(triangles-qt PRIVATE
+        triangles_common
+        Qt5::Core
+        Qt5::Gui
+        Qt5::Widgets
+    )
+
+    # Optional: D-Bus notifications (Linux)
+    if(USE_DBUS)
+        target_compile_definitions(triangles-qt PRIVATE USE_DBUS)
+        target_link_libraries(triangles-qt PRIVATE Qt5::DBus)
+    endif()
+
+    # Optional: QR code
+    if(USE_QRCODE)
+        target_compile_definitions(triangles-qt PRIVATE USE_QRCODE)
+        target_link_libraries(triangles-qt PRIVATE QRencode::QRencode)
+    endif()
+
+    # Windows resource file (.rc with version info and icon)
+    if(WIN32)
+        target_sources(triangles-qt PRIVATE qt/res/triangles-qt.rc)
+        # Ensure RC compiler can find clientversion.h
+        if(MINGW)
+            set_source_files_properties(qt/res/triangles-qt.rc PROPERTIES
+                COMPILE_FLAGS "-I${CMAKE_CURRENT_SOURCE_DIR}"
+            )
+        endif()
+    endif()
+
+    # macOS bundle settings
+    if(APPLE)
+        set_target_properties(triangles-qt PROPERTIES
+            OUTPUT_NAME "Triangles-Qt"
+            MACOSX_BUNDLE_ICON_FILE triangles.icns
+            MACOSX_BUNDLE_BUNDLE_NAME "Triangles-Qt"
+            MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_VERSION}"
+            MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
+        )
+        set_source_files_properties(
+            "${CMAKE_CURRENT_SOURCE_DIR}/qt/res/icons/triangles.icns"
+            PROPERTIES MACOSX_PACKAGE_LOCATION "Resources"
+        )
+        target_sources(triangles-qt PRIVATE qt/res/icons/triangles.icns)
+    endif()
+
+    # Translations (optional — requires LinguistTools)
+    if(TARGET Qt5::lrelease)
+        file(GLOB TS_FILES "${CMAKE_CURRENT_SOURCE_DIR}/qt/locale/triangles_*.ts")
+        if(TS_FILES)
+            set_source_files_properties(${TS_FILES} PROPERTIES
+                OUTPUT_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/qt/locale"
+            )
+            qt5_add_translation(QM_FILES ${TS_FILES})
+            target_sources(triangles-qt PRIVATE ${QM_FILES})
+        endif()
+    endif()
+endif()
+
+# ═══════════════════════════════════════════════════════════════════════════════
+# 6. Unit tests (test_triangles)
+# ═══════════════════════════════════════════════════════════════════════════════
+if(BUILD_TESTS)
+    enable_testing()
+
+    file(GLOB TEST_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/test/*.cpp")
+    # Exclude miner_tests.cpp (never ported from Bitcoin)
+    list(FILTER TEST_SOURCES EXCLUDE REGEX "miner_tests\\.cpp$")
+
+    add_executable(test_triangles
+        ${TEST_SOURCES}
+        # Per-target: wallet without QT_GUI, noui for noui_connect()
+        wallet.cpp
+        noui.cpp
+    )
+    # No init.cpp — test_triangles.cpp provides its own StartShutdown() stub
+
+    target_compile_definitions(test_triangles PRIVATE
+        "TEST_DATA_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/test/data\""
+    )
+
+    target_include_directories(test_triangles PRIVATE
+        "${CMAKE_CURRENT_SOURCE_DIR}"
+        "${CMAKE_CURRENT_SOURCE_DIR}/test"
+    )
+
+    target_link_libraries(test_triangles PRIVATE
+        triangles_common
+        Boost::unit_test_framework
+    )
+
+    add_test(NAME triangles_unit_tests COMMAND test_triangles --log_level=test_suite)
+endif()

src/allocators.h

@@ -254,4 +254,9 @@ struct zero_after_free_allocator : public std::allocator<T>
 // This is exactly like std::string, but with a custom allocator.
 typedef std::basic_string<char, std::char_traits<char>, secure_allocator<char> > SecureString;
 
+static inline SecureString MakeSecureString(const std::string& value)
+{
+    return SecureString(value.begin(), value.end());
+}
+
 #endif

src/bootstrap.cpp

@@ -10,10 +10,18 @@
 
 #include <zlib.h>
 
+#include "version.h"
+#include "uint256.h"
+
 #include <fstream>
 #include <sstream>
 #include <cstdio>
 #include <cstring>
+#include <cstdlib>
+
+// Forward declarations to avoid pulling in heavy consensus headers
+extern bool fTestNet;
+namespace Checkpoints { bool IsKnownCheckpoint(int nHeight, const uint256& hash); }
 
 namespace fs = boost::filesystem;
 using boost::asio::ip::tcp;
@@ -311,6 +319,112 @@ static bool ExtractTarGz(const fs::path& tarGzPath,
 
 } // anonymous namespace
 
+bool ParseManifest(const fs::path& manifestPath,
+                   SnapshotManifest& manifest,
+                   std::string& strError)
+{
+    std::ifstream in(manifestPath.string().c_str());
+    if (!in.is_open()) {
+        strError = "Cannot open " + manifestPath.string();
+        return false;
+    }
+
+    manifest.format = 0;
+    manifest.network.clear();
+    manifest.height = -1;
+    manifest.hash.clear();
+    manifest.dbversion = 0;
+
+    std::string line;
+    while (std::getline(in, line)) {
+        boost::trim(line);
+        if (line.empty() || line[0] == '#')
+            continue;
+
+        size_t eq = line.find('=');
+        if (eq == std::string::npos)
+            continue;
+
+        std::string key = line.substr(0, eq);
+        std::string val = line.substr(eq + 1);
+        boost::trim(key);
+        boost::trim(val);
+
+        if (key == "format")
+            manifest.format = std::atoi(val.c_str());
+        else if (key == "network")
+            manifest.network = val;
+        else if (key == "height")
+            manifest.height = std::atoi(val.c_str());
+        else if (key == "hash")
+            manifest.hash = val;
+        else if (key == "dbversion")
+            manifest.dbversion = std::atoi(val.c_str());
+    }
+    in.close();
+
+    if (manifest.format == 0) {
+        strError = "Manifest missing 'format' field";
+        return false;
+    }
+    if (manifest.network.empty()) {
+        strError = "Manifest missing 'network' field";
+        return false;
+    }
+    if (manifest.height < 0) {
+        strError = "Manifest missing or invalid 'height' field";
+        return false;
+    }
+    if (manifest.hash.empty()) {
+        strError = "Manifest missing 'hash' field";
+        return false;
+    }
+    if (manifest.dbversion == 0) {
+        strError = "Manifest missing 'dbversion' field";
+        return false;
+    }
+
+    return true;
+}
+
+bool VerifyManifest(const SnapshotManifest& manifest,
+                    std::string& strError)
+{
+    if (manifest.format != 1) {
+        strError = "Unsupported manifest format: " + std::to_string(manifest.format);
+        return false;
+    }
+
+    std::string expectedNetwork = fTestNet ? "test" : "main";
+    if (manifest.network != expectedNetwork) {
+        strError = "Network mismatch: manifest says '" + manifest.network
+                 + "', expected '" + expectedNetwork + "'";
+        return false;
+    }
+
+    if (manifest.dbversion != DATABASE_VERSION) {
+        strError = "DB version mismatch: manifest says "
+                 + std::to_string(manifest.dbversion)
+                 + ", binary expects " + std::to_string(DATABASE_VERSION);
+        return false;
+    }
+
+    uint256 manifestHash(manifest.hash);
+    if (manifestHash == 0) {
+        strError = "Invalid hash in manifest: " + manifest.hash;
+        return false;
+    }
+
+    if (!Checkpoints::IsKnownCheckpoint(manifest.height, manifestHash)) {
+        strError = "Height " + std::to_string(manifest.height)
+                 + " / hash " + manifest.hash
+                 + " is not a known checkpoint";
+        return false;
+    }
+
+    return true;
+}
+
 bool DownloadBootstrap(const std::string& host,
                        const fs::path& dataDir,
                        ProgressCallback progressFn,
@@ -320,7 +434,7 @@ bool DownloadBootstrap(const std::string& host,
 
     // Try downloading bootstrap.tar.gz first
     fs::path tmpTarGz = dataDir / "bootstrap.tar.gz.tmp";
-    std::string tarUrl = std::string(BASE_PATH) + "bootstrap.tar.gz";
+    std::string tarUrl = std::string(BASE_PATH) + "triangles-bootstrap.tar.gz";
 
     bool tarDownloaded = DownloadFile(host, tarUrl, tmpTarGz, progressFn, strError);
 
@@ -362,16 +476,55 @@ bool DownloadBootstrap(const std::string& host,
         return false;
     }
 
-    // Remove any extracted txleveldb/ and database/ - they were built on
-    // a different machine and won't work here. FastImportBlockFile() will
-    // rebuild the index directly from blk0001.dat on next startup.
+    // Check if the archive included a trusted pre-built index (txleveldb/)
+    // with a valid snapshot.manifest. If verified, keep it to skip the
+    // multi-hour FastImportBlockFile() rebuild.
     fs::path txleveldb = dataDir / "txleveldb";
-    fs::path database = dataDir / "database";
-    if (fs::exists(txleveldb))
-        fs::remove_all(txleveldb);
+    fs::path database  = dataDir / "database";
+    fs::path manifestPath = dataDir / "snapshot.manifest";
+
+    bool keepIndex = false;
+
+    if (fs::exists(manifestPath) && fs::exists(txleveldb)) {
+        SnapshotManifest manifest;
+        std::string manifestError;
+
+        if (ParseManifest(manifestPath, manifest, manifestError)) {
+            printf("Bootstrap: snapshot.manifest found (format=%d, network=%s, "
+                   "height=%d, dbversion=%d)\n",
+                   manifest.format, manifest.network.c_str(),
+                   manifest.height, manifest.dbversion);
+
+            if (VerifyManifest(manifest, manifestError)) {
+                printf("Bootstrap: manifest verified - keeping pre-built index "
+                       "(height %d, checkpoint match)\n", manifest.height);
+                keepIndex = true;
+            } else {
+                printf("Bootstrap: manifest verification failed: %s\n",
+                       manifestError.c_str());
+            }
+        } else {
+            printf("Bootstrap: cannot parse snapshot.manifest: %s\n",
+                   manifestError.c_str());
+        }
+    }
+
+    if (!keepIndex) {
+        // No valid manifest or verification failed - delete the index.
+        // FastImportBlockFile() will rebuild from blk0001.dat on next startup.
+        printf("Bootstrap: removing extracted txleveldb/ (will rebuild index from blk0001.dat)\n");
+        if (fs::exists(txleveldb))
+            fs::remove_all(txleveldb);
+    }
+
+    // Always remove BDB database/ dir (wallet environment from another machine)
     if (fs::exists(database))
         fs::remove_all(database);
 
+    // Clean up manifest file (not needed after verification)
+    if (fs::exists(manifestPath))
+        fs::remove(manifestPath);
+
     return true;
 }
 

src/bootstrap.h

@@ -41,6 +41,24 @@ namespace Bootstrap {
                            ProgressCallback progressFn,
                            std::string& strError);
 
+    // Snapshot manifest (parsed from snapshot.manifest in bootstrap archive)
+    struct SnapshotManifest {
+        int format;            // format version, must be 1
+        std::string network;   // "main" or "test"
+        int height;            // block height of the snapshot tip
+        std::string hash;      // block hash at that height (hex, no 0x prefix)
+        int dbversion;         // DATABASE_VERSION the txleveldb was built with
+    };
+
+    // Parse a snapshot.manifest file into a SnapshotManifest struct.
+    bool ParseManifest(const boost::filesystem::path& manifestPath,
+                       SnapshotManifest& manifest,
+                       std::string& strError);
+
+    // Verify a parsed manifest against compiled-in checkpoints and config.
+    bool VerifyManifest(const SnapshotManifest& manifest,
+                        std::string& strError);
+
 } // namespace Bootstrap
 
 #endif // TRIANGLES_BOOTSTRAP_H

src/checkpoints.cpp

@@ -60,6 +60,14 @@ namespace Checkpoints
         return hash == i->second;
     }
 
+    bool IsKnownCheckpoint(int nHeight, const uint256& hash)
+    {
+        MapCheckpoints& checkpoints = (fTestNet ? mapCheckpointsTestnet : mapCheckpoints);
+        MapCheckpoints::const_iterator i = checkpoints.find(nHeight);
+        if (i == checkpoints.end()) return false;
+        return hash == i->second;
+    }
+
     int GetTotalBlocksEstimate()
     {
         MapCheckpoints& checkpoints = (fTestNet ? mapCheckpointsTestnet : mapCheckpoints);

src/checkpoints.h

@@ -39,6 +39,9 @@ namespace Checkpoints
     // Returns true if block passes checkpoint checks
     bool CheckHardened(int nHeight, const uint256& hash);
 
+    // Returns true only if (nHeight, hash) is an exact entry in mapCheckpoints
+    bool IsKnownCheckpoint(int nHeight, const uint256& hash);
+
     // Return conservative estimate of total number of blocks, 0 if unknown
     int GetTotalBlocksEstimate();
 

src/checkqueue.h

@@ -0,0 +1,181 @@
+// Copyright (c) 2012-2013 The Bitcoin developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef TRIANGLES_CHECKQUEUE_H
+#define TRIANGLES_CHECKQUEUE_H
+
+#include <algorithm>
+#include <deque>
+#include <vector>
+
+#include <boost/thread/condition_variable.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/thread.hpp>
+
+template<typename T>
+class CCheckQueue
+{
+private:
+    boost::mutex mutex;
+    boost::condition_variable condWorker;
+    boost::condition_variable condMaster;
+
+    std::deque<T> queue;
+    unsigned int nIdle;
+    unsigned int nTotal;
+    bool fAllOk;
+    unsigned int nTodo;
+    bool fQuit;
+
+    unsigned int nBatchSize;
+
+    bool Loop(bool fMaster)
+    {
+        boost::unique_lock<boost::mutex> lock(mutex);
+        if (!fMaster)
+            nTotal++;
+        nIdle++;
+
+        bool fOk = true;
+
+        for (;;)
+        {
+            while (queue.empty())
+            {
+                if (fQuit)
+                {
+                    nIdle--;
+                    if (!fMaster)
+                        nTotal--;
+                    return false;
+                }
+                if (fMaster && nTodo == 0)
+                {
+                    bool fRet = fAllOk;
+                    nIdle--;
+                    return fRet;
+                }
+                if (fMaster)
+                    condMaster.wait(lock);
+                else
+                    condWorker.wait(lock);
+            }
+
+            unsigned int nNow = std::max(1U, std::min((unsigned int)queue.size() / (nTotal + 1), nBatchSize));
+            std::vector<T> vChecks(nNow);
+            for (unsigned int i = 0; i < nNow; i++)
+            {
+                vChecks[i].swap(queue.front());
+                queue.pop_front();
+            }
+            nIdle--;
+            lock.unlock();
+
+            for (unsigned int i = 0; i < vChecks.size(); i++)
+            {
+                if (fOk)
+                    fOk = vChecks[i]();
+            }
+            vChecks.clear();
+
+            lock.lock();
+            nIdle++;
+            nTodo -= nNow;
+            if (!fOk)
+                fAllOk = false;
+
+            if (nTodo == 0)
+                condMaster.notify_one();
+        }
+    }
+
+public:
+    CCheckQueue(unsigned int nBatchSizeIn = 128)
+        : nIdle(0), nTotal(0), fAllOk(true), nTodo(0), fQuit(false),
+          nBatchSize(nBatchSizeIn) {}
+
+    void Thread()
+    {
+        Loop(false);
+    }
+
+    void StartBatch()
+    {
+        boost::unique_lock<boost::mutex> lock(mutex);
+        fAllOk = true;
+        nTodo = 0;
+    }
+
+    void Add(std::vector<T>& vChecks)
+    {
+        if (vChecks.empty())
+            return;
+
+        boost::unique_lock<boost::mutex> lock(mutex);
+        for (typename std::vector<T>::iterator it = vChecks.begin(); it != vChecks.end(); ++it)
+        {
+            queue.push_back(T());
+            queue.back().swap(*it);
+        }
+        nTodo += vChecks.size();
+        if (vChecks.size() == 1)
+            condWorker.notify_one();
+        else
+            condWorker.notify_all();
+    }
+
+    bool Wait()
+    {
+        return Loop(true);
+    }
+
+    void Quit()
+    {
+        boost::unique_lock<boost::mutex> lock(mutex);
+        fQuit = true;
+        condWorker.notify_all();
+        condMaster.notify_all();
+    }
+};
+
+template<typename T>
+class CCheckQueueControl
+{
+private:
+    CCheckQueue<T>* pqueue;
+    bool fDone;
+
+    CCheckQueueControl(const CCheckQueueControl&);
+    CCheckQueueControl& operator=(const CCheckQueueControl&);
+
+public:
+    CCheckQueueControl(CCheckQueue<T>* pqueueIn)
+        : pqueue(pqueueIn), fDone(false)
+    {
+        if (pqueue)
+            pqueue->StartBatch();
+    }
+
+    bool Wait()
+    {
+        if (!pqueue || fDone)
+            return true;
+        fDone = true;
+        return pqueue->Wait();
+    }
+
+    void Add(std::vector<T>& vChecks)
+    {
+        if (pqueue)
+            pqueue->Add(vChecks);
+    }
+
+    ~CCheckQueueControl()
+    {
+        if (!fDone)
+            Wait();
+    }
+};
+
+#endif // TRIANGLES_CHECKQUEUE_H

src/clientversion.h

@@ -7,8 +7,8 @@
 
 // These need to be macros, as version.cpp's and triangles-qt.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR       5
-#define CLIENT_VERSION_MINOR       3
-#define CLIENT_VERSION_REVISION    4
+#define CLIENT_VERSION_MINOR       7
+#define CLIENT_VERSION_REVISION    6
 #define CLIENT_VERSION_BUILD       0
 
 // Converts the parameter X to a string after macro replacement on X has been performed.

src/db.cpp

@@ -479,7 +479,7 @@ void CDBEnv::Flush(bool fShutdown)
             else
                 mi++;
         }
-        printf("DBFlush(%s)%s ended %15"PRId64"ms\n", fShutdown ? "true" : "false", fDbEnvInit ? "" : " db not started", GetTimeMillis() - nStart);
+        printf("DBFlush(%s)%s ended %15" PRId64 "ms\n", fShutdown ? "true" : "false", fDbEnvInit ? "" : " db not started", GetTimeMillis() - nStart);
         if (fShutdown)
         {
             char** listp;

src/init.cpp

@@ -6,6 +6,7 @@
 #include "walletdb.h"
 #include "trianglesrpc.h"
 #include "net.h"
+#include "netbase.h"
 #include "init.h"
 #include "util.h"
 #include "ui_interface.h"
@@ -21,6 +22,7 @@
 #endif
 #include "notificationqueue.h"
 #include "addressindex.h"
+#include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 // boost/filesystem/convenience.hpp removed in modern Boost; functionality is in filesystem.hpp
@@ -50,6 +52,29 @@ enum Checkpoints::CPMode CheckpointsMode;
 
 static CCriticalSection cs_DeferredStartup;
 static bool fDeferredStartupRunning = false;
+static boost::thread_group* pScriptCheckThreads = NULL;
+
+static void ThreadScriptCheck()
+{
+    RenameThread("Triangles-scrchk");
+    if (pScriptCheckQueue)
+        pScriptCheckQueue->Thread();
+}
+
+static void StartupPerfLog(const char* phase, int64_t elapsedMs)
+{
+    printf("STARTUP-PERF: %s %" PRId64 "ms\n", phase, elapsedMs);
+}
+
+static void StartupPerfLog(const char* phase, int64_t elapsedMs, const std::string& detail)
+{
+    if (detail.empty())
+    {
+        StartupPerfLog(phase, elapsedMs);
+        return;
+    }
+    printf("STARTUP-PERF: %s %" PRId64 "ms %s\n", phase, elapsedMs, detail.c_str());
+}
 
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -95,17 +120,20 @@ void ThreadDeferredStartup(void* parg)
         {
             int64_t nStart = GetTimeMillis();
             SecureMsgStart(fNoSmsg, GetBoolArg("-smsgscanchain"));
-            printf(" securemsg   %15"PRId64"ms\n", GetTimeMillis() - nStart);
+            printf(" securemsg   %15" PRId64 "ms\n", GetTimeMillis() - nStart);
+            StartupPerfLog("deferred.securemsg", GetTimeMillis() - nStart);
         }
 
         if (!fShutdown && pwalletMain)
         {
             int64_t nStart = GetTimeMillis();
             pwalletMain->ReacceptWalletTransactions();
-            printf(" reaccept    %15"PRId64"ms\n", GetTimeMillis() - nStart);
+            printf(" reaccept    %15" PRId64 "ms\n", GetTimeMillis() - nStart);
+            StartupPerfLog("deferred.reaccept_wallet_transactions", GetTimeMillis() - nStart);
         }
 
-        printf("Deferred startup tasks finished %"PRId64"ms\n", GetTimeMillis() - nTotalStart);
+        printf("Deferred startup tasks finished %" PRId64 "ms\n", GetTimeMillis() - nTotalStart);
+        StartupPerfLog("deferred.total", GetTimeMillis() - nTotalStart);
     }
     catch (std::exception& e)
     {
@@ -158,6 +186,25 @@ void Shutdown(void* parg)
         }
 
         SecureMsgShutdown();
+
+        // Stop network threads FIRST so nothing references Tor objects
+        nTransactionsUpdated++;
+        StopNode();
+
+        if (pScriptCheckQueue)
+        {
+            pScriptCheckQueue->Quit();
+            if (pScriptCheckThreads)
+            {
+                pScriptCheckThreads->join_all();
+                delete pScriptCheckThreads;
+                pScriptCheckThreads = NULL;
+            }
+            delete pScriptCheckQueue;
+            pScriptCheckQueue = NULL;
+        }
+
+        // NOW safe to destroy Tor state - all threads have stopped
         ShutdownTorV3();
         StopEmbeddedTor();
 
@@ -176,10 +223,8 @@ void Shutdown(void* parg)
             pNotificationQueue = NULL;
         }
 
-        nTransactionsUpdated++;
 //        CTxDB().Close();
         bitdb.Flush(false);
-        StopNode();
         bitdb.Flush(true);
         fs::remove(GetPidFile());
         UnregisterWallet(pwalletMain);
@@ -335,8 +380,9 @@ std::string HelpMessage()
         //"  -proxy=<ip:port>       " + _("Connect through socks proxy") + "\n" +
         //"  -socks=<n>             " + _("Select the version of socks proxy to use (4-5, default: 5)") + "\n" +
         "  -tor=<ip:port>         " + _("Use proxy to reach tor hidden services (default: same as -proxy)") + "\n"
-        "  -notor                 " + _("Disable Tor startup and .onion connectivity") + "\n" +
+        "  -notor                 " + _("Disable Tor (WARNING: wallet will not start - Tor is required)") + "\n" +
         "  -torsocks=<port>       " + _("Set embedded or managed Tor SOCKS proxy port (default: 19099)") + "\n" +
+        "  -torhiddenservice      " + _("Enable the managed Tor hidden service (default: 1)") + "\n" +
         "  -torhsport=<port>      " + _("Set embedded or managed Tor hidden service port (default: wallet listen port)") + "\n" +
         //"  -dns                   " + _("Allow DNS lookups for -addnode, -seednode and -connect") + "\n" +
         "  -port=<port>           " + _("Listen for connections on <port> (default: 24112 or testnet: 24111)") + "\n" +
@@ -355,8 +401,11 @@ std::string HelpMessage()
         "  -synctime              " + _("Sync time with other nodes. Disable if time on your system is precise e.g. syncing with NTP (default: 1)") + "\n" +
         "  -cppolicy              " + _("Sync checkpoints policy (default: strict)") + "\n" +
         "  -onionseed             " + _("Find peers using .onion seeds (default: 1 unless -connect)") + "\n" +
+        "  -seedurl=<host>        " + _("HTTP seed list host (default: seeds.cryptographic-triangles.org)") + "\n" +
+        "  -noseedurl             " + _("Disable HTTP seed list fetch on startup") + "\n" +
         "  -banscore=<n>          " + _("Threshold for disconnecting misbehaving peers (default: 100)") + "\n" +
         "  -bantime=<n>           " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)") + "\n" +
+        "  -par=<n>               " + _("Set the number of script verification threads (default: auto, 0 = auto, 1 = single-threaded)") + "\n" +
         "  -maxreceivebuffer=<n>  " + _("Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)") + "\n" +
         "  -maxsendbuffer=<n>     " + _("Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)") + "\n" +
 #ifdef USE_UPNP
@@ -397,6 +446,8 @@ std::string HelpMessage()
         "  -upgradewallet         " + _("Upgrade wallet to latest format") + "\n" +
         "  -keypool=<n>           " + _("Set key pool size to <n> (default: 100)") + "\n" +
         "  -rescan                " + _("Rescan the block chain for missing wallet transactions") + "\n" +
+        "  -postibdrescan         " + _("Run the wallet rescan after initial sync in a background thread (default: 1)") + "\n" +
+        "  -zapwallettxes         " + _("Delete all wallet transactions and only recover from blockchain on startup") + "\n" +
         "  -salvagewallet         " + _("Attempt to recover private keys from a corrupt wallet.dat") + "\n" +
         "  -checkblocks=<n>       " + _("How many blocks to check at startup (default: 2500, 0 = all)") + "\n" +
         "  -checklevel=<n>        " + _("How thorough the block verification is (0-6, default: 1)") + "\n" +
@@ -449,6 +500,7 @@ bool InitSanityCheck(void)
  */
 bool AppInit2()
 {
+    const int64_t nAppInitStart = GetTimeMillis();
     // ********************************************************* Step 1: setup
 #ifdef _MSC_VER
     // Turn off Microsoft heap dump noise
@@ -550,6 +602,11 @@ bool AppInit2()
         SoftSetBoolArg("-rescan", true);
     }
 
+    if (GetBoolArg("-zapwallettxes")) {
+        // Zap all tx from wallet: rescan to rebuild from blockchain
+        SoftSetBoolArg("-rescan", true);
+    }
+
     // ********************************************************* Step 3: parameter-to-internal-flags
 
     fDebug = GetBoolArg("-debug");
@@ -605,6 +662,24 @@ bool AppInit2()
     fConfChange = GetBoolArg("-confchange", false);
     fEnforceCanonical = GetBoolArg("-enforcecanonical", true);
 
+    int nScriptCheckThreads = GetArg("-par", 0);
+    if (nScriptCheckThreads <= 0)
+        nScriptCheckThreads = boost::thread::hardware_concurrency();
+    if (nScriptCheckThreads > 16)
+        nScriptCheckThreads = 16;
+    if (nScriptCheckThreads > 1)
+    {
+        pScriptCheckQueue = new CCheckQueue<CScriptCheck>(128);
+        pScriptCheckThreads = new boost::thread_group();
+        for (int i = 0; i < nScriptCheckThreads - 1; ++i)
+            pScriptCheckThreads->create_thread(&ThreadScriptCheck);
+        printf("Script verification threads: %d workers + main thread\n", nScriptCheckThreads - 1);
+    }
+
+    fAddressIndex = GetBoolArg("-addressindex", false);
+    if (fAddressIndex)
+        printf("Address index enabled\n");
+
     if (mapArgs.count("-mininput"))
     {
         if (!ParseMoney(mapArgs["-mininput"], nMinimumInputValue))
@@ -672,6 +747,7 @@ bool AppInit2()
     // ********************************************************* Step 5: verify database integrity
 
     uiInterface.InitMessage(_("Verifying database integrity..."));
+    nStart = GetTimeMillis();
 
     if (!bitdb.Open(GetDataDir()))
     {
@@ -688,6 +764,13 @@ bool AppInit2()
             return false;
     }
 
+    if (GetBoolArg("-zapwallettxes") && fs::exists(GetDataDir() / strWalletFileName))
+    {
+        uiInterface.InitMessage(_("Zapping all transactions from wallet..."));
+        if (!CWalletDB::ZapWalletTx(strWalletFileName))
+            return InitError(_("Error: could not zap wallet transactions"));
+    }
+
     if (fs::exists(GetDataDir() / strWalletFileName))
     {
         CDBEnv::VerifyResult r = bitdb.Verify(strWalletFileName, CWalletDB::Recover);
@@ -702,17 +785,19 @@ bool AppInit2()
         if (r == CDBEnv::RECOVER_FAIL)
             return InitError(_("wallet.dat corrupt, salvage failed"));
     }
+    StartupPerfLog("verify_db", GetTimeMillis() - nStart, strprintf("wallet=%s", strWalletFileName.c_str()));
 
     // ********************************************************* Step 6: network initialization
+    nStart = GetTimeMillis();
 
     //int nSocksVersion = GetArg("-socks", 5);
     //
     //if (nSocksVersion != 4 && nSocksVersion != 5)
     //  return InitError(strprintf(_("Unknown -socks proxy version requested: %i"), nSocksVersion));
 
-    // Network selection: enable all networks (IPv4, IPv6, Tor)
-    // Tor is always enabled; clearnet is also allowed for seed node discovery
-    // Users can restrict to Tor-only with -onlynet=tor
+    // Network selection: Tor-native mode
+    // All traffic routes through embedded Tor. Clearnet (IPv4/IPv6) is disabled
+    // after Tor starts successfully. Only .onion peers are accepted.
     if (mapArgs.count("-onlynet")) {
         std::set<enum Network> nets;
         for (std::string snet : mapMultiArgs["-onlynet"]) {
@@ -730,7 +815,7 @@ bool AppInit2()
 
     // Tor proxy: always configured for .onion connectivity
     CService addrOnion;
-    unsigned short const onion_port = 19099;
+    unsigned short const onion_port = static_cast<unsigned short>(GetArg("-torsocks", 19099));
 
     if (mapArgs.count("-tor") && mapArgs["-tor"] != "0") {
         addrOnion = CService(mapArgs["-tor"], onion_port);
@@ -797,11 +882,27 @@ bool AppInit2()
 
     for (string strDest : mapMultiArgs["-seednode"])
         AddOneShot(strDest);
+    StartupPerfLog("network_init", GetTimeMillis() - nStart, strprintf("listen=%d seednodes=%" PRIszu, !fNoListen, mapMultiArgs["-seednode"].size()));
 
     // ********************************************************* Step 6b: bootstrap download (daemon)
+    // Automatic: if data dir has no blockchain, bootstrap without asking.
+    // Can also be forced with -bootstrap flag, or disabled with -nobootstrap.
 #ifndef QT_GUI
-    if (GetBoolArg("-bootstrap", false))
     {
+        bool wantsBootstrap = GetBoolArg("-bootstrap", false);
+        bool noBootstrap = GetBoolArg("-nobootstrap", false);
+        fs::path dataPath = GetDataDir();
+        bool needsBootstrap = Bootstrap::NeedsBootstrap(dataPath);
+
+        if (needsBootstrap && !noBootstrap) {
+            printf("Bootstrap: no blockchain data found — downloading automatically.\n");
+            printf("Bootstrap: (use -nobootstrap to skip)\n");
+            wantsBootstrap = true;
+        }
+
+    if (wantsBootstrap)
+    {
+        int64_t nBootstrapStart = GetTimeMillis();
         fs::path dataPath = GetDataDir();
         std::string host = Bootstrap::DEFAULT_HOST;
         std::string strError;
@@ -832,7 +933,10 @@ bool AppInit2()
         } else {
             printf("\nBootstrap: done.\n");
         }
+        StartupPerfLog("bootstrap_download", GetTimeMillis() - nBootstrapStart,
+            strprintf("host=%s success=%d", host.c_str(), success));
     }
+    } // end bootstrap scope
 #endif
 
     // ********************************************************* Step 7: load blockchain
@@ -867,7 +971,9 @@ bool AppInit2()
     {
         uiInterface.InitMessage(_("Importing bootstrap blocks..."));
         printf("Block index empty but blk0001.dat exists - running fast import...\n");
+        int64_t nFastImportStart = GetTimeMillis();
         FastImportBlockFile();
+        StartupPerfLog("bootstrap_fast_import", GetTimeMillis() - nFastImportStart, strprintf("bestheight=%d", nBestHeight));
     }
 
     // as LoadBlockIndex can take several minutes, it's possible the user
@@ -878,7 +984,24 @@ bool AppInit2()
         printf("Shutdown requested. Exiting.\n");
         return false;
     }
-    printf(" block index %15"PRId64"ms\n", GetTimeMillis() - nStart);
+    printf(" block index %15" PRId64 "ms\n", GetTimeMillis() - nStart);
+    StartupPerfLog("block_index", GetTimeMillis() - nStart, strprintf("bestheight=%d indexsize=%" PRIszu, nBestHeight, mapBlockIndex.size()));
+
+    // Diagnostic: check for blocks in mapBlockIndex above pindexBest
+    {
+        int nMaxIndexHeight = 0;
+        int nAboveBest = 0;
+        for (std::map<uint256, CBlockIndex*>::iterator it = mapBlockIndex.begin();
+             it != mapBlockIndex.end(); ++it)
+        {
+            if (it->second->nHeight > nMaxIndexHeight)
+                nMaxIndexHeight = it->second->nHeight;
+            if (it->second->nHeight > nBestHeight)
+                nAboveBest++;
+        }
+        printf("SYNC-DIAG: mapBlockIndex=%d entries, maxHeight=%d, bestHeight=%d, aboveBest=%d\n",
+            (int)mapBlockIndex.size(), nMaxIndexHeight, nBestHeight, nAboveBest);
+    }
 
     if (GetBoolArg("-printblockindex") || GetBoolArg("-printblocktree"))
     {
@@ -897,7 +1020,11 @@ bool AppInit2()
             {
                 CBlockIndex* pindex = (*mi).second;
                 CBlock block;
-                block.ReadFromDisk(pindex);
+                if (!block.ReadFromDisk(pindex))
+                {
+                    printf("Error: Failed to read block %s from disk\n", hash.ToString().c_str());
+                    continue;
+                }
                 block.BuildMerkleTree();
                 block.print();
                 printf("\n");
@@ -972,7 +1099,8 @@ bool AppInit2()
     }
 
     printf("%s", strErrors.str().c_str());
-    printf(" wallet      %15"PRId64"ms\n", GetTimeMillis() - nStart);
+    printf(" wallet      %15" PRId64 "ms\n", GetTimeMillis() - nStart);
+    StartupPerfLog("wallet_load", GetTimeMillis() - nStart, strprintf("firstrun=%d", fFirstRun));
 
     RegisterWallet(pwalletMain);
 
@@ -981,10 +1109,12 @@ bool AppInit2()
         pindexRescan = pindexGenesisBlock;
     else
     {
+        int64_t nWalletLocatorStart = GetTimeMillis();
         CWalletDB walletdb(strWalletFileName);
         CBlockLocator locator;
         if (walletdb.ReadBestBlock(locator))
             pindexRescan = locator.GetBlockIndex();
+        StartupPerfLog("wallet_bestblock_locator", GetTimeMillis() - nWalletLocatorStart);
     }
     if (pindexBest != pindexRescan && pindexBest && pindexRescan && pindexBest->nHeight > pindexRescan->nHeight)
     {
@@ -992,7 +1122,7 @@ bool AppInit2()
         printf("Rescanning last %i blocks (from block %i)...\n", pindexBest->nHeight - pindexRescan->nHeight, pindexRescan->nHeight);
         nStart = GetTimeMillis();
         bool fScannedWithIndex = false;
-        if (GetBoolArg("-addressindex", false) && !GetBoolArg("-rescan"))
+        if (fAddressIndex && !GetBoolArg("-rescan"))
         {
             CTxDB txdb("r");
             int nAddressIndexStartHeight = 0;
@@ -1016,7 +1146,13 @@ bool AppInit2()
         if (!fScannedWithIndex)
             pwalletMain->ScanForWalletTransactions(pindexRescan, true);
 
-        printf(" rescan      %15"PRId64"ms\n", GetTimeMillis() - nStart);
+        printf(" rescan      %15" PRId64 "ms\n", GetTimeMillis() - nStart);
+        StartupPerfLog("wallet_rescan", GetTimeMillis() - nStart,
+            strprintf("from=%d to=%d indexed=%d", pindexRescan->nHeight, pindexBest->nHeight, fScannedWithIndex));
+    }
+    else
+    {
+        StartupPerfLog("wallet_rescan", 0, "skipped");
     }
 
     // ********************************************************* Step 8.5: start Tor and initialize V3 identity
@@ -1024,7 +1160,40 @@ bool AppInit2()
         uiInterface.InitMessage(_("Starting Tor..."));
         printf("Starting Tor process...\n");
 
+        // Restore hidden service secret key from wallet backup if the key
+        // file is missing on disk.  This preserves the .onion identity even
+        // if the tor_data directory was deleted.
+        if (pwalletMain && !GetBoolArg("-notor", false)) {
+            std::string restoreDataPath = GetArg("-tordatadir", (GetDataDir() / "tor_data").string());
+            fs::path secretKeyPath = fs::path(restoreDataPath) / "hidden_service" / "hs_ed25519_secret_key";
+
+            if (!fs::exists(secretKeyPath)) {
+                CWalletDB walletdb(pwalletMain->strWalletFile);
+                std::vector<unsigned char> backedUpKey;
+
+                if (walletdb.ReadSetting("tor_v3_hs_secret_key_backup", backedUpKey) &&
+                    backedUpKey.size() == 96) {
+                    fs::create_directories(secretKeyPath.parent_path());
+
+                    std::ofstream keyFile(secretKeyPath.string().c_str(), std::ios::binary);
+                    if (keyFile.is_open()) {
+                        keyFile.write(reinterpret_cast<const char*>(backedUpKey.data()),
+                                      backedUpKey.size());
+                        keyFile.close();
+                        printf("Restored Tor hidden service secret key from wallet backup\n");
+                    } else {
+                        printf("WARNING: Failed to write restored hs_ed25519_secret_key to %s\n",
+                               secretKeyPath.string().c_str());
+                    }
+                }
+
+                OPENSSL_cleanse(backedUpKey.data(), backedUpKey.size());
+            }
+        }
+
+        int64_t nTorStart = GetTimeMillis();
         bool torStarted = StartEmbeddedTor();
+        StartupPerfLog("tor_start", GetTimeMillis() - nTorStart, strprintf("started=%d", torStarted));
         std::string torDataPath = CTorEmbedded::GetInstance()->GetDataDir();
         if (torDataPath.empty())
             torDataPath = (GetDataDir() / "tor_data").string();
@@ -1032,24 +1201,46 @@ bool AppInit2()
         if (torStarted) {
             printf("Tor process running, SOCKS proxy at %s\n",
                    CTorEmbedded::GetInstance()->GetSocksProxy().c_str());
+
+            // TOR-NATIVE MODE: Force all traffic through embedded Tor
+            int socksPort = CTorEmbedded::GetInstance()->GetSocksPort();
+            CService torProxyAddr("127.0.0.1", socksPort);
+
+            SetProxy(NET_IPV4, torProxyAddr, 5);
+            SetProxy(NET_IPV6, torProxyAddr, 5);
+            SetProxy(NET_TOR, torProxyAddr, 5);
+            SetNameProxy(torProxyAddr, 5);
+
+            // Disable clearnet reachability - ONION ONLY
+            SetReachable(NET_IPV4, false);
+            SetReachable(NET_IPV6, false);
+            SetReachable(NET_TOR, true);
+
+            printf("TOR-NATIVE MODE: All network traffic forced through Tor\n");
+            printf("  Clearnet disabled - .onion addresses only\n");
+
+            #ifdef USE_UPNP
+            fUseUPnP = false;
+            #endif
         } else {
-            printf("WARNING: Tor not available. .onion peers will not be reachable.\n");
-            printf("  Clearnet connections will still work normally.\n");
+            return InitError(_("Tor failed to start. Triangles requires Tor to operate."));
         }
 
         // Initialize Tor V3 identity (Ed25519 keys, onion address)
         uiInterface.InitMessage(_("Initializing Tor V3 identity..."));
         printf("Initializing Tor V3 onion identity...\n");
 
+        int64_t nTorIdentityStart = GetTimeMillis();
         LoadTorV3Config();
         TorV3Config& torConfig = GetTorV3Config();
-        torConfig.enableTor = true;
-        torConfig.enableHiddenService = true;
-        torConfig.hiddenServicePort = GetListenPort();
+        torConfig.enableTor = torStarted;
+        torConfig.enableHiddenService = torStarted && CTorEmbedded::GetInstance()->IsHiddenServiceEnabled();
+        torConfig.hiddenServicePort = CTorEmbedded::GetInstance()->GetHiddenServicePort();
         torConfig.torDataDirectory = torDataPath;
+        std::string onionAddr;
 
-        if (InitTorV3()) {
-            string onionAddr = CTorV3Manager::GetInstance()->GetWalletOnionAddress();
+        if (torConfig.enableTor && torConfig.enableHiddenService && InitTorV3()) {
+            onionAddr = CTorV3Manager::GetInstance()->GetWalletOnionAddress();
             if (!onionAddr.empty()) {
                 // Write onion/hostname for compatibility with existing code paths
                 fs::path onionDir = GetDataDir() / "onion";
@@ -1061,14 +1252,19 @@ bool AppInit2()
                 }
 
                 // Register onion address as local address for peer discovery
-                AddLocal(CService(onionAddr, GetListenPort(), fNameLookup), LOCAL_MANUAL);
+                AddLocal(CService(onionAddr, torConfig.hiddenServicePort, fNameLookup), LOCAL_MANUAL);
                 printf("Tor V3 identity: %s\n", onionAddr.c_str());
             } else {
                 printf("WARNING: Tor V3 initialized but no onion address available\n");
             }
+        } else if (torStarted && !torConfig.enableHiddenService) {
+            printf("Tor hidden service disabled by configuration\n");
+        } else if (!torStarted) {
+            printf("Skipping Tor V3 identity because the Tor backend is unavailable\n");
         } else {
             printf("WARNING: Failed to initialize Tor V3 identity\n");
         }
+        StartupPerfLog("tor_v3_identity", GetTimeMillis() - nTorIdentityStart);
 
         // Also check if Tor gave us a hidden service hostname
         if (torStarted) {
@@ -1081,12 +1277,21 @@ bool AppInit2()
                     while (!torOnion.empty() && (torOnion.back() == '\n' || torOnion.back() == '\r' || torOnion.back() == ' '))
                         torOnion.pop_back();
                     if (!torOnion.empty()) {
-                        AddLocal(CService(torOnion, GetListenPort(), fNameLookup), LOCAL_MANUAL);
+                        if (torOnion != onionAddr) {
+                            AddLocal(CService(torOnion, torConfig.hiddenServicePort, fNameLookup), LOCAL_MANUAL);
+                        }
                         printf("Tor hidden service (from Tor process): %s\n", torOnion.c_str());
                     }
                 }
             }
         }
+        StartupPerfLog("tor_setup_total", GetTimeMillis() - nTorStart);
+
+        // Launch background thread for Tor health monitoring and seeder maintenance
+        if (torStarted) {
+            if (!NewThread(ThreadTorMaintenance, NULL))
+                printf("Warning: ThreadTorMaintenance could not be started\n");
+        }
     }
 
     // ********************************************************* Step 9: import blocks
@@ -1097,9 +1302,11 @@ bool AppInit2()
 
         for (string strFile : mapMultiArgs["-loadblock"])
         {
+            int64_t nLoadBlockStart = GetTimeMillis();
             FILE *file = fopen(strFile.c_str(), "rb");
             if (file)
                 LoadExternalBlockFile(file);
+            StartupPerfLog("loadblock_import", GetTimeMillis() - nLoadBlockStart, strprintf("file=%s", strFile.c_str()));
         }
         exit(0);
     }
@@ -1108,12 +1315,14 @@ bool AppInit2()
     if (fs::exists(pathBootstrap)) {
         uiInterface.InitMessage(_("Importing bootstrap blockchain data file."));
 
+        int64_t nBootstrapImportStart = GetTimeMillis();
         FILE *file = fopen(pathBootstrap.string().c_str(), "rb");
         if (file) {
             fs::path pathBootstrapOld = GetDataDir() / "bootstrap.dat.old";
             LoadExternalBlockFile(file);
             RenameOver(pathBootstrap, pathBootstrapOld);
         }
+        StartupPerfLog("bootstrap_dat_import", GetTimeMillis() - nBootstrapImportStart, strprintf("file=%s", pathBootstrap.string().c_str()));
     }
 
     // ********************************************************* Step 10: load peers
@@ -1128,11 +1337,13 @@ bool AppInit2()
             printf("Invalid or missing peers.dat; recreating\n");
     }
 
-    printf("Loaded %i addresses from peers.dat  %"PRId64"ms\n",
+    printf("Loaded %i addresses from peers.dat  %" PRId64 "ms\n",
            addrman.size(), GetTimeMillis() - nStart);
+    StartupPerfLog("peers_load", GetTimeMillis() - nStart, strprintf("count=%d", addrman.size()));
     
     
     // ********************************************************* Step 11: start node
+    nStart = GetTimeMillis();
 
     if (!CheckDiskSpace())
         return false;
@@ -1140,11 +1351,11 @@ bool AppInit2()
     RandAddSeedPerfmon();
 
     //// debug print
-    printf("mapBlockIndex.size() = %"PRIszu"\n",   mapBlockIndex.size());
+    printf("mapBlockIndex.size() = %" PRIszu "\n",   mapBlockIndex.size());
     printf("nBestHeight = %d\n",            nBestHeight);
-    printf("setKeyPool.size() = %"PRIszu"\n",      pwalletMain->setKeyPool.size());
-    printf("mapWallet.size() = %"PRIszu"\n",       pwalletMain->mapWallet.size());
-    printf("mapAddressBook.size() = %"PRIszu"\n",  pwalletMain->mapAddressBook.size());
+    printf("setKeyPool.size() = %" PRIszu "\n",      pwalletMain->setKeyPool.size());
+    printf("mapWallet.size() = %" PRIszu "\n",       pwalletMain->mapWallet.size());
+    printf("mapAddressBook.size() = %" PRIszu "\n",  pwalletMain->mapAddressBook.size());
 
     if (!NewThread(StartNode, NULL))
         InitError(_("Error: could not start node"));
@@ -1161,6 +1372,7 @@ bool AppInit2()
         printf("Warning: deferred startup thread could not be started, running inline\n");
         ThreadDeferredStartup(NULL);
     }
+    StartupPerfLog("start_services", GetTimeMillis() - nStart);
 
     // ********************************************************* Step 11.5: ZMQ notifications
 #ifdef ENABLE_ZMQ
@@ -1183,11 +1395,6 @@ bool AppInit2()
     }
 #endif
 
-    // ********************************************************* Step 11.6: Address index
-    fAddressIndex = GetBoolArg("-addressindex", false);
-    if (fAddressIndex)
-        printf("Address index enabled\n");
-
     // ********************************************************* Step 11.7: SSE notification queue
     if (GetBoolArg("-ssenotify", false))
     {
@@ -1199,6 +1406,7 @@ bool AppInit2()
 
     uiInterface.InitMessage(_("Done loading"));
     printf("Done loading\n");
+    StartupPerfLog("appinit_total", GetTimeMillis() - nAppInitStart);
 
     if (!strErrors.str().empty())
         return InitError(strErrors.str());

src/irc.cpp

@@ -260,7 +260,7 @@ void ThreadIRCSeed2(void* parg)
         if (!fNoListen && GetLocal(addrLocal, &addrIPv4) && nNameRetry<3)
             strMyName = EncodeAddress(GetLocalAddress(&addrConnect));
         if (strMyName == "")
-            strMyName = strprintf("x%"PRIu64"", GetRand(1000000000));
+            strMyName = strprintf("x%" PRIu64 "", GetRand(1000000000));
 
         Send(hSocket, strprintf("NICK %s\r", strMyName.c_str()).c_str());
         Send(hSocket, strprintf("USER %s 8 * : %s\r", strMyName.c_str(), strMyName.c_str()).c_str());

src/json/json_compat.h

@@ -0,0 +1,284 @@
+// Copyright (c) 2024-2026 Triangles developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+//
+// Drop-in compatibility layer: json_spirit API backed by nlohmann/json.
+// Provides the same types (Value, Object, Array, Pair) and functions
+// (find_value, write_string, read_string) in the json_spirit namespace,
+// so existing RPC code compiles without changes.
+
+#ifndef JSON_COMPAT_H
+#define JSON_COMPAT_H
+
+#include "nlohmann_json.hpp"
+
+#include <cstdint>
+#include <map>
+#include <stdexcept>
+#include <string>
+#include <vector>
+
+namespace json_spirit {
+
+// Use ordered_json to preserve insertion order (matches json_spirit's vector<Pair> behavior)
+typedef nlohmann::ordered_json json_internal;
+
+// ---------- Type enum (matches json_spirit exactly) ----------
+
+enum Value_type {
+    obj_type   = 0,
+    array_type = 1,
+    str_type   = 2,
+    bool_type  = 3,
+    int_type   = 4,
+    real_type  = 5,
+    null_type  = 6
+};
+
+inline const char* ValueTypeName(Value_type type)
+{
+    switch (type)
+    {
+    case obj_type:   return "obj";
+    case array_type: return "array";
+    case str_type:   return "str";
+    case bool_type:  return "bool";
+    case int_type:   return "int";
+    case real_type:  return "real";
+    case null_type:  return "null";
+    }
+    return "unknown";
+}
+
+// ---------- Forward declarations ----------
+
+class Value;
+struct Pair;
+
+// ---------- Value ----------
+
+class Value {
+    json_internal j_;
+
+    friend std::string write_string(const Value& val, bool pretty);
+    friend bool read_string(const std::string& s, Value& val);
+    friend bool read(const std::string& s, Value& val);
+
+public:
+    // Default: null
+    Value() : j_(nullptr) {}
+
+    // Primitives
+    Value(const char* s)        : j_(std::string(s)) {}
+    Value(const std::string& s) : j_(s) {}
+    Value(bool b)               : j_(b) {}
+    Value(int i)                : j_(static_cast<int64_t>(i)) {}
+    Value(unsigned int u)       : j_(static_cast<uint64_t>(u)) {}
+    Value(int64_t i)            : j_(i) {}
+    Value(uint64_t u)           : j_(u) {}
+    Value(double d)             : j_(d) {}
+
+    // Compound types (defined after Pair/Object/Array)
+    inline Value(const std::vector<Pair>& obj);
+    inline Value(const std::vector<Value>& arr);
+
+    // Type introspection
+    Value_type type() const {
+        if (j_.is_null())            return null_type;
+        if (j_.is_object())          return obj_type;
+        if (j_.is_array())           return array_type;
+        if (j_.is_string())          return str_type;
+        if (j_.is_boolean())         return bool_type;
+        if (j_.is_number_integer())  return int_type;
+        if (j_.is_number_float())    return real_type;
+        return null_type;
+    }
+
+    bool is_null()   const { return j_.is_null(); }
+    bool is_uint64() const { return j_.is_number_unsigned(); }
+
+    // Accessors (throw on type mismatch, matching json_spirit semantics)
+    const std::string& get_str() const {
+        if (!j_.is_string())
+            throw std::runtime_error("value type is not str");
+        return j_.get_ref<const std::string&>();
+    }
+
+    bool get_bool() const {
+        if (!j_.is_boolean())
+            throw std::runtime_error("value type is not bool");
+        return j_.get<bool>();
+    }
+
+    int get_int() const {
+        if (!j_.is_number_integer())
+            throw std::runtime_error("value type is not int");
+        return j_.get<int>();
+    }
+
+    int64_t get_int64() const {
+        if (!j_.is_number_integer())
+            throw std::runtime_error("value type is not int");
+        return j_.get<int64_t>();
+    }
+
+    uint64_t get_uint64() const {
+        if (!j_.is_number_integer())
+            throw std::runtime_error("value type is not int");
+        return j_.get<uint64_t>();
+    }
+
+    double get_real() const {
+        // json_spirit converts ints to double in get_real()
+        if (!j_.is_number())
+            throw std::runtime_error("value type is not numeric");
+        return j_.get<double>();
+    }
+
+    // Compound accessors (defined after Pair/Object/Array)
+    inline std::vector<Pair> get_obj() const;
+    inline std::vector<Value> get_array() const;
+
+    // Map-based object accessor for mValue compatibility
+    inline std::map<std::string, Value> get_map_obj() const;
+
+    // Template accessor (used by ConvertTo<T>)
+    template<typename T> T get_value() const;
+
+    // Static null constant (matches json_spirit::Value::null)
+    static const Value null;
+
+    bool operator==(const Value& o) const { return j_ == o.j_; }
+    bool operator!=(const Value& o) const { return j_ != o.j_; }
+};
+
+// Define the static member
+inline const Value Value::null{};
+
+// ---------- Pair ----------
+
+struct Pair {
+    std::string name_;
+    Value       value_;
+
+    Pair() {}
+    Pair(const std::string& name, const Value& value)
+        : name_(name), value_(value) {}
+
+    bool operator==(const Pair& o) const { return name_ == o.name_; }
+};
+
+// ---------- Object / Array typedefs ----------
+
+typedef std::vector<Pair>  Object;
+typedef std::vector<Value> Array;
+
+// ---------- Map-based aliases (mValue/mObject for messagemodel.cpp compat) ----------
+
+typedef Value mValue;
+typedef std::map<std::string, Value> mObject;
+
+// ---------- Value compound constructors ----------
+
+inline Value::Value(const std::vector<Pair>& obj) {
+    j_ = json_internal::object();
+    for (const auto& p : obj)
+        j_[p.name_] = p.value_.j_;
+}
+
+inline Value::Value(const std::vector<Value>& arr) {
+    j_ = json_internal::array();
+    for (const auto& v : arr)
+        j_.push_back(v.j_);
+}
+
+// ---------- Value compound accessors ----------
+
+inline std::vector<Pair> Value::get_obj() const {
+    if (!j_.is_object())
+        throw std::runtime_error("value type is not obj");
+    std::vector<Pair> result;
+    result.reserve(j_.size());
+    for (auto it = j_.begin(); it != j_.end(); ++it) {
+        Value v;
+        v.j_ = it.value();
+        result.emplace_back(it.key(), v);
+    }
+    return result;
+}
+
+inline std::vector<Value> Value::get_array() const {
+    if (!j_.is_array())
+        throw std::runtime_error("value type is not array");
+    std::vector<Value> result;
+    result.reserve(j_.size());
+    for (const auto& elem : j_) {
+        Value v;
+        v.j_ = elem;
+        result.push_back(v);
+    }
+    return result;
+}
+
+inline std::map<std::string, Value> Value::get_map_obj() const {
+    if (!j_.is_object())
+        throw std::runtime_error("value type is not obj");
+    std::map<std::string, Value> result;
+    for (auto it = j_.begin(); it != j_.end(); ++it) {
+        Value v;
+        v.j_ = it.value();
+        result[it.key()] = v;
+    }
+    return result;
+}
+
+// ---------- Template get_value specializations ----------
+
+template<> inline std::string Value::get_value<std::string>() const { return get_str(); }
+template<> inline bool        Value::get_value<bool>()        const { return get_bool(); }
+template<> inline int         Value::get_value<int>()         const { return get_int(); }
+template<> inline int64_t     Value::get_value<int64_t>()     const { return get_int64(); }
+template<> inline uint64_t    Value::get_value<uint64_t>()    const { return get_uint64(); }
+template<> inline double      Value::get_value<double>()      const { return get_real(); }
+template<> inline Object      Value::get_value<Object>()      const { return get_obj(); }
+template<> inline Array       Value::get_value<Array>()       const { return get_array(); }
+
+// ---------- Utility functions ----------
+
+inline const Value& find_value(const Object& obj, const std::string& name) {
+    for (const auto& p : obj)
+        if (p.name_ == name)
+            return p.value_;
+    static const Value null_value;
+    return null_value;
+}
+
+inline std::string write_string(const Value& val, bool pretty = false) {
+    return val.j_.dump(pretty ? 4 : -1);
+}
+
+inline bool read_string(const std::string& s, Value& val) {
+    try {
+        val.j_ = json_internal::parse(s);
+        return true;
+    } catch (const nlohmann::detail::parse_error&) {
+        return false;
+    }
+}
+
+// Alias matching json_spirit::read() signature (used by messagemodel.cpp)
+inline bool read(const std::string& s, Value& val) {
+    return read_string(s, val);
+}
+
+// Stream-based reader (used by test harness read_json)
+template<typename Istream>
+inline bool read_stream(Istream& is, Value& val) {
+    std::string s((std::istreambuf_iterator<char>(is)),
+                   std::istreambuf_iterator<char>());
+    return read_string(s, val);
+}
+
+} // namespace json_spirit
+
+#endif // JSON_COMPAT_H

src/json/json_spirit.h

@@ -1,18 +0,0 @@
-#ifndef JSON_SPIRIT
-#define JSON_SPIRIT
-
-//          Copyright John W. Wilkinson 2007 - 2009.
-// Distributed under the MIT License, see accompanying file LICENSE.txt
-
-// json spirit version 4.03
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#include "json_spirit_value.h"
-#include "json_spirit_reader.h"
-#include "json_spirit_writer.h"
-#include "json_spirit_utils.h"
-
-#endif

src/json/json_spirit_error_position.h

@@ -1,54 +0,0 @@
-#ifndef JSON_SPIRIT_ERROR_POSITION
-#define JSON_SPIRIT_ERROR_POSITION
-
-//          Copyright John W. Wilkinson 2007 - 2009.
-// Distributed under the MIT License, see accompanying file LICENSE.txt
-
-// json spirit version 4.03
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#include <string>
-
-namespace json_spirit
-{
-    // An Error_position exception is thrown by the "read_or_throw" functions below on finding an error.
-    // Note the "read_or_throw" functions are around 3 times slower than the standard functions "read" 
-    // functions that return a bool.
-    //
-    struct Error_position
-    {
-        Error_position();
-        Error_position( unsigned int line, unsigned int column, const std::string& reason );
-        bool operator==( const Error_position& lhs ) const;
-        unsigned int line_;
-        unsigned int column_;
-        std::string reason_;
-    };
-
-    inline Error_position::Error_position()
-    :   line_( 0 )
-    ,   column_( 0 )
-    {
-    }
-
-    inline Error_position::Error_position( unsigned int line, unsigned int column, const std::string& reason )
-    :   line_( line )
-    ,   column_( column )
-    ,   reason_( reason )
-    {
-    }
-
-    inline bool Error_position::operator==( const Error_position& lhs ) const
-    {
-        if( this == &lhs ) return true;
-
-        return ( reason_ == lhs.reason_ ) &&
-               ( line_   == lhs.line_ ) &&
-               ( column_ == lhs.column_ ); 
-}
-}
-
-#endif

src/json/json_spirit_reader.cpp

@@ -1,137 +0,0 @@
-//          Copyright John W. Wilkinson 2007 - 2009.
-// Distributed under the MIT License, see accompanying file LICENSE.txt
-
-// json spirit version 4.03
-
-#include "json_spirit_reader.h"
-#include "json_spirit_reader_template.h"
-
-using namespace json_spirit;
-
-bool json_spirit::read( const std::string& s, Value& value )
-{
-    return read_string( s, value );
-}
-
-void json_spirit::read_or_throw( const std::string& s, Value& value )
-{
-    read_string_or_throw( s, value );
-}
-
-bool json_spirit::read( std::istream& is, Value& value )
-{
-    return read_stream( is, value );
-}
-
-void json_spirit::read_or_throw( std::istream& is, Value& value )
-{
-    read_stream_or_throw( is, value );
-}
-
-bool json_spirit::read( std::string::const_iterator& begin, std::string::const_iterator end, Value& value )
-{
-    return read_range( begin, end, value );
-}
-
-void json_spirit::read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, Value& value )
-{
-    begin = read_range_or_throw( begin, end, value );
-}
-
-#ifndef BOOST_NO_STD_WSTRING
-
-bool json_spirit::read( const std::wstring& s, wValue& value )
-{
-    return read_string( s, value );
-}
-
-void json_spirit::read_or_throw( const std::wstring& s, wValue& value )
-{
-    read_string_or_throw( s, value );
-}
-
-bool json_spirit::read( std::wistream& is, wValue& value )
-{
-    return read_stream( is, value );
-}
-
-void json_spirit::read_or_throw( std::wistream& is, wValue& value )
-{
-    read_stream_or_throw( is, value );
-}
-
-bool json_spirit::read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value )
-{
-    return read_range( begin, end, value );
-}
-
-void json_spirit::read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value )
-{
-    begin = read_range_or_throw( begin, end, value );
-}
-
-#endif
-
-bool json_spirit::read( const std::string& s, mValue& value )
-{
-    return read_string( s, value );
-}
-
-void json_spirit::read_or_throw( const std::string& s, mValue& value )
-{
-    read_string_or_throw( s, value );
-}
-
-bool json_spirit::read( std::istream& is, mValue& value )
-{
-    return read_stream( is, value );
-}
-
-void json_spirit::read_or_throw( std::istream& is, mValue& value )
-{
-    read_stream_or_throw( is, value );
-}
-
-bool json_spirit::read( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value )
-{
-    return read_range( begin, end, value );
-}
-
-void json_spirit::read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value )
-{
-    begin = read_range_or_throw( begin, end, value );
-}
-
-#ifndef BOOST_NO_STD_WSTRING
-
-bool json_spirit::read( const std::wstring& s, wmValue& value )
-{
-    return read_string( s, value );
-}
-
-void json_spirit::read_or_throw( const std::wstring& s, wmValue& value )
-{
-    read_string_or_throw( s, value );
-}
-
-bool json_spirit::read( std::wistream& is, wmValue& value )
-{
-    return read_stream( is, value );
-}
-
-void json_spirit::read_or_throw( std::wistream& is, wmValue& value )
-{
-    read_stream_or_throw( is, value );
-}
-
-bool json_spirit::read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value )
-{
-    return read_range( begin, end, value );
-}
-
-void json_spirit::read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value )
-{
-    begin = read_range_or_throw( begin, end, value );
-}
-
-#endif

src/json/json_spirit_reader.h

@@ -1,62 +0,0 @@
-#ifndef JSON_SPIRIT_READER
-#define JSON_SPIRIT_READER
-
-//          Copyright John W. Wilkinson 2007 - 2009.
-// Distributed under the MIT License, see accompanying file LICENSE.txt
-
-// json spirit version 4.03
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#include "json_spirit_value.h"
-#include "json_spirit_error_position.h"
-#include <iostream>
-
-namespace json_spirit
-{
-    // functions to reads a JSON values
-
-    bool read( const std::string& s, Value& value );
-    bool read( std::istream& is,     Value& value );
-    bool read( std::string::const_iterator& begin, std::string::const_iterator end, Value& value );
-
-    void read_or_throw( const std::string& s, Value& value );  
-    void read_or_throw( std::istream& is,     Value& value );
-    void read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, Value& value );
-
-#ifndef BOOST_NO_STD_WSTRING
-
-    bool read( const std::wstring& s, wValue& value );
-    bool read( std::wistream&  is,    wValue& value );
-    bool read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value );    
-
-    void read_or_throw( const std::wstring& s, wValue& value );
-    void read_or_throw( std::wistream& is,     wValue& value );
-    void read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value );
-
-#endif
-
-    bool read( const std::string& s, mValue& value );
-    bool read( std::istream& is,     mValue& value );
-    bool read( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value );
-
-    void read_or_throw( const std::string& s, mValue& value );  
-    void read_or_throw( std::istream& is,     mValue& value );
-    void read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value );
-
-#ifndef BOOST_NO_STD_WSTRING
-
-    bool read( const std::wstring& s, wmValue& value );
-    bool read( std::wistream& is,     wmValue& value );
-    bool read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value );    
-
-    void read_or_throw( const std::wstring& s, wmValue& value );
-    void read_or_throw( std::wistream& is,     wmValue& value );
-    void read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value );
-
-#endif
-}
-
-#endif

src/json/json_spirit_reader_template.h

@@ -1,612 +0,0 @@
-#ifndef JSON_SPIRIT_READER_TEMPLATE
-#define JSON_SPIRIT_READER_TEMPLATE
-
-//          Copyright John W. Wilkinson 2007 - 2009.
-// Distributed under the MIT License, see accompanying file LICENSE.txt
-
-// json spirit version 4.03
-
-#include "json_spirit_value.h"
-#include "json_spirit_error_position.h"
-
-//#define BOOST_SPIRIT_THREADSAFE  // uncomment for multithreaded use, requires linking to boost.thread
-
-#include <boost/bind.hpp>
-#include <boost/function.hpp>
-#include <boost/version.hpp>
-
-#if BOOST_VERSION >= 103800
-    #include <boost/spirit/include/classic_core.hpp>
-    #include <boost/spirit/include/classic_confix.hpp>
-    #include <boost/spirit/include/classic_escape_char.hpp>
-    #include <boost/spirit/include/classic_multi_pass.hpp>
-    #include <boost/spirit/include/classic_position_iterator.hpp>
-    #define spirit_namespace boost::spirit::classic
-#else
-    #include <boost/spirit/core.hpp>
-    #include <boost/spirit/utility/confix.hpp>
-    #include <boost/spirit/utility/escape_char.hpp>
-    #include <boost/spirit/iterator/multi_pass.hpp>
-    #include <boost/spirit/iterator/position_iterator.hpp>
-    #define spirit_namespace boost::spirit
-#endif
-
-namespace json_spirit
-{
-    const spirit_namespace::int_parser < boost::int64_t >  int64_p  = spirit_namespace::int_parser < boost::int64_t  >();
-    const spirit_namespace::uint_parser< boost::uint64_t > uint64_p = spirit_namespace::uint_parser< boost::uint64_t >();
-
-    template< class Iter_type >
-    bool is_eq( Iter_type first, Iter_type last, const char* c_str )
-    {
-        for( Iter_type i = first; i != last; ++i, ++c_str )
-        {
-            if( *c_str == 0 ) return false;
-
-            if( *i != *c_str ) return false;
-        }
-
-        return true;
-    }
-
-    template< class Char_type >
-    Char_type hex_to_num( const Char_type c )
-    {
-        if( ( c >= '0' ) && ( c <= '9' ) ) return c - '0';
-        if( ( c >= 'a' ) && ( c <= 'f' ) ) return c - 'a' + 10;
-        if( ( c >= 'A' ) && ( c <= 'F' ) ) return c - 'A' + 10;
-        return 0;
-    }
-
-    template< class Char_type, class Iter_type >
-    Char_type hex_str_to_char( Iter_type& begin )
-    {
-        const Char_type c1( *( ++begin ) );
-        const Char_type c2( *( ++begin ) );
-
-        return ( hex_to_num( c1 ) << 4 ) + hex_to_num( c2 );
-    }       
-
-    template< class Char_type, class Iter_type >
-    Char_type unicode_str_to_char( Iter_type& begin )
-    {
-        const Char_type c1( *( ++begin ) );
-        const Char_type c2( *( ++begin ) );
-        const Char_type c3( *( ++begin ) );
-        const Char_type c4( *( ++begin ) );
-
-        return ( hex_to_num( c1 ) << 12 ) + 
-               ( hex_to_num( c2 ) <<  8 ) + 
-               ( hex_to_num( c3 ) <<  4 ) + 
-               hex_to_num( c4 );
-    }
-
-    template< class String_type >
-    void append_esc_char_and_incr_iter( String_type& s, 
-                                        typename String_type::const_iterator& begin, 
-                                        typename String_type::const_iterator end )
-    {
-        typedef typename String_type::value_type Char_type;
-             
-        const Char_type c2( *begin );
-
-        switch( c2 )
-        {
-            case 't':  s += '\t'; break;
-            case 'b':  s += '\b'; break;
-            case 'f':  s += '\f'; break;
-            case 'n':  s += '\n'; break;
-            case 'r':  s += '\r'; break;
-            case '\\': s += '\\'; break;
-            case '/':  s += '/';  break;
-            case '"':  s += '"';  break;
-            case 'x':  
-            {
-                if( end - begin >= 3 )  //  expecting "xHH..."
-                {
-                    s += hex_str_to_char< Char_type >( begin );  
-                }
-                break;
-            }
-            case 'u':  
-            {
-                if( end - begin >= 5 )  //  expecting "uHHHH..."
-                {
-                    s += unicode_str_to_char< Char_type >( begin );  
-                }
-                break;
-            }
-        }
-    }
-
-    template< class String_type >
-    String_type substitute_esc_chars( typename String_type::const_iterator begin, 
-                                   typename String_type::const_iterator end )
-    {
-        typedef typename String_type::const_iterator Iter_type;
-
-        if( end - begin < 2 ) return String_type( begin, end );
-
-        String_type result;
-        
-        result.reserve( end - begin );
-
-        const Iter_type end_minus_1( end - 1 );
-
-        Iter_type substr_start = begin;
-        Iter_type i = begin;
-
-        for( ; i < end_minus_1; ++i )
-        {
-            if( *i == '\\' )
-            {
-                result.append( substr_start, i );
-
-                ++i;  // skip the '\'
-             
-                append_esc_char_and_incr_iter( result, i, end );
-
-                substr_start = i + 1;
-            }
-        }
-
-        result.append( substr_start, end );
-
-        return result;
-    }
-
-    template< class String_type >
-    String_type get_str_( typename String_type::const_iterator begin, 
-                       typename String_type::const_iterator end )
-    {
-        assert( end - begin >= 2 );
-
-        typedef typename String_type::const_iterator Iter_type;
-
-        Iter_type str_without_quotes( ++begin );
-        Iter_type end_without_quotes( --end );
-
-        return substitute_esc_chars< String_type >( str_without_quotes, end_without_quotes );
-    }
-
-    inline std::string get_str( std::string::const_iterator begin, std::string::const_iterator end )
-    {
-        return get_str_< std::string >( begin, end );
-    }
-
-    inline std::wstring get_str( std::wstring::const_iterator begin, std::wstring::const_iterator end )
-    {
-        return get_str_< std::wstring >( begin, end );
-    }
-    
-    template< class String_type, class Iter_type >
-    String_type get_str( Iter_type begin, Iter_type end )
-    {
-        const String_type tmp( begin, end );  // convert multipass iterators to string iterators
-
-        return get_str( tmp.begin(), tmp.end() );
-    }
-
-    // this class's methods get called by the spirit parse resulting
-    // in the creation of a JSON object or array
-    //
-    // NB Iter_type could be a std::string iterator, wstring iterator, a position iterator or a multipass iterator
-    //
-    template< class Value_type, class Iter_type >
-    class Semantic_actions 
-    {
-    public:
-
-        typedef typename Value_type::Config_type Config_type;
-        typedef typename Config_type::String_type String_type;
-        typedef typename Config_type::Object_type Object_type;
-        typedef typename Config_type::Array_type Array_type;
-        typedef typename String_type::value_type Char_type;
-
-        Semantic_actions( Value_type& value )
-        :   value_( value )
-        ,   current_p_( 0 )
-        {
-        }
-
-        void begin_obj( Char_type c )
-        {
-            assert( c == '{' );
-
-            begin_compound< Object_type >();
-        }
-
-        void end_obj( Char_type c )
-        {
-            assert( c == '}' );
-
-            end_compound();
-        }
-
-        void begin_array( Char_type c )
-        {
-            assert( c == '[' );
-     
-            begin_compound< Array_type >();
-        }
-
-        void end_array( Char_type c )
-        {
-            assert( c == ']' );
-
-            end_compound();
-        }
-
-        void new_name( Iter_type begin, Iter_type end )
-        {
-            assert( current_p_->type() == obj_type );
-
-            name_ = get_str< String_type >( begin, end );
-        }
-
-        void new_str( Iter_type begin, Iter_type end )
-        {
-            add_to_current( get_str< String_type >( begin, end ) );
-        }
-
-        void new_true( Iter_type begin, Iter_type end )
-        {
-            assert( is_eq( begin, end, "true" ) );
-
-            add_to_current( true );
-        }
-
-        void new_false( Iter_type begin, Iter_type end )
-        {
-            assert( is_eq( begin, end, "false" ) );
-
-            add_to_current( false );
-        }
-
-        void new_null( Iter_type begin, Iter_type end )
-        {
-            assert( is_eq( begin, end, "null" ) );
-
-            add_to_current( Value_type() );
-        }
-
-        void new_int( boost::int64_t i )
-        {
-            add_to_current( i );
-        }
-
-        void new_uint64( boost::uint64_t ui )
-        {
-            add_to_current( ui );
-        }
-
-        void new_real( double d )
-        {
-            add_to_current( d );
-        }
-
-    private:
-
-        Semantic_actions& operator=( const Semantic_actions& ); 
-                                    // to prevent "assignment operator could not be generated" warning
-
-        Value_type* add_first( const Value_type& value )
-        {
-            assert( current_p_ == 0 );
-
-            value_ = value;
-            current_p_ = &value_;
-            return current_p_;
-        }
-
-        template< class Array_or_obj >
-        void begin_compound()
-        {
-            if( current_p_ == 0 )
-            {
-                add_first( Array_or_obj() );
-            }
-            else
-            {
-                stack_.push_back( current_p_ );
-
-                Array_or_obj new_array_or_obj;   // avoid copy by building new array or object in place
-
-                current_p_ = add_to_current( new_array_or_obj );
-            }
-        }
-
-        void end_compound()
-        {
-            if( current_p_ != &value_ )
-            {
-                current_p_ = stack_.back();
-                
-                stack_.pop_back();
-            }    
-        }
-
-        Value_type* add_to_current( const Value_type& value )
-        {
-            if( current_p_ == 0 )
-            {
-                return add_first( value );
-            }
-            else if( current_p_->type() == array_type )
-            {
-                current_p_->get_array().push_back( value );
-
-                return &current_p_->get_array().back(); 
-            }
-            
-            assert( current_p_->type() == obj_type );
-
-            return &Config_type::add( current_p_->get_obj(), name_, value );
-        }
-
-        Value_type& value_;             // this is the object or array that is being created
-        Value_type* current_p_;         // the child object or array that is currently being constructed
-
-        std::vector< Value_type* > stack_;   // previous child objects and arrays
-
-        String_type name_;              // of current name/value pair
-    };
-
-    template< typename Iter_type >
-    void throw_error( spirit_namespace::position_iterator< Iter_type > i, const std::string& reason )
-    {
-        throw Error_position( i.get_position().line, i.get_position().column, reason );
-    }
-
-    template< typename Iter_type >
-    void throw_error( Iter_type i, const std::string& reason )
-    {
-       throw reason;
-    }
-
-    // the spirit grammer 
-    //
-    template< class Value_type, class Iter_type >
-    class Json_grammer : public spirit_namespace::grammar< Json_grammer< Value_type, Iter_type > >
-    {
-    public:
-
-        typedef Semantic_actions< Value_type, Iter_type > Semantic_actions_t;
-
-        Json_grammer( Semantic_actions_t& semantic_actions )
-        :   actions_( semantic_actions )
-        {
-        }
-
-        static void throw_not_value( Iter_type begin, Iter_type end )
-        {
-    	    throw_error( begin, "not a value" );
-        }
-
-        static void throw_not_array( Iter_type begin, Iter_type end )
-        {
-    	    throw_error( begin, "not an array" );
-        }
-
-        static void throw_not_object( Iter_type begin, Iter_type end )
-        {
-    	    throw_error( begin, "not an object" );
-        }
-
-        static void throw_not_pair( Iter_type begin, Iter_type end )
-        {
-    	    throw_error( begin, "not a pair" );
-        }
-
-        static void throw_not_colon( Iter_type begin, Iter_type end )
-        {
-    	    throw_error( begin, "no colon in pair" );
-        }
-
-        static void throw_not_string( Iter_type begin, Iter_type end )
-        {
-    	    throw_error( begin, "not a string" );
-        }
-
-        template< typename ScannerT >
-        class definition
-        {
-        public:
-
-            definition( const Json_grammer& self )
-            {
-                using namespace spirit_namespace;
-
-                typedef typename Value_type::String_type::value_type Char_type;
-
-                // first we convert the semantic action class methods to functors with the 
-                // parameter signature expected by spirit
-
-                typedef boost::function< void( Char_type )            > Char_action;
-                typedef boost::function< void( Iter_type, Iter_type ) > Str_action;
-                typedef boost::function< void( double )               > Real_action;
-                typedef boost::function< void( boost::int64_t )       > Int_action;
-                typedef boost::function< void( boost::uint64_t )      > Uint64_action;
-
-                Char_action   begin_obj  ( boost::bind( &Semantic_actions_t::begin_obj,   &self.actions_, _1 ) );
-                Char_action   end_obj    ( boost::bind( &Semantic_actions_t::end_obj,     &self.actions_, _1 ) );
-                Char_action   begin_array( boost::bind( &Semantic_actions_t::begin_array, &self.actions_, _1 ) );
-                Char_action   end_array  ( boost::bind( &Semantic_actions_t::end_array,   &self.actions_, _1 ) );
-                Str_action    new_name   ( boost::bind( &Semantic_actions_t::new_name,    &self.actions_, _1, _2 ) );
-                Str_action    new_str    ( boost::bind( &Semantic_actions_t::new_str,     &self.actions_, _1, _2 ) );
-                Str_action    new_true   ( boost::bind( &Semantic_actions_t::new_true,    &self.actions_, _1, _2 ) );
-                Str_action    new_false  ( boost::bind( &Semantic_actions_t::new_false,   &self.actions_, _1, _2 ) );
-                Str_action    new_null   ( boost::bind( &Semantic_actions_t::new_null,    &self.actions_, _1, _2 ) );
-                Real_action   new_real   ( boost::bind( &Semantic_actions_t::new_real,    &self.actions_, _1 ) );
-                Int_action    new_int    ( boost::bind( &Semantic_actions_t::new_int,     &self.actions_, _1 ) );
-                Uint64_action new_uint64 ( boost::bind( &Semantic_actions_t::new_uint64,  &self.actions_, _1 ) );
-
-                // actual grammer
-
-                json_
-                    = value_ | eps_p[ &throw_not_value ]
-                    ;
-
-                value_
-                    = string_[ new_str ] 
-                    | number_ 
-                    | object_ 
-                    | array_ 
-                    | str_p( "true" ) [ new_true  ] 
-                    | str_p( "false" )[ new_false ] 
-                    | str_p( "null" ) [ new_null  ]
-                    ;
-
-                object_ 
-                    = ch_p('{')[ begin_obj ]
-                    >> !members_
-                    >> ( ch_p('}')[ end_obj ] | eps_p[ &throw_not_object ] )
-                    ;
-
-                members_
-                    = pair_ >> *( ',' >> pair_ )
-                    ;
-
-                pair_
-                    = string_[ new_name ]
-                    >> ( ':' | eps_p[ &throw_not_colon ] )
-                    >> ( value_ | eps_p[ &throw_not_value ] )
-                    ;
-
-                array_
-                    = ch_p('[')[ begin_array ]
-                    >> !elements_
-                    >> ( ch_p(']')[ end_array ] | eps_p[ &throw_not_array ] )
-                    ;
-
-                elements_
-                    = value_ >> *( ',' >> value_ )
-                    ;
-
-                string_ 
-                    = lexeme_d // this causes white space inside a string to be retained
-                      [
-                          confix_p
-                          ( 
-                              '"', 
-                              *lex_escape_ch_p,
-                              '"'
-                          ) 
-                      ]
-                    ;
-
-                number_
-                    = strict_real_p[ new_real   ] 
-                    | int64_p      [ new_int    ]
-                    | uint64_p     [ new_uint64 ]
-                    ;
-            }
-
-            spirit_namespace::rule< ScannerT > json_, object_, members_, pair_, array_, elements_, value_, string_, number_;
-
-            const spirit_namespace::rule< ScannerT >& start() const { return json_; }
-        };
-
-    private:
-
-        Json_grammer& operator=( const Json_grammer& ); // to prevent "assignment operator could not be generated" warning
-
-        Semantic_actions_t& actions_;
-    };
-
-    template< class Iter_type, class Value_type >
-    Iter_type read_range_or_throw( Iter_type begin, Iter_type end, Value_type& value )
-    {
-        Semantic_actions< Value_type, Iter_type > semantic_actions( value );
-     
-        const spirit_namespace::parse_info< Iter_type > info = 
-                            spirit_namespace::parse( begin, end, 
-                                                    Json_grammer< Value_type, Iter_type >( semantic_actions ), 
-                                                    spirit_namespace::space_p );
-
-        if( !info.hit )
-        {
-            assert( false ); // in theory exception should already have been thrown
-            throw_error( info.stop, "error" );
-        }
-
-        return info.stop;
-    }
-
-    template< class Iter_type, class Value_type >
-    void add_posn_iter_and_read_range_or_throw( Iter_type begin, Iter_type end, Value_type& value )
-    {
-        typedef spirit_namespace::position_iterator< Iter_type > Posn_iter_t;
-
-        const Posn_iter_t posn_begin( begin, end );
-        const Posn_iter_t posn_end( end, end );
-     
-        read_range_or_throw( posn_begin, posn_end, value );
-    }
-
-    template< class Iter_type, class Value_type >
-    bool read_range( Iter_type& begin, Iter_type end, Value_type& value )
-    {
-        try
-        {
-            begin = read_range_or_throw( begin, end, value );
-
-            return true;
-        }
-        catch( ... )
-        {
-            return false;
-        }
-    }
-
-    template< class String_type, class Value_type >
-    void read_string_or_throw( const String_type& s, Value_type& value )
-    {
-        add_posn_iter_and_read_range_or_throw( s.begin(), s.end(), value );
-    }
-
-    template< class String_type, class Value_type >
-    bool read_string( const String_type& s, Value_type& value )
-    {
-        typename String_type::const_iterator begin = s.begin();
-
-        return read_range( begin, s.end(), value );
-    }
-
-    template< class Istream_type >
-    struct Multi_pass_iters
-    {
-        typedef typename Istream_type::char_type Char_type;
-        typedef std::istream_iterator< Char_type, Char_type > istream_iter;
-        typedef spirit_namespace::multi_pass< istream_iter > Mp_iter;
-
-        Multi_pass_iters( Istream_type& is )
-        {
-            is.unsetf( std::ios::skipws );
-
-            begin_ = spirit_namespace::make_multi_pass( istream_iter( is ) );
-            end_   = spirit_namespace::make_multi_pass( istream_iter() );
-        }
-
-        Mp_iter begin_;
-        Mp_iter end_;
-    };
-
-    template< class Istream_type, class Value_type >
-    bool read_stream( Istream_type& is, Value_type& value )
-    {
-        Multi_pass_iters< Istream_type > mp_iters( is );
-
-        return read_range( mp_iters.begin_, mp_iters.end_, value );
-    }
-
-    template< class Istream_type, class Value_type >
-    void read_stream_or_throw( Istream_type& is, Value_type& value )
-    {
-        const Multi_pass_iters< Istream_type > mp_iters( is );
-
-        add_posn_iter_and_read_range_or_throw( mp_iters.begin_, mp_iters.end_, value );
-    }
-}
-
-#endif

src/json/json_spirit_stream_reader.h

@@ -1,70 +0,0 @@
-#ifndef JSON_SPIRIT_READ_STREAM
-#define JSON_SPIRIT_READ_STREAM
-
-//          Copyright John W. Wilkinson 2007 - 2009.
-// Distributed under the MIT License, see accompanying file LICENSE.txt
-
-// json spirit version 4.03
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#include "json_spirit_reader_template.h"
-
-namespace json_spirit
-{
-    // these classes allows you to read multiple top level contiguous values from a stream,
-    // the normal stream read functions have a bug that prevent multiple top level values 
-    // from being read unless they are separated by spaces
-
-    template< class Istream_type, class Value_type >
-    class Stream_reader
-    {
-    public:
-
-        Stream_reader( Istream_type& is )
-        :   iters_( is )
-        {
-        }
-
-        bool read_next( Value_type& value )
-        {
-            return read_range( iters_.begin_, iters_.end_, value );
-        }
-
-    private:
-
-        typedef Multi_pass_iters< Istream_type > Mp_iters;
-
-        Mp_iters iters_;
-    };
-
-    template< class Istream_type, class Value_type >
-    class Stream_reader_thrower
-    {
-    public:
-
-        Stream_reader_thrower( Istream_type& is )
-        :   iters_( is )
-        ,    posn_begin_( iters_.begin_, iters_.end_ )
-        ,    posn_end_( iters_.end_, iters_.end_ )
-        {
-        }
-
-        void read_next( Value_type& value )
-        {
-            posn_begin_ = read_range_or_throw( posn_begin_, posn_end_, value );
-        }
-
-    private:
-
-        typedef Multi_pass_iters< Istream_type > Mp_iters;
-        typedef spirit_namespace::position_iterator< typename Mp_iters::Mp_iter > Posn_iter_t;
-
-        Mp_iters iters_;
-        Posn_iter_t posn_begin_, posn_end_;
-    };
-}
-
-#endif

src/json/json_spirit_utils.h

@@ -1,61 +0,0 @@
-#ifndef JSON_SPIRIT_UTILS
-#define JSON_SPIRIT_UTILS
-
-//          Copyright John W. Wilkinson 2007 - 2009.
-// Distributed under the MIT License, see accompanying file LICENSE.txt
-
-// json spirit version 4.03
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#include "json_spirit_value.h"
-#include <map>
-
-namespace json_spirit
-{ 
-    template< class Obj_t, class Map_t >
-    void obj_to_map( const Obj_t& obj, Map_t& mp_obj )
-    {
-        mp_obj.clear();
-
-        for( typename Obj_t::const_iterator i = obj.begin(); i != obj.end(); ++i )
-        {
-            mp_obj[ i->name_ ] = i->value_;
-        }
-    }
-
-    template< class Obj_t, class Map_t >
-    void map_to_obj( const Map_t& mp_obj, Obj_t& obj )
-    {
-        obj.clear();
-
-        for( typename Map_t::const_iterator i = mp_obj.begin(); i != mp_obj.end(); ++i )
-        {
-            obj.push_back( typename Obj_t::value_type( i->first, i->second ) );
-        }
-    }
-
-    typedef std::map< std::string, Value > Mapped_obj;
-
-#ifndef BOOST_NO_STD_WSTRING
-    typedef std::map< std::wstring, wValue > wMapped_obj;
-#endif
-
-    template< class Object_type, class String_type >
-    const typename Object_type::value_type::Value_type& find_value( const Object_type& obj, const String_type& name )
-    {
-        for( typename Object_type::const_iterator i = obj.begin(); i != obj.end(); ++i )
-        {
-            if( i->name_ == name )
-            {
-                return i->value_;
-            }
-        }
-
-        return Object_type::value_type::Value_type::null;
-    }
-}
-
-#endif

src/json/json_spirit_value.cpp

@@ -1,8 +0,0 @@
-/* Copyright (c) 2007 John W Wilkinson
-
-   This source code can be used for any purpose as long as
-   this comment is retained. */
-
-// json spirit version 2.00
-
-#include "json_spirit_value.h"

src/json/json_spirit_value.h

@@ -1,534 +0,0 @@
-#ifndef JSON_SPIRIT_VALUE
-#define JSON_SPIRIT_VALUE
-
-//          Copyright John W. Wilkinson 2007 - 2009.
-// Distributed under the MIT License, see accompanying file LICENSE.txt
-
-// json spirit version 4.03
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#include <vector>
-#include <map>
-#include <string>
-#include <cassert>
-#include <sstream>
-#include <stdexcept>
-#include <boost/config.hpp> 
-#include <boost/cstdint.hpp> 
-#include <boost/shared_ptr.hpp>
-#include <boost/variant.hpp>
-
-namespace json_spirit
-{
-    enum Value_type{ obj_type, array_type, str_type, bool_type, int_type, real_type, null_type };
-    static const char* Value_type_name[]={"obj", "array", "str", "bool", "int", "real", "null"};
-
-    template< class Config >    // Config determines whether the value uses std::string or std::wstring and
-                                // whether JSON Objects are represented as vectors or maps
-    class Value_impl
-    {
-    public:
-
-        typedef Config Config_type;
-        typedef typename Config::String_type String_type;
-        typedef typename Config::Object_type Object;
-        typedef typename Config::Array_type Array;
-        typedef typename String_type::const_pointer Const_str_ptr;  // eg const char*
-
-        Value_impl();  // creates null value
-        Value_impl( Const_str_ptr      value ); 
-        Value_impl( const String_type& value );
-        Value_impl( const Object&      value );
-        Value_impl( const Array&       value );
-        Value_impl( bool               value );
-        Value_impl( int                value );
-        Value_impl( boost::int64_t     value );
-        Value_impl( boost::uint64_t    value );
-        Value_impl( double             value );
-
-        Value_impl( const Value_impl& other );
-
-        bool operator==( const Value_impl& lhs ) const;
-
-        Value_impl& operator=( const Value_impl& lhs );
-
-        Value_type type() const;
-
-        bool is_uint64() const;
-        bool is_null() const;
-
-        const String_type& get_str()    const;
-        const Object&      get_obj()    const;
-        const Array&       get_array()  const;
-        bool               get_bool()   const;
-        int                get_int()    const;
-        boost::int64_t     get_int64()  const;
-        boost::uint64_t    get_uint64() const;
-        double             get_real()   const;
-
-        Object& get_obj();
-        Array&  get_array();
-
-        template< typename T > T get_value() const;  // example usage: int    i = value.get_value< int >();
-                                                     // or             double d = value.get_value< double >();
-
-        static const Value_impl null;
-
-    private:
-
-        void check_type( const Value_type vtype ) const;
-
-        typedef boost::variant< String_type, 
-                                boost::recursive_wrapper< Object >, boost::recursive_wrapper< Array >, 
-                                bool, boost::int64_t, double > Variant;
-
-        Value_type type_;
-        Variant v_;
-        bool is_uint64_;
-    };
-
-    // vector objects
-
-    template< class Config >
-    struct Pair_impl
-    {
-        typedef typename Config::String_type String_type;
-        typedef typename Config::Value_type Value_type;
-
-        Pair_impl( const String_type& name, const Value_type& value );
-
-        bool operator==( const Pair_impl& lhs ) const;
-
-        String_type name_;
-        Value_type value_;
-    };
-
-    template< class String >
-    struct Config_vector
-    {
-        typedef String String_type;
-        typedef Value_impl< Config_vector > Value_type;
-        typedef Pair_impl < Config_vector > Pair_type;
-        typedef std::vector< Value_type > Array_type;
-        typedef std::vector< Pair_type > Object_type;
-
-        static Value_type& add( Object_type& obj, const String_type& name, const Value_type& value )
-        {
-            obj.push_back( Pair_type( name , value ) );
-
-            return obj.back().value_;
-        }
-                
-        static String_type get_name( const Pair_type& pair )
-        {
-            return pair.name_;
-        }
-                
-        static Value_type get_value( const Pair_type& pair )
-        {
-            return pair.value_;
-        }
-    };
-
-    // typedefs for ASCII
-
-    typedef Config_vector< std::string > Config;
-
-    typedef Config::Value_type  Value;
-    typedef Config::Pair_type   Pair;
-    typedef Config::Object_type Object;
-    typedef Config::Array_type  Array;
-
-    // typedefs for Unicode
-
-#ifndef BOOST_NO_STD_WSTRING
-
-    typedef Config_vector< std::wstring > wConfig;
-
-    typedef wConfig::Value_type  wValue;
-    typedef wConfig::Pair_type   wPair;
-    typedef wConfig::Object_type wObject;
-    typedef wConfig::Array_type  wArray;
-#endif
-
-    // map objects
-
-    template< class String >
-    struct Config_map
-    {
-        typedef String String_type;
-        typedef Value_impl< Config_map > Value_type;
-        typedef std::vector< Value_type > Array_type;
-        typedef std::map< String_type, Value_type > Object_type;
-        typedef typename Object_type::value_type Pair_type;
-
-        static Value_type& add( Object_type& obj, const String_type& name, const Value_type& value )
-        {
-            return obj[ name ] = value;
-        }
-                
-        static String_type get_name( const Pair_type& pair )
-        {
-            return pair.first;
-        }
-                
-        static Value_type get_value( const Pair_type& pair )
-        {
-            return pair.second;
-        }
-    };
-
-    // typedefs for ASCII
-
-    typedef Config_map< std::string > mConfig;
-
-    typedef mConfig::Value_type  mValue;
-    typedef mConfig::Object_type mObject;
-    typedef mConfig::Array_type  mArray;
-
-    // typedefs for Unicode
-
-#ifndef BOOST_NO_STD_WSTRING
-
-    typedef Config_map< std::wstring > wmConfig;
-
-    typedef wmConfig::Value_type  wmValue;
-    typedef wmConfig::Object_type wmObject;
-    typedef wmConfig::Array_type  wmArray;
-
-#endif
-
-    ///////////////////////////////////////////////////////////////////////////////////////////////
-    //
-    // implementation
-
-    template< class Config >
-    const Value_impl< Config > Value_impl< Config >::null;
-
-    template< class Config >
-    Value_impl< Config >::Value_impl()
-    :   type_( null_type )
-    ,   is_uint64_( false )
-    {
-    }
-
-    template< class Config >
-    Value_impl< Config >::Value_impl( const Const_str_ptr value )
-    :   type_( str_type )
-    ,   v_( String_type( value ) )
-    ,   is_uint64_( false )
-    {
-    }
-
-    template< class Config >
-    Value_impl< Config >::Value_impl( const String_type& value )
-    :   type_( str_type )
-    ,   v_( value )
-    ,   is_uint64_( false )
-    {
-    }
-
-    template< class Config >
-    Value_impl< Config >::Value_impl( const Object& value )
-    :   type_( obj_type )
-    ,   v_( value )
-    ,   is_uint64_( false )
-    {
-    }
-
-    template< class Config >
-    Value_impl< Config >::Value_impl( const Array& value )
-    :   type_( array_type )
-    ,   v_( value )
-    ,   is_uint64_( false )
-    {
-    }
-
-    template< class Config >
-    Value_impl< Config >::Value_impl( bool value )
-    :   type_( bool_type )
-    ,   v_( value )
-    ,   is_uint64_( false )
-    {
-    }
-
-    template< class Config >
-    Value_impl< Config >::Value_impl( int value )
-    :   type_( int_type )
-    ,   v_( static_cast< boost::int64_t >( value ) )
-    ,   is_uint64_( false )
-    {
-    }
-
-    template< class Config >
-    Value_impl< Config >::Value_impl( boost::int64_t value )
-    :   type_( int_type )
-    ,   v_( value )
-    ,   is_uint64_( false )
-    {
-    }
-
-    template< class Config >
-    Value_impl< Config >::Value_impl( boost::uint64_t value )
-    :   type_( int_type )
-    ,   v_( static_cast< boost::int64_t >( value ) )
-    ,   is_uint64_( true )
-    {
-    }
-
-    template< class Config >
-    Value_impl< Config >::Value_impl( double value )
-    :   type_( real_type )
-    ,   v_( value )
-    ,   is_uint64_( false )
-    {
-    }
-
-    template< class Config >
-    Value_impl< Config >::Value_impl( const Value_impl< Config >& other )
-    :   type_( other.type() )
-    ,   v_( other.v_ )
-    ,   is_uint64_( other.is_uint64_ )
-    {
-    }
-
-    template< class Config >
-    Value_impl< Config >& Value_impl< Config >::operator=( const Value_impl& lhs )
-    {
-        Value_impl tmp( lhs );
-
-        std::swap( type_, tmp.type_ );
-        std::swap( v_, tmp.v_ );
-        std::swap( is_uint64_, tmp.is_uint64_ );
-
-        return *this;
-    }
-
-    template< class Config >
-    bool Value_impl< Config >::operator==( const Value_impl& lhs ) const
-    {
-        if( this == &lhs ) return true;
-
-        if( type() != lhs.type() ) return false;
-
-        return v_ == lhs.v_; 
-    }
-
-    template< class Config >
-    Value_type Value_impl< Config >::type() const
-    {
-        return type_;
-    }
-
-    template< class Config >
-    bool Value_impl< Config >::is_uint64() const
-    {
-        return is_uint64_;
-    }
-
-    template< class Config >
-    bool Value_impl< Config >::is_null() const
-    {
-        return type() == null_type;
-    }
-
-    template< class Config >
-    void Value_impl< Config >::check_type( const Value_type vtype ) const
-    {
-        if( type() != vtype ) 
-        {
-            std::ostringstream os;
-
-            ///// triangles: Tell the types by name instead of by number
-            os << "value is type " << Value_type_name[type()] << ", expected " << Value_type_name[vtype];
-
-            throw std::runtime_error( os.str() );
-        }
-    }
-
-    template< class Config >
-    const typename Config::String_type& Value_impl< Config >::get_str() const
-    {
-        check_type(  str_type );
-
-        return *boost::get< String_type >( &v_ );
-    }
-
-    template< class Config >
-    const typename Value_impl< Config >::Object& Value_impl< Config >::get_obj() const
-    {
-        check_type( obj_type );
-
-        return *boost::get< Object >( &v_ );
-    }
-     
-    template< class Config >
-    const typename Value_impl< Config >::Array& Value_impl< Config >::get_array() const
-    {
-        check_type(  array_type );
-
-        return *boost::get< Array >( &v_ );
-    }
-     
-    template< class Config >
-    bool Value_impl< Config >::get_bool() const
-    {
-        check_type(  bool_type );
-
-        return boost::get< bool >( v_ );
-    }
-     
-    template< class Config >
-    int Value_impl< Config >::get_int() const
-    {
-        check_type(  int_type );
-
-        return static_cast< int >( get_int64() );
-    }
-    
-    template< class Config >
-    boost::int64_t Value_impl< Config >::get_int64() const
-    {
-        check_type(  int_type );
-
-        return boost::get< boost::int64_t >( v_ );
-    }
-    
-    template< class Config >
-    boost::uint64_t Value_impl< Config >::get_uint64() const
-    {
-        check_type(  int_type );
-
-        return static_cast< boost::uint64_t >( get_int64() );
-    }
-
-    template< class Config >
-    double Value_impl< Config >::get_real() const
-    {
-        if( type() == int_type )
-        {
-            return is_uint64() ? static_cast< double >( get_uint64() )
-                               : static_cast< double >( get_int64() );
-        }
-
-        check_type(  real_type );
-
-        return boost::get< double >( v_ );
-    }
-
-    template< class Config >
-    typename Value_impl< Config >::Object& Value_impl< Config >::get_obj()
-    {
-        check_type(  obj_type );
-
-        return *boost::get< Object >( &v_ );
-    }
-
-    template< class Config >
-    typename Value_impl< Config >::Array& Value_impl< Config >::get_array()
-    {
-        check_type(  array_type );
-
-        return *boost::get< Array >( &v_ );
-    }
-
-    template< class Config >
-    Pair_impl< Config >::Pair_impl( const String_type& name, const Value_type& value )
-    :   name_( name )
-    ,   value_( value )
-    {
-    }
-
-    template< class Config >
-    bool Pair_impl< Config >::operator==( const Pair_impl< Config >& lhs ) const
-    {
-        if( this == &lhs ) return true;
-
-        return ( name_ == lhs.name_ ) && ( value_ == lhs.value_ );
-    }
-
-    // converts a C string, ie. 8 bit char array, to a string object
-    //
-    template < class String_type >
-    String_type to_str( const char* c_str )
-    {
-        String_type result;
-
-        for( const char* p = c_str; *p != 0; ++p )
-        {
-            result += *p;
-        }
-
-        return result;
-    }
-
-    //
-
-    namespace internal_
-    {
-        template< typename T >
-        struct Type_to_type
-        {
-        };
-
-        template< class Value > 
-        int get_value( const Value& value, Type_to_type< int > )
-        {
-            return value.get_int();
-        }
-       
-        template< class Value > 
-        boost::int64_t get_value( const Value& value, Type_to_type< boost::int64_t > )
-        {
-            return value.get_int64();
-        }
-       
-        template< class Value > 
-        boost::uint64_t get_value( const Value& value, Type_to_type< boost::uint64_t > )
-        {
-            return value.get_uint64();
-        }
-       
-        template< class Value > 
-        double get_value( const Value& value, Type_to_type< double > )
-        {
-            return value.get_real();
-        }
-       
-        template< class Value > 
-        typename Value::String_type get_value( const Value& value, Type_to_type< typename Value::String_type > )
-        {
-            return value.get_str();
-        }
-       
-        template< class Value > 
-        typename Value::Array get_value( const Value& value, Type_to_type< typename Value::Array > )
-        {
-            return value.get_array();
-        }
-       
-        template< class Value > 
-        typename Value::Object get_value( const Value& value, Type_to_type< typename Value::Object > )
-        {
-            return value.get_obj();
-        }
-       
-        template< class Value > 
-        bool get_value( const Value& value, Type_to_type< bool > )
-        {
-            return value.get_bool();
-        }
-    }
-
-    template< class Config >
-    template< typename T > 
-    T Value_impl< Config >::get_value() const
-    {
-        return internal_::get_value( *this, internal_::Type_to_type< T >() );
-    }
-}
-
-#endif

src/json/json_spirit_writer.cpp

@@ -1,95 +0,0 @@
-//          Copyright John W. Wilkinson 2007 - 2009.
-// Distributed under the MIT License, see accompanying file LICENSE.txt
-
-// json spirit version 4.03
-
-#include "json_spirit_writer.h"
-#include "json_spirit_writer_template.h"
-
-void json_spirit::write( const Value& value, std::ostream& os )
-{
-    write_stream( value, os, false );
-}
-
-void json_spirit::write_formatted( const Value& value, std::ostream& os )
-{
-    write_stream( value, os, true );
-}
-
-std::string json_spirit::write( const Value& value )
-{
-    return write_string( value, false );
-}
-
-std::string json_spirit::write_formatted( const Value& value )
-{
-    return write_string( value, true );
-}
-
-#ifndef BOOST_NO_STD_WSTRING
-
-void json_spirit::write( const wValue& value, std::wostream& os )
-{
-    write_stream( value, os, false );
-}
-
-void json_spirit::write_formatted( const wValue& value, std::wostream& os )
-{
-    write_stream( value, os, true );
-}
-
-std::wstring json_spirit::write( const wValue&  value )
-{
-    return write_string( value, false );
-}
-
-std::wstring json_spirit::write_formatted( const wValue&  value )
-{
-    return write_string( value, true );
-}
-
-#endif
-
-void json_spirit::write( const mValue& value, std::ostream& os )
-{
-    write_stream( value, os, false );
-}
-
-void json_spirit::write_formatted( const mValue& value, std::ostream& os )
-{
-    write_stream( value, os, true );
-}
-
-std::string json_spirit::write( const mValue& value )
-{
-    return write_string( value, false );
-}
-
-std::string json_spirit::write_formatted( const mValue& value )
-{
-    return write_string( value, true );
-}
-
-#ifndef BOOST_NO_STD_WSTRING
-
-void json_spirit::write( const wmValue& value, std::wostream& os )
-{
-    write_stream( value, os, false );
-}
-
-void json_spirit::write_formatted( const wmValue& value, std::wostream& os )
-{
-    write_stream( value, os, true );
-}
-
-std::wstring json_spirit::write( const wmValue&  value )
-{
-    return write_string( value, false );
-}
-
-std::wstring json_spirit::write_formatted( const wmValue&  value )
-{
-    return write_string( value, true );
-}
-
-#endif

src/json/json_spirit_writer.h

@@ -1,50 +0,0 @@
-#ifndef JSON_SPIRIT_WRITER
-#define JSON_SPIRIT_WRITER
-
-//          Copyright John W. Wilkinson 2007 - 2009.
-// Distributed under the MIT License, see accompanying file LICENSE.txt
-
-// json spirit version 4.03
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
-#include "json_spirit_value.h"
-#include <iostream>
-
-namespace json_spirit
-{
-    // functions to convert JSON Values to text, 
-    // the "formatted" versions add whitespace to format the output nicely
-
-    void         write          ( const Value& value, std::ostream&  os );
-    void         write_formatted( const Value& value, std::ostream&  os );
-    std::string  write          ( const Value& value );
-    std::string  write_formatted( const Value& value );
-
-#ifndef BOOST_NO_STD_WSTRING
-
-    void         write          ( const wValue& value, std::wostream& os );
-    void         write_formatted( const wValue& value, std::wostream& os );
-    std::wstring write          ( const wValue& value );
-    std::wstring write_formatted( const wValue& value );
-
-#endif
-
-    void         write          ( const mValue& value, std::ostream&  os );
-    void         write_formatted( const mValue& value, std::ostream&  os );
-    std::string  write          ( const mValue& value );
-    std::string  write_formatted( const mValue& value );
-
-#ifndef BOOST_NO_STD_WSTRING
-
-    void         write          ( const wmValue& value, std::wostream& os );
-    void         write_formatted( const wmValue& value, std::wostream& os );
-    std::wstring write          ( const wmValue& value );
-    std::wstring write_formatted( const wmValue& value );
-
-#endif
-}
-
-#endif

src/json/json_spirit_writer_template.h

@@ -1,248 +0,0 @@
-#ifndef JSON_SPIRIT_WRITER_TEMPLATE
-#define JSON_SPIRIT_WRITER_TEMPLATE
-
-//          Copyright John W. Wilkinson 2007 - 2009.
-// Distributed under the MIT License, see accompanying file LICENSE.txt
-
-// json spirit version 4.03
-
-#include "json_spirit_value.h"
-
-#include <cassert>
-#include <sstream>
-#include <iomanip>
-
-namespace json_spirit
-{
-    inline char to_hex_char( unsigned int c )
-    {
-        assert( c <= 0xF );
-
-        const char ch = static_cast< char >( c );
-
-        if( ch < 10 ) return '0' + ch;
-
-        return 'A' - 10 + ch;
-    }
-
-    template< class String_type >
-    String_type non_printable_to_string( unsigned int c )
-    {
-        typedef typename String_type::value_type Char_type;
-
-        String_type result( 6, '\\' );
-
-        result[1] = 'u';
-
-        result[ 5 ] = to_hex_char( c & 0x000F ); c >>= 4;
-        result[ 4 ] = to_hex_char( c & 0x000F ); c >>= 4;
-        result[ 3 ] = to_hex_char( c & 0x000F ); c >>= 4;
-        result[ 2 ] = to_hex_char( c & 0x000F );
-
-        return result;
-    }
-
-    template< typename Char_type, class String_type >
-    bool add_esc_char( Char_type c, String_type& s )
-    {
-        switch( c )
-        {
-            case '"':  s += to_str< String_type >( "\\\"" ); return true;
-            case '\\': s += to_str< String_type >( "\\\\" ); return true;
-            case '\b': s += to_str< String_type >( "\\b"  ); return true;
-            case '\f': s += to_str< String_type >( "\\f"  ); return true;
-            case '\n': s += to_str< String_type >( "\\n"  ); return true;
-            case '\r': s += to_str< String_type >( "\\r"  ); return true;
-            case '\t': s += to_str< String_type >( "\\t"  ); return true;
-        }
-
-        return false;
-    }
-
-    template< class String_type >
-    String_type add_esc_chars( const String_type& s )
-    {
-        typedef typename String_type::const_iterator Iter_type;
-        typedef typename String_type::value_type     Char_type;
-
-        String_type result;
-
-        const Iter_type end( s.end() );
-
-        for( Iter_type i = s.begin(); i != end; ++i )
-        {
-            const Char_type c( *i );
-
-            if( add_esc_char( c, result ) ) continue;
-
-            const wint_t unsigned_c( ( c >= 0 ) ? c : 256 + c );
-
-            if( iswprint( unsigned_c ) )
-            {
-                result += c;
-            }
-            else
-            {
-                result += non_printable_to_string< String_type >( unsigned_c );
-            }
-        }
-
-        return result;
-    }
-
-    // this class generates the JSON text,
-    // it keeps track of the indentation level etc.
-    //
-    template< class Value_type, class Ostream_type >
-    class Generator
-    {
-        typedef typename Value_type::Config_type Config_type;
-        typedef typename Config_type::String_type String_type;
-        typedef typename Config_type::Object_type Object_type;
-        typedef typename Config_type::Array_type Array_type;
-        typedef typename String_type::value_type Char_type;
-        typedef typename Object_type::value_type Obj_member_type;
-
-    public:
-
-        Generator( const Value_type& value, Ostream_type& os, bool pretty )
-        :   os_( os )
-        ,   indentation_level_( 0 )
-        ,   pretty_( pretty )
-        {
-            output( value );
-        }
-
-    private:
-
-        void output( const Value_type& value )
-        {
-            switch( value.type() )
-            {
-                case obj_type:   output( value.get_obj() );   break;
-                case array_type: output( value.get_array() ); break;
-                case str_type:   output( value.get_str() );   break;
-                case bool_type:  output( value.get_bool() );  break;
-                case int_type:   output_int( value );         break;
-
-                /// triangles: Added std::fixed and changed precision from 16 to 8
-                case real_type:  os_ << std::showpoint << std::fixed << std::setprecision(8)
-                                     << value.get_real();     break;
-
-                case null_type:  os_ << "null";               break;
-                default: assert( false );
-            }
-        }
-
-        void output( const Object_type& obj )
-        {
-            output_array_or_obj( obj, '{', '}' );
-        }
-
-        void output( const Array_type& arr )
-        {
-            output_array_or_obj( arr, '[', ']' );
-        }
-
-        void output( const Obj_member_type& member )
-        {
-            output( Config_type::get_name( member ) ); space(); 
-            os_ << ':'; space(); 
-            output( Config_type::get_value( member ) );
-        }
-
-        void output_int( const Value_type& value )
-        {
-            if( value.is_uint64() )
-            {
-                os_ << value.get_uint64();
-            }
-            else
-            {
-               os_ << value.get_int64();
-            }
-        }
-
-        void output( const String_type& s )
-        {
-            os_ << '"' << add_esc_chars( s ) << '"';
-        }
-
-        void output( bool b )
-        {
-            os_ << to_str< String_type >( b ? "true" : "false" );
-        }
-
-        template< class T >
-        void output_array_or_obj( const T& t, Char_type start_char, Char_type end_char )
-        {
-            os_ << start_char; new_line();
-
-            ++indentation_level_;
-            
-            for( typename T::const_iterator i = t.begin(); i != t.end(); ++i )
-            {
-                indent(); output( *i );
-
-                typename T::const_iterator next = i;
-
-                if( ++next != t.end())
-                {
-                    os_ << ',';
-                }
-
-                new_line();
-            }
-
-            --indentation_level_;
-
-            indent(); os_ << end_char;
-        }
-        
-        void indent()
-        {
-            if( !pretty_ ) return;
-
-            for( int i = 0; i < indentation_level_; ++i )
-            { 
-                os_ << "    ";
-            }
-        }
-
-        void space()
-        {
-            if( pretty_ ) os_ << ' ';
-        }
-
-        void new_line()
-        {
-            if( pretty_ ) os_ << '\n';
-        }
-
-        Generator& operator=( const Generator& ); // to prevent "assignment operator could not be generated" warning
-
-        Ostream_type& os_;
-        int indentation_level_;
-        bool pretty_;
-    };
-
-    template< class Value_type, class Ostream_type >
-    void write_stream( const Value_type& value, Ostream_type& os, bool pretty )
-    {
-        Generator< Value_type, Ostream_type >( value, os, pretty );
-    }
-
-    template< class Value_type >
-    typename Value_type::String_type write_string( const Value_type& value, bool pretty )
-    {
-        typedef typename Value_type::String_type::value_type Char_type;
-
-        std::basic_ostringstream< Char_type > os;
-
-        write_stream( value, os, pretty );
-
-        return os.str();
-    }
-}
-
-#endif

src/leveldb/CMakeLists.txt

@@ -0,0 +1,148 @@
+set(LEVELDB_CORE_SOURCES
+    db/builder.cc
+    db/c.cc
+    db/db_impl.cc
+    db/db_iter.cc
+    db/dbformat.cc
+    db/dumpfile.cc
+    db/filename.cc
+    db/log_reader.cc
+    db/log_writer.cc
+    db/memtable.cc
+    db/repair.cc
+    db/table_cache.cc
+    db/version_edit.cc
+    db/version_set.cc
+    db/write_batch.cc
+    table/block.cc
+    table/block_builder.cc
+    table/filter_block.cc
+    table/format.cc
+    table/iterator.cc
+    table/merger.cc
+    table/table.cc
+    table/table_builder.cc
+    table/two_level_iterator.cc
+    util/arena.cc
+    util/bloom.cc
+    util/cache.cc
+    util/coding.cc
+    util/comparator.cc
+    util/crc32c.cc
+    util/env.cc
+    util/filter_policy.cc
+    util/hash.cc
+    util/histogram.cc
+    util/logging.cc
+    util/options.cc
+    util/status.cc
+)
+
+if(WIN32)
+    list(APPEND LEVELDB_CORE_SOURCES util/env_windows.cc)
+else()
+    list(APPEND LEVELDB_CORE_SOURCES util/env_posix.cc)
+endif()
+
+add_library(leveldb_lib STATIC ${LEVELDB_CORE_SOURCES})
+
+target_compile_features(leveldb_lib PUBLIC cxx_std_11)
+
+target_include_directories(leveldb_lib
+    PUBLIC
+        "${CMAKE_CURRENT_SOURCE_DIR}/include"
+    PRIVATE
+        "${CMAKE_CURRENT_SOURCE_DIR}"
+)
+
+target_compile_definitions(leveldb_lib
+    PRIVATE
+        HAVE_CRC32C=0
+        HAVE_SNAPPY=0
+)
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+    target_compile_options(leveldb_lib PRIVATE -fno-builtin-memcmp)
+endif()
+
+if(WIN32)
+    target_compile_definitions(leveldb_lib PRIVATE
+        _REENTRANT
+        OS_WINDOWS
+        LEVELDB_PLATFORM_WINDOWS
+        WINVER=0x0500
+        __USE_MINGW_ANSI_STDIO=1
+    )
+    target_link_libraries(leveldb_lib PUBLIC shlwapi)
+elseif(APPLE)
+    target_compile_definitions(leveldb_lib PRIVATE
+        OS_MACOSX
+        LEVELDB_PLATFORM_POSIX
+    )
+    target_link_libraries(leveldb_lib PUBLIC Threads::Threads)
+else()
+    target_compile_definitions(leveldb_lib PRIVATE
+        _REENTRANT
+        OS_LINUX
+        LEVELDB_PLATFORM_POSIX
+    )
+    target_link_libraries(leveldb_lib PUBLIC Threads::Threads)
+endif()
+
+add_library(leveldb_memenv STATIC helpers/memenv/memenv.cc)
+
+target_compile_features(leveldb_memenv PUBLIC cxx_std_11)
+
+target_include_directories(leveldb_memenv
+    PUBLIC
+        "${CMAKE_CURRENT_SOURCE_DIR}/include"
+        "${CMAKE_CURRENT_SOURCE_DIR}/helpers"
+    PRIVATE
+        "${CMAKE_CURRENT_SOURCE_DIR}"
+)
+
+target_compile_definitions(leveldb_memenv
+    PRIVATE
+        HAVE_CRC32C=0
+        HAVE_SNAPPY=0
+)
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+    target_compile_options(leveldb_memenv PRIVATE -fno-builtin-memcmp)
+endif()
+
+if(WIN32)
+    target_compile_definitions(leveldb_memenv PRIVATE
+        _REENTRANT
+        OS_WINDOWS
+        LEVELDB_PLATFORM_WINDOWS
+        WINVER=0x0500
+        __USE_MINGW_ANSI_STDIO=1
+    )
+elseif(APPLE)
+    target_compile_definitions(leveldb_memenv PRIVATE
+        OS_MACOSX
+        LEVELDB_PLATFORM_POSIX
+    )
+else()
+    target_compile_definitions(leveldb_memenv PRIVATE
+        _REENTRANT
+        OS_LINUX
+        LEVELDB_PLATFORM_POSIX
+    )
+endif()
+
+target_link_libraries(leveldb_memenv PUBLIC leveldb_lib)
+
+add_library(leveldb_bundled INTERFACE)
+
+target_link_libraries(leveldb_bundled INTERFACE
+    leveldb_lib
+    leveldb_memenv
+)
+
+target_include_directories(leveldb_bundled INTERFACE
+    "${CMAKE_CURRENT_SOURCE_DIR}"
+    "${CMAKE_CURRENT_SOURCE_DIR}/include"
+    "${CMAKE_CURRENT_SOURCE_DIR}/helpers"
+)

src/main.h

@@ -11,6 +11,7 @@
 #include "script.h"
 #include "scrypt.h"
 #include "hashblock.h"
+#include "checkqueue.h"
 
 #include <list>
 
@@ -25,20 +26,23 @@ class CAddress;
 class CInv;
 class CRequestTracker;
 class CNode;
+class CScriptCheck;
 
 static const int CUTOFF_POW_BLOCK = 9000;
 static const int CRAPCHAIN_CUTOFF_BLOCK = 17691; // pre-Pharao (version 4) blockchain until block 17691
 static const int FORK_HEIGHT_V5 = 17651; // v5 hard fork: decentralization + Tor v3 (next block after last checkpoint)
+static const int FORK_HEIGHT_V5_4 = 2186941; // v5.4: tighter timestamps, deterministic fork resolution
 
 static const unsigned int MAX_BLOCK_SIZE = 1000000;
 static const unsigned int MAX_BLOCK_SIZE_GEN = MAX_BLOCK_SIZE/2;
 static const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50;
 static const unsigned int MAX_ORPHAN_TRANSACTIONS = MAX_BLOCK_SIZE/100;
 static const unsigned int MAX_ORPHAN_BLOCKS = 750;
+static const unsigned int MAX_ORPHAN_BLOCKS_IBD = 4000;
 static const unsigned int MAX_INV_SZ = 50000;
 static const int64_t MIN_TX_FEE = (1 * CENT) / 100;
 static const int64_t MIN_RELAY_TX_FEE = (1 * CENT) / 100;
-static const int64_t MAX_MONEY = 222222 * COIN;
+static const int64_t MAX_MONEY = 2222222 * COIN;
 static const int64_t  COIN_YEAR_REWARD =  33 * CENT; // 33% per year
 static const int64_t MAX_TRI_PROOF_OF_STAKE = 0.33 * COIN;
 static const int MODIFIER_INTERVAL_SWITCH = 1;
@@ -55,8 +59,11 @@ static const int fHaveUPnP = false;
 
 static const uint256 hashGenesisBlockOfficial("0x7e7a6e4dd5fe895106fca912dfbacaeaf2a89e76c6a588df8ff96e0e18b96021");
 static const uint256 hashGenesisBlockTestNet ("0x7e7a6e4dd5fe895106fca912dfbacaeaf2a89e76c6a588df8ff96e0e18b96021");
-inline int64_t PastDrift(int64_t nTime)   { return nTime - 10 * 60; } // up to 10 minutes from the past
-inline int64_t FutureDrift(int64_t nTime) { return nTime + 10 * 60; } // up to 10 minutes from the future
+inline int64_t GetMaxTimeDrift(int nHeight) { return (nHeight >= FORK_HEIGHT_V5_4) ? 3 * 60 : 10 * 60; }
+inline int64_t PastDrift(int64_t nTime, int nHeight)   { return nTime - GetMaxTimeDrift(nHeight); }
+inline int64_t FutureDrift(int64_t nTime, int nHeight)  { return nTime + GetMaxTimeDrift(nHeight); }
+inline int64_t PastDrift(int64_t nTime)   { return PastDrift(nTime, nBestHeight); }
+inline int64_t FutureDrift(int64_t nTime) { return FutureDrift(nTime, nBestHeight); }
 
 
 extern CScript COINBASE_FLAGS;
@@ -426,7 +433,51 @@ enum GetMinFee_mode
     GMF_SEND,
 };
 
-typedef std::map<uint256, std::pair<CTxIndex, CTransaction> > MapPrevTx;
+/** A single unspent transaction output entry in the UTXO database.
+ *  Keyed by (txhash, output_index). Erased when spent.
+ */
+class CUtxoEntry
+{
+public:
+    int64_t nValue;         // output value in satoshis
+    int nHeight;            // block height where output was created
+    CScript scriptPubKey;   // output script (needed for sig verification)
+    bool fCoinBase;         // from a coinbase transaction
+    bool fCoinStake;        // from a coinstake transaction
+    unsigned int nTxTime;   // transaction timestamp (needed for PoS coin age)
+
+    CUtxoEntry()
+    {
+        SetNull();
+    }
+
+    IMPLEMENT_SERIALIZE
+    (
+        READWRITE(nValue);
+        READWRITE(nHeight);
+        READWRITE(scriptPubKey);
+        READWRITE(fCoinBase);
+        READWRITE(fCoinStake);
+        READWRITE(nTxTime);
+    )
+
+    void SetNull()
+    {
+        nValue = -1;
+        nHeight = 0;
+        scriptPubKey.clear();
+        fCoinBase = false;
+        fCoinStake = false;
+        nTxTime = 0;
+    }
+
+    bool IsNull() const
+    {
+        return (nValue == -1);
+    }
+};
+
+typedef std::map<COutPoint, CUtxoEntry> MapPrevTx;
 
 /** The basic transaction that is broadcasted on the network and contained in
  * blocks.  A transaction can contain multiple inputs and outputs.
@@ -642,7 +693,7 @@ public:
     {
         std::string str;
         str += IsCoinBase()? "Coinbase" : (IsCoinStake()? "Coinstake" : "CTransaction");
-        str += strprintf("(hash=%s, nTime=%d, ver=%d, vin.size=%"PRIszu", vout.size=%"PRIszu", nLockTime=%d)\n",
+        str += strprintf("(hash=%s, nTime=%d, ver=%d, vin.size=%" PRIszu ", vout.size=%" PRIszu ", nLockTime=%d)\n",
             GetHash().ToString().substr(0,10).c_str(),
             nTime,
             nVersion,
@@ -667,33 +718,30 @@ public:
     bool ReadFromDisk(COutPoint prevout);
     bool DisconnectInputs(CTxDB& txdb);
 
-    /** Fetch from memory and/or disk. inputsRet keys are transaction hashes.
+    /** Fetch UTXO entries for all inputs from the UTXO database or mempool.
 
-     @param[in] txdb	Transaction database
-     @param[in] mapTestPool	List of pending changes to the transaction index database
-     @param[in] fBlock	True if being called to add a new best-block to the chain
-     @param[in] fMiner	True if being called by CreateNewBlock
-     @param[out] inputsRet	Pointers to this transaction's inputs
-     @param[out] fInvalid	returns true if transaction is invalid
-     @return	Returns true if all inputs are in txdb or mapTestPool
+     @param[in] txdb            Transaction database
+     @param[in] mapPendingUtxos UTXOs created by earlier transactions in the same block
+     @param[in] fBlock          True if being called to add a new best-block to the chain
+     @param[in] fMiner          True if being called by CreateNewBlock
+     @param[out] inputsRet      UTXO entries for this transaction's inputs (keyed by COutPoint)
+     @param[out] fInvalid       returns true if transaction is invalid
+     @return Returns true if all inputs are found
      */
-    bool FetchInputs(CTxDB& txdb, const std::map<uint256, CTxIndex>& mapTestPool,
+    bool FetchInputs(CTxDB& txdb, const MapPrevTx& mapPendingUtxos,
                      bool fBlock, bool fMiner, MapPrevTx& inputsRet, bool& fInvalid);
 
-    /** Sanity check previous transactions, then, if all checks succeed,
-        mark them as spent by this transaction.
+    /** Validate inputs against UTXO entries and verify signatures.
 
-        @param[in] inputs	Previous transactions (from FetchInputs)
-        @param[out] mapTestPool	Keeps track of inputs that need to be updated on disk
-        @param[in] posThisTx	Position of this transaction on disk
-        @param[in] pindexBlock
-        @param[in] fBlock	true if called from ConnectBlock
-        @param[in] fMiner	true if called from CreateNewBlock
+        @param[in] inputs       UTXO entries for inputs (from FetchInputs)
+        @param[in] pindexBlock  Block being connected
+        @param[in] fBlock       true if called from ConnectBlock
+        @param[in] fMiner       true if called from CreateNewBlock
         @return Returns true if all checks succeed
      */
-    bool ConnectInputs(CTxDB& txdb, MapPrevTx inputs,
-                       std::map<uint256, CTxIndex>& mapTestPool, const CDiskTxPos& posThisTx,
-                       const CBlockIndex* pindexBlock, bool fBlock, bool fMiner);
+    bool ConnectInputs(CTxDB& txdb, const MapPrevTx& inputs,
+                       const CBlockIndex* pindexBlock, bool fBlock, bool fMiner,
+                       std::vector<CScriptCheck>* pvChecks = NULL);
     bool ClientConnectInputs();
     bool CheckTransaction() const;
     bool AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs=true, bool* pfMissingInputs=NULL);
@@ -766,9 +814,10 @@ public:
 
 
 
-/**  A txdb record that contains the disk location of a transaction and the
- * locations of transactions that spend its outputs.  vSpent is really only
- * used as a flag, but having the location is very helpful for debugging.
+/**  A txdb record that contains the disk location of a transaction.
+ *  Used for getrawtransaction and wallet position lookups.
+ *  vSpent is legacy (kept for serialization compat) — spent state is
+ *  tracked by the UTXO set (CUtxoEntry) since dbformat=3.
  */
 class CTxIndex
 {
@@ -1069,7 +1118,7 @@ public:
 
     void print() const
     {
-        printf("CBlock(hash=%s, ver=%d, hashPrevBlock=%s, hashMerkleRoot=%s, nTime=%u, nBits=%08x, nNonce=%u, vtx=%"PRIszu", vchBlockSig=%s)\n",
+        printf("CBlock(hash=%s, ver=%d, hashPrevBlock=%s, hashMerkleRoot=%s, nTime=%u, nBits=%08x, nNonce=%u, vtx=%" PRIszu ", vchBlockSig=%s)\n",
             GetHash().ToString().c_str(),
             nVersion,
             hashPrevBlock.ToString().c_str(),
@@ -1330,7 +1379,7 @@ public:
 
     std::string ToString() const
     {
-        return strprintf("CBlockIndex(nprev=%p, pnext=%p, nFile=%u, nBlockPos=%-6d nHeight=%d, nMint=%s, nMoneySupply=%s, nFlags=(%s)(%d)(%s), nStakeModifier=%016"PRIx64", nStakeModifierChecksum=%08x, hashProofOfStake=%s, prevoutStake=(%s), nStakeTime=%d merkle=%s, hashBlock=%s)",
+        return strprintf("CBlockIndex(nprev=%p, pnext=%p, nFile=%u, nBlockPos=%-6d nHeight=%d, nMint=%s, nMoneySupply=%s, nFlags=(%s)(%d)(%s), nStakeModifier=%016" PRIx64 ", nStakeModifierChecksum=%08x, hashProofOfStake=%s, prevoutStake=(%s), nStakeTime=%d merkle=%s, hashBlock=%s)",
             pprev, pnext, nFile, nBlockPos, nHeight,
             FormatMoney(nMint).c_str(), FormatMoney(nMoneySupply).c_str(),
             GeneratedStakeModifier() ? "MOD" : "-", GetStakeEntropyBit(), IsProofOfStake()? "PoS" : "PoW",
@@ -1359,6 +1408,10 @@ public:
     uint256 hashPrev;
     uint256 hashNext;
 
+    // When true, nChainTrust is included in the on-disk serialization.
+    // Set by LoadBlockIndex based on the DB format version before deserializing.
+    static bool fSerializeChainTrust;
+
     CDiskBlockIndex()
     {
         hashPrev = 0;
@@ -1406,6 +1459,10 @@ public:
         READWRITE(nBits);
         READWRITE(nNonce);
         READWRITE(blockHash);
+
+        // DB format v2+: persist chain trust to skip expensive recalculation on startup
+        if (fSerializeChainTrust)
+            READWRITE(nChainTrust);
     )
 
     uint256 GetBlockHash() const
@@ -1618,4 +1675,42 @@ public:
 
 extern CTxMemPool mempool;
 
-#endif
+/**
+ * Closure representing one script check for parallel verification.
+ * Captures everything needed to call VerifyScript independently.
+ */
+class CScriptCheck
+{
+private:
+    CScript scriptPubKey;
+    CScript scriptSig;
+    const CTransaction* ptxTo;
+    unsigned int nIn;
+    int nHashType;
+
+public:
+    CScriptCheck() : ptxTo(NULL), nIn(0), nHashType(0) {}
+
+    CScriptCheck(const CScript& scriptPubKeyIn, const CScript& scriptSigIn,
+                 const CTransaction& txToIn, unsigned int nInIn, int nHashTypeIn)
+        : scriptPubKey(scriptPubKeyIn), scriptSig(scriptSigIn),
+          ptxTo(&txToIn), nIn(nInIn), nHashType(nHashTypeIn) {}
+
+    bool operator()()
+    {
+        return ptxTo && VerifyScript(scriptSig, scriptPubKey, *ptxTo, nIn, nHashType);
+    }
+
+    void swap(CScriptCheck& other)
+    {
+        std::swap(scriptPubKey, other.scriptPubKey);
+        std::swap(scriptSig, other.scriptSig);
+        std::swap(ptxTo, other.ptxTo);
+        std::swap(nIn, other.nIn);
+        std::swap(nHashType, other.nHashType);
+    }
+};
+
+extern CCheckQueue<CScriptCheck>* pScriptCheckQueue;
+
+#endif

src/makefile.mingw

@@ -1,261 +0,0 @@
-# Copyright (c) 2009-2010 Satoshi Nakamoto
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
-# Windows (MSYS2 MinGW64) makefile for trianglesd headless daemon
-
-USE_UPNP:=1
-USE_IPV6:=1
-
-CXX=g++
-CC=gcc
-LINK=$(CXX)
-
-DEPSDIR=C:/msys64/mingw64
-
-DEFS=-DBOOST_SPIRIT_THREADSAFE -DBOOST_THREAD_USE_LIB -DBOOST_BIND_GLOBAL_PLACEHOLDERS -DWIN32 -D__NO_SYSTEM_INCLUDES
-
-DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/tor $(CURDIR)/obj \
-    $(DEPSDIR)/include)
-
-LIBS = $(addprefix -L,$(DEPSDIR)/lib)
-
-# libevent
-LIBS += -levent
-
-LMODE = dynamic
-LMODE2 = dynamic
-ifdef STATIC
-	LMODE = static
-	ifeq (${STATIC}, all)
-		LMODE2 = static
-	endif
-endif
-
-LIBS += \
- -lboost_filesystem-mt \
- -lboost_program_options-mt \
- -lboost_thread-mt \
- -lboost_chrono-mt \
- -ldb_cxx \
- -lssl \
- -lcrypto \
- -levent
-
-ifndef USE_UPNP
-	override USE_UPNP = -
-endif
-ifneq (${USE_UPNP}, -)
-	LIBS += -lminiupnpc -liphlpapi
-	DEFS += -DUSE_UPNP=$(USE_UPNP) -DSTATICLIB -DMINIUPNP_STATICLIB
-endif
-
-ifneq (${USE_IPV6}, -)
-	DEFS += -DUSE_IPV6=$(USE_IPV6)
-endif
-
-# Windows-specific libraries
-LIBS += \
- -lws2_32 \
- -lshlwapi \
- -lmswsock \
- -lole32 \
- -loleaut32 \
- -luuid \
- -lgdi32 \
- -lcrypt32 \
- -lz \
- -lpthread
-
-# Hardening
-HARDENING=-fno-stack-protector
-HARDENING+=-fstack-protector-all -Wstack-protector
-HARDENING+=-D_FORTIFY_SOURCE=2
-
-DEBUGFLAGS=-g
-
-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)
-
-xLDFLAGS=-static -static-libgcc -static-libstdc++ $(LDFLAGS)
-
-OBJS= \
-    obj/fugue.o \
-    obj/hamsi.o \
-    obj/hamsi_helper.o \
-    obj/groestl.o \
-    obj/blake.o \
-    obj/bmw.o \
-    obj/skein.o \
-    obj/keccak.o \
-    obj/shavite.o \
-    obj/jh.o \
-    obj/luffa.o \
-    obj/cubehash.o \
-    obj/echo.o \
-    obj/simd.o \
-    obj/aes_helper.o \
-    obj/alert.o \
-    obj/version.o \
-    obj/checkpoints.o \
-    obj/netbase.o \
-    obj/addrman.o \
-    obj/crypter.o \
-    obj/key.o \
-    obj/db.o \
-    obj/init.o \
-    obj/irc.o \
-    obj/keystore.o \
-    obj/miner.o \
-    obj/main.o \
-    obj/net.o \
-    obj/bootstrap.o \
-    obj/net_bootstrap.o \
-    obj/protocol.o \
-    obj/trianglesrpc.o \
-    obj/rest.o \
-    obj/rpcdump.o \
-    obj/rpcnet.o \
-    obj/rpcmining.o \
-    obj/rpcwallet.o \
-    obj/rpcblockchain.o \
-    obj/rpcrawtransaction.o \
-    obj/rpcsmessage.o \
-    obj/script.o \
-    obj/sync.o \
-    obj/util.o \
-    obj/wallet.o \
-    obj/walletdb.o \
-    obj/noui.o \
-    obj/kernel.o \
-    obj/pbkdf2.o \
-    obj/scrypt.o \
-    obj/scrypt-arm.o \
-    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_embed_hooks.o \
-    obj/tor_embedded.o
-
-all: trianglesd.exe
-
-LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
-DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
-DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
-OBJS += obj/txdb-leveldb.o
-
-leveldb/libleveldb.a:
-	@echo "Building LevelDB ..."; cd leveldb; CC=gcc CXX=g++ TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT="-fno-keep-inline-dllexport -march=nocona -msahf -mtune=generic -Wa,-mbig-obj -O2" libleveldb.a libmemenv.a; cd ..;
-obj/txdb-leveldb.o: leveldb/libleveldb.a
-
-# auto-generated dependencies:
--include obj/*.P
-
-obj/build.h: FORCE
-	/bin/sh ../share/genbuild.sh obj/build.h
-version.cpp: obj/build.h
-DEFS += -DHAVE_BUILD_INFO
-
-obj/scrypt-x86.o: scrypt-x86.S
-	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
-
-obj/scrypt-x86_64.o: scrypt-x86_64.S
-	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
-
-obj/scrypt-arm.o: scrypt-arm.S
-	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
-
-obj/%.o: %.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/%.o: %.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/%.o: tor/%.c
-	$(CC) -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/anonymize.o: tor/anonymize.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/onion_v3.o: tor/onion_v3.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_process.o: tor/tor_process.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/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/bootstrap.o: bootstrap.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); \
-	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
-	rm -f $(@:%.o=%.d)
-
-trianglesd.exe: $(OBJS:obj/%=obj/%) obj/anonymize.o
-	$(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
-
-clean:
-	-rm -f trianglesd.exe
-	-rm -f obj/*.o
-	-rm -f obj/*.P
-	-rm -f obj/build.h
-	-rm -f leveldb/libleveldb.a
-	-rm -f leveldb/libmemenv.a
-
-FORCE:

src/makefile.osx

@@ -1,301 +0,0 @@
-# -*- mode: Makefile; -*-
-# Copyright (c) 2011 Bitcoin Developers
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-# Mac OS X makefile for triangles
-# Originally by Laszlo Hanyecz (solar@heliacal.net)
-
-CXX=llvm-g++
-CC=llvm-gcc
-DEPSDIR=/opt/local
-
-INCLUDEPATHS= \
- -I"$(CURDIR)" \
- -I"$(CURDIR)/obj" \
- -I"$(CURDIR)/tor" \
- -I"$(DEPSDIR)/include" \
- -I"$(DEPSDIR)/include/db48" \
- -I"$(DEPSDIR)/include/boost"
-
-LIBPATHS= \
- -L"$(DEPSDIR)/lib" \
- -L"$(DEPSDIR)/lib/db48"
-
-USE_UPNP:=1
-USE_IPV6:=1
-
-LIBS= -dead_strip
-
-TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
-
-ifdef STATIC
-# Build STATIC if you are redistributing the bitcoind binary
-TESTLIBS += \
- $(DEPSDIR)/lib/libboost_unit_test_framework-mt.a
-
-LIBS += \
- $(DEPSDIR)/lib/db48/libdb_cxx-4.8.a \
- $(DEPSDIR)/lib/libboost_system-mt.a \
- $(DEPSDIR)/lib/libboost_filesystem-mt.a \
- $(DEPSDIR)/lib/libboost_program_options-mt.a \
- $(DEPSDIR)/lib/libboost_thread-mt.a \
- $(DEPSDIR)/lib/libssl.a \
- $(DEPSDIR)/lib/libcrypto.a \
- -lz
-else
-TESTLIBS += \
- -lboost_unit_test_framework-mt
-LIBS += \
- -ldb_cxx-4.8 \
- -lboost_system-mt \
- -lboost_filesystem-mt \
- -lboost_program_options-mt \
- -lboost_thread-mt \
- -lssl \
- -lcrypto \
- -lz \
- -levent
-TESTDEFS += -DBOOST_TEST_DYN_LINK
-endif
-
-DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE
-
-ifdef RELEASE
-# Compile for maximum compatibility and smallest size.
-# This requires that dependencies are compiled
-# the same way.
-CFLAGS = -mmacosx-version-min=10.5 -arch x86_64 -O3 -msse2
-else
-CFLAGS = -g -msse2
-endif
-
-# triangles doesn't work because we don't support big-endian
-CFLAGS += -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \
-    $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
-
-OBJS= \
-    obj/address.o \
-    obj/addressmap.o \
-    obj/aes.o \
-    obj/backtrace.o \
-    obj/buffers.o \
-    obj/channel.o \
-    obj/channeltls.o \
-    obj/circpathbias.o \
-    obj/circuitbuild.o \
-    obj/circuitlist.o \
-    obj/circuitmux.o \
-    obj/circuitmux_ewma.o \
-    obj/circuitstats.o \
-    obj/circuituse.o \
-    obj/command.o \
-    obj/compat.o \
-    obj/compat_libevent.o \
-    obj/config.o \
-    obj/config_codedigest.o \
-    obj/confparse.o \
-    obj/connection.o \
-    obj/connection_edge.o \
-    obj/connection_or.o \
-    obj/container.o \
-    obj/control.o \
-    obj/cpuworker.o \
-    obj/crypto.o \
-    obj/crypto_curve25519.o \
-    obj/crypto_format.o \
-    obj/curve25519-donna.o \
-    obj/di_ops.o \
-    obj/directory.o \
-    obj/dirserv.o \
-    obj/dirvote.o \
-    obj/dns.o \
-    obj/dnsserv.o \
-    obj/entrynodes.o \
-    obj/ext_orport.o \
-    obj/fp_pair.o \
-    obj/geoip.o \
-    obj/hibernate.o \
-    obj/log.o \
-    obj/memarea.o \
-    obj/mempool.o \
-    obj/microdesc.o \
-    obj/networkstatus.o \
-    obj/nodelist.o \
-    obj/onion.o \
-    obj/onion_fast.o \
-    obj/onion_main.o \
-    obj/onion_ntor.o \
-    obj/onion_tap.o \
-    obj/policies.o \
-    obj/procmon.o \
-    obj/reasons.o \
-    obj/relay.o \
-    obj/rendclient.o \
-    obj/rendcommon.o \
-    obj/rendmid.o \
-    obj/rendservice.o \
-    obj/rephist.o \
-    obj/replaycache.o \
-    obj/router.o \
-    obj/routerlist.o \
-    obj/routerparse.o \
-    obj/routerset.o \
-    obj/sandbox.o \
-    obj/statefile.o \
-    obj/status.o \
-    obj/tor_util.o \
-    obj/torgzip.o \
-    obj/tortls.o \
-    obj/transports.o \
-    obj/util_codedigest.o \
-    obj/fugue.o \
-    obj/hamsi.o \
-    obj/groestl.o \
-    obj/blake.o \
-    obj/bmw.o \
-    obj/skein.o \
-    obj/keccak.o \
-    obj/shavite.o \
-    obj/jh.o \
-    obj/luffa.o \
-    obj/cubehash.o \
-    obj/echo.o \
-    obj/simd.o \
-    obj/alert.o \
-    obj/version.o \
-    obj/checkpoints.o \
-    obj/netbase.o \
-    obj/addrman.o \
-    obj/crypter.o \
-    obj/key.o \
-    obj/db.o \
-    obj/init.o \
-    obj/irc.o \
-    obj/keystore.o \
-    obj/miner.o \
-    obj/main.o \
-    obj/net.o \
-    obj/protocol.o \
-    obj/trianglesrpc.o \
-    obj/rpcdump.o \
-    obj/rpcnet.o \
-    obj/rpcmining.o \
-    obj/rpcwallet.o \
-    obj/rpcblockchain.o \
-    obj/rpcrawtransaction.o \
-    obj/rpcsmessage.o \
-    obj/script.o \
-    obj/sync.o \
-    obj/util.o \
-    obj/wallet.o \
-    obj/walletdb.o \
-    obj/noui.o \
-    obj/kernel.o \
-    obj/pbkdf2.o \
-    obj/scrypt.o \
-    obj/scrypt-arm.o \
-    obj/scrypt-x86.o \
-    obj/scrypt-x86_64.o \
-    obj/smessage.o 
-ifndef USE_UPNP
-	override USE_UPNP = -
-endif
-ifneq (${USE_UPNP}, -)
-	DEFS += -DUSE_UPNP=$(USE_UPNP)
-ifdef STATIC
-	LIBS += $(DEPSDIR)/lib/libminiupnpc.a
-else
-	LIBS += -lminiupnpc
-endif
-endif
-
-ifneq (${USE_IPV6}, -)
-	DEFS += -DUSE_IPV6=$(USE_IPV6)
-endif
-
-all: trianglesd
-
-test check: test_triangles FORCE
-	./test_triangles
-
-LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
-DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
-DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
-OBJS += obj/txdb-leveldb.o
-leveldb/libleveldb.a:
-	@echo "Building LevelDB ..."; cd leveldb; make libleveldb.a libmemenv.a; cd ..;
-obj/txdb-leveldb.o: leveldb/libleveldb.a
-
-# auto-generated dependencies:
--include obj/*.P
--include obj-test/*.P
-
-obj/build.h: FORCE
-	/bin/sh ../share/genbuild.sh obj/build.h
-version.cpp: obj/build.h
-DEFS += -DHAVE_BUILD_INFO
-
-obj/%.o: %.cpp
-	$(CXX) -c $(CFLAGS) -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/%.o: %.c
-	$(CC) -c $(CFLAGS) -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/%.o: tor/%.c
-	$(CC) -c $(CFLAGS) -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/anonymize.o: tor/anonymize.cpp
-	$(CXX) -c $(CFLAGS) -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/scrypt-x86.o: scrypt-x86.S
-	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
-
-obj/scrypt-x86_64.o: scrypt-x86_64.S
-	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
-
-obj/scrypt-arm.o: scrypt-arm.S
-	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
-
-trianglesd: $(OBJS:obj/%=obj/%) obj/anonymize.o
-	$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
-
-TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
-
-obj-test/%.o: test/%.cpp
-	$(CXX) -c $(TESTDEFS) $(CFLAGS) -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)
-
-test_triangles: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
-	$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) $(TESTLIBS)
-
-clean:
-	-rm -f trianglesd test_triangles
-	-rm -f obj/*.o
-	-rm -f obj-test/*.o
-	-rm -f obj/*.P
-	-rm -f obj-test/*.P
-	-rm -f obj/build.h
-	-rm -f leveldb/libleveldb.a
-	-rm -f leveldb/libmemenv.a
-
-FORCE:

src/makefile.unix

@@ -1,322 +0,0 @@
-# Copyright (c) 2009-2010 Satoshi Nakamoto
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-USE_UPNP:=0
-USE_IPV6:=1
-
-LINK:=$(CXX)
-ARCH:=$(system lscpu | head -n 1 | awk '{print $2}')
-
-DEFS=-DBOOST_SPIRIT_THREADSAFE
-
-DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/tor $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH))
-LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH))
-
-# libevent
-EVENTDIR = /usr/local
-DEFS += $(addprefix -I,$(EVENTDIR)/include)
-LIBS += -levent $(addprefix -L,$(EVENTDIR)/lib)
-
-TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
-
-LMODE = dynamic
-LMODE2 = dynamic
-ifdef STATIC
-	LMODE = static
-	ifeq (${STATIC}, all)
-		LMODE2 = static
-	endif
-else
-	TESTDEFS += -DBOOST_TEST_DYN_LINK
-endif
-
-# for boost 1.37, add -mt to the boost libraries
-LIBS += \
- -Wl,-B$(LMODE) \
-   -l boost_system$(BOOST_LIB_SUFFIX) \
-   -l boost_filesystem$(BOOST_LIB_SUFFIX) \
-   -l boost_program_options$(BOOST_LIB_SUFFIX) \
-   -l boost_thread$(BOOST_LIB_SUFFIX) \
-   -l boost_chrono$(BOOST_LIB_SUFFIX) \
-   -l db_cxx$(BDB_LIB_SUFFIX) \
-   -l ssl \
-   -l event \
-   -l crypto
-
-ifndef USE_UPNP
-	override USE_UPNP = -
-endif
-ifneq (${USE_UPNP}, -)
-	LIBS += -l miniupnpc
-	DEFS += -DUSE_UPNP=$(USE_UPNP)
-endif
-
-ifneq (${USE_IPV6}, -)
-	DEFS += -DUSE_IPV6=$(USE_IPV6)
-endif
-
-LIBS+= \
- -Wl,-B$(LMODE2) \
-   -l z \
-   -l dl \
-   -l pthread
-
-
-# Hardening
-# Make some classes of vulnerabilities unexploitable in case one is discovered.
-#
-    # This is a workaround for Ubuntu bug #691722, the default -fstack-protector causes
-    # -fstack-protector-all to be ignored unless -fno-stack-protector is used first.
-    # see: https://bugs.launchpad.net/ubuntu/+source/gcc-4.5/+bug/691722
-    HARDENING=-fno-stack-protector
-
-    # Stack Canaries
-    # Put numbers at the beginning of each stack frame and check that they are the same.
-    # If a stack buffer if overflowed, it writes over the canary number and then on return
-    # when that number is checked, it won't be the same and the program will exit with
-    # a "Stack smashing detected" error instead of being exploited.
-    HARDENING+=-fstack-protector-all -Wstack-protector
-
-    # Make some important things such as the global offset table read only as soon as
-    # the dynamic linker is finished building it. This will prevent overwriting of addresses
-    # which would later be jumped to.
-    LDHARDENING+=-Wl,-z,relro -Wl,-z,now
-
-    # Build position independent code to take advantage of Address Space Layout Randomization
-    # offered by some kernels.
-    # see doc/build-unix.txt for more information.
-    ifdef PIE
-        HARDENING+=-fPIE
-        LDHARDENING+=-pie
-    endif
-
-    # -D_FORTIFY_SOURCE=2 does some checking for potentially exploitable code patterns in
-    # the source such overflowing a statically defined buffer.
-    HARDENING+=-D_FORTIFY_SOURCE=2
-#
-
-
-DEBUGFLAGS=-g
-
-
-ifeq (${ARCH}, i686)
-    EXT_OPTIONS=-msse2
-endif
-
-
-# CXXFLAGS can be specified on the make command line, so we use xCXXFLAGS that only
-# adds some defaults in front. Unfortunately, CXXFLAGS=... $(CXXFLAGS) does not work.
-xCXXFLAGS=-O2 -std=c++17 $(EXT_OPTIONS) -pthread -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter \
-    $(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS)
-
-# LDFLAGS can be specified on the make command line, so we use xLDFLAGS that only
-# adds some defaults in front. Unfortunately, LDFLAGS=... $(LDFLAGS) does not work.
-xLDFLAGS=$(LDHARDENING) $(LDFLAGS)
-
-# Old embedded Tor v2 client removed - incompatible with OpenSSL 3.x
-# Tor v3 onion services handled by onion_v3.cpp via external Tor/SOCKS5
-OBJS= \
-    obj/fugue.o \
-    obj/hamsi.o \
-    obj/hamsi_helper.o \
-    obj/groestl.o \
-    obj/blake.o \
-    obj/bmw.o \
-    obj/skein.o \
-    obj/keccak.o \
-    obj/shavite.o \
-    obj/jh.o \
-    obj/luffa.o \
-    obj/cubehash.o \
-    obj/echo.o \
-    obj/simd.o \
-    obj/aes_helper.o \
-    obj/alert.o \
-    obj/version.o \
-    obj/checkpoints.o \
-    obj/netbase.o \
-    obj/addrman.o \
-    obj/crypter.o \
-    obj/key.o \
-    obj/db.o \
-    obj/init.o \
-    obj/irc.o \
-    obj/keystore.o \
-    obj/miner.o \
-    obj/main.o \
-    obj/net.o \
-    obj/bootstrap.o \
-    obj/net_bootstrap.o \
-    obj/protocol.o \
-    obj/trianglesrpc.o \
-    obj/rest.o \
-    obj/rpcdump.o \
-    obj/rpcnet.o \
-    obj/rpcmining.o \
-    obj/rpcwallet.o \
-    obj/rpcblockchain.o \
-    obj/rpcrawtransaction.o \
-    obj/rpcsmessage.o \
-    obj/script.o \
-    obj/sync.o \
-    obj/util.o \
-    obj/wallet.o \
-    obj/walletdb.o \
-    obj/noui.o \
-    obj/kernel.o \
-    obj/pbkdf2.o \
-    obj/scrypt.o \
-    obj/scrypt-arm.o \
-    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_embed_hooks.o \
-    obj/tor_embedded.o
-
-# Embedded Tor support (optional)
-# 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)
-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 += -llzma -lzstd -lm -lpthread
-endif
-
-# ZMQ support (optional)
-# Build with: make -f makefile.unix USE_ZMQ=1
-ifdef USE_ZMQ
-    DEFS += -DENABLE_ZMQ
-    LIBS += -lzmq
-    OBJS += obj/zmqpublishnotifier.o
-endif
-
-all: trianglesd
-
-test check: test_triangles FORCE
-	./test_triangles
-
-LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
-DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
-DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
-OBJS += obj/txdb-leveldb.o
-leveldb/libleveldb.a:
-	@echo "Building LevelDB ..."; cd leveldb; make libleveldb.a libmemenv.a; cd ..;
-obj/txdb-leveldb.o: leveldb/libleveldb.a
-
-# auto-generated dependencies:
--include obj/*.P
--include obj-test/*.P
-
-obj/build.h: FORCE
-	/bin/sh ../share/genbuild.sh obj/build.h
-version.cpp: obj/build.h
-DEFS += -DHAVE_BUILD_INFO
-
-obj/scrypt-x86.o: scrypt-x86.S
-	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
-
-obj/scrypt-x86_64.o: scrypt-x86_64.S
-	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
-
-obj/scrypt-arm.o: scrypt-arm.S
-	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
-	
-obj/%.o: %.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/%.o: %.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/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/onion_v3.o: tor/onion_v3.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_process.o: tor/tor_process.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/bootstrap.o: bootstrap.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); \
-	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
-	rm -f $(@:%.o=%.d)
-
-trianglesd: $(OBJS:obj/%=obj/%)
-	$(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
-
-TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
-
-obj-test/%.o: test/%.cpp
-	$(CXX) -c $(TESTDEFS) $(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)
-
-test_triangles: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
-	$(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-B$(LMODE) -lboost_unit_test_framework $(xLDFLAGS) $(LIBS)
-
-clean:
-	-rm -f trianglesd test_triangles
-	-rm -f obj/*.o
-	-rm -f obj-test/*.o
-	-rm -f obj/*.P
-	-rm -f obj-test/*.P
-	-rm -f obj/build.h
-	-rm -f leveldb/libleveldb.a
-	-rm -f leveldb/libmemenv.a
-
-FORCE:

src/miner.cpp

@@ -17,41 +17,8 @@ using namespace std;
 
 //
 
-int static FormatHashBlocks(void* pbuffer, unsigned int len)
-{
-    unsigned char* pdata = (unsigned char*)pbuffer;
-    unsigned int blocks = 1 + ((len + 8) / 64);
-    unsigned char* pend = pdata + 64 * blocks;
-    memset(pdata + len, 0, 64 * blocks - len);
-    pdata[len] = 0x80;
-    unsigned int bits = len * 8;
-    pend[-1] = (bits >> 0) & 0xff;
-    pend[-2] = (bits >> 8) & 0xff;
-    pend[-3] = (bits >> 16) & 0xff;
-    pend[-4] = (bits >> 24) & 0xff;
-    return blocks;
-}
-
-static const unsigned int pSHA256InitState[8] =
-{0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19};
-
-void SHA256Transform(void* pstate, void* pinput, const void* pinit)
-{
-    SHA256_CTX ctx;
-    unsigned char data[64];
-
-    SHA256_Init(&ctx);
-
-    for (int i = 0; i < 16; i++)
-        ((uint32_t*)data)[i] = ByteReverse(((uint32_t*)pinput)[i]);
-
-    for (int i = 0; i < 8; i++)
-        ctx.h[i] = ((uint32_t*)pinit)[i];
-
-    SHA256_Update(&ctx, data, sizeof(data));
-    for (int i = 0; i < 8; i++)
-        ((uint32_t*)pstate)[i] = ctx.h[i];
-}
+// PoW mining helpers (SHA256Transform, FormatHashBlocks, FormatHashBuffers,
+// IncrementExtraNonce, CheckWork) removed - PoW ended at block 9000.
 
 // Some explaining would be appreciated
 class COrphan
@@ -247,7 +214,6 @@ CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake, int64_t* pFees)
         }
 
         // Collect transactions into block
-        map<uint256, CTxIndex> mapTestPool;
         uint64_t nBlockSize = 1000;
         uint64_t nBlockTx = 0;
         int nBlockSigOps = 100;
@@ -299,10 +265,10 @@ CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake, int64_t* pFees)
 
             // Connecting shouldn't fail due to dependency on other memory pool transactions
             // because we're already processing them in order of dependency
-            map<uint256, CTxIndex> mapTestPoolTmp(mapTestPool);
             MapPrevTx mapInputs;
+            MapPrevTx mapEmpty;
             bool fInvalid;
-            if (!tx.FetchInputs(txdb, mapTestPoolTmp, false, true, mapInputs, fInvalid))
+            if (!tx.FetchInputs(txdb, mapEmpty, false, true, mapInputs, fInvalid))
                 continue;
 
             int64_t nTxFees = tx.GetValueIn(mapInputs)-tx.GetValueOut();
@@ -313,10 +279,8 @@ CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake, int64_t* pFees)
             if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS)
                 continue;
 
-            if (!tx.ConnectInputs(txdb, mapInputs, mapTestPoolTmp, CDiskTxPos(1,1,1), pindexPrev, false, true))
+            if (!tx.ConnectInputs(txdb, mapInputs, pindexPrev, false, true))
                 continue;
-            mapTestPoolTmp[tx.GetHash()] = CTxIndex(CDiskTxPos(1,1,1), tx.vout.size());
-            swap(mapTestPool, mapTestPoolTmp);
 
             // Added
             pblock->vtx.push_back(tx);
@@ -354,7 +318,7 @@ CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake, int64_t* pFees)
         nLastBlockSize = nBlockSize;
 
         if (fDebug && GetBoolArg("-printpriority"))
-            printf("CreateNewBlock(): total size %"PRIu64"\n", nBlockSize);
+            printf("CreateNewBlock(): total size %" PRIu64 "\n", nBlockSize);
 
         if (!fProofOfStake)
             pblock->vtx[0].vout[0].nValue = GetProofOfWorkReward(nFees);
@@ -365,7 +329,7 @@ CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake, int64_t* pFees)
         // Fill in header
         pblock->hashPrevBlock  = pindexPrev->GetBlockHash();
         pblock->nTime          = max(pindexPrev->GetPastTimeLimit()+1, pblock->GetMaxTransactionTime());
-        pblock->nTime          = max(pblock->GetBlockTime(), PastDrift(pindexPrev->GetBlockTime()));
+        pblock->nTime          = max(pblock->GetBlockTime(), PastDrift(pindexPrev->GetBlockTime(), pindexPrev->nHeight + 1));
         if (!fProofOfStake)
             pblock->UpdateTime(pindexPrev);
         pblock->nNonce         = 0;
@@ -375,110 +339,6 @@ CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake, int64_t* pFees)
 }
 
 
-void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce)
-{
-    // Update nExtraNonce
-    static uint256 hashPrevBlock;
-    if (hashPrevBlock != pblock->hashPrevBlock)
-    {
-        nExtraNonce = 0;
-        hashPrevBlock = pblock->hashPrevBlock;
-    }
-    ++nExtraNonce;
-
-    unsigned int nHeight = pindexPrev->nHeight+1; // Height first in coinbase required for block.version=2
-    pblock->vtx[0].vin[0].scriptSig = (CScript() << nHeight << CBigNum(nExtraNonce)) + COINBASE_FLAGS;
-    assert(pblock->vtx[0].vin[0].scriptSig.size() <= 100);
-
-    pblock->hashMerkleRoot = pblock->BuildMerkleTree();
-}
-
-
-void FormatHashBuffers(CBlock* pblock, char* pmidstate, char* pdata, char* phash1)
-{
-    //
-    // Pre-build hash buffers
-    //
-    struct
-    {
-        struct unnamed2
-        {
-            int nVersion;
-            uint256 hashPrevBlock;
-            uint256 hashMerkleRoot;
-            unsigned int nTime;
-            unsigned int nBits;
-            unsigned int nNonce;
-        }
-        block;
-        unsigned char pchPadding0[64];
-        uint256 hash1;
-        unsigned char pchPadding1[64];
-    }
-    tmp;
-    memset(&tmp, 0, sizeof(tmp));
-
-    tmp.block.nVersion       = pblock->nVersion;
-    tmp.block.hashPrevBlock  = pblock->hashPrevBlock;
-    tmp.block.hashMerkleRoot = pblock->hashMerkleRoot;
-    tmp.block.nTime          = pblock->nTime;
-    tmp.block.nBits          = pblock->nBits;
-    tmp.block.nNonce         = pblock->nNonce;
-
-    FormatHashBlocks(&tmp.block, sizeof(tmp.block));
-    FormatHashBlocks(&tmp.hash1, sizeof(tmp.hash1));
-
-    // Byte swap all the input buffer
-    for (unsigned int i = 0; i < sizeof(tmp)/4; i++)
-        ((unsigned int*)&tmp)[i] = ByteReverse(((unsigned int*)&tmp)[i]);
-
-    // Precalc the first half of the first hash, which stays constant
-    SHA256Transform(pmidstate, &tmp.block, pSHA256InitState);
-
-    memcpy(pdata, &tmp.block, 128);
-    memcpy(phash1, &tmp.hash1, 64);
-}
-
-
-bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey)
-{
-    uint256 hash = pblock->GetHash();
-    uint256 hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256();
-
-    if(!pblock->IsProofOfWork())
-        return error("CheckWork() : %s is not a proof-of-work block", hash.GetHex().c_str());
-
-    if (hash > hashTarget && pblock->IsProofOfWork())
-        return error("CheckWork() : proof-of-work not meeting target");
-
-    //// debug print
-    printf("CheckWork() : new proof-of-work block found  \n  hash: %s  \ntarget: %s\n", hash.GetHex().c_str(), hashTarget.GetHex().c_str());
-    pblock->print();
-    printf("generated %s\n", FormatMoney(pblock->vtx[0].vout[0].nValue).c_str());
-
-    // Found a solution
-    {
-        LOCK(cs_main);
-        if (pblock->hashPrevBlock != hashBestChain)
-            return error("CheckWork() : generated block is stale");
-
-        // Remove key from key pool
-        reservekey.KeepKey();
-
-        // Track how many getdata requests this block gets
-        {
-            LOCK(wallet.cs_wallet);
-            wallet.mapRequestCount[hash] = 0;
-        }
-
-        // Process this block the same as if we had received it from another node
-        if (!ProcessBlock(NULL, pblock))
-            return error("CheckWork() : ProcessBlock, block not accepted");
-    }
-
-    return true;
-}
-
 bool CheckStake(CBlock* pblock, CWallet& wallet)
 {
     uint256 proofHash = 0, hashTarget = 0;
@@ -487,8 +347,10 @@ bool CheckStake(CBlock* pblock, CWallet& wallet)
     if(!pblock->IsProofOfStake())
         return error("CheckStake() : %s is not a proof-of-stake block", hash.GetHex().c_str());
 
+    if (pblock->vtx.size() < 2)
+        return error("CheckStake() : block has no coinstake transaction");
+
     // verify hash target and signature of coinstake tx
-    //bool fIsInitialDownload = IsInitialBlockDownload();
     if (!CheckProofOfStake(pblock->vtx[1], pblock->nBits, proofHash, hashTarget))
         return error("CheckStake() : proof-of-stake checking failed");
 
@@ -574,7 +436,10 @@ void StakeMiner(CWallet *pwallet)
         int64_t nFees;
         unique_ptr<CBlock> pblock(CreateNewBlock(pwallet, true, &nFees));
         if (!pblock.get())
-            return;
+        {
+            MilliSleep(5000);
+            continue;
+        }
 
         // Try to sign the block
         if (pblock->SignBlock(*pwallet, nFees))

src/miner.h

@@ -12,21 +12,9 @@
 /* Generate a new block, without valid proof-of-work */
 CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake=false, int64_t* pFees = 0);
 
-/** Modify the extranonce in a block */
-void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce);
-
-/** Do mining precalculation */
-void FormatHashBuffers(CBlock* pblock, char* pmidstate, char* pdata, char* phash1);
-
-/** Check mined proof-of-work block */
-bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey);
-
 /** Check mined proof-of-stake block */
 bool CheckStake(CBlock* pblock, CWallet& wallet);
 
-/** Base sha256 mining transform */
-void SHA256Transform(void* pstate, void* pinput, const void* pinit);
-
 #endif // TRIANGLES_MINER_H
 
 

src/net.cpp

@@ -13,6 +13,11 @@
 #include "ui_interface.h"
 #include "onionseed.h"
 
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+
+#include <sstream>
+
 #ifdef WIN32
 #include <string.h>
 #endif
@@ -41,8 +46,8 @@ void ThreadOpenAddedConnections2(void* parg);
 #ifdef USE_UPNP
 void ThreadMapPort2(void* parg);
 #endif
-void ThreadDNSAddressSeed(void* parg);
-void ThreadDNSAddressSeed2(void* parg);
+void ThreadHTTPSeedFetch(void* parg);
+void ThreadHTTPSeedFetch2(void* parg);
 bool OpenNetworkConnection(const CAddress& addrConnect, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false);
 
 
@@ -57,8 +62,11 @@ struct LocalServiceInfo {
 bool fClient = false;
 //bool fDiscover = true;
 
+#ifdef USE_UPNP
 bool fUseUPnP = GetBoolArg("-upnp", USE_UPNP);
-//bool fUseUPnP = false;
+#else
+bool fUseUPnP = false;
+#endif
 uint64_t nLocalServices = (fClient ? 0 : NODE_NETWORK);
 static CCriticalSection cs_mapLocalHost;
 static map<CNetAddr, LocalServiceInfo> mapLocalHost;
@@ -487,6 +495,14 @@ CNode* FindNode(const CService& addr)
 
 CNode* ConnectNode(CAddress addrConnect, const char *pszDest)
 {
+    // TOR-NATIVE: Reject all non-.onion addresses
+    std::string addrStr = pszDest ? std::string(pszDest) : addrConnect.ToStringIP();
+    if (addrStr.find(".onion") == std::string::npos) {
+        if (fDebug)
+            printf("ConnectNode(): REJECTED non-onion address: %s (Tor-native mode)\n", addrStr.c_str());
+        return NULL;
+    }
+
     if (pszDest == NULL) {
         if (IsLocal(addrConnect))
             return NULL;
@@ -607,6 +623,32 @@ bool CNode::IsBanned(CNetAddr ip)
     return fResult;
 }
 
+bool CNode::Ban(CNetAddr ip, int64_t banTime)
+{
+    if (ip.IsLocal())
+        return false;
+
+    LOCK(cs_setBanned);
+    std::map<CNetAddr, int64_t>::iterator it = setBanned.find(ip);
+    if (it != setBanned.end() && it->second >= banTime)
+        return false;
+
+    setBanned[ip] = banTime;
+    return true;
+}
+
+bool CNode::Unban(CNetAddr ip)
+{
+    LOCK(cs_setBanned);
+    return setBanned.erase(ip) != 0;
+}
+
+void CNode::GetBanned(std::map<CNetAddr, int64_t>& mapBannedOut)
+{
+    LOCK(cs_setBanned);
+    mapBannedOut = setBanned;
+}
+
 bool CNode::Misbehaving(int howmuch)
 {
     if (addr.IsLocal())
@@ -878,10 +920,19 @@ void ThreadSocketHandler2(void* parg)
                 }
             }
         }
-        if (vNodes.size() != nPrevNodeCount)
         {
-            nPrevNodeCount = vNodes.size();
-            uiInterface.NotifyNumConnectionsChanged(vNodes.size());
+            // Read vNodes.size() under the lock to avoid data race
+            unsigned int nNodeCount;
+            {
+                LOCK(cs_vNodes);
+                nNodeCount = vNodes.size();
+            }
+            if (nNodeCount != nPrevNodeCount)
+            {
+                nPrevNodeCount = nNodeCount;
+                if (!fShutdown)
+                    uiInterface.NotifyNumConnectionsChanged(nNodeCount);
+            }
         }
 
 
@@ -1013,7 +1064,7 @@ void ThreadSocketHandler2(void* parg)
         for (CNode* pnode : vNodesCopy)
         {
             if (fShutdown)
-                return;
+                break;
 
             //
             // Receive
@@ -1039,7 +1090,7 @@ void ThreadSocketHandler2(void* parg)
                             if (!pnode->ReceiveMsgBytes(pchBuf, nBytes))
                                 pnode->CloseSocketDisconnect();
                             pnode->nLastRecv = GetTime();
-                            pnode->nRecvBytes += nBytes;       
+                            pnode->nRecvBytes += nBytes;
                         }
                         else if (nBytes == 0)
                         {
@@ -1104,6 +1155,8 @@ void ThreadSocketHandler2(void* parg)
                 pnode->Release();
         }
 
+        if (fShutdown)
+            return;
         MilliSleep(10);
     }
 }
@@ -1328,40 +1381,29 @@ void ThreadOnionSeed(void* parg)
 
 
 
+    // Load hardcoded .onion seeds (if any)
     static const char *(*strOnionSeed)[1] = fTestNet ? strTestNetOnionSeed : strMainNetOnionSeed;
-
-
     int found = 0;
 
-    printf("Loading addresses from .onion seeds\n");
-
-
-
-
-
     for (unsigned int seed_idx = 0; strOnionSeed[seed_idx][0] != NULL; seed_idx++) {
         CNetAddr parsed;
-        if (
-            !parsed.SetSpecial(
-                strOnionSeed[seed_idx][0]
-            )
-        ) {
+        if (!parsed.SetSpecial(strOnionSeed[seed_idx][0]))
             throw runtime_error("ThreadOnionSeed() : invalid .onion seed");
-        }
 
         int nOneDay = 24*3600;
         CAddress addr = CAddress(CService(parsed, GetDefaultPort()));
-        addr.nTime = GetTime() - 3*nOneDay - GetRand(4*nOneDay); // use a random age between 3 and 7 days old
-
-        found++;
+        addr.nTime = GetTime() - 3*nOneDay - GetRand(4*nOneDay);
         addrman.Add(addr, parsed);
-
-
-
-
+        found++;
     }
 
-    printf("%d addresses found from .onion seeds\n", found);
+    printf("%d addresses from hardcoded .onion seeds\n", found);
+
+    // Also fetch dynamic seeds from HTTP seed list
+    // This is the primary discovery mechanism — seeds.cryptographic-triangles.org
+    ThreadHTTPSeedFetch2(NULL);
+
+    printf("ThreadOnionSeed: seeding complete\n");
 }
 
 
@@ -1375,9 +1417,9 @@ void ThreadOnionSeed(void* parg)
 
 
 
+// Hardcoded seeds removed - peer discovery is now fully dynamic via HTTP seed list.
+// See: seeds.cryptographic-triangles.org
 unsigned int pnSeed[] = {
-    0xCE58E9C2, // DNS2-OpenClaw: 194.233.88.206
-    0x13A7D04A, // DNS3-Sami:     74.208.167.19
 };
 
 void DumpAddresses()
@@ -1419,56 +1461,222 @@ void ThreadDumpAddress(void* parg)
     printf("ThreadDumpAddress exited\n");
 }
 
-void ThreadDNSAddressSeed2(void* parg)
+void ThreadHTTPSeedFetch2(void* parg)
 {
-    static const char* strDNSSeed[] = {
-        "seed1.cryptographic-triangles.org",
-        "seed2.cryptographic-triangles.org",
-        "seed3.cryptographic-triangles.org",
-        "backup-seed.cryptographic-triangles.org",
-    };
+    static const char* DEFAULT_SEED_URL_HOST = "seeds.cryptographic-triangles.org";
+    static const char* DEFAULT_SEED_URL_PATH = "/seeds.txt";
+    static const int HTTPS_PORT = 443;
 
-    printf("Loading addresses from DNS seeds...\n");
-    int found = 0;
+    std::string seedHost = GetArg("-seedurl", DEFAULT_SEED_URL_HOST);
+    std::string seedPath = DEFAULT_SEED_URL_PATH;
 
-    for (unsigned int seed_idx = 0; seed_idx < ARRAYLEN(strDNSSeed); seed_idx++)
-    {
-        if (fShutdown)
+    // Allow full URL override: -seedurl=myhost.com/path/seeds.txt
+    size_t slashPos = seedHost.find('/');
+    if (slashPos != std::string::npos) {
+        seedPath = seedHost.substr(slashPos);
+        seedHost = seedHost.substr(0, slashPos);
+    }
+
+    printf("Fetching seed list from https://%s%s (via Tor)...\n", seedHost.c_str(), seedPath.c_str());
+
+    SSL_CTX* ctx = NULL;
+    SSL* ssl = NULL;
+    SOCKET hSocket = INVALID_SOCKET;
+
+    try {
+        // Connect through Tor SOCKS proxy using existing proxy-aware socket infrastructure
+        CService addrResolved;
+        std::string connectDest = seedHost + ":" + std::to_string(HTTPS_PORT);
+
+        if (!ConnectSocketByName(addrResolved, hSocket, connectDest.c_str(), HTTPS_PORT, nConnectTimeout)) {
+            printf("HTTPS seed fetch: cannot connect to %s through Tor proxy\n", seedHost.c_str());
             return;
+        }
 
-        vector<CNetAddr> vaddr;
-        if (LookupHost(strDNSSeed[seed_idx], vaddr))
+        // Set up TLS over the connected socket
+        ctx = SSL_CTX_new(TLS_client_method());
+        if (!ctx) {
+            printf("HTTPS seed fetch: SSL_CTX_new failed\n");
+            closesocket(hSocket);
+            return;
+        }
+
+        // Use system default CA certificates for verification
+        SSL_CTX_set_default_verify_paths(ctx);
+        SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, NULL);
+
+        ssl = SSL_new(ctx);
+        if (!ssl) {
+            printf("HTTPS seed fetch: SSL_new failed\n");
+            SSL_CTX_free(ctx);
+            closesocket(hSocket);
+            return;
+        }
+
+        // Set SNI hostname (required for Caddy/Let's Encrypt)
+        SSL_set_tlsext_host_name(ssl, seedHost.c_str());
+        SSL_set_fd(ssl, (int)hSocket);
+
+        int ret = SSL_connect(ssl);
+        if (ret != 1) {
+            int sslErr = SSL_get_error(ssl, ret);
+            unsigned long errCode = ERR_get_error();
+            char errBuf[256];
+            ERR_error_string_n(errCode, errBuf, sizeof(errBuf));
+            printf("HTTPS seed fetch: TLS handshake failed (ssl_err=%d): %s\n", sslErr, errBuf);
+            SSL_free(ssl);
+            SSL_CTX_free(ctx);
+            closesocket(hSocket);
+            return;
+        }
+
+        printf("HTTPS seed fetch: TLS connection established to %s\n", seedHost.c_str());
+
+        // Send HTTP request over TLS
+        std::string request =
+            "GET " + seedPath + " HTTP/1.1\r\n"
+            "Host: " + seedHost + "\r\n"
+            "Connection: close\r\n"
+            "User-Agent: Triangles\r\n"
+            "\r\n";
+
+        int nSent = 0;
+        int nLen = request.size();
+        while (nSent < nLen) {
+            int nBytes = SSL_write(ssl, request.c_str() + nSent, nLen - nSent);
+            if (nBytes <= 0) {
+                printf("HTTPS seed fetch: SSL_write failed\n");
+                SSL_shutdown(ssl);
+                SSL_free(ssl);
+                SSL_CTX_free(ctx);
+                closesocket(hSocket);
+                return;
+            }
+            nSent += nBytes;
+        }
+
+        // Read response over TLS
+        std::string response;
+        char buf[4096];
+        while (true) {
+            int nBytes = SSL_read(ssl, buf, sizeof(buf));
+            if (nBytes <= 0)
+                break;
+            response.append(buf, nBytes);
+        }
+
+        SSL_shutdown(ssl);
+        SSL_free(ssl);
+        SSL_CTX_free(ctx);
+        closesocket(hSocket);
+        ssl = NULL;
+        ctx = NULL;
+        hSocket = INVALID_SOCKET;
+
+        if (response.empty()) {
+            printf("HTTPS seed fetch: empty response from %s\n", seedHost.c_str());
+            return;
+        }
+
+        // Parse HTTP response - find end of headers
+        size_t headerEnd = response.find("\r\n\r\n");
+        if (headerEnd == std::string::npos) {
+            printf("HTTPS seed fetch: malformed response (no header terminator)\n");
+            return;
+        }
+
+        // Check status code
+        std::string statusLine = response.substr(0, response.find("\r\n"));
+        if (statusLine.find("200") == std::string::npos) {
+            printf("HTTPS seed fetch: %s from %s\n", statusLine.c_str(), seedHost.c_str());
+            return;
+        }
+
+        std::string body = response.substr(headerEnd + 4);
+
+        // Parse one address per line: "address:port" or just "address"
+        int found = 0;
+        std::istringstream lines(body);
+        std::string line;
+        while (std::getline(lines, line))
         {
-            for (CNetAddr& ip : vaddr)
-            {
-                CAddress addr(CService(ip, GetDefaultPort()));
+            if (fShutdown)
+                return;
+
+            // Trim whitespace and carriage returns
+            while (!line.empty() && (line.back() == '\r' || line.back() == ' ' || line.back() == '\t'))
+                line.pop_back();
+            while (!line.empty() && (line.front() == ' ' || line.front() == '\t'))
+                line.erase(line.begin());
+
+            if (line.empty() || line[0] == '#')
+                continue;
+
+            // Parse address:port
+            std::string addrStr = line;
+            int port = GetDefaultPort();
+
+            // For .onion addresses, the last colon before port is after ".onion"
+            size_t onionPos = addrStr.find(".onion:");
+            if (onionPos != std::string::npos) {
+                port = atoi(addrStr.substr(onionPos + 7).c_str());
+                addrStr = addrStr.substr(0, onionPos + 6); // keep ".onion"
+            } else if (addrStr.find(".onion") == std::string::npos) {
+                // Clearnet address - find last colon for port
+                size_t colonPos = addrStr.rfind(':');
+                if (colonPos != std::string::npos) {
+                    port = atoi(addrStr.substr(colonPos + 1).c_str());
+                    addrStr = addrStr.substr(0, colonPos);
+                }
+            }
+
+            if (port <= 0 || port > 65535)
+                port = GetDefaultPort();
+
+            CNetAddr parsed;
+            bool resolved = parsed.SetSpecial(addrStr);
+            if (!resolved) {
+                std::vector<CNetAddr> vIP;
+                if (LookupHost(addrStr.c_str(), vIP, 1, false) && !vIP.empty()) {
+                    parsed = vIP[0];
+                    resolved = true;
+                }
+            }
+            if (resolved) {
+                CAddress addr(CService(parsed, port));
                 addr.nTime = GetTime() - 3*24*60*60; // 3 days ago
-                addrman.Add(addr, CNetAddr(strDNSSeed[seed_idx], true));
+                addrman.Add(addr, CNetAddr("https-seed", true));
                 found++;
             }
         }
-    }
 
-    printf("%d addresses found from DNS seeds\n", found);
+        printf("%d addresses found from HTTPS seed list (%s)\n", found, seedHost.c_str());
+
+    } catch (std::exception& e) {
+        printf("HTTPS seed fetch failed: %s\n", e.what());
+        if (ssl) { SSL_shutdown(ssl); SSL_free(ssl); }
+        if (ctx) SSL_CTX_free(ctx);
+        if (hSocket != INVALID_SOCKET) closesocket(hSocket);
+    }
 }
 
-void ThreadDNSAddressSeed(void* parg)
+void ThreadHTTPSeedFetch(void* parg)
 {
-    RenameThread("Triangles-dnsseed");
+    RenameThread("Triangles-httpseed");
     try
     {
-        vnThreadsRunning[THREAD_DNSSEED]++;
-        ThreadDNSAddressSeed2(parg);
-        vnThreadsRunning[THREAD_DNSSEED]--;
+        vnThreadsRunning[THREAD_HTTPSEED]++;
+        ThreadHTTPSeedFetch2(parg);
+        vnThreadsRunning[THREAD_HTTPSEED]--;
     }
     catch (std::exception& e) {
-        vnThreadsRunning[THREAD_DNSSEED]--;
-        PrintException(&e, "ThreadDNSAddressSeed()");
+        vnThreadsRunning[THREAD_HTTPSEED]--;
+        PrintException(&e, "ThreadHTTPSeedFetch()");
     } catch (...) {
-        vnThreadsRunning[THREAD_DNSSEED]--;
-        PrintException(NULL, "ThreadDNSAddressSeed()");
+        vnThreadsRunning[THREAD_HTTPSEED]--;
+        PrintException(NULL, "ThreadHTTPSeedFetch()");
     }
-    printf("ThreadDNSAddressSeed exited\n");
+    printf("ThreadHTTPSeedFetch exited\n");
 }
 
 void ThreadOpenConnections(void* parg)
@@ -1515,18 +1723,35 @@ void static ThreadStakeMiner(void* parg)
 {
     printf("ThreadStakeMiner started\n");
     CWallet* pwallet = (CWallet*)parg;
-    try
+    int nConsecutiveErrors = 0;
+    while (!fShutdown)
     {
-        vnThreadsRunning[THREAD_STAKE_MINER]++;
-        StakeMiner(pwallet);
-        vnThreadsRunning[THREAD_STAKE_MINER]--;
-    }
-    catch (std::exception& e) {
-        vnThreadsRunning[THREAD_STAKE_MINER]--;
-        PrintException(&e, "ThreadStakeMiner()");
-    } catch (...) {
-        vnThreadsRunning[THREAD_STAKE_MINER]--;
-        PrintException(NULL, "ThreadStakeMiner()");
+        try
+        {
+            vnThreadsRunning[THREAD_STAKE_MINER]++;
+            StakeMiner(pwallet);
+            vnThreadsRunning[THREAD_STAKE_MINER]--;
+            break; // normal exit
+        }
+        catch (std::exception& e) {
+            vnThreadsRunning[THREAD_STAKE_MINER]--;
+            nConsecutiveErrors++;
+            printf("ThreadStakeMiner() exception: %s (attempt %d)\n", e.what(), nConsecutiveErrors);
+            if (nConsecutiveErrors >= 10) {
+                printf("ThreadStakeMiner() too many consecutive errors, giving up\n");
+                break;
+            }
+            MilliSleep(5000); // wait 5 seconds before retrying
+        } catch (...) {
+            vnThreadsRunning[THREAD_STAKE_MINER]--;
+            nConsecutiveErrors++;
+            printf("ThreadStakeMiner() unknown exception (attempt %d)\n", nConsecutiveErrors);
+            if (nConsecutiveErrors >= 10) {
+                printf("ThreadStakeMiner() too many consecutive errors, giving up\n");
+                break;
+            }
+            MilliSleep(5000);
+        }
     }
     printf("ThreadStakeMiner exiting, %d threads remaining\n", vnThreadsRunning[THREAD_STAKE_MINER]);
 }
@@ -1575,30 +1800,8 @@ void ThreadOpenConnections2(void* parg)
         if (fShutdown)
             return;
 
-        // Add hardcoded seed nodes when we have no connections.
-        // Original check (addrman.size()==0) was too conservative - stale entries
-        // in peers.dat would prevent fallback to working hardcoded IPs forever.
-        {
-            LOCK(cs_vNodes);
-            bool fNoOutbound = true;
-            for (CNode* pnode : vNodes) {
-                if (!pnode->fInbound) { fNoOutbound = false; break; }
-            }
-            if (fNoOutbound && (GetTime() - nStart > 10) && !fTestNet)
-            {
-                std::vector<CAddress> vAdd;
-                for (unsigned int i = 0; i < ARRAYLEN(pnSeed); i++)
-                {
-                    struct in_addr ip;
-                    memcpy(&ip, &pnSeed[i], sizeof(ip));
-                    CAddress addr(CService(ip, GetDefaultPort()));
-                    addr.nTime = GetTime() - GetRand(60*60); // seen recently
-                    vAdd.push_back(addr);
-                }
-                addrman.Add(vAdd, CNetAddr("127.0.0.1"));
-                printf("No outbound connections after 10s, added %d hardcoded seeds\n", (int)vAdd.size());
-            }
-        }
+        // Hardcoded seed fallback removed - peer discovery is now fully dynamic
+        // via HTTP seed list from seeds.cryptographic-triangles.org
 
         //
         // Choose an address to connect to based on most recently seen
@@ -1832,6 +2035,9 @@ void ThreadMessageHandler2(void* parg)
             pnodeTrickle = vNodesCopy[GetRand(vNodesCopy.size())];
         for (CNode* pnode : vNodesCopy)
         {
+            if (fShutdown)
+                break;
+
             // Receive messages
             {
                 TRY_LOCK(pnode->cs_vRecvMsg, lockRecv);
@@ -1839,8 +2045,6 @@ void ThreadMessageHandler2(void* parg)
                     if (!ProcessMessages(pnode))
                         pnode->CloseSocketDisconnect();
             }
-            if (fShutdown)
-                return;
 
             // Send messages
             {
@@ -1848,8 +2052,6 @@ void ThreadMessageHandler2(void* parg)
                 if (lockSend)
                     SendMessages(pnode, pnode == pnodeTrickle);
             }
-            if (fShutdown)
-                return;
         }
 
         {
@@ -2102,9 +2304,14 @@ void StartNode(void* parg)
     if (fUseUPnP)
         MapPort();
 
-    // DNS seed lookup
-    if (!NewThread(ThreadDNSAddressSeed, NULL))
-        printf("Error: NewThread(ThreadDNSAddressSeed) failed\n");
+    // HTTP seed list fetch — only as a standalone thread if onion seeding is disabled,
+    // since ThreadOnionSeed already calls ThreadHTTPSeedFetch2 internally.
+    if (GetBoolArg("-onionseed", true))
+        printf("HTTP seed fetch handled by onion seed thread\n");
+    else if (GetBoolArg("-noseedurl", false))
+        printf("HTTP seed fetch disabled\n");
+    else if (!NewThread(ThreadHTTPSeedFetch, NULL))
+        printf("Error: NewThread(ThreadHTTPSeedFetch) failed\n");
 
     // Send and receive from sockets, accept connections
     if (!NewThread(ThreadSocketHandler, NULL))
@@ -2162,7 +2369,7 @@ bool StopNode()
 #ifdef USE_UPNP
     if (vnThreadsRunning[THREAD_UPNP] > 0) printf("ThreadMapPort still running\n");
 #endif
-    if (vnThreadsRunning[THREAD_DNSSEED] > 0) printf("ThreadDNSAddressSeed still running\n");
+    if (vnThreadsRunning[THREAD_HTTPSEED] > 0) printf("ThreadHTTPSeedFetch still running\n");
     if (vnThreadsRunning[THREAD_ADDEDCONNECTIONS] > 0) printf("ThreadOpenAddedConnections still running\n");
     if (vnThreadsRunning[THREAD_DUMPADDRESS] > 0) printf("ThreadDumpAddresses still running\n");
     if (vnThreadsRunning[THREAD_STAKE_MINER] > 0) printf("ThreadStakeMiner still running\n");
@@ -2180,6 +2387,18 @@ bool StopNode()
     }
     MilliSleep(50);
     DumpAddresses();
+
+    // Force-disconnect and clean up all remaining nodes now that threads have stopped.
+    // Close sockets first so any lingering I/O fails immediately.
+    {
+        LOCK(cs_vNodes);
+        for (CNode* pnode : vNodes)
+        {
+            pnode->CloseSocketDisconnect();
+            pnode->Cleanup();
+        }
+    }
+
     return true;
 }
 
@@ -2191,7 +2410,8 @@ public:
     }
     ~CNetCleanup()
     {
-        // Close sockets
+        // Close sockets - acquire lock in case other threads are still winding down
+        LOCK(cs_vNodes);
         for (CNode* pnode : vNodes)
             if (pnode->hSocket != INVALID_SOCKET)
                 closesocket(pnode->hSocket);

src/net.h

@@ -103,7 +103,7 @@ enum threadId
     THREAD_MESSAGEHANDLER,
     THREAD_RPCLISTENER,
     THREAD_UPNP,
-    THREAD_DNSSEED,
+    THREAD_HTTPSEED,
     THREAD_ADDEDCONNECTIONS,
     THREAD_DUMPADDRESS,
     THREAD_RPCHANDLER,
@@ -252,6 +252,7 @@ public:
     bool fNetworkNode;
     bool fSuccessfullyConnected;
     bool fDisconnect;
+    bool fPreferHeaders; // peer requested block announcements via headers (sendheaders)
     CSemaphoreGrant grantOutbound;
     int nRefCount;
 protected:
@@ -308,6 +309,7 @@ public:
         fNetworkNode = false;
         fSuccessfullyConnected = false;
         fDisconnect = false;
+        fPreferHeaders = false;
         nRefCount = 0;
         nSendSize = 0;
         nSendOffset = 0;
@@ -732,6 +734,9 @@ public:
     // new code.
     static void ClearBanned(); // needed for unit testing
     static bool IsBanned(CNetAddr ip);
+    static bool Ban(CNetAddr ip, int64_t banTime);
+    static bool Unban(CNetAddr ip);
+    static void GetBanned(std::map<CNetAddr, int64_t>& mapBannedOut);
     bool Misbehaving(int howmuch); // 1 == a little, 100 == a lot
     void copyStats(CNodeStats &stats);
 };

src/net_bootstrap.cpp

@@ -1,256 +1,44 @@
 // Copyright (c) 2024 Triangles developers
-// Network Bootstrap Implementation for Triangles v5.0.0.0
+// Network Bootstrap Implementation for Triangles
 // Distributed under the MIT/X11 software license
 
 #include "net_bootstrap.h"
+#include "main.h"
 #include "net.h"
 #include "util.h"
-#include "init.h"
-#include "tor/onion_v3.h"
 
 namespace NetBootstrap {
 
-    // Forward declarations
-    bool InitializeLegacyBootstrap();
-    bool InitializeMixedBootstrap();
-    bool InitializeTorOnlyBootstrap();
-
-    // Global variable for tracking network activity
-    int64_t nTimeBestReceived = 0;
-
-    BootstrapMode GetBootstrapMode() {
-        // Determine bootstrap mode based on configuration
-        bool torEnabled = GetBoolArg("-tor", false) || GetBoolArg("-proxy", false);
-        bool onlyTor = GetBoolArg("-onlynet", false) && GetArg("-onlynet", "") == "tor";
-        
-        if (onlyTor) {
-            printf("Network Bootstrap: Tor-only mode selected\n");
-            return BOOTSTRAP_TOR_ONLY;
-        } else if (torEnabled) {
-            printf("Network Bootstrap: Mixed Tor + clearnet mode selected\n");
-            return BOOTSTRAP_TOR_MIXED;
-        } else {
-            printf("Network Bootstrap: Legacy clearnet mode selected\n");
-            return BOOTSTRAP_LEGACY;
-        }
-    }
-
-    bool InitializeNetworkBootstrap(BootstrapMode mode) {
-        printf("Initializing network bootstrap (mode: %d)...\n", mode);
-        
-        try {
-            switch (mode) {
-                case BOOTSTRAP_LEGACY:
-                    return InitializeLegacyBootstrap();
-                    
-                case BOOTSTRAP_TOR_MIXED:
-                    return InitializeMixedBootstrap();
-                    
-                case BOOTSTRAP_TOR_ONLY:
-                    return InitializeTorOnlyBootstrap();
-                    
-                default:
-                    printf("ERROR: Unknown bootstrap mode: %d\n", mode);
-                    return false;
-            }
-        } catch (const std::exception& e) {
-            printf("ERROR: Exception in network bootstrap: %s\n", e.what());
-            return false;
-        }
-    }
-
-    bool InitializeLegacyBootstrap() {
-        printf("Initializing legacy network bootstrap for old wallet compatibility...\n");
-        
-        // Use DNS seeds and hardcoded IP addresses
-        // This ensures old wallets can still connect
-        
-        // Add DNS seed nodes
-        for (int i = 0; strDNSSeed[i] != NULL; i++) {
-            printf("Adding DNS seed: %s\n", strDNSSeed[i]);
-            // DNS resolution will be handled by the existing network code
-        }
-        
-        // Add hardcoded IP seed nodes
-        for (int i = 0; i < ARRAYLEN(pnSeed); i++) {
-            if (pnSeed[i] != 0) {
-                printf("Adding IP seed: 0x%08x\n", pnSeed[i]);
-                // IP seeds will be processed by existing network code
-            }
-        }
-        
-        printf("Legacy bootstrap initialized successfully\n");
-        return true;
-    }
-
-    bool InitializeMixedBootstrap() {
-        printf("Initializing mixed Tor + clearnet bootstrap...\n");
-        
-        // Initialize legacy bootstrap first
-        if (!InitializeLegacyBootstrap()) {
-            printf("ERROR: Failed to initialize legacy bootstrap\n");
-            return false;
-        }
-        
-        // Initialize Tor v3 functionality
-        if (!InitTorV3()) {
-            printf("WARNING: Failed to initialize Tor v3, continuing with clearnet only\n");
-            return true; // Don't fail completely, just continue without Tor
-        }
-        
-        // Get Tor manager instance
-        CTorV3Manager* torManager = CTorV3Manager::GetInstance();
-        if (!torManager) {
-            printf("WARNING: Could not get Tor manager instance\n");
-            return true;
-        }
-        
-        // Connect to Tor seed nodes
-        std::vector<std::string> torSeeds = torManager->GetKnownSeederNodes();
-        printf("Found %d Tor seed nodes\n", (int)torSeeds.size());
-        
-        for (const std::string& seed : torSeeds) {
-            printf("Attempting to connect to Tor seed: %s\n", seed.c_str());
-            torManager->ConnectToSeederNode(seed);
-        }
-        
-        printf("Mixed bootstrap initialized successfully\n");
-        return true;
-    }
-
-    bool InitializeTorOnlyBootstrap() {
-        printf("Initializing Tor-only bootstrap...\n");
-        
-        // Initialize Tor v3 functionality
-        if (!InitTorV3()) {
-            printf("ERROR: Failed to initialize Tor v3 for Tor-only mode\n");
-            return false;
-        }
-        
-        // Get Tor manager instance
-        CTorV3Manager* torManager = CTorV3Manager::GetInstance();
-        if (!torManager) {
-            printf("ERROR: Could not get Tor manager instance for Tor-only mode\n");
-            return false;
-        }
-        
-        // Enable Tor
-        torManager->SetTorEnabled(true);
-        
-        // Create hidden service if configured
-        if (GetBoolArg("-torhiddenservice", false)) {
-            int hiddenServicePort = GetArg("-torhiddenserviceport", NetworkConfig::TOR_HIDDEN_SERVICE_PORT);
-            if (!torManager->CreateWalletHiddenService(hiddenServicePort)) {
-                printf("WARNING: Failed to create hidden service\n");
-            } else {
-                printf("Created hidden service on port %d\n", hiddenServicePort);
-                
-                // Register as seeder if enabled
-                if (GetBoolArg("-torseeder", false)) {
-                    std::string onionAddress = torManager->GetWalletOnionAddress();
-                    if (!onionAddress.empty()) {
-                        torManager->RegisterAsSeederNode(onionAddress, hiddenServicePort);
-                        printf("Registered as Tor seeder: %s:%d\n", onionAddress.c_str(), hiddenServicePort);
-                    }
-                }
-            }
-        }
-        
-        // Connect to Tor seed nodes
-        std::vector<std::string> torSeeds = torManager->GetKnownSeederNodes();
-        printf("Found %d Tor seed nodes for Tor-only mode\n", (int)torSeeds.size());
-        
-        if (torSeeds.empty()) {
-            printf("WARNING: No Tor seed nodes available for Tor-only mode\n");
-            return false;
-        }
-        
-        int connected = 0;
-        for (const std::string& seed : torSeeds) {
-            printf("Attempting to connect to Tor seed: %s\n", seed.c_str());
-            if (torManager->ConnectToSeederNode(seed)) {
-                connected++;
-            }
-        }
-        
-        if (connected == 0) {
-            printf("ERROR: Failed to connect to any Tor seed nodes\n");
-            return false;
-        }
-        
-        printf("Tor-only bootstrap initialized successfully (%d connections)\n", connected);
-        return true;
-    }
-
-    bool IsOldWalletCompatible(int protocolVersion) {
-        return protocolVersion >= NetworkConfig::MIN_PROTOCOL_VERSION_OLD_WALLET;
-    }
-
-    std::vector<std::string> GetCompatibleSeedNodes(int protocolVersion) {
-        std::vector<std::string> seeds;
-        
-        if (protocolVersion >= NetworkConfig::CURRENT_PROTOCOL_VERSION) {
-            // Modern wallet - can use all seed types
-            
-            // Add Tor v3 seeds
-            CTorV3Manager* torManager = CTorV3Manager::GetInstance();
-            if (torManager) {
-                std::vector<std::string> torSeeds = torManager->GetKnownSeederNodes();
-                seeds.insert(seeds.end(), torSeeds.begin(), torSeeds.end());
-            }
-            
-            // Add DNS seeds
-            for (int i = 0; strDNSSeed[i] != NULL; i++) {
-                seeds.push_back(std::string(strDNSSeed[i]));
-            }
-            
-        } else if (IsOldWalletCompatible(protocolVersion)) {
-            // Old but compatible wallet - use DNS seeds only
-            for (int i = 0; strDNSSeed[i] != NULL; i++) {
-                seeds.push_back(std::string(strDNSSeed[i]));
-            }
-        }
-        
-        return seeds;
-    }
-
     NetworkHealth GetNetworkHealth() {
         NetworkHealth health;
         health.connectedPeers = 0;
         health.torPeers = 0;
-        health.clearnetPeers = 0;
         health.isBootstrapped = false;
         health.isSyncing = false;
         health.lastBlockTime = 0;
-        
+
         // Count connected peers
         {
             LOCK(cs_vNodes);
             health.connectedPeers = vNodes.size();
-            
-            // Count Tor vs clearnet peers
+
             for (CNode* pnode : vNodes) {
                 std::string addr = pnode->addr.ToString();
                 if (addr.find(".onion") != std::string::npos) {
                     health.torPeers++;
-                } else {
-                    health.clearnetPeers++;
                 }
             }
         }
-        
-        // Check if we're bootstrapped (have at least 3 connections)
+
+        // Bootstrapped if at least 3 connections
         health.isBootstrapped = (health.connectedPeers >= 3);
-        
-        // Check sync status
-        extern int nBestHeight;
-        extern int64_t nTimeBestReceived;
-        
-        health.isSyncing = (nTimeBestReceived > 0 && 
-                           GetTime() - nTimeBestReceived < 3600); // Synced within last hour
-        health.lastBlockTime = nTimeBestReceived;
-        
+
+        // Sync status (nTimeBestReceived declared in main.h)
+        health.isSyncing = (::nTimeBestReceived > 0 &&
+                           GetTime() - ::nTimeBestReceived < 3600);
+        health.lastBlockTime = ::nTimeBestReceived;
+
         return health;
     }
 
-} // namespace NetBootstrap
+} // namespace NetBootstrap

src/net_bootstrap.h

@@ -1,5 +1,5 @@
 // Copyright (c) 2024 Triangles developers
-// Network Bootstrap Configuration for Triangles v5.0.0.0
+// Network Bootstrap Configuration for Triangles
 // Distributed under the MIT/X11 software license
 
 #ifndef TRIANGLES_NET_BOOTSTRAP_H
@@ -9,86 +9,45 @@
 #include <string>
 #include <vector>
 
-// Network bootstrap configuration for preserving old wallets
-// while enabling modern Tor v3 functionality
+// Tor-native network bootstrap configuration.
+// All connections route through embedded Tor. Clearnet is disabled.
 
 namespace NetBootstrap {
 
-    // DNS seed nodes for initial bootstrap (clearnet fallback)
-    // Unused attribute prevents warnings
-    static const char* strDNSSeed[] __attribute__((unused)) = {
-        "seed1.cryptographic-triangles.org",
-        "seed2.cryptographic-triangles.org",
-        "seed3.cryptographic-triangles.org",
-        "backup-seed.cryptographic-triangles.org",
-        NULL
-    };
-
-    // Legacy IP seed nodes for old wallet compatibility
-    // These should be actual IP addresses of stable nodes
-    static const unsigned int pnSeed[] __attribute__((unused)) = {
-        // Format: IP addresses in network byte order (little-endian)
-        // For IP a.b.c.d: (d << 24) | (c << 16) | (b << 8) | a
-        0xCE58E9C2, // DNS2-OpenClaw: 194.233.88.206
-        0x13A7D04A, // DNS3-Sami:     74.208.167.19
-    };
-
     // Network protocol compatibility settings
     struct NetworkConfig {
-        // Preserve compatibility with old wallets
         static const int MIN_PROTOCOL_VERSION_OLD_WALLET = 70200;
         static const int CURRENT_PROTOCOL_VERSION = 70205;
-        
-        // Network ports (preserved from existing configuration)
+
+        // Network ports
         static const int DEFAULT_PORT_MAINNET = 24112;
         static const int DEFAULT_PORT_TESTNET = 24111;
         static const int DEFAULT_RPC_PORT_MAINNET = 19112;
         static const int DEFAULT_RPC_PORT_TESTNET = 19111;
-        
-        // Connection limits for different node types
-        static const int MAX_CONNECTIONS_DEFAULT = 125;
-        static const int MAX_CONNECTIONS_TOR_ONLY = 64;
+
+        // Connection limits
+        static const int MAX_CONNECTIONS_DEFAULT = 64;
         static const int MAX_OUTBOUND_CONNECTIONS = 8;
-        
-        // Tor-specific configuration
+
+        // Tor configuration
         static const int TOR_HIDDEN_SERVICE_PORT = 24112;
-        static constexpr const char* TOR_PROXY_DEFAULT = "127.0.0.1:9050";
-        
-        // Network timeouts and retry settings
+
+        // Timeouts
         static const int CONNECTION_TIMEOUT_SECONDS = 30;
-        static const int PEER_DISCOVERY_INTERVAL_SECONDS = 3600; // 1 hour
-        static const int SEEDER_ANNOUNCEMENT_INTERVAL_SECONDS = 1800; // 30 minutes
+        static const int PEER_DISCOVERY_INTERVAL_SECONDS = 3600;
     };
 
-    // Bootstrap sequence for different wallet types
-    enum BootstrapMode {
-        BOOTSTRAP_LEGACY,      // Old wallets without Tor
-        BOOTSTRAP_TOR_MIXED,   // Mixed clearnet + Tor
-        BOOTSTRAP_TOR_ONLY     // Tor-only mode
-    };
-
-    // Get bootstrap configuration based on wallet capabilities
-    BootstrapMode GetBootstrapMode();
-    
-    // Initialize network bootstrap based on configuration
-    bool InitializeNetworkBootstrap(BootstrapMode mode);
-    
-    // Backward compatibility helpers
-    bool IsOldWalletCompatible(int protocolVersion);
-    std::vector<std::string> GetCompatibleSeedNodes(int protocolVersion);
-    
     // Network health monitoring
     struct NetworkHealth {
         int connectedPeers;
         int torPeers;
-        int clearnetPeers;
         bool isBootstrapped;
         bool isSyncing;
         int64_t lastBlockTime;
     };
-    
+
     NetworkHealth GetNetworkHealth();
-    
+
 } // namespace NetBootstrap
 
-#endif // TRIANGLES_NET_BOOTSTRAP_H
+#endif // TRIANGLES_NET_BOOTSTRAP_H

src/netbase.cpp

@@ -6,6 +6,7 @@
 #include "netbase.h"
 #include "util.h"
 #include "sync.h"
+#include <openssl/evp.h>
 
 #ifndef WIN32
 #include <sys/fcntl.h>
@@ -860,15 +861,19 @@ std::string CNetAddr::ToStringIP() const
         unsigned char addr35[35];
         memcpy(addr35, tor_v3_pubkey, 32);
         // Compute checksum: SHA3-256(".onion checksum" || pubkey || version)[:2]
-        // For now use a simplified checksum from the stored data
         unsigned char checksumInput[15 + 32 + 1];
         memcpy(checksumInput, ".onion checksum", 15);
         memcpy(checksumInput + 15, tor_v3_pubkey, 32);
         checksumInput[47] = 0x03; // version
-        // SHA-256 as fallback (SHA3-256 via tor_crypto_compat.h for full impl)
-        uint256 hash = Hash(checksumInput, checksumInput + 48);
-        addr35[32] = ((unsigned char*)&hash)[0];
-        addr35[33] = ((unsigned char*)&hash)[1];
+        unsigned char sha3hash[32];
+        unsigned int sha3len = 0;
+        EVP_MD_CTX *mdctx = EVP_MD_CTX_new();
+        EVP_DigestInit_ex(mdctx, EVP_sha3_256(), NULL);
+        EVP_DigestUpdate(mdctx, checksumInput, 48);
+        EVP_DigestFinal_ex(mdctx, sha3hash, &sha3len);
+        EVP_MD_CTX_free(mdctx);
+        addr35[32] = sha3hash[0];
+        addr35[33] = sha3hash[1];
         addr35[34] = 0x03; // version
         return EncodeBase32(addr35, 35) + ".onion";
     }

src/onionseed.h

@@ -2,12 +2,14 @@
 #ifndef TRIANGLES_ONIONSEED_H
 #define TRIANGLES_ONIONSEED_H
 
-// hidden service seeds
-// v5 hard fork: v2 onion seeds removed (Tor v2 deprecated Oct 2021)
-// v3 onion seeds will be added when bootstrap nodes are deployed
+// Hardcoded onion seed nodes for initial peer discovery.
+// Also fetched dynamically via https://seeds.cryptographic-triangles.org/seeds.txt
 static const char *strMainNetOnionSeed[][1] = {
-    {"gxvrhv3qitnc6kobrhsrse46bmcfitnybapor3or3oczzuxn6hfzxyid.onion"},
-    {"futmtrvh6j34t7s6yjdxfia6iwuyfzwh4k5eqfof5kfhoqk3xmi3qoqd.onion"},
+    {"jbpfhe7zw3qm67wy3j2ayysp3mnrjobopthnko3b3sgahqtecblwqmid.onion"},
+    {"uddaxjbo3lh2zskg7w6gwln4ty5cel7q4c5jbx7fdtv6zf2j47gdlyad.onion"},
+    {"el5sirhhleecuctpeeprelzubpqmoqivvra3rzlwbjttinxa4fq3wnid.onion"},
+    {"sj5dhybnlp3v4y5niyc5unrnd6s43lyx5ibup7rolyosjbi2u2hsbvyd.onion"},
+    {"i3kr5meha7se4ns3wss3h7v46m6uksfzv4wrohdqxpj6n35wyo2bvlid.onion"},
     {NULL}
 };
 

src/qt/addressbookpage.cpp

@@ -27,7 +27,10 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) :
     tab(tab)
 {
     ui->setupUi(this);
-    setWindowFlags(Qt::CustomizeWindowHint | Qt::FramelessWindowHint | Qt::Window);
+    if (mode == ForEditing && parent)
+        setWindowFlags(Qt::Widget);
+    else
+        setWindowFlags(Qt::CustomizeWindowHint | Qt::FramelessWindowHint | Qt::Window);
     ui->wAddressBookHeader->installEventFilter(new DialogMoveHandler(this));
 
 #ifdef Q_OS_MAC // Icons on push buttons are very uncommon on Mac

src/qt/askpassphrasedialog.cpp

@@ -99,11 +99,9 @@ void AskPassphraseDialog::accept()
     oldpass.reserve(MAX_PASSPHRASE_SIZE);
     newpass1.reserve(MAX_PASSPHRASE_SIZE);
     newpass2.reserve(MAX_PASSPHRASE_SIZE);
-    // TODO: get rid of this .c_str() by implementing SecureString::operator=(std::string)
-    // Alternately, find a way to make this input mlock()'d to begin with.
-    oldpass.assign(ui->passEdit1->text().toStdString().c_str());
-    newpass1.assign(ui->passEdit2->text().toStdString().c_str());
-    newpass2.assign(ui->passEdit3->text().toStdString().c_str());
+    oldpass = MakeSecureString(ui->passEdit1->text().toStdString());
+    newpass1 = MakeSecureString(ui->passEdit2->text().toStdString());
+    newpass2 = MakeSecureString(ui->passEdit3->text().toStdString());
 
     switch(mode)
     {

src/qt/clientmodel.cpp

@@ -70,12 +70,20 @@ void ClientModel::updateTimer()
     int newNumBlocks = getNumBlocks();
     int newNumBlocksOfPeers = getNumBlocksOfPeers();
 
-    // Always emit during IBD so the speed/ETA display stays live
-    if(cachedNumBlocks != newNumBlocks || cachedNumBlocksOfPeers != newNumBlocksOfPeers
-       || newNumBlocks < newNumBlocksOfPeers)
+    // Always emit when values change or during IBD.
+    // Also emit every ~30 seconds even when idle so setNumBlocks() can
+    // re-evaluate sync status (e.g. when a new block arrives after a long gap).
+    static int64_t nLastEmit = 0;
+    int64_t nNow = GetTime();
+    bool fChanged = (cachedNumBlocks != newNumBlocks || cachedNumBlocksOfPeers != newNumBlocksOfPeers);
+    bool fCatchingUp = (newNumBlocks < newNumBlocksOfPeers);
+    bool fPeriodicRefresh = (nNow - nLastEmit >= 30);
+
+    if(fChanged || fCatchingUp || fPeriodicRefresh)
     {
         cachedNumBlocks = newNumBlocks;
         cachedNumBlocksOfPeers = newNumBlocksOfPeers;
+        nLastEmit = nNow;
 
         emit numBlocksChanged(newNumBlocks, newNumBlocksOfPeers);
     }
@@ -185,13 +193,16 @@ static void NotifyBlocksChanged(ClientModel *clientmodel)
 
 static void NotifyNumConnectionsChanged(ClientModel *clientmodel, int newNumConnections)
 {
-    // Too noisy: OutputDebugStringF("NotifyNumConnectionsChanged %i\n", newNumConnections);
+    // Don't queue UI updates during shutdown - ClientModel may be destroyed
+    // before Qt processes the queued invocation, causing use-after-free.
+    if (fShutdown) return;
     QMetaObject::invokeMethod(clientmodel, "updateNumConnections", Qt::QueuedConnection,
                               Q_ARG(int, newNumConnections));
 }
 
 static void NotifyAlertChanged(ClientModel *clientmodel, const uint256 &hash, ChangeType status)
 {
+    if (fShutdown) return;
     OutputDebugStringF("NotifyAlertChanged %s status=%i\n", hash.GetHex().c_str(), status);
     QMetaObject::invokeMethod(clientmodel, "updateAlert", Qt::QueuedConnection,
                               Q_ARG(QString, QString::fromStdString(hash.GetHex())),

src/qt/forms/rpcconsole.ui

@@ -1085,6 +1085,63 @@ QPushButton:!enabled {
             </property>
            </widget>
           </item>
+          <item>
+           <layout class="QHBoxLayout" name="filterLayout">
+            <property name="spacing">
+             <number>12</number>
+            </property>
+            <item>
+             <widget class="QLabel" name="showLabel">
+              <property name="text">
+               <string>Show:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="showRequestsCheckBox">
+              <property name="text">
+               <string>Requests</string>
+              </property>
+              <property name="checked">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="showRepliesCheckBox">
+              <property name="text">
+               <string>Replies</string>
+              </property>
+              <property name="checked">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="showErrorsCheckBox">
+              <property name="text">
+               <string>Errors</string>
+              </property>
+              <property name="checked">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacerFilters">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout">
             <property name="spacing">

src/qt/guiutil.cpp

@@ -405,6 +405,96 @@ bool SetStartOnSystemStartup(bool fAutoStart)
     }
     return true;
 }
+#elif defined(Q_OS_MAC) || defined(MAC_OSX) || defined(__APPLE__)
+
+boost::filesystem::path static GetLaunchAgentsDir()
+{
+    const QString homeDir = QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
+    if (homeDir.isEmpty())
+        return boost::filesystem::path();
+    return boost::filesystem::path(homeDir.toStdString()) / "Library" / "LaunchAgents";
+}
+
+boost::filesystem::path static GetAutostartFilePath()
+{
+    return GetLaunchAgentsDir() / "org.triangles.triangles-qt.plist";
+}
+
+static std::string PlistEscape(const std::string& value)
+{
+    std::string escaped;
+    escaped.reserve(value.size());
+    for (std::string::const_iterator it = value.begin(); it != value.end(); ++it)
+    {
+        switch (*it)
+        {
+        case '&': escaped += "&"; break;
+        case '<': escaped += "&lt;"; break;
+        case '>': escaped += "&gt;"; break;
+        case '"': escaped += "&quot;"; break;
+        case '\'': escaped += "&apos;"; break;
+        default: escaped += *it; break;
+        }
+    }
+    return escaped;
+}
+
+bool GetStartOnSystemStartup()
+{
+    boost::filesystem::ifstream optionFile(GetAutostartFilePath());
+    if (!optionFile.good())
+        return false;
+
+    std::string contents;
+    std::string line;
+    while (getline(optionFile, line))
+        contents += line;
+    optionFile.close();
+
+    return contents.find("<key>RunAtLoad</key>") != std::string::npos &&
+           contents.find("<true/>") != std::string::npos &&
+           contents.find("<string>-min</string>") != std::string::npos;
+}
+
+bool SetStartOnSystemStartup(bool fAutoStart)
+{
+    if (!fAutoStart)
+        return !boost::filesystem::exists(GetAutostartFilePath()) || boost::filesystem::remove(GetAutostartFilePath());
+
+    const QString exePath = QApplication::applicationFilePath();
+    if (exePath.isEmpty())
+        return false;
+
+    const QString workingDir = QFileInfo(exePath).absolutePath();
+    boost::filesystem::create_directories(GetLaunchAgentsDir());
+
+    boost::filesystem::ofstream optionFile(GetAutostartFilePath(), std::ios_base::out|std::ios_base::trunc);
+    if (!optionFile.good())
+        return false;
+
+    optionFile
+        << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+        << "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" "
+        << "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
+        << "<plist version=\"1.0\">\n"
+        << "<dict>\n"
+        << "    <key>Label</key>\n"
+        << "    <string>org.triangles.triangles-qt</string>\n"
+        << "    <key>ProgramArguments</key>\n"
+        << "    <array>\n"
+        << "        <string>" << PlistEscape(exePath.toStdString()) << "</string>\n"
+        << "        <string>-min</string>\n"
+        << "    </array>\n"
+        << "    <key>RunAtLoad</key>\n"
+        << "    <true/>\n"
+        << "    <key>WorkingDirectory</key>\n"
+        << "    <string>" << PlistEscape(workingDir.toStdString()) << "</string>\n"
+        << "</dict>\n"
+        << "</plist>\n";
+    optionFile.close();
+
+    return optionFile.good();
+}
 #else
 
 // TODO: OSX startup stuff; see:

src/qt/introdialog.cpp

@@ -16,6 +16,8 @@
 
 #include <boost/filesystem.hpp>
 
+#include <set>
+
 IntroDialog::IntroDialog(QWidget *parent) :
     QDialog(parent)
 {
@@ -190,6 +192,24 @@ bool IntroDialog::pickDataDirectory()
         settings.setValue("strDataDir", dataDir);
     }
 
+    // Check for pending data directory migration
+    if (settings.value("fPendingDataDirMigration", false).toBool()) {
+        QString oldDir = settings.value("strDataDirPrevious", "").toString();
+        if (!oldDir.isEmpty() && oldDir != dataDir) {
+            if (!migrateDataDirectory(oldDir, dataDir)) {
+                // Migration failed - revert to old directory
+                QMessageBox::warning(0, "Triangles",
+                    QString("Data directory migration failed.\nContinuing with the previous directory:\n%1")
+                        .arg(oldDir));
+                dataDir = oldDir;
+                settings.setValue("strDataDir", oldDir);
+            }
+        }
+        // Clear migration state regardless
+        settings.remove("strDataDirPrevious");
+        settings.setValue("fPendingDataDirMigration", false);
+    }
+
     // If the saved path is the default, don't set -datadir (let normal defaults work)
     QString defaultDir = QString::fromStdString(GetDefaultDataDir().string());
     if (dataDir != defaultDir) {
@@ -205,9 +225,22 @@ bool IntroDialog::pickDataDirectory()
         return false;
     }
 
-    // Offer bootstrap download on each startup (unless user checked "don't ask again")
+    // Auto-bootstrap: if no blockchain data exists, download automatically.
+    // If data exists, offer optional re-download (unless user checked "don't ask again").
     fs::path dataDirPath(dataDir.toStdString());
-    if (!settings.value("bootstrapDontAsk", false).toBool())
+    bool needsBootstrap = Bootstrap::NeedsBootstrap(dataDirPath);
+    bool userWantsBootstrap = false;
+
+    if (needsBootstrap)
+    {
+        // No blockchain data — bootstrap automatically, just inform the user
+        QMessageBox::information(0, "Triangles",
+            "No blockchain data found.\n\n"
+            "Downloading the latest blockchain snapshot automatically.\n"
+            "This will only take a few minutes.");
+        userWantsBootstrap = true;
+    }
+    else if (!settings.value("bootstrapDontAsk", false).toBool())
     {
         QMessageBox msgBox;
         msgBox.setWindowTitle("Triangles");
@@ -227,7 +260,10 @@ bool IntroDialog::pickDataDirectory()
         if (dontAskBox->isChecked())
             settings.setValue("bootstrapDontAsk", true);
 
-        if (ret == QMessageBox::Yes)
+        userWantsBootstrap = (ret == QMessageBox::Yes);
+    }
+
+        if (userWantsBootstrap)
         {
             std::string host = Bootstrap::DEFAULT_HOST;
             std::string strError;
@@ -271,7 +307,148 @@ bool IntroDialog::pickDataDirectory()
                 progress.setValue(100);
             }
         }
-    }
 
     return true;
 }
+
+static void copyDirectoryRecursive(const boost::filesystem::path& src,
+                                   const boost::filesystem::path& dst)
+{
+    namespace fs = boost::filesystem;
+    fs::create_directories(dst);
+    for (fs::directory_iterator it(src), end; it != end; ++it) {
+        fs::path dstChild = dst / it->path().filename();
+        if (fs::is_directory(it->path())) {
+            copyDirectoryRecursive(it->path(), dstChild);
+        } else {
+            fs::copy_file(it->path(), dstChild, fs::copy_options::overwrite_existing);
+        }
+    }
+}
+
+bool IntroDialog::migrateDataDirectory(const QString& oldPath, const QString& newPath)
+{
+    namespace fs = boost::filesystem;
+
+    fs::path srcDir(oldPath.toStdString());
+    fs::path dstDir(newPath.toStdString());
+
+    if (!fs::exists(srcDir) || !fs::is_directory(srcDir))
+        return false;
+
+    // Create destination directory
+    try {
+        fs::create_directories(dstDir);
+    } catch (const fs::filesystem_error& e) {
+        printf("Migration: Cannot create destination directory: %s\n", e.what());
+        return false;
+    }
+
+    // Check free space
+    try {
+        quint64 srcSize = 0;
+        for (fs::recursive_directory_iterator it(srcDir), end; it != end; ++it) {
+            if (fs::is_regular_file(*it))
+                srcSize += fs::file_size(*it);
+        }
+        fs::space_info si = fs::space(dstDir);
+        if (si.available < srcSize + (50 * 1024 * 1024)) { // 50MB headroom
+            printf("Migration: Insufficient disk space. Need %llu, have %llu\n",
+                   (unsigned long long)srcSize, (unsigned long long)si.available);
+            return false;
+        }
+    } catch (const fs::filesystem_error& e) {
+        printf("Migration: Cannot check disk space: %s\n", e.what());
+        return false;
+    }
+
+    // Files/directories to skip during copy
+    static const std::set<std::string> skipFiles = {
+        ".lock",
+        "debug.log",
+        "db.log",
+    };
+
+    // Show progress dialog
+    QProgressDialog progress("Moving data directory...", QString(), 0, 0, 0);
+    progress.setWindowTitle("Triangles - Data Migration");
+    progress.setWindowModality(Qt::ApplicationModal);
+    progress.setMinimumDuration(0);
+    progress.setCancelButton(0);
+    progress.show();
+    QApplication::processEvents();
+
+    // Phase 1: Copy wallet.dat FIRST (most critical file)
+    fs::path walletSrc = srcDir / "wallet.dat";
+    fs::path walletDst = dstDir / "wallet.dat";
+    if (fs::exists(walletSrc)) {
+        progress.setLabelText("Copying wallet.dat...");
+        QApplication::processEvents();
+        try {
+            // Copy to temp name first, then rename for atomicity
+            fs::path walletTmp = dstDir / "wallet.dat.migrating";
+            fs::copy_file(walletSrc, walletTmp, fs::copy_options::overwrite_existing);
+
+            // Verify copy by checking file size
+            if (fs::file_size(walletTmp) != fs::file_size(walletSrc)) {
+                fs::remove(walletTmp);
+                printf("Migration: wallet.dat copy size mismatch!\n");
+                return false;
+            }
+
+            // Rename into place
+            if (fs::exists(walletDst))
+                fs::remove(walletDst);
+            fs::rename(walletTmp, walletDst);
+        } catch (const fs::filesystem_error& e) {
+            printf("Migration: Failed to copy wallet.dat: %s\n", e.what());
+            return false; // Abort - wallet is critical
+        }
+    }
+
+    // Phase 2: Copy everything else
+    int filesCopied = 0;
+    try {
+        for (fs::directory_iterator it(srcDir), end; it != end; ++it) {
+            std::string filename = it->path().filename().string();
+
+            // Skip special files
+            if (skipFiles.count(filename))
+                continue;
+
+            // Skip wallet.dat (already copied)
+            if (filename == "wallet.dat")
+                continue;
+
+            fs::path dst = dstDir / filename;
+
+            progress.setLabelText(QString("Copying %1...").arg(QString::fromStdString(filename)));
+            QApplication::processEvents();
+
+            if (fs::is_directory(it->path())) {
+                copyDirectoryRecursive(it->path(), dst);
+            } else {
+                fs::copy_file(it->path(), dst, fs::copy_options::overwrite_existing);
+            }
+            filesCopied++;
+        }
+    } catch (const fs::filesystem_error& e) {
+        // Non-wallet copy failure: log but don't abort
+        // Chain data can be re-synced; wallet was already safely copied
+        printf("Migration: Warning: failed to copy some files: %s\n", e.what());
+    }
+
+    // Phase 3: Rename old wallet.dat as safety backup (don't delete old dir)
+    try {
+        if (fs::exists(walletSrc)) {
+            fs::rename(walletSrc, srcDir / "wallet.dat.bak-migrated");
+        }
+    } catch (...) {
+        // Not critical
+    }
+
+    progress.close();
+    printf("Migration: Successfully copied %d items from %s to %s\n",
+           filesCopied, srcDir.string().c_str(), dstDir.string().c_str());
+    return true;
+}

src/qt/introdialog.h

@@ -25,6 +25,13 @@ public:
      */
     static bool pickDataDirectory();
 
+    /**
+     * Migrate data directory contents from oldPath to newPath.
+     * Returns true on success, false on failure.
+     * Shows a progress dialog during the copy.
+     */
+    static bool migrateDataDirectory(const QString& oldPath, const QString& newPath);
+
 private slots:
     void on_browseButton_clicked();
     void on_defaultRadio_toggled(bool checked);

src/qt/messagemodel.cpp

@@ -8,7 +8,7 @@
 
 #include "ui_interface.h"
 #include "base58.h"
-#include "json_spirit.h"
+#include "json/json_compat.h"
 
 #include <QSet>
 #include <QTimer>
@@ -19,6 +19,7 @@
 #include <QMenu>
 #include <QFont>
 #include <QColor>
+#include <QTextDocument>
 
 Q_DECLARE_METATYPE(std::vector<unsigned char>);
 
@@ -27,6 +28,24 @@ QList<QString> ambiguous; /**< Specifies Ambiguous addresses */
 const QString MessageModel::Sent = "Sent";
 const QString MessageModel::Received = "Received";
 
+namespace {
+
+static QString FormatShortMessage(const QString& message)
+{
+    static const int kMaxPreviewChars = 80;
+
+    QTextDocument doc;
+    doc.setHtml(message);
+
+    QString preview = doc.toPlainText().simplified();
+    if (preview.length() <= kMaxPreviewChars)
+        return preview;
+
+    return preview.left(kMaxPreviewChars - 3) + "...";
+}
+
+} // namespace
+
 struct MessageTableEntryLessThan
 {
     bool operator()(const MessageTableEntry &a, const MessageTableEntry &b) const {return a.received_datetime < b.received_datetime;};
@@ -246,8 +265,9 @@ public:
 
 private:
     // Get the json value
-    const json_spirit::mValue & find_value(json_spirit::mObject & obj, const char * key)
+    const json_spirit::Value & find_json_value(json_spirit::mObject & obj, const char * key)
     {
+        static const json_spirit::Value null_val;
         std::string newKey = key;
 
         json_spirit::mObject::const_iterator i = obj.find(newKey);
@@ -255,12 +275,12 @@ private:
         if(i != obj.end() && i->first == newKey)
             return i->second;
         else
-            return json_spirit::mValue::null;
+            return null_val;
     }
 
     const std::string get_value(json_spirit::mObject & obj, const char * key)
     {
-        json_spirit::mValue val = find_value(obj, key);
+        const json_spirit::Value& val = find_json_value(obj, key);
 
         if(val.is_null())
             return "";
@@ -272,7 +292,7 @@ private:
     void handleMessageEntry(const MessageTableEntry & message, const bool append)
     {
         addMessageEntry(message, append);
-        json_spirit::mValue mVal;
+        json_spirit::Value mVal;
         json_spirit::read(message.message.toStdString(), mVal);
 
         if(mVal.is_null())
@@ -281,8 +301,8 @@ private:
             return;
         }
 
-        json_spirit::mObject mObj(mVal.get_obj());
-        json_spirit::mValue mvType = find_value(mObj, "type");
+        json_spirit::mObject mObj(mVal.get_map_obj());
+        json_spirit::Value mvType = find_json_value(mObj, "type");
 
     }
 
@@ -485,7 +505,7 @@ QVariant MessageModel::data(const QModelIndex &index, int role) const
     case FilterAddressRole: return (rec->type == MessageTableEntry::Sent ? rec->to_address + rec->from_address : rec->from_address + rec->to_address);
     case LabelRole:         return rec->label;
     case MessageRole:       return rec->message;
-    case ShortMessageRole:  return rec->message; // TODO: Short message
+    case ShortMessageRole:  return FormatShortMessage(rec->message);
     case HTMLRole:          return rec->received_datetime.toString() + "<br>"  + (rec->label.isEmpty() ? rec->from_address : rec->label)  + "<br>" + rec->message;
     case Ambiguous:
         int it;

src/qt/optionsdialog.cpp

@@ -7,12 +7,21 @@
 #include "optionsmodel.h"
 #include "dialog_move_handler.h"
 
+#include "init.h"
+#include "util.h"
+
+#include <boost/filesystem.hpp>
+
 #include <QDir>
+#include <QFileDialog>
+#include <QGroupBox>
 #include <QIntValidator>
 #include <QLocale>
 #include <QMessageBox>
+#include <QProcess>
 #include <QRegExp>
 #include <QRegExpValidator>
+#include <QSettings>
 
 OptionsDialog::OptionsDialog(QWidget *parent) :
     QDialog(parent),
@@ -21,12 +30,54 @@ OptionsDialog::OptionsDialog(QWidget *parent) :
     mapper(0),
     fRestartWarningDisplayed_Proxy(false),
     fRestartWarningDisplayed_Lang(false),
-    fProxyIpValid(true)
+    fProxyIpValid(true),
+    dataDirPath(0),
+    dataDirFreeSpaceLabel(0)
 {
     ui->setupUi(this);
     setWindowFlags(Qt::CustomizeWindowHint | Qt::FramelessWindowHint | Qt::Window);
     ui->wCaption->installEventFilter(new DialogMoveHandler(this));
 
+    /* Data Directory section in Main tab */
+    m_currentDataDir = QString::fromStdString(GetDataDir(false).string());
+    m_pendingDataDir.clear();
+
+    QGroupBox *groupDataDir = new QGroupBox(tr("Data Directory"), this);
+    groupDataDir->setStyleSheet(
+        "QGroupBox { border: 1px solid #61280E; margin-top: 8px; padding-top: 16px; color: #f26522; }"
+        "QGroupBox::title { subcontrol-origin: margin; left: 10px; padding: 0 3px; }");
+
+    QVBoxLayout *dataDirLayout = new QVBoxLayout(groupDataDir);
+
+    QHBoxLayout *dataDirPathLayout = new QHBoxLayout();
+    dataDirPath = new QLineEdit(m_currentDataDir, groupDataDir);
+    dataDirPath->setReadOnly(true);
+    dataDirPath->setStyleSheet("QLineEdit { background-color: #1c1c1c; border: 1px solid #f26522; color: #f26522; padding: 2px; }");
+
+    QPushButton *dataDirBrowseButton = new QPushButton(tr("Browse..."), groupDataDir);
+    dataDirBrowseButton->setStyleSheet(
+        "QPushButton { background-color: #000; color: #f26522; border: 1px solid #f26522; padding: 2px 12px; min-height: 20px; }"
+        "QPushButton:hover { background-color: #61280E; }"
+        "QPushButton:pressed:flat { color: #000; background-color: #f26522; }");
+
+    dataDirPathLayout->addWidget(dataDirPath);
+    dataDirPathLayout->addWidget(dataDirBrowseButton);
+    dataDirLayout->addLayout(dataDirPathLayout);
+
+    dataDirFreeSpaceLabel = new QLabel(groupDataDir);
+    dataDirFreeSpaceLabel->setStyleSheet("color: #999; font-size: 11px;");
+    dataDirLayout->addWidget(dataDirFreeSpaceLabel);
+
+    // Insert into Main tab layout, before the vertical spacer (last item)
+    QVBoxLayout *mainTabLayout = qobject_cast<QVBoxLayout*>(ui->tabWidget->widget(0)->layout());
+    if (mainTabLayout) {
+        int spacerIndex = mainTabLayout->count() - 1; // vertical spacer is last
+        mainTabLayout->insertWidget(spacerIndex, groupDataDir);
+    }
+
+    connect(dataDirBrowseButton, SIGNAL(clicked()), this, SLOT(on_dataDirBrowseButton_clicked()));
+    updateDataDirFreeSpace();
+
     /* Network elements init */
 #ifndef USE_UPNP
     ui->mapPortUpnp->setEnabled(false);
@@ -188,6 +239,8 @@ void OptionsDialog::setSaveButtonState(bool fState)
 void OptionsDialog::on_okButton_clicked()
 {
     mapper->submit();
+    if (handleDataDirChange())
+        return; // restart flow handles closing
     accept();
 }
 
@@ -199,6 +252,7 @@ void OptionsDialog::on_cancelButton_clicked()
 void OptionsDialog::on_applyButton_clicked()
 {
     mapper->submit();
+    handleDataDirChange();
     disableApplyButton();
 }
 
@@ -303,3 +357,150 @@ bool OptionsDialog::eventFilter(QObject *object, QEvent *event)
     }
     return QDialog::eventFilter(object, event);
 }
+
+void OptionsDialog::on_dataDirBrowseButton_clicked()
+{
+    QString dir = QFileDialog::getExistingDirectory(
+        this, tr("Choose data directory"), m_currentDataDir);
+    if (!dir.isEmpty() && dir != m_currentDataDir)
+    {
+        m_pendingDataDir = dir;
+        dataDirPath->setText(dir);
+        updateDataDirFreeSpace();
+        enableApplyButton();
+    }
+}
+
+void OptionsDialog::updateDataDirFreeSpace()
+{
+    namespace fs = boost::filesystem;
+    QString path = dataDirPath->text();
+    fs::path fsPath(path.toStdString());
+    try {
+        while (!fsPath.empty() && !fs::exists(fsPath))
+            fsPath = fsPath.parent_path();
+        if (!fsPath.empty()) {
+            fs::space_info si = fs::space(fsPath);
+            double freeGB = (double)si.available / (1024.0 * 1024.0 * 1024.0);
+            dataDirFreeSpaceLabel->setText(
+                tr("Free space: %1 GB").arg(QString::number(freeGB, 'f', 2)));
+        } else {
+            dataDirFreeSpaceLabel->setText(tr("Cannot determine free space"));
+        }
+    } catch (const fs::filesystem_error &) {
+        dataDirFreeSpaceLabel->setText(tr("Cannot determine free space"));
+    }
+}
+
+quint64 OptionsDialog::calculateDirSize(const QString& path)
+{
+    namespace fs = boost::filesystem;
+    quint64 totalSize = 0;
+    try {
+        for (fs::recursive_directory_iterator it(path.toStdString()), end; it != end; ++it) {
+            if (fs::is_regular_file(*it))
+                totalSize += fs::file_size(*it);
+        }
+    } catch (...) {}
+    return totalSize;
+}
+
+bool OptionsDialog::handleDataDirChange()
+{
+    if (m_pendingDataDir.isEmpty() || m_pendingDataDir == m_currentDataDir)
+        return false;
+
+    namespace fs = boost::filesystem;
+    fs::path destPath(m_pendingDataDir.toStdString());
+
+    // Check destination is writable
+    try {
+        fs::create_directories(destPath);
+    } catch (const fs::filesystem_error& e) {
+        QMessageBox::critical(this, tr("Error"),
+            tr("Cannot create directory: %1").arg(QString::fromStdString(e.what())));
+        m_pendingDataDir.clear();
+        dataDirPath->setText(m_currentDataDir);
+        updateDataDirFreeSpace();
+        return false;
+    }
+
+    // Check free space vs current data dir size
+    quint64 dataDirSize = calculateDirSize(m_currentDataDir);
+    try {
+        fs::space_info si = fs::space(destPath);
+        quint64 required = dataDirSize + (dataDirSize / 10); // 10% headroom
+        if (si.available < required) {
+            QMessageBox::critical(this, tr("Insufficient Space"),
+                tr("The destination has %1 MB free but the data directory requires approximately %2 MB.")
+                    .arg(si.available / (1024*1024))
+                    .arg(required / (1024*1024)));
+            m_pendingDataDir.clear();
+            dataDirPath->setText(m_currentDataDir);
+            updateDataDirFreeSpace();
+            return false;
+        }
+    } catch (const fs::filesystem_error&) {
+        // If we can't check space, proceed anyway
+    }
+
+    // Save migration state to QSettings
+    QSettings settings;
+    settings.setValue("strDataDirPrevious", m_currentDataDir);
+    settings.setValue("strDataDir", m_pendingDataDir);
+    settings.setValue("fPendingDataDirMigration", true);
+
+    // Ask about restart
+    QMessageBox msgBox(this);
+    msgBox.setWindowFlags(Qt::FramelessWindowHint);
+    msgBox.setWindowTitle(tr("Data Directory Changed"));
+    msgBox.setText(tr("The data directory will be moved from:\n%1\n\nTo:\n%2\n\n"
+                      "This will happen when the wallet restarts.")
+                   .arg(m_currentDataDir).arg(m_pendingDataDir));
+    msgBox.setIcon(QMessageBox::Information);
+    msgBox.setIconPixmap(QPixmap(":/msgbox/information"));
+    msgBox.setStyleSheet("QMessageBox { border: 2px solid #f26522; background-color: #000; color: #f26522; }");
+
+    QPushButton *restartBtn = msgBox.addButton(tr("Restart Now"), QMessageBox::AcceptRole);
+    QPushButton *laterBtn = msgBox.addButton(tr("Later"), QMessageBox::RejectRole);
+
+    QString btnStyle =
+        "QPushButton { background-color: #000; color: #f26522; border: 1px solid #f26522; "
+        "min-width: 120px; max-width: 120px; max-height: 20px; min-height: 20px; }"
+        "QPushButton:hover { background-color: #61280E; }"
+        "QPushButton:pressed:flat { color: #000; background-color: #f26522; }";
+    restartBtn->setStyleSheet(btnStyle);
+    laterBtn->setStyleSheet(btnStyle);
+
+    msgBox.exec();
+
+    if (msgBox.clickedButton() == restartBtn) {
+        performRestart();
+        return true;
+    }
+    return false;
+}
+
+void OptionsDialog::performRestart()
+{
+    // Launch a new instance of ourselves
+    QString exePath = QApplication::applicationFilePath();
+    QStringList args = QApplication::arguments();
+    args.removeFirst(); // remove argv[0]
+
+    // Remove any existing -datadir argument so the new instance
+    // reads strDataDir from QSettings and performs migration
+    QMutableStringListIterator it(args);
+    while (it.hasNext()) {
+        QString arg = it.next();
+        if (arg.startsWith("-datadir") || arg.startsWith("/datadir"))
+            it.remove();
+    }
+
+    // Start new process detached so it survives our shutdown
+    QProcess::startDetached(exePath, args);
+
+    // Close dialog and trigger wallet shutdown
+    accept();
+    StartShutdown();
+}

src/qt/optionsdialog.h

@@ -3,6 +3,9 @@
 
 #include <QDialog>
 
+class QLineEdit;
+class QLabel;
+
 namespace Ui {
 class OptionsDialog;
 }
@@ -45,17 +48,29 @@ private slots:
     void updateDisplayUnit();
     void handleProxyIpValid(QValidatedLineEdit *object, bool fState);
     void applyTorDefaults(bool enabled);
+    void on_dataDirBrowseButton_clicked();
+    void updateDataDirFreeSpace();
 
 signals:
     void proxyIpValid(QValidatedLineEdit *object, bool fValid);
 
 private:
+    bool handleDataDirChange();
+    void performRestart();
+    quint64 calculateDirSize(const QString& path);
+
     Ui::OptionsDialog *ui;
     OptionsModel *model;
     MonitoredDataMapper *mapper;
     bool fRestartWarningDisplayed_Proxy;
     bool fRestartWarningDisplayed_Lang;
     bool fProxyIpValid;
+
+    // Data directory widgets (built programmatically)
+    QLineEdit *dataDirPath;
+    QLabel *dataDirFreeSpaceLabel;
+    QString m_currentDataDir;
+    QString m_pendingDataDir;
 };
 
 #endif // OPTIONSDIALOG_H

src/qt/overviewpage.cpp

@@ -92,6 +92,7 @@ OverviewPage::OverviewPage(QWidget *parent) :
     currentStake(0),
     currentUnconfirmedBalance(-1),
     currentImmatureBalance(-1),
+    walletTransactionSyncing(false),
     txdelegate(new TxViewDelegate()),
     filter(0)
 {
@@ -166,8 +167,10 @@ void OverviewPage::setModel(WalletModel *model)
         // Keep up to date with wallet
         setBalance(model->getBalance(), model->getStake(), model->getUnconfirmedBalance(), model->getImmatureBalance());
         connect(model, SIGNAL(balanceChanged(qint64, qint64, qint64, qint64)), this, SLOT(setBalance(qint64, qint64, qint64, qint64)));
+        connect(model, SIGNAL(transactionSyncStateChanged(bool)), this, SLOT(setTransactionSyncState(bool)));
 
         connect(model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));
+        setTransactionSyncState(model->isTransactionSyncing());
     }
 
     // update the display unit, to not use the default ("TRI")
@@ -188,6 +191,23 @@ void OverviewPage::updateDisplayUnit()
     }
 }
 
+void OverviewPage::setTransactionSyncState(bool syncing)
+{
+    walletTransactionSyncing = syncing;
+    if (!filter)
+        return;
+
+    filter->setDynamicSortFilter(!syncing);
+    ui->listTransactions->setUpdatesEnabled(!syncing);
+
+    if (!syncing)
+    {
+        filter->invalidate();
+        filter->sort(TransactionTableModel::Status, Qt::DescendingOrder);
+        ui->listTransactions->viewport()->update();
+    }
+}
+
 void OverviewPage::showOutOfSyncWarning(bool fShow)
 {
     ui->labelWalletStatus->setVisible(fShow);