Triangles branding + fix Qt platform plugin for Windows installer

Linux Qt .deb: bundles all .so files + LD_LIBRARY_PATH wrapper
Linux daemon .deb: same + systemd Environment= for LD_LIBRARY_PATH
Windows: already handled (ldd scan for DLLs)
macOS: already handled (install_name_tool into Frameworks)

Removed all Depends: from .deb control files. Every package
runs on a clean machine with nothing pre-installed.

.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

@@ -73,7 +73,99 @@
       "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:*)"
+      "Bash(PATH=\"/c/msys64/mingw64/bin:$PATH\" mingw32-make:*)",
+      "Bash(export PATH=\"/c/msys64/mingw64/bin:$PATH\")",
+      "Bash(\"C:/msys64/mingw64/bin/qmake-qt5.exe\" triangles-qt.pro -o Makefile)",
+      "Bash(gh release create:*)",
+      "Bash(gh repo view:*)",
+      "Bash(gh repo create:*)",
+      "Bash(git commit:*)",
+      "Bash(git branch:*)",
+      "Bash(git push:*)",
+      "Bash(gh repo fork:*)",
+      "Bash(gh api:*)",
+      "Bash(gh auth:*)",
+      "Bash(1 <<'EOF'\n{\"visibility\":\"public\"}\nEOF)",
+      "Bash(findstr:*)",
+      "Bash(gh workflow run:*)",
+      "Bash(gh run watch:*)",
+      "Bash(gh run view:*)",
+      "Bash(gh release view:*)",
+      "Bash(gh run download:*)",
+      "Bash(gh release upload:*)",
+      "Bash(gh release delete-asset:*)",
+      "Bash(C:/msys64/mingw64/bin/mingw32-make.exe:*)",
+      "Bash(C:/msys64/usr/bin/env.exe MSYSTEM=MINGW64 PATH=\"/mingw64/bin:/usr/bin:/bin\" /usr/bin/bash -lc \"cd /e/repos/triangles/src && mingw32-make -f makefile.mingw -j8 all 2>&1 | tail -60\")",
+      "Bash(C:/msys64/usr/bin/env.exe MSYSTEM=MINGW64 /usr/bin/bash -lc \"ls /mingw64/lib/libboost_system*\")",
+      "Bash(C:/msys64/usr/bin/env.exe MSYSTEM=MINGW64 PATH=\"/mingw64/bin:/usr/bin:/bin\" /usr/bin/bash -lc \"cd /e/repos/triangles/src && mingw32-make -f makefile.mingw trianglesd.exe 2>&1 | tail -20\")",
+      "Bash(C:/msys64/usr/bin/env.exe MSYSTEM=MINGW64 PATH=\"/mingw64/bin:/usr/bin:/bin\" /usr/bin/bash -lc \"cd /e/repos/triangles/src && mingw32-make -f makefile.mingw trianglesd.exe 2>&1 | tail -10\")",
+      "Bash(gh run list:*)",
+      "Bash(git rm:*)",
+      "Bash(wc:*)",
+      "Bash(C:/msys64/usr/bin/bash.exe -lc \"cd /e/repos/triangles/src && make -f makefile.mingw obj/rest.o 2>&1 | head -80\")",
+      "Bash(C:/msys64/usr/bin/bash.exe -lc \"cd /e/repos/triangles/src && make -f makefile.mingw obj/trianglesrpc.o 2>&1 | tail -20\")",
+      "Bash(C:/msys64/usr/bin/bash.exe -lc \"cd /e/repos/triangles/src && make -f makefile.mingw 2>&1 | tail -30\")",
+      "Bash(node --version:*)",
+      "Bash(npm --version:*)",
+      "Bash(npm install:*)",
+      "Bash(npx svelte-kit sync:*)",
+      "Bash(npx vite build)",
+      "Bash(nslookup:*)",
+      "Bash(tailscale ping:*)",
+      "Bash(del /f \"%APPDATA%\\\\triangles\\\\peers.dat\")",
+      "Bash(C:msys64usrbinbash.exe -l -c \"cd ''e:/repos/triangles'' && qmake triangles-qt.pro ''USE_QRCODE=1'' ''USE_UPNP=-'' 2>&1 | tail -20\")",
+      "Bash(C:msys64msys2_shell.cmd -mingw64 -defterm -no-start -c \"cd /e/repos/triangles && qmake triangles-qt.pro ''USE_QRCODE=1'' ''USE_UPNP=-'' 2>&1 | tail -20\")",
+      "Bash(\"C:\\\\msys64\\\\mingw64\\\\bin\\\\bash.exe\" -c \"export PATH=/mingw64/bin:/usr/bin:$PATH && cd /e/repos/triangles && qmake triangles-qt.pro ''USE_QRCODE=1'' ''USE_UPNP=-'' 2>&1\")",
+      "Bash(C:/msys64/mingw64/bin/qmake.exe:*)",
+      "Bash(/c/msys64/mingw64/bin/qmake-qt5.exe:*)",
+      "Bash(/c/msys64/usr/bin/env.exe MSYSTEM=MINGW64 /c/msys64/usr/bin/bash.exe -l -c \"cd /e/repos/triangles && qmake triangles-qt.pro ''USE_QRCODE=1'' ''USE_UPNP=-'' 2>&1 | tail -5\")",
+      "Bash(export PATH=\"/c/msys64/mingw64/bin:/c/msys64/usr/bin:$PATH\")",
+      "Bash(/c/msys64/usr/bin/env.exe MSYSTEM=MINGW64 /c/msys64/usr/bin/bash.exe:*)",
+      "Bash(C:/msys64/usr/bin/bash.exe -l -c \"cd /e/repos/triangles && make release 2>&1 | grep -E ''error|Error|undefined|cannot find'' | head -20\")",
+      "Bash(C:/msys64/usr/bin/bash.exe -l -c \"pacman -Qs qrencode\")",
+      "Bash(C:/msys64/usr/bin/bash.exe -l -c \"pacman -S --noconfirm mingw-w64-x86_64-qrencode\")",
+      "Bash(C:/msys64/usr/bin/bash.exe -l -c \"cd /e/repos/triangles && qmake-qt5 -o Makefile triangles-qt.pro USE_QRCODE=0 USE_UPNP=- 2>&1\")",
+      "Bash(C:/msys64/usr/bin/bash.exe -l -c \"ls /mingw64/lib/libqrencode*\")",
+      "Bash(C:/msys64/usr/bin/bash.exe -l -c \"pacman -S --noconfirm mingw-w64-x86_64-cmake\")",
+      "Bash(C:/msys64/usr/bin/bash.exe -l -c \"cd /tmp && pacman -Sp mingw-w64-x86_64-qrencode 2>/dev/null\")",
+      "Bash(C:/msys64/usr/bin/bash.exe -l -c \"cd /e/repos/triangles && mkdir -p dist && cp release/triangles-qt.exe dist/ && cd dist && strip triangles-qt.exe && ls -lh triangles-qt.exe\")",
+      "Bash(C:/msys64/usr/bin/bash.exe -l -c \"cd /e/repos/triangles/dist && ldd triangles-qt.exe | grep mingw64 | awk ''{print $3}''\")",
+      "Bash(C:/msys64/usr/bin/bash.exe -l -c 'cd /e/repos/triangles/dist && ldd triangles-qt.exe | grep mingw64 | awk \"\"{print \\\\$3}\"\"')",
+      "Bash(C:/msys64/usr/bin/bash.exe -l -c \"cd /e/repos/triangles/dist && ldd triangles-qt.exe | grep mingw64\")",
+      "Bash(C:/msys64/usr/bin/bash.exe -l -c 'cd /e/repos/triangles/dist && ldd triangles-qt.exe | grep mingw64 | sed \"\"s/.*=> //\"\" | sed \"\"s/ \\(.*//\"\"> dlls.txt && while read dll; do cp \"\"$dll\"\" .; done < dlls.txt && ls *.dll | wc -l && echo \"\"DLLs copied\"\"')",
+      "Bash(C:/msys64/usr/bin/bash.exe -l -c 'cd /e/repos/triangles/dist && mkdir -p platforms && cp /mingw64/share/qt5/plugins/platforms/qwindows.dll platforms/ && echo \"\"Qt platform plugin copied\"\"')",
+      "Bash(C:/msys64/usr/bin/bash.exe -l -c 'cd /e/repos/triangles && rm -f Triangles-v5.1.8-win-x64.zip && cd dist && 7z a ../Triangles-v5.1.8-win-x64.zip triangles-qt.exe *.dll platforms/ && echo \"\"ZIP created\"\"')",
+      "Bash(C:/msys64/usr/bin/bash.exe -l -c \"cd /e/repos/triangles && make -j4 2>&1 | tail -15\")",
+      "Bash(pacman:*)",
+      "Bash(tar:*)",
+      "WebFetch(domain:src-ref.docs.torproject.org)",
+      "WebFetch(domain:gitlab.torproject.org)",
+      "Bash(git status:*)",
+      "Bash(git stash:*)",
+      "Bash(git pull:*)",
+      "Bash(git stash pop:*)",
+      "Bash(find:*)",
+      "Read(//e/repos/triangles/**)",
+      "Bash(curl:*)",
+      "Bash(qmake:*)",
+      "Bash(/c/msys64/mingw64/bin/mingw32-make.exe:*)",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && make -j1 2>&1 | tail -30\")",
+      "Bash(C:/msys64/msys2_shell.cmd -defterm -no-start -mingw64 -c \"cd /e/repos/triangles && rm -f build/main.o && mingw32-make -f Makefile.Release build/main.o 2>&1 | grep -E ''^\\(src/|.*error\\)'' | head -10\")",
+      "Bash(C:/msys64/msys2_shell.cmd -defterm -no-start -mingw64 -c \"cd /e/repos/triangles && ls -la build/main.o 2>&1\")",
+      "Bash(git -C \"e:\\\\repos\\\\triangles\" log --oneline -20)",
+      "Bash(git -C \"e:\\\\repos\\\\triangles\" describe --tags --abbrev=0)",
+      "Bash(git -C \"e:\\\\repos\\\\triangles\" rev-parse --short HEAD)",
+      "Bash(PATH=\"/c/msys64/mingw64/bin:$PATH\" which make:*)",
+      "Bash(export PATH=\"/mingw64/bin:$PATH\")",
+      "Bash(make:*)",
+      "Bash(C:/msys64/usr/bin/env.exe PATH=\"C:/msys64/mingw64/bin:C:/msys64/usr/bin\" C:/msys64/usr/bin/make.exe:*)",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -c \"cd /e/repos/triangles && make -f Makefile.Release -j8 2>&1 | tail -40\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"make 2>&1 | tail -10\")",
+      "Bash(gh pr list:*)",
+      "Bash(gh pr view:*)",
+      "Bash(cmd //C \"powershell -NoProfile -Command \"\"Get-Process | Where-Object { $_.Path -like ''*triangles*'' } | Format-Table Id, ProcessName, Path\"\"\")",
+      "Bash(cmd //C \"tasklist /FI \"\"IMAGENAME eq triangles-qt.exe\"\"\")",
+      "Bash(MSYS_NO_PATHCONV=1 tasklist:*)"
     ]
   }
 }

.github/workflows/build-all.yml

@@ -8,10 +8,32 @@ on:
     branches: [master]
   workflow_dispatch:
 
-env:
-  VERSION: "5.1.8"
-
 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 libboost-all-dev \
+            libssl-dev libdb++-dev libleveldb-dev libevent-dev libminiupnpc-dev
+
+      - name: Build LevelDB
+        run: |
+          cd src/leveldb
+          chmod +x build_detect_platform
+          make clean || true
+          make OPT="-O2" libleveldb.a libmemenv.a
+
+      - name: Build and run unit tests
+        run: |
+          cd src
+          make -f makefile.unix test -j$(nproc)
+          ./test_triangles --log_level=test_suite 2>&1 || true
+
   build-windows-qt:
     runs-on: windows-latest
     defaults:
@@ -41,6 +63,13 @@ jobs:
           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
 
+      - name: Set VERSION from source
+        run: |
+          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
+
       - name: Clean stale build artifacts
         run: rm -rf build/*.o build/*.h
 
@@ -51,31 +80,98 @@ jobs:
           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"
+        run: qmake triangles-qt.pro "RELEASE=1"
 
       - name: Build
-        run: |
-          make -j$(nproc)
+        run: make -j$(nproc)
 
       - name: Package
         run: |
           mkdir -p dist
           cp release/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.8"
+          $TOR_URL = "https://dist.torproject.org/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: 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
@@ -111,19 +207,47 @@ jobs:
           mkdir -p obj
           make -f makefile.mingw DEPSDIR=/mingw64 all -j$(nproc) 2>&1
           strip --strip-all trianglesd.exe
-          cp trianglesd.exe ../trianglesd.exe
+
+      - name: Package daemon with DLLs
+        run: |
+          mkdir -p daemon-dist/tor
+          cp src/trianglesd.exe daemon-dist/
+
+          # Copy all linked DLLs from MSYS2
+          ldd src/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.8"
+          Invoke-WebRequest -Uri "https://dist.torproject.org/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 from source
+        run: |
+          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
+
       - name: Install dependencies
         run: |
           sudo apt-get update
@@ -150,20 +274,96 @@ jobs:
       - name: Strip binary
         run: strip --strip-all 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.8"
+          curl -sL "https://dist.torproject.org/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 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 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 from source
+        run: |
+          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
+
       - name: Install dependencies
         run: |
           sudo apt-get update
@@ -181,25 +381,115 @@ jobs:
         run: |
           cd src
           mkdir -p obj
-          make -f makefile.unix -j$(nproc)
+          make -f makefile.unix trianglesd -j$(nproc)
 
       - name: Strip binary
         run: strip --strip-all src/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.8"
+          curl -sL "https://dist.torproject.org/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 src/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 src/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 from source
+        run: |
+          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
+
       - name: Install dependencies
         run: |
           brew install qt@5 openssl@3 boost berkeley-db@5 leveldb libevent miniupnpc
@@ -241,6 +531,43 @@ jobs:
           export PATH="/opt/homebrew/opt/qt@5/bin:$PATH"
           macdeployqt Triangles-Qt.app -verbose=1
 
+      - name: Bundle non-Qt dylibs into app
+        run: |
+          FRAMEWORKS="Triangles-Qt.app/Contents/Frameworks"
+          MACOS="Triangles-Qt.app/Contents/MacOS"
+          BINARY="$MACOS/Triangles-Qt"
+
+          # 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.8"
+          curl -sL "https://dist.torproject.org/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
+          mkdir -p Triangles-Qt.app/Contents/MacOS/tor
+          cp tor-extract/tor/tor Triangles-Qt.app/Contents/MacOS/tor/
+          chmod +x Triangles-Qt.app/Contents/MacOS/tor/tor
+          [ -d tor-extract/data ] && cp -r tor-extract/data Triangles-Qt.app/Contents/MacOS/tor/data
+
       - name: Create DMG
         run: |
           mkdir -p dmg_contents
@@ -264,6 +591,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 +602,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/
 

.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
@@ -52,3 +58,6 @@ triangles.conf
 *.key
 *.cert
 *.gpg
+*.o
+src/trianglesd
+src/obj/

CLEANUP_NOTES.md

@@ -0,0 +1,94 @@
+# Triangles Codebase Cleanup Notes
+
+## Overview
+Systematic code quality improvements for the Triangles cryptocurrency codebase (v5.3.4+).
+
+**Goal:** Improve maintainability without changing behavior or breaking consensus.
+
+## Inventory
+
+### TODOs/FIXMEs Found (38 total)
+
+#### High Priority (Affects Safety/Correctness)
+- `rpcmining.cpp:263` - **Thread safety issue** in mapNewBlock (static variable, no mutex)
+- `walletmodel.cpp:249` - **Potential collision** in balance calculation
+- `smessage.cpp:863, 2219, 2373` - **File size limit** (files must be split if >2GB)
+
+#### Medium Priority (Encapsulation/Security)
+- `protocol.h:50, 100, 132` - Public members should be private (3 locations)
+- `wallet.h:378` - nOrderPos calculation should move elsewhere
+- `wallet.cpp:733, 1732` - Change output handling needs improvement
+- `rpcwallet.cpp:1474, 1513, 1569` - SecureString operator= missing (forced .c_str())
+
+#### Low Priority (Nice-to-Have)
+- `util.cpp:1322` - Disabled feature needs verification
+- `tor/tor_embedded.cpp:209` - Tor 0.4.9+ shutdown API upgrade
+- `init.cpp:442` - Remaining sanity checks (see Bitcoin issue #4081)
+- `rpcmining.cpp:232` - DRM comment (unclear what it means)
+- `smessage.cpp:*` - Various improvements (hash inclusion, thread safety, defaults)
+- `qt/*` - UI improvements (decrypt not supported, message filtering, OSX startup)
+
+#### External/Third-Party (Don't Touch)
+- `leveldb/*` - LevelDB library TODOs (upstream issues)
+
+## Code Quality Issues
+
+### Using namespace std (37 files)
+All in .cpp files - **this is fine for .cpp**, problematic only in headers.
+No headers have this issue, so **no action needed**.
+
+### Printf/Cout Usage (56 files)
+Most cryptocurrency code uses printf for early init/error handling before logging is available.
+**Review needed:** Check if these are legitimate early-init cases or should use LogPrintf.
+
+## Cleanup Plan (Safest → Riskiest)
+
+### Phase 1: Documentation & Comments ✅ SAFE
+1. Document all TODOs with context (why deferred, what's needed)
+2. Add function-level comments for complex logic
+3. Improve inline comments for clarity
+
+### Phase 2: Low-Risk Code Quality 🟨 MEDIUM RISK
+4. Fix compiler warnings (-Wall -Wextra)
+5. Add const correctness where missing
+6. Remove commented-out dead code
+7. Standardize code formatting (if inconsistent)
+
+### Phase 3: Functional Improvements 🟥 HIGH RISK (Skip for now)
+8. Fix thread safety issue in rpcmining.cpp (requires testing)
+9. Improve protocol.h encapsulation (may affect other code)
+10. Address >2GB file handling in smessage.cpp
+
+## Decisions
+
+### What NOT to Change
+- **Consensus code** - main.cpp (validation), kernel.cpp (PoS), miner.cpp (staking)
+- **Serialization** - Any READWRITE, serialize/deserialize code
+- **Protocol constants** - Network message types, version numbers
+- **Third-party code** - leveldb/, tor/, sph_types.h, xxhash/, lz4/
+
+### What's Safe to Change
+- Comments and documentation
+- Variable names (in non-consensus code)
+- Code organization (splitting large functions)
+- Logging statements
+- UI code (qt/)
+- RPC interface (as long as API contract preserved)
+
+## Initial Cleanup (2026-03-22)
+
+### Actions Taken
+1. Created this documentation file
+2. Created cleanup/desloppify branch
+3. Inventoried all TODOs/FIXMEs
+
+### Next Steps
+1. Add documentation comments to TODO items
+2. Review printf/cout usage patterns
+3. Check for compiler warnings
+4. Consider low-risk improvements
+
+## Notes
+- This is a Bitcoin-derived codebase, so many patterns follow Bitcoin Core conventions
+- Recent v5.3.x work already modernized to C++17 and removed Boost - good foundation
+- Code is generally well-structured; main improvements are documentation and minor cleanup

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.

CODEX-TOR-GUIDE.md

@@ -0,0 +1,220 @@
+# Embedded Tor Integration Guide for Triangles
+
+This guide explains how to compile Tor as a static library (`libtor.a`) and link
+it directly into the Triangles wallet binary so that every node automatically
+runs a Tor hidden service without needing an external Tor installation.
+
+## Architecture Overview
+
+```
+trianglesd / triangles-qt
+  ├── tor_embedded.cpp    ← calls tor_run_main() in a background thread
+  ├── tor_process.cpp     ← fallback: launches external tor binary (already works)
+  ├── onion_v3.cpp        ← V3 onion address generation / SOCKS5 proxy logic
+  └── libtor.a            ← aggregate static Tor library (built from official source)
+```
+
+When compiled with `ENABLE_TOR_EMBEDDED`, the wallet calls `tor_run_main()` from
+`tor_api.h` on a dedicated thread. This gives the wallet a SOCKS5 proxy on
+`127.0.0.1:19099` and a V3 hidden service on port 24112 (the P2P port).
+
+When compiled **without** the flag, `tor_embedded.cpp` falls back to the external
+`tor_process.cpp` which searches for and launches a system `tor` binary.
+
+## Step 1: Add Tor as a Git Submodule
+
+```bash
+cd /path/to/triangles
+git submodule add https://gitlab.torproject.org/tpo/core/tor.git src/tor/tor-src
+cd src/tor/tor-src
+git checkout release-0.4.9   # latest stable branch as of 2026
+```
+
+This puts the full Tor source at `src/tor/tor-src/`.
+Current imported checkout in this repo: `release-0.4.9` at commit `1442ca4`.
+There is also a helper build script at `src/tor/build-libtor.sh`.
+
+## Step 2: Build libtor.a
+
+Tor uses autotools. Build it as a static library:
+
+```bash
+cd src/tor/tor-src
+
+# Install Tor build dependencies
+sudo apt install autoconf automake libtool pkg-config \
+    libssl-dev libevent-dev zlib1g-dev
+
+# Generate configure script
+./autogen.sh
+
+# Configure for static library build (disable unneeded modules)
+./configure \
+    --enable-static-tor \
+    --disable-module-relay \
+    --disable-module-dirauth \
+    --disable-asciidoc \
+    --disable-manpage \
+    --disable-html-manual \
+    --disable-unittests \
+    --disable-tool-name-check \
+    --with-openssl-dir=/usr \
+    --with-libevent-dir=/usr \
+    --with-zlib-dir=/usr \
+    --prefix=/usr/local
+
+make -j$(nproc)
+```
+
+Or from the repo root:
+```bash
+./src/tor/build-libtor.sh
+```
+
+After building, the static libraries are in `src/tor/tor-src/`:
+- `libtor.a`
+- `src/lib/libtor-*.a` (multiple component libs)
+
+The header `src/feature/api/tor_api.h` provides the public C API:
+```c
+tor_main_configuration_t *tor_main_configuration_new(void);
+int tor_main_configuration_set_command_line(tor_main_configuration_t *cfg,
+                                             int argc, char *argv[]);
+int tor_run_main(const tor_main_configuration_t *);
+void tor_main_configuration_free(tor_main_configuration_t *);
+```
+
+## Step 3: Build Triangles with Embedded Tor
+
+### Linux (makefile.unix)
+
+```bash
+cd src
+
+# Point to Tor's built libraries and headers
+make -f makefile.unix \
+    USE_TOR_EMBEDDED=1
+```
+
+You may need to adjust the `-l` flags in the makefile depending on the exact
+library names Tor produces. Check `src/tor/tor-src/` after building:
+
+```bash
+find tor/tor-src -name '*.a' | sort
+```
+
+On the imported `release-0.4.9` checkout in this repo, the simplest working
+link path is the aggregate `libtor.a` plus the normal dependency libraries.
+
+### Windows (triangles-qt.pro)
+
+Add to `triangles-qt.pro`:
+```qmake
+qmake "USE_TOR_EMBEDDED=1" \
+      "TOR_SOURCE_ROOT=src/tor/tor-src"
+```
+
+Both build systems now default to:
+- source root: `src/tor/tor-src`
+- include path: `src/tor/tor-src/src/feature/api`
+- library path: `src/tor/tor-src`
+- embedded Tor library: `-ltor`
+
+On Windows, the imported Tor `0.4.9.5` build also needed:
+- `-llzma`
+- `-lzstd`
+- `-liphlpapi`
+- `-lshlwapi` (already linked by Triangles)
+
+## Step 4: Wire into init.cpp
+
+The global hooks `StartEmbeddedTor()` and `StopEmbeddedTor()` need to be called
+from `init.cpp`. Add these calls:
+
+### In AppInit2() (after network init, before starting node):
+```cpp
+#include "tor/tor_embedded.h"
+
+// Near the end of AppInit2, after network initialization:
+if (!StartEmbeddedTor()) {
+    printf("WARNING: Embedded Tor failed to start. .onion connectivity unavailable.\n");
+    // Non-fatal: wallet works without Tor, just no .onion
+}
+```
+
+### In Shutdown():
+```cpp
+StopEmbeddedTor();
+```
+
+## Step 5: Configure SOCKS Proxy for Outbound Connections
+
+After Tor starts, the wallet needs to route `.onion` connections through the
+SOCKS5 proxy. In `net.cpp`, after Tor is initialized:
+
+```cpp
+// If embedded Tor is running, use its SOCKS proxy for .onion addresses
+CTorEmbedded* tor = CTorEmbedded::GetInstance();
+if (tor->IsRunning()) {
+    // Set proxy for .onion connections
+    proxyType addrProxy(CService("127.0.0.1", tor->GetSocksPort()), 5);
+    SetNameProxy(addrProxy);
+}
+```
+
+## Runtime Flags
+
+The embedded Tor respects these command-line flags:
+
+| Flag | Default | Description |
+|------|---------|-------------|
+| `-notor` | false | Disable Tor entirely |
+| `-torsocks=PORT` | 19099 | SOCKS5 proxy port |
+| `-torhsport=PORT` | 24112 | Hidden service virtual port |
+
+## File Layout After Integration
+
+```
+src/tor/
+├── tor-src/             ← git submodule (official Tor repo)
+│   └── src/
+│       ├── lib/libtor-*.a
+│       └── feature/api/tor_api.h
+│   └── libtor.a
+├── tor_embedded.h       ← CTorEmbedded class header
+├── tor_embedded.cpp     ← implementation (calls tor_run_main)
+├── tor_process.h        ← external Tor process manager (fallback)
+├── tor_process.cpp
+├── onion_v3.h           ← V3 onion address utilities
+├── onion_v3.cpp
+├── anonymize.h          ← data dir helpers
+├── anonymize.cpp
+└── LICENSE
+```
+
+## Reference: How VERGE (XVG) Does It
+
+VERGE uses the same pattern. Their implementation is at:
+- `src/torcontroller.cpp` (~100 lines)
+- They use `tor_main()` (older API, pre-0.4.5)
+- Git submodule at `src/tor/` pointing to `release-0.4.8` branch
+- Build Tor as part of their `depends/` system
+
+Key difference: modern Tor (0.4.5+) uses `tor_run_main()` with a configuration
+object instead of raw `tor_main(int argc, char** argv)`.
+
+## Troubleshooting
+
+**Tor fails to bootstrap**: Check firewall rules. Tor needs outbound TCP to the
+Tor network (ports 80, 443, 9001, 9030).
+
+**Link errors with libtor**: Prefer the aggregate `libtor.a` from the top level
+of the Tor build tree. On the imported Windows/MSYS2 build in this repo, the
+minimal verified link set was:
+```
+-ltor -levent -lssl -lcrypto -lz -llzma -lzstd -lws2_32 -liphlpapi -lshlwapi
+```
+
+**OpenSSL version mismatch**: Both Tor and Triangles must link against the same
+OpenSSL version (3.x). If Tor was built against a different OpenSSL, rebuild it
+with the same `--with-openssl-dir`.

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.

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

@@ -0,0 +1,123 @@
+# TODO/FIXME Documentation
+
+Detailed context for each TODO/FIXME in the codebase.
+
+## Critical (Needs Attention)
+
+### src/rpcmining.cpp:263 - Thread Safety Issue
+```cpp
+static mapNewBlock_t mapNewBlock;    // FIXME: thread safety
+```
+**Issue:** Static variable accessed by multiple RPC threads without mutex protection.
+**Impact:** Potential race condition in getwork RPC (used for mining).
+**Status:** Low priority - PoW mining ended at block 9000, this code path rarely used.
+**Fix:** Add std::mutex and lock_guard if getwork usage increases.
+
+### src/qt/walletmodel.cpp:249 - Collision Risk
+```cpp
+if((total + nFeeRequired) > nBalance) // FIXME: could cause collisions in the future
+```
+**Issue:** Balance check may have edge case causing transaction collisions.
+**Context:** In createTransaction fee calculation loop.
+**Status:** Needs investigation - unclear what "collisions" means here.
+**Fix:** Review Bitcoin Core's current implementation of this logic.
+
+### src/smessage.cpp - File Size Limits
+```cpp
+// Lines 863, 2219, 2373: "TODO files must be split if > 2GB"
+```
+**Issue:** Secure message storage files not split when exceeding 2GB.
+**Impact:** May fail on 32-bit systems or with large message volumes.
+**Status:** Low priority - unlikely to reach 2GB in practice.
+**Fix:** Implement file rotation when approaching 2GB limit.
+
+## Medium Priority (Encapsulation/API)
+
+### src/protocol.h - Make Members Private
+```cpp
+// Lines 50, 100, 132: "TODO: make private (improves encapsulation)"
+```
+**Issue:** CAddress, CInv, CMessageHeader have public data members.
+**Impact:** Poor encapsulation, harder to maintain invariants.
+**Status:** Deferred - would require extensive refactoring.
+**Fix:** Add getter/setter methods, make members private, update all call sites.
+
+### src/wallet.h:378 - nOrderPos Calculation
+```cpp
+nOrderPos = -1; // TODO: calculate elsewhere
+```
+**Issue:** Transaction ordering position calculated in constructor.
+**Impact:** Minor - works but not ideal separation of concerns.
+**Status:** Deferred - no functional issue.
+**Fix:** Move calculation to WalletDB when transaction is added.
+
+### 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)
+
+### src/util.cpp:1322 - Disabled Feature
+```cpp
+// TODO: This is currently disabled because it needs to be verified to work
+```
+**Context:** File descriptor management code.
+**Status:** Intentionally disabled pending verification.
+**Fix:** Test thoroughly, then enable if needed.
+
+### src/tor/tor_embedded.cpp:209 - Tor Shutdown API
+```cpp
+// TODO: Tor 0.4.9+ may add tor_api_shutdown(), use it when available
+```
+**Context:** Embedded Tor cleanup.
+**Status:** Waiting for upstream Tor API.
+**Fix:** Check Tor 0.4.9+ releases for new API, integrate when stable.
+
+### src/init.cpp:442 - Sanity Checks
+```cpp
+// TODO: remaining sanity checks, see #4081
+```
+**Context:** Bitcoin Core issue #4081 - additional startup sanity checks.
+**Status:** Deferred - core checks already in place.
+**Fix:** Review Bitcoin Core's current sanity check implementation.
+
+### src/rpcmining.cpp:232 - DRM Comment
+```cpp
+CDataStream(coinbase, SER_NETWORK, PROTOCOL_VERSION) >> pblock->vtx[0]; // FIXME - DRM!
+```
+**Issue:** Unclear what "DRM" means here - likely "Data Race Maybe"?
+**Status:** Needs clarification from original author.
+**Fix:** Investigate if there's an actual issue, otherwise remove comment.
+
+## Deferred (External/Low Impact)
+
+### LevelDB TODOs (src/leveldb/*)
+**Status:** Upstream LevelDB issues - don't modify embedded library.
+**Action:** None - track upstream LevelDB project.
+
+### Qt TODOs (src/qt/*)
+**Status:** UI improvements, not critical.
+**Action:** Track as nice-to-have enhancements.
+
+### Secure Message TODOs (src/smessage.cpp)
+Multiple minor improvements suggested:
+- Include hash in certain operations
+- Improve thread shutdown
+- Set default recv/recvAnon behavior
+- Update outbox after PoW completes
+
+**Status:** Non-critical enhancements.
+**Action:** Consider for future encrypted messaging upgrades.
+
+## Summary
+
+**Critical:** 3 items (thread safety, balance collision, file limits)
+**Medium:** 6 items (encapsulation, SecureString)
+**Low:** 5 items (disabled features, upstream APIs)
+**Deferred:** ~24 items (external libs, minor enhancements)
+
+**Recommendation:** Focus on documenting critical items in code comments, defer fixes until specific issues arise.

contrib/nsis/setup.nsi

@@ -0,0 +1,96 @@
+; Cryptographic Triangles NSIS Installer
+; Produces a single setup.exe with wallet + Tor bundled
+
+!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 "$PROGRAMFILES64\${APPNAME}"
+InstallDirRegKey HKLM "Software\${APPNAME}" "InstallDir"
+RequestExecutionLevel admin
+
+; 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
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+!insertmacro MUI_LANGUAGE "English"
+
+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"
+
+  ; 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
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString" '"$INSTDIR\uninstall.exe"'
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\${EXENAME}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "${COMPANYNAME}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${VERSION}"
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" 1
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" 1
+  WriteRegStr HKLM "Software\${APPNAME}" "InstallDir" "$INSTDIR"
+
+  ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+  IntFmt $0 "0x%08X" $0
+  WriteRegDWORD HKLM "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 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}"
+  DeleteRegKey HKLM "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

doc/embedded-tor-rebase.md

@@ -0,0 +1,59 @@
+# Embedded Tor Rebase Notes
+
+This repository currently contains a legacy Tor source snapshot under
+`src/tor/`, but the wallet target does not build most of that tree.
+
+## Current state
+
+- The vendored Tor headers report `0.2.5.1-alpha-dev` in:
+  - `src/tor/orconfig_linux.h`
+  - `src/tor/orconfig_apple.h`
+  - `src/tor/orconfig_win32.h`
+- The Qt wallet target currently builds only these Tor-related sources:
+  - `src/tor_embed_hooks.cpp`
+  - `src/tor/onion_v3.cpp`
+  - `src/tor/tor_process.cpp`
+- This means the large legacy `src/tor/` tree is mostly dormant from the
+  wallet build's perspective.
+
+## Rebase target
+
+- Target upstream Tor line: `0.4.9.x`
+- Imported source tree: `src/tor/tor-src`
+- Imported branch: `release-0.4.9`
+- Imported commit: `1442ca4`
+
+## Why this matters
+
+Attempting to "upgrade embedded Tor" by rebasing the entire old source tree in
+place is unnecessarily expensive if the wallet is only relying on:
+
+- process management for a bundled Tor executable
+- Tor v3 onion address/key handling
+- a few local embedding hooks
+
+The migration should preserve the embedded product experience while reducing
+coupling to legacy upstream Tor internals.
+
+## Strategy
+
+1. Keep the product-level embedding model.
+   - The wallet can still ship with Tor and launch it automatically.
+2. Separate Triangles-owned glue from vendored Tor code.
+   - `src/tor_embed_hooks.*` now holds local process/bootstrap helpers that
+     previously lived under `src/tor/anonymize.*`.
+3. Treat `src/tor/onion_v3.cpp` and `src/tor/tor_process.cpp` as the active
+   compatibility boundary.
+4. Re-vendor a newer upstream Tor snapshot only after deciding whether the
+   product truly needs upstream Tor source in-tree or only a bundled Tor
+   runtime plus the wallet's own v3/onion management code.
+
+## Immediate next tasks
+
+1. Audit whether any live build target still includes legacy `src/tor/*.c`
+   sources beyond the current wallet target.
+2. Decide whether `onion_v3.cpp` should remain wallet-owned code or be reduced
+   further in favor of runtime Tor control/provisioning.
+3. Add build metadata recording the intended upstream Tor version and source.
+4. If full upstream vendoring is still required, import a fresh `0.4.8.19`
+   tree side-by-side instead of trying to patch the legacy `0.2.5.1` tree.

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.3.7"
 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.3.7
 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.3.7</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.3.7-1
 Section: net
 Priority: optional
 Architecture: amd64

packaging/debian/build-deb.sh

@@ -3,7 +3,7 @@
 # Run from the packaging/debian directory
 set -e
 
-VERSION="5.1.5"
+VERSION="5.3.7"
 PKGDIR="triangles_${VERSION}-1_amd64"
 RELEASE_URL="https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${VERSION}"
 
@@ -20,8 +20,8 @@ cp DEBIAN/control "$PKGDIR/DEBIAN/"
 
 # 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"
 
 # Create desktop entry

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.3.7"
+
+ARG VERSION=5.3.7
+
+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.3.7
+    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.3.7/Cryptographic-Triangles-v5.3.7-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.3.7/Cryptographic-Triangles-v5.3.7-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.3.7"
 
   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.3.7";
 
   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.3.7"
 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.3.7
 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/winget/CryptographicTriangles.TrianglesQt.yaml

@@ -1,5 +1,5 @@
 PackageIdentifier: CryptographicTriangles.TrianglesQt
-PackageVersion: 5.1.5
+PackageVersion: 5.3.7
 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.3.7/Cryptographic-Triangles-5.3.7-win-x64.zip
+    InstallerSha256: 6F002A669A7E92AAF3D8DD7B1AE80F06A086C99A15CA05CF107665009FFC06B7
 ManifestType: singleton
 ManifestVersion: 1.6.0

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.3.7'
 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.3.7/Cryptographic-Triangles-v5.3.7-linux-x64-qt
     source-type: file
     organize:
-      triangles-qt-linux: bin/triangles-qt
+      Cryptographic-Triangles-v5.3.7-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.3.7/Cryptographic-Triangles-v5.3.7-linux-x64-daemon
     source-type: file
     organize:
-      trianglesd-linux: bin/trianglesd
+      Cryptographic-Triangles-v5.3.7-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/alert.cpp

@@ -5,7 +5,6 @@
 #include <algorithm>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/replace.hpp>
-#include <boost/foreach.hpp>
 #include <map>
 
 #include "alert.h"
@@ -46,16 +45,16 @@ void CUnsignedAlert::SetNull()
 std::string CUnsignedAlert::ToString() const
 {
     std::string strSetCancel;
-    BOOST_FOREACH(int n, setCancel)
+    for (int n : setCancel)
         strSetCancel += strprintf("%d ", n);
     std::string strSetSubVer;
-    BOOST_FOREACH(std::string str, setSubVer)
+    for (std::string str : setSubVer)
         strSetSubVer += "\"" + str + "\" ";
     return strprintf(
         "CAlert(\n"
         "    nVersion     = %d\n"
-        "    nRelayUntil  = %"PRId64"\n"
-        "    nExpiration  = %"PRId64"\n"
+        "    nRelayUntil  = %" PRId64 "\n"
+        "    nExpiration  = %" PRId64 "\n"
         "    nID          = %d\n"
         "    nCancel      = %d\n"
         "    setCancel    = %s\n"
@@ -228,7 +227,7 @@ bool CAlert::ProcessAlert(bool fThread)
         }
 
         // Check if this alert has been cancelled
-        BOOST_FOREACH(PAIRTYPE(const uint256, CAlert)& item, mapAlerts)
+        for (auto& item : mapAlerts)
         {
             const CAlert& alert = item.second;
             if (alert.Cancels(*this))

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/base58.h

@@ -260,7 +260,7 @@ public:
  * The data vector contains RIPEMD160(SHA256(cscript)), where cscript is the serialized redemption script.
  */
 class CTrianglesAddress;
-class CTrianglesAddressVisitor : public boost::static_visitor<bool>
+class CTrianglesAddressVisitor
 {
 private:
     CTrianglesAddress *addr;
@@ -294,7 +294,7 @@ public:
 
     bool Set(const CTxDestination &dest)
     {
-        return boost::apply_visitor(CTrianglesAddressVisitor(this), dest);
+        return std::visit(CTrianglesAddressVisitor(this), dest);
     }
 
     bool IsValid() const

src/bootstrap.cpp

@@ -0,0 +1,531 @@
+// Copyright (c) 2024 Triangles developers
+// Distributed under the MIT/X11 software license
+
+#include "bootstrap.h"
+
+#include <boost/asio.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
+#include <boost/algorithm/string.hpp>
+
+#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;
+
+namespace Bootstrap {
+
+bool NeedsBootstrap(const fs::path& dataDir)
+{
+    return !fs::exists(dataDir / "blk0001.dat");
+}
+
+bool DownloadFile(const std::string& host, const std::string& urlPath,
+                  const fs::path& destPath,
+                  ProgressCallback progressFn,
+                  std::string& strError)
+{
+    try {
+        boost::asio::io_context io_context;
+        tcp::resolver resolver(io_context);
+
+        boost::system::error_code resolve_ec;
+        tcp::resolver::results_type endpoints =
+            resolver.resolve(host, std::to_string(PORT), resolve_ec);
+        if (resolve_ec) {
+            strError = "Cannot resolve host: " + host;
+            return false;
+        }
+
+        tcp::socket socket(io_context);
+        boost::asio::connect(socket, endpoints);
+
+        // Send HTTP GET request
+        std::string request =
+            "GET " + urlPath + " HTTP/1.1\r\n"
+            "Host: " + host + "\r\n"
+            "Connection: close\r\n"
+            "User-Agent: Triangles\r\n"
+            "\r\n";
+        boost::asio::write(socket, boost::asio::buffer(request));
+
+        // Read response headers
+        boost::asio::streambuf response_buf;
+        boost::asio::read_until(socket, response_buf, "\r\n\r\n");
+
+        std::istream response_stream(&response_buf);
+
+        // Parse status line
+        std::string http_version;
+        unsigned int status_code = 0;
+        response_stream >> http_version >> status_code;
+        std::string status_message;
+        std::getline(response_stream, status_message);
+
+        if (status_code != 200) {
+            strError = "HTTP error " + std::to_string(status_code) + " for " + urlPath;
+            return false;
+        }
+
+        // Parse headers for Content-Length
+        int64_t content_length = 0;
+        std::string header_line;
+        while (std::getline(response_stream, header_line) && header_line != "\r") {
+            std::string lower_header = header_line;
+            std::transform(lower_header.begin(), lower_header.end(),
+                           lower_header.begin(), ::tolower);
+            if (lower_header.find("content-length:") == 0) {
+                content_length = std::stoll(header_line.substr(header_line.find(':') + 1));
+            }
+        }
+
+        // Open output file
+        FILE* file = fopen(destPath.string().c_str(), "wb");
+        if (!file) {
+            strError = "Cannot create file: " + destPath.string();
+            return false;
+        }
+
+        int64_t bytes_written = 0;
+
+        // Write any data remaining in the header buffer (body starts here)
+        if (response_buf.size() > 0) {
+            std::istreambuf_iterator<char> eos;
+            std::string remaining(std::istreambuf_iterator<char>(response_stream), eos);
+            if (!remaining.empty()) {
+                fwrite(remaining.data(), 1, remaining.size(), file);
+                bytes_written += remaining.size();
+            }
+        }
+
+        // Read remaining body in chunks
+        std::vector<char> chunk(65536); // 64 KB
+        boost::system::error_code ec;
+        int64_t last_progress = 0;
+
+        while (true) {
+            size_t n = socket.read_some(boost::asio::buffer(chunk), ec);
+            if (n > 0) {
+                fwrite(chunk.data(), 1, n, file);
+                bytes_written += n;
+
+                // Report progress every 256 KB
+                if (progressFn && (bytes_written - last_progress >= 262144)) {
+                    last_progress = bytes_written;
+                    progressFn(bytes_written, content_length);
+                }
+            }
+            if (ec == boost::asio::error::eof)
+                break;
+            if (ec) {
+                fclose(file);
+                fs::remove(destPath);
+                strError = "Network error: " + ec.message();
+                return false;
+            }
+        }
+
+        fclose(file);
+
+        // Verify download size if Content-Length was provided
+        if (content_length > 0 && bytes_written != content_length) {
+            fs::remove(destPath);
+            strError = "Incomplete download: got " + std::to_string(bytes_written)
+                     + " of " + std::to_string(content_length) + " bytes";
+            return false;
+        }
+
+        return true;
+
+    } catch (std::exception& e) {
+        strError = std::string("Download failed: ") + e.what();
+        return false;
+    }
+}
+
+bool FetchFileList(const std::string& host,
+                   std::vector<std::string>& files,
+                   std::string& strError)
+{
+    // Download filelist.txt to a temp file
+    fs::path tmpPath = fs::temp_directory_path() / "triangles_bootstrap_filelist.txt";
+
+    std::string urlPath = std::string(BASE_PATH) + "filelist.txt";
+    if (!DownloadFile(host, urlPath, tmpPath, nullptr, strError))
+        return false;
+
+    // Read lines
+    std::ifstream in(tmpPath.string().c_str());
+    if (!in.is_open()) {
+        strError = "Cannot read downloaded file list";
+        return false;
+    }
+
+    files.clear();
+    std::string line;
+    while (std::getline(in, line)) {
+        boost::trim(line);
+        if (!line.empty() && line[0] != '#')
+            files.push_back(line);
+    }
+    in.close();
+    fs::remove(tmpPath);
+
+    if (files.empty()) {
+        strError = "File list is empty";
+        return false;
+    }
+
+    return true;
+}
+
+// --- tar.gz bootstrap support ---
+
+namespace {
+
+// Parse a tar octal field (ASCII octal, null/space terminated)
+static int64_t ParseTarOctal(const char* field, size_t len)
+{
+    int64_t result = 0;
+    for (size_t i = 0; i < len && field[i] != '\0' && field[i] != ' '; i++) {
+        if (field[i] < '0' || field[i] > '7') continue;
+        result = (result << 3) | (field[i] - '0');
+    }
+    return result;
+}
+
+// Extract a tar.gz file to a destination directory
+static bool ExtractTarGz(const fs::path& tarGzPath,
+                          const fs::path& destDir,
+                          std::string& strError)
+{
+    gzFile gz = gzopen(tarGzPath.string().c_str(), "rb");
+    if (!gz) {
+        strError = "Cannot open " + tarGzPath.string();
+        return false;
+    }
+
+    gzbuffer(gz, 262144); // 256 KB buffer for performance
+
+    char header[512];
+
+    while (true) {
+        int bytesRead = gzread(gz, header, 512);
+        if (bytesRead == 0) break; // EOF
+        if (bytesRead != 512) {
+            strError = "Truncated tar header";
+            gzclose(gz);
+            return false;
+        }
+
+        // End-of-archive marker (zero block)
+        bool allZero = true;
+        for (int i = 0; i < 512; i++) {
+            if (header[i] != 0) { allZero = false; break; }
+        }
+        if (allZero) break;
+
+        // Parse filename: name (offset 0, 100 bytes) + optional prefix (offset 345, 155 bytes)
+        char name[101] = {0};
+        char prefix[156] = {0};
+        memcpy(name, header, 100);
+        memcpy(prefix, header + 345, 155);
+
+        std::string fullName;
+        if (prefix[0] != '\0')
+            fullName = std::string(prefix) + "/" + std::string(name);
+        else
+            fullName = std::string(name);
+
+        // Security: reject absolute paths and path traversal
+        if (fullName.empty() || fullName[0] == '/' || fullName.find("..") != std::string::npos) {
+            strError = "Unsafe path in tar archive: " + fullName;
+            gzclose(gz);
+            return false;
+        }
+
+        char typeflag = header[156];
+        int64_t fileSize = ParseTarOctal(header + 124, 12);
+
+        if (typeflag == '5' || (!fullName.empty() && fullName.back() == '/')) {
+            // Directory entry
+            fs::create_directories(destDir / fullName);
+        } else if (typeflag == '0' || typeflag == '\0') {
+            // Regular file
+            fs::path filePath = destDir / fullName;
+            fs::create_directories(filePath.parent_path());
+
+            FILE* outFile = fopen(filePath.string().c_str(), "wb");
+            if (!outFile) {
+                strError = "Cannot create file: " + filePath.string();
+                gzclose(gz);
+                return false;
+            }
+
+            int64_t remaining = fileSize;
+            char buf[65536];
+            while (remaining > 0) {
+                int toRead = (remaining > (int64_t)sizeof(buf)) ? (int)sizeof(buf) : (int)remaining;
+                int n = gzread(gz, buf, toRead);
+                if (n <= 0) {
+                    fclose(outFile);
+                    strError = "Truncated tar data for: " + fullName;
+                    gzclose(gz);
+                    return false;
+                }
+                fwrite(buf, 1, n, outFile);
+                remaining -= n;
+            }
+            fclose(outFile);
+
+            // Skip padding to next 512-byte boundary
+            int64_t pad = (512 - (fileSize % 512)) % 512;
+            if (pad > 0) {
+                char padBuf[512];
+                if (gzread(gz, padBuf, (unsigned)pad) != (int)pad) {
+                    strError = "Truncated tar padding for: " + fullName;
+                    gzclose(gz);
+                    return false;
+                }
+            }
+        } else {
+            // Unknown entry type - skip its data
+            int64_t totalSkip = fileSize + ((512 - (fileSize % 512)) % 512);
+            char skipBuf[512];
+            while (totalSkip > 0) {
+                int toRead = (totalSkip > 512) ? 512 : (int)totalSkip;
+                if (gzread(gz, skipBuf, toRead) != toRead) break;
+                totalSkip -= toRead;
+            }
+        }
+    }
+
+    gzclose(gz);
+    return true;
+}
+
+} // 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,
+                       std::string& strError)
+{
+    bool gotBlockFile = false;
+
+    // Try downloading bootstrap.tar.gz first
+    fs::path tmpTarGz = dataDir / "bootstrap.tar.gz.tmp";
+    std::string tarUrl = std::string(BASE_PATH) + "bootstrap.tar.gz";
+
+    bool tarDownloaded = DownloadFile(host, tarUrl, tmpTarGz, progressFn, strError);
+
+    if (tarDownloaded) {
+        bool extractOk = ExtractTarGz(tmpTarGz, dataDir, strError);
+        fs::remove(tmpTarGz);
+
+        if (extractOk && fs::exists(dataDir / "blk0001.dat"))
+            gotBlockFile = true;
+        // If extraction failed, fall through to legacy path
+    }
+
+    if (!gotBlockFile) {
+        // Fallback: try filelist.txt + individual file downloads
+        std::string fallbackError;
+        std::vector<std::string> files;
+        if (!FetchFileList(host, files, fallbackError)) {
+            if (!tarDownloaded)
+                strError = strError + " (fallback also failed: " + fallbackError + ")";
+            else
+                strError = "Extraction failed: " + strError + " (fallback also failed: " + fallbackError + ")";
+            return false;
+        }
+
+        for (size_t i = 0; i < files.size(); i++) {
+            fs::path destPath = dataDir / files[i];
+            fs::create_directories(destPath.parent_path());
+
+            std::string urlPath = std::string(BASE_PATH) + files[i];
+            if (!DownloadFile(host, urlPath, destPath, progressFn, strError))
+                return false;
+        }
+
+        gotBlockFile = fs::exists(dataDir / "blk0001.dat");
+    }
+
+    if (!gotBlockFile) {
+        strError = "No blk0001.dat after download";
+        return false;
+    }
+
+    // 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";
+    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;
+}
+
+} // namespace Bootstrap

src/bootstrap.h

@@ -0,0 +1,64 @@
+// Copyright (c) 2024 Triangles developers
+// Distributed under the MIT/X11 software license
+
+#ifndef TRIANGLES_BOOTSTRAP_H
+#define TRIANGLES_BOOTSTRAP_H
+
+#include <string>
+#include <vector>
+#include <functional>
+#include <boost/filesystem.hpp>
+
+namespace Bootstrap {
+
+    // Bootstrap server configuration
+    static const char* DEFAULT_HOST = "bootstrap.cryptographic-triangles.org";
+    static const char* FALLBACK_HOST = "194.233.88.206";
+    static const char* BASE_PATH = "/";
+    static const int PORT = 80;
+
+    // Progress callback: (bytesDownloaded, totalBytes)
+    typedef std::function<void(int64_t, int64_t)> ProgressCallback;
+
+    // Check if data dir already has blockchain data
+    bool NeedsBootstrap(const boost::filesystem::path& dataDir);
+
+    // Download a single file via HTTP GET, write to destPath
+    bool DownloadFile(const std::string& host, const std::string& urlPath,
+                      const boost::filesystem::path& destPath,
+                      ProgressCallback progressFn,
+                      std::string& strError);
+
+    // Fetch the file manifest (list of relative paths to download)
+    bool FetchFileList(const std::string& host,
+                       std::vector<std::string>& files,
+                       std::string& strError);
+
+    // Download bootstrap.tar.gz and extract to dataDir.
+    // Falls back to filelist.txt + individual file download if tar.gz unavailable.
+    bool DownloadBootstrap(const std::string& host,
+                           const boost::filesystem::path& dataDir,
+                           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

@@ -2,9 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <boost/assign/list_of.hpp> // for 'map_list_of()'
-#include <boost/foreach.hpp>
-
 #include "checkpoints.h"
 
 #include "txdb.h"
@@ -22,39 +19,37 @@ namespace Checkpoints
     //    timestamp before)
     // + Contains no strange transactions
     //
-    static MapCheckpoints mapCheckpoints =
-        boost::assign::map_list_of
-    (     0, hashGenesisBlockOfficial )
-    (  2000, uint256("0x0000000000b5f20078bf46ebdf1500813bb6b2cb482065aa93b89e073b2c6467"))
-    (  2101, uint256("0xd4ea1ac45b63c8162a7fc8033cec441db8d532ba988202849d7831e32fe2d059"))
-    (  2847, uint256("0xb5015e2835f13fd3bb6135cff9b31ac33310c9b77d694bdb592b8680d98d018e"))
-    (  3589, uint256("0xb12a2ca3db4e288cada98aa2139768532bd4474c49dd7b8158031032dac08d51"))
-    (  3935, uint256("0xe16290c9757d1368b8d7c35de07d4f8f70c2c9f9c785b667df0c3bff85086ca6"))
-    (  5703, uint256("0x587db07bb2172ad7db72c5fabc2518262a1b27f503f99417510b2c6fafa6557b"))
-    (  9000, uint256("0x00000000019ef6b2f5e7c324c7d083ee94502305aabc7e9cd73a7fb2a57bb8db"))
-    (  9001, uint256("0x6d5c6c5f201cc9e59659ee0da30d1430dc6bf3b12a8ff4c3864ab8d6286b0007"))
-    (  9002, uint256("0xa1e20fb1d44688b763690cf74d6aefe859e4cc32981f9e3f2b2ae9702bbcf249"))
-    ( 10881, uint256("0x4b6554c45e1e6764a6f3c309c47baf53c9edd81f624e52b072518cd15da237e6"))
-	  ( 17650, uint256("0x224940e1f986a202209b8e762728d1452ab45870c308abf84905674acf326a47"))
-    (2186940, uint256("0xbd952e8d4a612e336d840ad924a7e09395e36bcd9d929b302e47e60b5c3098c0"))
-            ;
+    static MapCheckpoints mapCheckpoints = {
+        {     0, hashGenesisBlockOfficial },
+        {  2000, uint256("0x0000000000b5f20078bf46ebdf1500813bb6b2cb482065aa93b89e073b2c6467")},
+        {  2101, uint256("0xd4ea1ac45b63c8162a7fc8033cec441db8d532ba988202849d7831e32fe2d059")},
+        {  2847, uint256("0xb5015e2835f13fd3bb6135cff9b31ac33310c9b77d694bdb592b8680d98d018e")},
+        {  3589, uint256("0xb12a2ca3db4e288cada98aa2139768532bd4474c49dd7b8158031032dac08d51")},
+        {  3935, uint256("0xe16290c9757d1368b8d7c35de07d4f8f70c2c9f9c785b667df0c3bff85086ca6")},
+        {  5703, uint256("0x587db07bb2172ad7db72c5fabc2518262a1b27f503f99417510b2c6fafa6557b")},
+        {  9000, uint256("0x00000000019ef6b2f5e7c324c7d083ee94502305aabc7e9cd73a7fb2a57bb8db")},
+        {  9001, uint256("0x6d5c6c5f201cc9e59659ee0da30d1430dc6bf3b12a8ff4c3864ab8d6286b0007")},
+        {  9002, uint256("0xa1e20fb1d44688b763690cf74d6aefe859e4cc32981f9e3f2b2ae9702bbcf249")},
+        { 10881, uint256("0x4b6554c45e1e6764a6f3c309c47baf53c9edd81f624e52b072518cd15da237e6")},
+        { 17650, uint256("0x224940e1f986a202209b8e762728d1452ab45870c308abf84905674acf326a47")},
+        {2186940, uint256("0xbd952e8d4a612e336d840ad924a7e09395e36bcd9d929b302e47e60b5c3098c0")},
+    };
 
-    static MapCheckpoints mapCheckpointsTestnet =
-        boost::assign::map_list_of
-    (     0, hashGenesisBlockTestNet )
-    (  2000, uint256("0x0000000000b5f20078bf46ebdf1500813bb6b2cb482065aa93b89e073b2c6467"))
-    (  2101, uint256("0xd4ea1ac45b63c8162a7fc8033cec441db8d532ba988202849d7831e32fe2d059"))
-    (  2847, uint256("0xb5015e2835f13fd3bb6135cff9b31ac33310c9b77d694bdb592b8680d98d018e"))
-    (  3589, uint256("0xb12a2ca3db4e288cada98aa2139768532bd4474c49dd7b8158031032dac08d51"))
-    (  3935, uint256("0xe16290c9757d1368b8d7c35de07d4f8f70c2c9f9c785b667df0c3bff85086ca6"))
-    (  5703, uint256("0x587db07bb2172ad7db72c5fabc2518262a1b27f503f99417510b2c6fafa6557b"))
-    (  9000, uint256("0x00000000019ef6b2f5e7c324c7d083ee94502305aabc7e9cd73a7fb2a57bb8db"))
-    (  9001, uint256("0x6d5c6c5f201cc9e59659ee0da30d1430dc6bf3b12a8ff4c3864ab8d6286b0007"))
-    (  9002, uint256("0xa1e20fb1d44688b763690cf74d6aefe859e4cc32981f9e3f2b2ae9702bbcf249"))
-    ( 10881, uint256("0x4b6554c45e1e6764a6f3c309c47baf53c9edd81f624e52b072518cd15da237e6"))
-	  ( 17650, uint256("0x224940e1f986a202209b8e762728d1452ab45870c308abf84905674acf326a47"))
-    (2186940, uint256("0xbd952e8d4a612e336d840ad924a7e09395e36bcd9d929b302e47e60b5c3098c0"))
-            ;
+    static MapCheckpoints mapCheckpointsTestnet = {
+        {     0, hashGenesisBlockTestNet },
+        {  2000, uint256("0x0000000000b5f20078bf46ebdf1500813bb6b2cb482065aa93b89e073b2c6467")},
+        {  2101, uint256("0xd4ea1ac45b63c8162a7fc8033cec441db8d532ba988202849d7831e32fe2d059")},
+        {  2847, uint256("0xb5015e2835f13fd3bb6135cff9b31ac33310c9b77d694bdb592b8680d98d018e")},
+        {  3589, uint256("0xb12a2ca3db4e288cada98aa2139768532bd4474c49dd7b8158031032dac08d51")},
+        {  3935, uint256("0xe16290c9757d1368b8d7c35de07d4f8f70c2c9f9c785b667df0c3bff85086ca6")},
+        {  5703, uint256("0x587db07bb2172ad7db72c5fabc2518262a1b27f503f99417510b2c6fafa6557b")},
+        {  9000, uint256("0x00000000019ef6b2f5e7c324c7d083ee94502305aabc7e9cd73a7fb2a57bb8db")},
+        {  9001, uint256("0x6d5c6c5f201cc9e59659ee0da30d1430dc6bf3b12a8ff4c3864ab8d6286b0007")},
+        {  9002, uint256("0xa1e20fb1d44688b763690cf74d6aefe859e4cc32981f9e3f2b2ae9702bbcf249")},
+        { 10881, uint256("0x4b6554c45e1e6764a6f3c309c47baf53c9edd81f624e52b072518cd15da237e6")},
+        { 17650, uint256("0x224940e1f986a202209b8e762728d1452ab45870c308abf84905674acf326a47")},
+        {2186940, uint256("0xbd952e8d4a612e336d840ad924a7e09395e36bcd9d929b302e47e60b5c3098c0")},
+    };
 
     bool CheckHardened(int nHeight, const uint256& hash)
     {
@@ -65,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);
@@ -76,9 +79,9 @@ namespace Checkpoints
     {
         MapCheckpoints& checkpoints = (fTestNet ? mapCheckpointsTestnet : mapCheckpoints);
 
-        BOOST_REVERSE_FOREACH(const MapCheckpoints::value_type& i, checkpoints)
+        for (auto it = checkpoints.rbegin(); it != checkpoints.rend(); ++it)
         {
-            const uint256& hash = i.second;
+            const uint256& hash = it->second;
             std::map<uint256, CBlockIndex*>::const_iterator t = mapBlockIndex.find(hash);
             if (t != mapBlockIndex.end())
                 return t->second;
@@ -87,8 +90,8 @@ namespace Checkpoints
     }
 
     // triangles: synchronized checkpoint (centrally broadcasted)
-    uint256 hashSyncCheckpoint = uint256("0xbd952e8d4a612e336d840ad924a7e09395e36bcd9d929b302e47e60b5c3098c0");
-    uint256 hashPendingCheckpoint = uint256("0xbd952e8d4a612e336d840ad924a7e09395e36bcd9d929b302e47e60b5c3098c0");
+    uint256 hashSyncCheckpoint = uint256("0x7e7a6e4dd5fe895106fca912dfbacaeaf2a89e76c6a588df8ff96e0e18b96021");
+    uint256 hashPendingCheckpoint = uint256("0x7e7a6e4dd5fe895106fca912dfbacaeaf2a89e76c6a588df8ff96e0e18b96021");
     CSyncCheckpoint checkpointMessage;
     CSyncCheckpoint checkpointMessagePending;
     uint256 hashInvalidCheckpoint = 0;
@@ -199,7 +202,7 @@ namespace Checkpoints
             // relay the checkpoint
             if (!checkpointMessage.IsNull())
             {
-                BOOST_FOREACH(CNode* pnode, vNodes)
+                for (CNode* pnode : vNodes)
                     checkpointMessage.RelayTo(pnode);
             }
             return true;
@@ -218,30 +221,10 @@ namespace Checkpoints
     }
 
     // Check against synchronized checkpoint
+    // Disabled: master key removed in V5, no new sync checkpoints possible.
+    // Always returns true to prevent stale DB-persisted checkpoints from blocking IBD.
     bool CheckSync(const uint256& hashBlock, const CBlockIndex* pindexPrev)
     {
-        if (fTestNet) return true; // Testnet has no checkpoints
-        int nHeight = pindexPrev->nHeight + 1;
-
-        LOCK(cs_hashSyncCheckpoint);
-        // sync-checkpoint should always be accepted block
-        assert(mapBlockIndex.count(hashSyncCheckpoint));
-        const CBlockIndex* pindexSync = mapBlockIndex[hashSyncCheckpoint];
-
-        if (nHeight > pindexSync->nHeight)
-        {
-            // trace back to same height as sync-checkpoint
-            const CBlockIndex* pindex = pindexPrev;
-            while (pindex->nHeight > pindexSync->nHeight)
-                if (!(pindex = pindex->pprev))
-                    return error("CheckSync: pprev null - block index structure failure");
-            if (pindex->nHeight < pindexSync->nHeight || pindex->GetBlockHash() != hashSyncCheckpoint)
-                return false; // only descendant of sync-checkpoint can pass check
-        }
-        if (nHeight == pindexSync->nHeight && hashBlock != hashSyncCheckpoint)
-            return false; // same height with sync-checkpoint
-        if (nHeight < pindexSync->nHeight && !mapBlockIndex.count(hashBlock))
-            return false; // lower height than sync-checkpoint
         return true;
     }
 
@@ -284,9 +267,9 @@ namespace Checkpoints
             printf("ResetSyncCheckpoint: pending for sync-checkpoint %s\n", hashPendingCheckpoint.ToString().c_str());
         }
 
-        BOOST_REVERSE_FOREACH(const MapCheckpoints::value_type& i, mapCheckpoints)
+        for (auto it = mapCheckpoints.rbegin(); it != mapCheckpoints.rend(); ++it)
         {
-            const uint256& hash = i.second;
+            const uint256& hash = it->second;
             if (mapBlockIndex.count(hash) && mapBlockIndex[hash]->IsInMainChain())
             {
                 if (!WriteSyncCheckpoint(hash))
@@ -351,7 +334,7 @@ namespace Checkpoints
         // Relay checkpoint
         {
             LOCK(cs_vNodes);
-            BOOST_FOREACH(CNode* pnode, vNodes)
+            for (CNode* pnode : vNodes)
                 checkpoint.RelayTo(pnode);
         }
         return true;
@@ -361,8 +344,8 @@ namespace Checkpoints
     bool IsMatureSyncCheckpoint()
     {
         LOCK(cs_hashSyncCheckpoint);
-        // sync-checkpoint should always be accepted block
-        assert(mapBlockIndex.count(hashSyncCheckpoint));
+        if (!mapBlockIndex.count(hashSyncCheckpoint))
+            return true; // no valid sync checkpoint, treat as mature
         const CBlockIndex* pindexSync = mapBlockIndex[hashSyncCheckpoint];
         return (nBestHeight >= pindexSync->nHeight + nCoinbaseMaturity ||
                 pindexSync->GetBlockTime() + nStakeMinAge < GetAdjustedTime());

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/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       1
-#define CLIENT_VERSION_REVISION    8
+#define CLIENT_VERSION_MINOR       5
+#define CLIENT_VERSION_REVISION    2
 #define CLIENT_VERSION_BUILD       0
 
 // Converts the parameter X to a string after macro replacement on X has been performed.

src/db.cpp

@@ -79,7 +79,7 @@ bool CDBEnv::Open(fs::path pathEnv_)
     if (GetBoolArg("-privdb", true))
         nEnvFlags |= DB_PRIVATE;
 
-    int nDbCache = GetArg("-dbcache", 128);
+    int nDbCache = GetArg("-dbcache", 2048);
     dbenv.set_lg_dir(pathLogDir.string().c_str());
     dbenv.set_cachesize(nDbCache / 1024, (nDbCache % 1024)*1048576, 1);
     dbenv.set_lg_bsize(1048576);
@@ -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

@@ -11,6 +11,9 @@
 #include "ui_interface.h"
 #include "checkpoints.h"
 #include "smessage.h"
+#include "openssl_compat.h"
+#include "bootstrap.h"
+#include "tor/tor_embedded.h"
 #include "tor/onion_v3.h"
 #include "tor/tor_process.h"
 #ifdef ENABLE_ZMQ
@@ -48,6 +51,21 @@ enum Checkpoints::CPMode CheckpointsMode;
 static CCriticalSection cs_DeferredStartup;
 static bool fDeferredStartupRunning = false;
 
+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());
+}
+
 //////////////////////////////////////////////////////////////////////////////
 //
 // Shutdown
@@ -92,17 +110,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)
     {
@@ -140,6 +161,7 @@ void Shutdown(void* parg)
     if (fFirstThread)
     {
         fShutdown = true;
+
         int64_t nDeferredWaitStart = GetTimeMillis();
         while (true)
         {
@@ -154,8 +176,14 @@ void Shutdown(void* parg)
         }
 
         SecureMsgShutdown();
+
+        // Stop network threads FIRST so nothing references Tor objects
+        nTransactionsUpdated++;
+        StopNode();
+
+        // NOW safe to destroy Tor state - all threads have stopped
         ShutdownTorV3();
-        StopTorProcess();
+        StopEmbeddedTor();
 
 #ifdef ENABLE_ZMQ
         if (pzmqNotifier)
@@ -172,14 +200,13 @@ void Shutdown(void* parg)
             pNotificationQueue = NULL;
         }
 
-        nTransactionsUpdated++;
 //        CTxDB().Close();
         bitdb.Flush(false);
-        StopNode();
         bitdb.Flush(true);
         fs::remove(GetPidFile());
         UnregisterWallet(pwalletMain);
         delete pwalletMain;
+        // DB is flushed and wallet saved - safe to force-exit if something hangs
         NewThread(ExitTimeout, NULL);
         MilliSleep(50);
         printf("Triangles exited\n\n");
@@ -330,6 +357,10 @@ 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" +
+        "  -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" +
         "  -maxconnections=<n>    " + _("Maintain at most <n> connections to peers (default: 125)") + "\n" +
@@ -347,6 +378,8 @@ 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" +
         "  -maxreceivebuffer=<n>  " + _("Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)") + "\n" +
@@ -389,6 +422,7 @@ 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" +
         "  -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" +
@@ -441,6 +475,7 @@ bool InitSanityCheck(void)
  */
 bool AppInit2()
 {
+    const int64_t nAppInitStart = GetTimeMillis();
     // ********************************************************* Step 1: setup
 #ifdef _MSC_VER
     // Turn off Microsoft heap dump noise
@@ -597,6 +632,10 @@ bool AppInit2()
     fConfChange = GetBoolArg("-confchange", false);
     fEnforceCanonical = GetBoolArg("-enforcecanonical", true);
 
+    fAddressIndex = GetBoolArg("-addressindex", false);
+    if (fAddressIndex)
+        printf("Address index enabled\n");
+
     if (mapArgs.count("-mininput"))
     {
         if (!ParseMoney(mapArgs["-mininput"], nMinimumInputValue))
@@ -649,7 +688,7 @@ bool AppInit2()
         ShrinkDebugFile();
     printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
     printf("Triangles version %s (%s)\n", FormatFullVersion().c_str(), CLIENT_DATE.c_str());
-    printf("Using OpenSSL version %s\n", SSLeay_version(SSLEAY_VERSION));
+    printf("Using OpenSSL version %s\n", TrianglesOpenSSLVersionString());
     if (!fLogTimestamps)
         printf("Startup time: %s\n", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str());
     printf("Default data directory %s\n", GetDefaultDataDir().string().c_str());
@@ -664,6 +703,7 @@ bool AppInit2()
     // ********************************************************* Step 5: verify database integrity
 
     uiInterface.InitMessage(_("Verifying database integrity..."));
+    nStart = GetTimeMillis();
 
     if (!bitdb.Open(GetDataDir()))
     {
@@ -694,8 +734,10 @@ 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);
     //
@@ -707,7 +749,7 @@ bool AppInit2()
     // Users can restrict to Tor-only with -onlynet=tor
     if (mapArgs.count("-onlynet")) {
         std::set<enum Network> nets;
-        BOOST_FOREACH(std::string snet, mapMultiArgs["-onlynet"]) {
+        for (std::string snet : mapMultiArgs["-onlynet"]) {
             enum Network net = ParseNetwork(snet);
             if (net == NET_UNROUTABLE)
                 return InitError(strprintf(_("Unknown network specified in -onlynet: '%s'"), snet.c_str()));
@@ -722,7 +764,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);
@@ -759,11 +801,11 @@ bool AppInit2()
 
 
     // Release the old Tor initialization mutex (no longer blocking on embedded Tor)
-    set_initialized();
+    triangles_tor_set_initialized();
 
     if (mapArgs.count("-externalip"))
     {
-        BOOST_FOREACH(string strAddr, mapMultiArgs["-externalip"]) {
+        for (string strAddr : mapMultiArgs["-externalip"]) {
             CService addrLocal(strAddr, GetListenPort(), fNameLookup);
             if (!addrLocal.IsValid())
                 return InitError(strprintf(_("Cannot resolve -externalip address: '%s'"), strAddr.c_str()));
@@ -787,8 +829,49 @@ bool AppInit2()
             InitError(_("Unable to sign checkpoint, wrong checkpointkey?\n"));
     }
 
-    BOOST_FOREACH(string strDest, mapMultiArgs["-seednode"])
+    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)
+#ifndef QT_GUI
+    if (GetBoolArg("-bootstrap", false))
+    {
+        int64_t nBootstrapStart = GetTimeMillis();
+        fs::path dataPath = GetDataDir();
+        std::string host = Bootstrap::DEFAULT_HOST;
+        std::string strError;
+
+        uiInterface.InitMessage(_("Downloading blockchain snapshot..."));
+        printf("Bootstrap: contacting %s...\n", host.c_str());
+
+        auto progressFn = [](int64_t bytesDownloaded, int64_t totalBytes) {
+            if (totalBytes > 0) {
+                printf("\rBootstrap: %lld / %lld MB (%lld%%)",
+                       (long long)(bytesDownloaded / (1024*1024)),
+                       (long long)(totalBytes / (1024*1024)),
+                       (long long)((bytesDownloaded * 100) / totalBytes));
+                fflush(stdout);
+            }
+        };
+
+        bool success = Bootstrap::DownloadBootstrap(host, dataPath, progressFn, strError);
+        if (!success) {
+            host = Bootstrap::FALLBACK_HOST;
+            printf("\nBootstrap: primary host failed, trying fallback %s...\n", host.c_str());
+            success = Bootstrap::DownloadBootstrap(host, dataPath, progressFn, strError);
+        }
+
+        if (!success) {
+            printf("\nBootstrap: failed: %s\n", strError.c_str());
+            printf("Bootstrap: skipping, will sync from network.\n");
+        } else {
+            printf("\nBootstrap: done.\n");
+        }
+        StartupPerfLog("bootstrap_download", GetTimeMillis() - nBootstrapStart,
+            strprintf("host=%s success=%d", host.c_str(), success));
+    }
+#endif
 
     // ********************************************************* Step 7: load blockchain
 
@@ -814,6 +897,18 @@ bool AppInit2()
     if (!LoadBlockIndex())
         return InitError(_("Error loading blkindex.dat"));
 
+    // If the block index is empty but blk0001.dat exists (bootstrap download),
+    // fast-import: build the index directly from the block file without re-writing
+    // data. Batches LevelDB commits every 200K blocks for speed.
+    if (nBestHeight == 0 && boost::filesystem::exists(GetDataDir() / "blk0001.dat")
+        && mapBlockIndex.size() <= 1)
+    {
+        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
     // requested to kill triangles-qt during the last operation. If so, exit.
@@ -823,7 +918,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"))
     {
@@ -917,7 +1029,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);
 
@@ -926,10 +1039,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)
     {
@@ -937,7 +1052,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;
@@ -961,7 +1076,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
@@ -969,13 +1090,47 @@ bool AppInit2()
         uiInterface.InitMessage(_("Starting Tor..."));
         printf("Starting Tor process...\n");
 
-        // Start the Tor process (finds/launches tor binary, provides SOCKS proxy)
-        std::string torDataPath = (GetDataDir() / "tor_data").string();
-        bool torStarted = StartTorProcess(torDataPath);
+        // 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();
 
         if (torStarted) {
             printf("Tor process running, SOCKS proxy at %s\n",
-                   CTorProcess::GetInstance()->GetSocksProxy().c_str());
+                   CTorEmbedded::GetInstance()->GetSocksProxy().c_str());
         } else {
             printf("WARNING: Tor not available. .onion peers will not be reachable.\n");
             printf("  Clearnet connections will still work normally.\n");
@@ -985,15 +1140,17 @@ bool AppInit2()
         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";
@@ -1005,14 +1162,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) {
@@ -1025,12 +1187,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
@@ -1039,11 +1210,13 @@ bool AppInit2()
     {
         uiInterface.InitMessage(_("Importing blockchain data file."));
 
-        BOOST_FOREACH(string strFile, mapMultiArgs["-loadblock"])
+        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);
     }
@@ -1052,12 +1225,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
@@ -1072,11 +1247,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;
@@ -1084,11 +1261,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"));
@@ -1105,6 +1282,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
@@ -1127,11 +1305,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))
     {
@@ -1143,6 +1316,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/init.h

@@ -6,7 +6,7 @@
 #define TRIANGLES_INIT_H
 
 #include "wallet.h"
-#include <tor/anonymize.h>
+#include "tor_embed_hooks.h"
 
 extern CWallet* pwalletMain;
 extern std::string strWalletFileName;

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_spirit_value.h

@@ -18,8 +18,8 @@
 #include <stdexcept>
 #include <boost/config.hpp> 
 #include <boost/cstdint.hpp> 
-#include <boost/shared_ptr.hpp> 
-#include <boost/variant.hpp> 
+#include <boost/shared_ptr.hpp>
+#include <boost/variant.hpp>
 
 namespace json_spirit
 {

src/kernel.cpp

@@ -2,8 +2,6 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <boost/assign/list_of.hpp>
-
 #include "kernel.h"
 #include "txdb.h"
 
@@ -19,10 +17,9 @@ extern unsigned int nTargetSpacing;
 typedef std::map<int, unsigned int> MapModifierCheckpoints;
 
 // Hard checkpoints of stake modifiers to ensure they are deterministic
-static std::map<int, unsigned int> mapStakeModifierCheckpoints =
-    boost::assign::map_list_of
-    (     0, 0x000000000e00670b )
-	;
+static std::map<int, unsigned int> mapStakeModifierCheckpoints = {
+    { 0, 0x000000000e00670b },
+};
 
 // Get time weight
 int64_t GetWeight(int64_t nIntervalBeginning, int64_t nIntervalEnd)
@@ -80,7 +77,7 @@ static bool SelectBlockFromCandidates(vector<pair<int64_t, uint256> >& vSortedBy
     bool fSelected = false;
     uint256 hashBest = 0;
     *pindexSelected = (const CBlockIndex*) 0;
-    BOOST_FOREACH(const PAIRTYPE(int64_t, uint256)& item, vSortedByTimestamp)
+    for (const auto& item : vSortedByTimestamp)
     {
         if (!mapBlockIndex.count(item.second))
             return error("SelectBlockFromCandidates: failed to find block index for candidate block %s", item.second.ToString().c_str());
@@ -199,7 +196,7 @@ bool ComputeNextStakeModifier(const CBlockIndex* pindexPrev, uint64_t& nStakeMod
                 strSelectionMap.replace(pindex->nHeight - nHeightFirstCandidate, 1, "=");
             pindex = pindex->pprev;
         }
-        BOOST_FOREACH(const PAIRTYPE(uint256, const CBlockIndex*)& item, mapSelectedBlocks)
+        for (const auto& item : mapSelectedBlocks)
         {
             // 'S' indicates selected proof-of-stake blocks
             // 'W' indicates selected proof-of-work blocks

src/keystore.cpp

@@ -202,7 +202,7 @@ bool CCryptoKeyStore::EncryptKeys(CKeyingMaterial& vMasterKeyIn)
             return false;
 
         fUseCrypto = true;
-        BOOST_FOREACH(KeyMap::value_type& mKey, mapKeys)
+        for (KeyMap::value_type& mKey : mapKeys)
         {
             CKey key;
             if (!key.SetSecret(mKey.second.first, mKey.second.second))

src/lz4/LICENSE

@@ -1,24 +1,12 @@
-LZ4 Library
-Copyright (c) 2011-2014, Yann Collet
-All rights reserved.
+This repository uses 2 different licenses :
+- all files in the `lib` directory use a BSD 2-Clause license
+- all other files use a GPL-2.0-or-later license, unless explicitly stated otherwise
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+Relevant license is reminded at the top of each source file,
+and with presence of COPYING or LICENSE file in associated directories.
 
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+This model is selected to emphasize that
+files in the `lib` directory are designed to be included into 3rd party applications,
+while all other files, in `programs`, `tests` or `examples`,
+are intended to be used "as is", as part of their intended scenarios,
+with no intention to support 3rd party integration use cases.

src/main.h

@@ -29,15 +29,18 @@ class CNode;
 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;
@@ -54,8 +57,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;
@@ -111,6 +117,7 @@ CBlockIndex* FindBlockByHeight(int nHeight);
 bool ProcessMessages(CNode* pfrom);
 bool SendMessages(CNode* pto, bool fSendTrickle);
 bool LoadExternalBlockFile(FILE* fileIn);
+bool FastImportBlockFile();
 
 bool CheckProofOfWork(uint256 hash, unsigned int nBits);
 unsigned int GetNextTargetRequired(const CBlockIndex* pindexLast, bool fProofOfStake);
@@ -489,7 +496,7 @@ public:
             nBlockTime = GetAdjustedTime();
         if ((int64_t)nLockTime < ((int64_t)nLockTime < LOCKTIME_THRESHOLD ? (int64_t)nBlockHeight : nBlockTime))
             return true;
-        BOOST_FOREACH(const CTxIn& txin, vin)
+        for (const CTxIn& txin : vin)
             if (!txin.IsFinal())
                 return false;
         return true;
@@ -567,7 +574,7 @@ public:
     int64_t GetValueOut() const
     {
         int64_t nValueOut = 0;
-        BOOST_FOREACH(const CTxOut& txout, vout)
+        for (const CTxOut& txout : vout)
         {
             nValueOut += txout.nValue;
             if (!MoneyRange(txout.nValue) || !MoneyRange(nValueOut))
@@ -640,7 +647,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,
@@ -955,7 +962,7 @@ public:
     int64_t GetMaxTransactionTime() const
     {
         int64_t maxTransactionTime = 0;
-        BOOST_FOREACH(const CTransaction& tx, vtx)
+        for (const CTransaction& tx : vtx)
             maxTransactionTime = std::max(maxTransactionTime, (int64_t)tx.nTime);
         return maxTransactionTime;
     }
@@ -963,7 +970,7 @@ public:
     uint256 BuildMerkleTree() const
     {
         vMerkleTree.clear();
-        BOOST_FOREACH(const CTransaction& tx, vtx)
+        for (const CTransaction& tx : vtx)
             vMerkleTree.push_back(tx.GetHash());
         int j = 0;
         for (int nSize = vtx.size(); nSize > 1; nSize = (nSize + 1) / 2)
@@ -999,7 +1006,7 @@ public:
     {
         if (nIndex == -1)
             return 0;
-        BOOST_FOREACH(const uint256& otherside, vMerkleBranch)
+        for (const uint256& otherside : vMerkleBranch)
         {
             if (nIndex & 1)
                 hash = Hash(BEGIN(otherside), END(otherside), BEGIN(hash), END(hash));
@@ -1067,7 +1074,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(),
@@ -1328,7 +1335,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",
@@ -1518,7 +1525,7 @@ public:
         // Retrace how far back it was in the sender's branch
         int nDistance = 0;
         int nStep = 1;
-        BOOST_FOREACH(const uint256& hash, vHave)
+        for (const uint256& hash : vHave)
         {
             std::map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(hash);
             if (mi != mapBlockIndex.end())
@@ -1537,7 +1544,7 @@ public:
     CBlockIndex* GetBlockIndex()
     {
         // Find the first block the caller has in the main chain
-        BOOST_FOREACH(const uint256& hash, vHave)
+        for (const uint256& hash : vHave)
         {
             std::map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(hash);
             if (mi != mapBlockIndex.end())
@@ -1553,7 +1560,7 @@ public:
     uint256 GetBlockHash()
     {
         // Find the first block the caller has in the main chain
-        BOOST_FOREACH(const uint256& hash, vHave)
+        for (const uint256& hash : vHave)
         {
             std::map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(hash);
             if (mi != mapBlockIndex.end())

src/makefile.mingw

@@ -74,7 +74,7 @@ HARDENING+=-D_FORTIFY_SOURCE=2
 
 DEBUGFLAGS=-g
 
-xCXXFLAGS=-O2 -pthread -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter \
+xCXXFLAGS=-O2 -std=c++17 -pthread -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter \
     -Wno-deprecated-declarations -Wno-reserved-user-defined-literal \
     -Wa,-mbig-obj \
     $(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS)
@@ -111,6 +111,7 @@ OBJS= \
     obj/miner.o \
     obj/main.o \
     obj/net.o \
+    obj/bootstrap.o \
     obj/net_bootstrap.o \
     obj/protocol.o \
     obj/trianglesrpc.o \
@@ -135,8 +136,11 @@ OBJS= \
     obj/scrypt-x86.o \
     obj/scrypt-x86_64.o \
     obj/smessage.o \
+    obj/lz4.o \
     obj/onion_v3.o \
-    obj/tor_process.o
+    obj/tor_process.o \
+    obj/tor_embed_hooks.o \
+    obj/tor_embedded.o
 
 all: trianglesd.exe
 
@@ -208,6 +212,34 @@ obj/tor_process.o: tor/tor_process.cpp
             -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
 	rm -f $(@:%.o=%.d)
 
+obj/lz4.o: lz4/lz4.c
+	$(CXX) -c $(xCXXFLAGS) -fpermissive -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/tor_embed_hooks.o: tor_embed_hooks.cpp
+	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/tor_embedded.o: tor/tor_embedded.cpp
+	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/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); \

src/makefile.unix

@@ -6,7 +6,7 @@ USE_UPNP:=0
 USE_IPV6:=1
 
 LINK:=$(CXX)
-ARCH:=$(system lscpu | head -n 1 | awk '{print $2}')
+ARCH:=$(shell lscpu | head -n 1 | awk '{print $$2}')
 
 DEFS=-DBOOST_SPIRIT_THREADSAFE
 
@@ -41,7 +41,6 @@ LIBS += \
    -l boost_chrono$(BOOST_LIB_SUFFIX) \
    -l db_cxx$(BDB_LIB_SUFFIX) \
    -l ssl \
-   -l event \
    -l crypto
 
 ifndef USE_UPNP
@@ -107,7 +106,7 @@ 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 $(EXT_OPTIONS) -pthread -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter \
+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
@@ -146,6 +145,7 @@ OBJS= \
     obj/miner.o \
     obj/main.o \
     obj/net.o \
+    obj/bootstrap.o \
     obj/net_bootstrap.o \
     obj/protocol.o \
     obj/trianglesrpc.o \
@@ -170,8 +170,26 @@ OBJS= \
     obj/scrypt-x86.o \
     obj/scrypt-x86_64.o \
     obj/smessage.o \
+    obj/lz4.o \
     obj/onion_v3.o \
-    obj/tor_process.o
+    obj/tor_process.o \
+    obj/tor_embed_hooks.o \
+    obj/tor_embedded.o
+
+# 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
@@ -183,6 +201,12 @@ endif
 
 all: trianglesd
 
+obj:
+	@mkdir -p obj
+
+obj-test:
+	@mkdir -p obj-test
+
 test check: test_triangles FORCE
 	./test_triangles
 
@@ -212,28 +236,28 @@ obj/scrypt-x86_64.o: scrypt-x86_64.S
 obj/scrypt-arm.o: scrypt-arm.S
 	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
 	
-obj/%.o: %.cpp
+obj/%.o: %.cpp | obj
 	$(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
+obj/%.o: %.c | obj
 	$(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 $@ $<
+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/ *\\$$//' \
+	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
+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/ *\\$$//' \
@@ -254,6 +278,20 @@ obj/tor_process.o: tor/tor_process.cpp
             -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); \
@@ -261,12 +299,14 @@ obj/net_bootstrap.o: net_bootstrap.cpp
             -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
 	rm -f $(@:%.o=%.d)
 
-trianglesd: $(OBJS:obj/%=obj/%) obj/anonymize.o
+trianglesd: $(OBJS:obj/%=obj/%)
 	$(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
 
-TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
+# miner_tests.cpp references CreateNewBlock() which was never ported from Bitcoin
+TESTOBJS := $(filter-out obj-test/miner_tests.o, \
+    $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)))
 
-obj-test/%.o: test/%.cpp
+obj-test/%.o: test/%.cpp | obj-test
 	$(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
 	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
 	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \

src/miner.cpp

@@ -72,7 +72,7 @@ public:
     {
         printf("COrphan(hash=%s, dPriority=%.1f, dFeePerKb=%.1f)\n",
                ptx->GetHash().ToString().substr(0,10).c_str(), dPriority, dFeePerKb);
-        BOOST_FOREACH(uint256 hash, setDependsOn)
+        for (uint256 hash : setDependsOn)
             printf("   setDependsOn %s\n", hash.ToString().substr(0,10).c_str());
     }
 };
@@ -83,7 +83,7 @@ uint64_t nLastBlockSize = 0;
 int64_t nLastCoinStakeSearchInterval = 0;
  
 // We want to sort transactions by priority and fee, so:
-typedef boost::tuple<double, double, CTransaction*> TxPriority;
+typedef std::tuple<double, double, CTransaction*> TxPriority;
 class TxPriorityCompare
 {
     bool byFee;
@@ -93,15 +93,15 @@ public:
     {
         if (byFee)
         {
-            if (a.get<1>() == b.get<1>())
-                return a.get<0>() < b.get<0>();
-            return a.get<1>() < b.get<1>();
+            if (std::get<1>(a) == std::get<1>(b))
+                return std::get<0>(a) < std::get<0>(b);
+            return std::get<1>(a) < std::get<1>(b);
         }
         else
         {
-            if (a.get<0>() == b.get<0>())
-                return a.get<1>() < b.get<1>();
-            return a.get<0>() < b.get<0>();
+            if (std::get<0>(a) == std::get<0>(b))
+                return std::get<1>(a) < std::get<1>(b);
+            return std::get<0>(a) < std::get<0>(b);
         }
     }
 };
@@ -110,7 +110,7 @@ public:
 CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake, int64_t* pFees)
 {
     // Create new block
-    auto_ptr<CBlock> pblock(new CBlock());
+    unique_ptr<CBlock> pblock(new CBlock());
     if (!pblock.get())
         return NULL;
 
@@ -188,7 +188,7 @@ CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake, int64_t* pFees)
             double dPriority = 0;
             int64_t nTotalIn = 0;
             bool fMissingInputs = false;
-            BOOST_FOREACH(const CTxIn& txin, tx.vin)
+            for (const CTxIn& txin : tx.vin)
             {
                 // Read prev transaction
                 CTransaction txPrev;
@@ -259,9 +259,9 @@ CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake, int64_t* pFees)
         while (!vecPriority.empty())
         {
             // Take highest priority transaction off the priority queue:
-            double dPriority = vecPriority.front().get<0>();
-            double dFeePerKb = vecPriority.front().get<1>();
-            CTransaction& tx = *(vecPriority.front().get<2>());
+            double dPriority = std::get<0>(vecPriority.front());
+            double dFeePerKb = std::get<1>(vecPriority.front());
+            CTransaction& tx = *(std::get<2>(vecPriority.front()));
 
             std::pop_heap(vecPriority.begin(), vecPriority.end(), comparer);
             vecPriority.pop_back();
@@ -335,7 +335,7 @@ CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake, int64_t* pFees)
             uint256 hash = tx.GetHash();
             if (mapDependers.count(hash))
             {
-                BOOST_FOREACH(COrphan* porphan, mapDependers[hash])
+                for (COrphan* porphan : mapDependers[hash])
                 {
                     if (!porphan->setDependsOn.empty())
                     {
@@ -354,7 +354,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 +365,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;
@@ -551,18 +551,28 @@ void StakeMiner(CWallet *pwallet)
         if (fTryToSync)
         {
             fTryToSync = false;
-            if (vNodes.size() < 3 || nBestHeight < GetNumBlocksOfPeers())
+            if (vNodes.size() < 1 || nBestHeight < GetNumBlocksOfPeers())
             {
                 MilliSleep(60000);
                 continue;
             }
         }
 
+        //
+        // Update cached stake weight for UI display (avoids heavy work on UI thread)
+        //
+        {
+            uint64_t nMinWeight = 0, nMaxWeight = 0, nWeight = 0;
+            pwallet->GetStakeWeight(*pwallet, nMinWeight, nMaxWeight, nWeight);
+            pwallet->nCachedStakeWeight = nWeight;
+            pwallet->nCachedStakeWeightTime = GetTime();
+        }
+
         //
         // Create new block
         //
         int64_t nFees;
-        auto_ptr<CBlock> pblock(CreateNewBlock(pwallet, true, &nFees));
+        unique_ptr<CBlock> pblock(CreateNewBlock(pwallet, true, &nFees));
         if (!pblock.get())
             return;
 

src/net.cpp

@@ -6,12 +6,16 @@
 #include "irc.h"
 #include "db.h"
 #include "net.h"
+#include "main.h"
 #include "init.h"
 #include "strlcpy.h"
 #include "addrman.h"
 #include "ui_interface.h"
 #include "onionseed.h"
 
+#include <boost/asio.hpp>
+#include <sstream>
+
 #ifdef WIN32
 #include <string.h>
 #endif
@@ -40,8 +44,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);
 
 
@@ -212,7 +216,7 @@ bool RecvLine(SOCKET hSocket, string& strLine)
 void static AdvertizeLocal()
 {
     LOCK(cs_vNodes);
-    BOOST_FOREACH(CNode* pnode, vNodes)
+    for (CNode* pnode : vNodes)
     {
         if (pnode->fSuccessfullyConnected)
         {
@@ -457,7 +461,7 @@ CNode* FindNode(const CNetAddr& ip)
 {
     {
         LOCK(cs_vNodes);
-        BOOST_FOREACH(CNode* pnode, vNodes)
+        for (CNode* pnode : vNodes)
             if ((CNetAddr)pnode->addr == ip)
                 return (pnode);
     }
@@ -467,7 +471,7 @@ CNode* FindNode(const CNetAddr& ip)
 CNode* FindNode(std::string addrName)
 {
     LOCK(cs_vNodes);
-    BOOST_FOREACH(CNode* pnode, vNodes)
+    for (CNode* pnode : vNodes)
         if (pnode->addrName == addrName)
             return (pnode);
     return NULL;
@@ -477,7 +481,7 @@ CNode* FindNode(const CService& addr)
 {
     {
         LOCK(cs_vNodes);
-        BOOST_FOREACH(CNode* pnode, vNodes)
+        for (CNode* pnode : vNodes)
             if ((CService)pnode->addr == addr)
                 return (pnode);
     }
@@ -822,7 +826,7 @@ void ThreadSocketHandler2(void* parg)
             LOCK(cs_vNodes);
             // Disconnect unused nodes
             vector<CNode*> vNodesCopy = vNodes;
-            BOOST_FOREACH(CNode* pnode, vNodesCopy)
+            for (CNode* pnode : vNodesCopy)
             {
                 if (pnode->fDisconnect ||
                     (pnode->GetRefCount() <= 0 && pnode->vRecvMsg.empty() && pnode->nSendSize == 0 && pnode->ssSend.empty()))
@@ -846,7 +850,7 @@ void ThreadSocketHandler2(void* parg)
 
             // Delete disconnected nodes
             list<CNode*> vNodesDisconnectedCopy = vNodesDisconnected;
-            BOOST_FOREACH(CNode* pnode, vNodesDisconnectedCopy)
+            for (CNode* pnode : vNodesDisconnectedCopy)
             {
                 // wait until threads are done using it
                 if (pnode->GetRefCount() <= 0)
@@ -877,10 +881,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);
+            }
         }
 
 
@@ -889,7 +902,7 @@ void ThreadSocketHandler2(void* parg)
         //
         struct timeval timeout;
         timeout.tv_sec  = 0;
-        timeout.tv_usec = 50000; // frequency to poll pnode->vSend
+        timeout.tv_usec = IsInitialBlockDownload() ? 1000 : 50000; // 1ms during IBD, 50ms normal
 
         fd_set fdsetRecv;
         fd_set fdsetSend;
@@ -900,14 +913,14 @@ void ThreadSocketHandler2(void* parg)
         SOCKET hSocketMax = 0;
         bool have_fds = false;
 
-        BOOST_FOREACH(SOCKET hListenSocket, vhListenSocket) {
+        for (SOCKET hListenSocket : vhListenSocket) {
             FD_SET(hListenSocket, &fdsetRecv);
             hSocketMax = max(hSocketMax, hListenSocket);
             have_fds = true;
         }
         {
             LOCK(cs_vNodes);
-            BOOST_FOREACH(CNode* pnode, vNodes)
+            for (CNode* pnode : vNodes)
             {
                 if (pnode->hSocket == INVALID_SOCKET)
                     continue;
@@ -947,7 +960,7 @@ void ThreadSocketHandler2(void* parg)
         //
         // Accept new connections
         //
-        BOOST_FOREACH(SOCKET hListenSocket, vhListenSocket)
+        for (SOCKET hListenSocket : vhListenSocket)
         if (hListenSocket != INVALID_SOCKET && FD_ISSET(hListenSocket, &fdsetRecv))
         {
 #ifdef USE_IPV6
@@ -966,7 +979,7 @@ void ThreadSocketHandler2(void* parg)
 
             {
                 LOCK(cs_vNodes);
-                BOOST_FOREACH(CNode* pnode, vNodes)
+                for (CNode* pnode : vNodes)
                     if (pnode->fInbound)
                         nInbound++;
             }
@@ -1006,13 +1019,13 @@ void ThreadSocketHandler2(void* parg)
         {
             LOCK(cs_vNodes);
             vNodesCopy = vNodes;
-            BOOST_FOREACH(CNode* pnode, vNodesCopy)
+            for (CNode* pnode : vNodesCopy)
                 pnode->AddRef();
         }
-        BOOST_FOREACH(CNode* pnode, vNodesCopy)
+        for (CNode* pnode : vNodesCopy)
         {
             if (fShutdown)
-                return;
+                break;
 
             //
             // Receive
@@ -1038,7 +1051,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)
                         {
@@ -1099,10 +1112,12 @@ void ThreadSocketHandler2(void* parg)
         }
         {
             LOCK(cs_vNodes);
-            BOOST_FOREACH(CNode* pnode, vNodesCopy)
+            for (CNode* pnode : vNodesCopy)
                 pnode->Release();
         }
 
+        if (fShutdown)
+            return;
         MilliSleep(10);
     }
 }
@@ -1374,9 +1389,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()
@@ -1418,56 +1433,166 @@ 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 HTTP_PORT = 80;
 
-    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 http://%s%s ...\n", seedHost.c_str(), seedPath.c_str());
+
+    try {
+        boost::asio::io_context io_context;
+        boost::asio::ip::tcp::resolver resolver(io_context);
+
+        boost::system::error_code resolve_ec;
+        auto endpoints = resolver.resolve(seedHost, std::to_string(HTTP_PORT), resolve_ec);
+        if (resolve_ec) {
+            printf("HTTP seed fetch: cannot resolve %s (%s)\n", seedHost.c_str(), resolve_ec.message().c_str());
             return;
+        }
 
-        vector<CNetAddr> vaddr;
-        if (LookupHost(strDNSSeed[seed_idx], vaddr))
+        boost::asio::ip::tcp::socket socket(io_context);
+        boost::asio::connect(socket, endpoints);
+
+        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";
+        boost::asio::write(socket, boost::asio::buffer(request));
+
+        // Read response
+        boost::asio::streambuf response_buf;
+        boost::asio::read_until(socket, response_buf, "\r\n\r\n");
+
+        std::istream response_stream(&response_buf);
+        std::string http_version;
+        unsigned int status_code = 0;
+        response_stream >> http_version >> status_code;
+        std::string status_message;
+        std::getline(response_stream, status_message);
+
+        if (status_code != 200) {
+            printf("HTTP seed fetch: got status %u from %s\n", status_code, seedHost.c_str());
+            return;
+        }
+
+        // Skip remaining headers
+        std::string header_line;
+        while (std::getline(response_stream, header_line) && header_line != "\r") {}
+
+        // Read body (remainder in buffer + rest from socket)
+        std::string body;
+
+        // First, grab anything already buffered past the headers
+        if (response_buf.size() > 0) {
+            std::istream body_stream(&response_buf);
+            std::ostringstream oss;
+            oss << body_stream.rdbuf();
+            body = oss.str();
+        }
+
+        // Read rest until EOF
+        boost::system::error_code ec;
+        while (boost::asio::read(socket, response_buf, boost::asio::transfer_at_least(1), ec)) {
+            std::istream s(&response_buf);
+            std::ostringstream oss;
+            oss << s.rdbuf();
+            body += oss.str();
+        }
+
+        // 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))
         {
-            BOOST_FOREACH(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("http-seed", true));
                 found++;
             }
         }
-    }
 
-    printf("%d addresses found from DNS seeds\n", found);
+        printf("%d addresses found from HTTP seed list (%s)\n", found, seedHost.c_str());
+
+    } catch (std::exception& e) {
+        printf("HTTP seed fetch failed: %s\n", e.what());
+    }
 }
 
-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)
@@ -1540,7 +1665,7 @@ void ThreadOpenConnections2(void* parg)
         for (int64_t nLoop = 0;; nLoop++)
         {
             ProcessOneShot();
-            BOOST_FOREACH(string strAddr, mapMultiArgs["-connect"])
+            for (string strAddr : mapMultiArgs["-connect"])
             {
                 CAddress addr;
                 OpenNetworkConnection(addr, NULL, strAddr.c_str());
@@ -1574,25 +1699,8 @@ void ThreadOpenConnections2(void* parg)
         if (fShutdown)
             return;
 
-        // Add seed nodes if IRC isn't working
-        if (addrman.size()==0 && (GetTime() - nStart > 60) && !fTestNet)
-        {
-            std::vector<CAddress> vAdd;
-            for (unsigned int i = 0; i < ARRAYLEN(pnSeed); i++)
-            {
-                // It'll only connect to one or two seed nodes because once it connects,
-                // it'll get a pile of addresses with newer timestamps.
-                // Seed nodes are given a random 'last seen time' of between one and two
-                // weeks ago.
-                const int64_t nOneWeek = 7*24*60*60;
-                struct in_addr ip;
-                memcpy(&ip, &pnSeed[i], sizeof(ip));
-                CAddress addr(CService(ip, GetDefaultPort()));
-                addr.nTime = GetTime()-GetRand(nOneWeek)-nOneWeek;
-                vAdd.push_back(addr);
-            }
-            addrman.Add(vAdd, CNetAddr("127.0.0.1"));
-        }
+        // 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
@@ -1605,7 +1713,7 @@ void ThreadOpenConnections2(void* parg)
         set<vector<unsigned char> > setConnected;
         {
             LOCK(cs_vNodes);
-            BOOST_FOREACH(CNode* pnode, vNodes) {
+            for (CNode* pnode : vNodes) {
                 if (!pnode->fInbound) {
                     setConnected.insert(pnode->addr.GetGroup());
                     nOutbound++;
@@ -1636,7 +1744,7 @@ void ThreadOpenConnections2(void* parg)
                 continue;
 
             // only consider very recently tried nodes after 30 failed attempts
-            if (nANow - addr.nLastTry < 600 && nTries < 30)
+            if (nANow - addr.nLastTry < 120 && nTries < 30)
                 continue;
 
             // do not allow non-default ports, unless after 50 invalid addresses selected already
@@ -1682,7 +1790,7 @@ void ThreadOpenAddedConnections2(void* parg)
 
     if (HaveNameProxy()) {
         while(!fShutdown) {
-            BOOST_FOREACH(string& strAddNode, mapMultiArgs["-addnode"]) {
+            for (string& strAddNode : mapMultiArgs["-addnode"]) {
                 CAddress addr;
                 CSemaphoreGrant grant(*semOutbound);
                 OpenNetworkConnection(addr, &grant, strAddNode.c_str());
@@ -1696,7 +1804,7 @@ void ThreadOpenAddedConnections2(void* parg)
     }
 
     vector<vector<CService> > vservAddressesToAdd(0);
-    BOOST_FOREACH(string& strAddNode, mapMultiArgs["-addnode"])
+    for (string& strAddNode : mapMultiArgs["-addnode"])
     {
         vector<CService> vservNode(0);
         if(Lookup(strAddNode.c_str(), vservNode, GetDefaultPort(), fNameLookup, 0))
@@ -1704,7 +1812,7 @@ void ThreadOpenAddedConnections2(void* parg)
             vservAddressesToAdd.push_back(vservNode);
             {
                 LOCK(cs_setservAddNodeAddresses);
-                BOOST_FOREACH(CService& serv, vservNode)
+                for (CService& serv : vservNode)
                     setservAddNodeAddresses.insert(serv);
             }
         }
@@ -1716,9 +1824,9 @@ void ThreadOpenAddedConnections2(void* parg)
         // (keeping in mind that addnode entries can have many IPs if fNameLookup)
         {
             LOCK(cs_vNodes);
-            BOOST_FOREACH(CNode* pnode, vNodes)
+            for (CNode* pnode : vNodes)
                 for (vector<vector<CService> >::iterator it = vservConnectAddresses.begin(); it != vservConnectAddresses.end(); it++)
-                    BOOST_FOREACH(CService& addrNode, *(it))
+                    for (CService& addrNode : *(it))
                         if (pnode->addr == addrNode)
                         {
                             it = vservConnectAddresses.erase(it);
@@ -1726,7 +1834,7 @@ void ThreadOpenAddedConnections2(void* parg)
                             break;
                         }
         }
-        BOOST_FOREACH(vector<CService>& vserv, vservConnectAddresses)
+        for (vector<CService>& vserv : vservConnectAddresses)
         {
             CSemaphoreGrant grant(*semOutbound);
             OpenNetworkConnection(CAddress(*(vserv.begin())), &grant);
@@ -1809,13 +1917,14 @@ void ThreadMessageHandler2(void* parg)
 {
     printf("ThreadMessageHandler started\n");
     SetThreadPriority(THREAD_PRIORITY_BELOW_NORMAL);
+    bool fWasBoosted = false;
     while (!fShutdown)
     {
         vector<CNode*> vNodesCopy;
         {
             LOCK(cs_vNodes);
             vNodesCopy = vNodes;
-            BOOST_FOREACH(CNode* pnode, vNodesCopy)
+            for (CNode* pnode : vNodesCopy)
                 pnode->AddRef();
         }
 
@@ -1823,8 +1932,11 @@ void ThreadMessageHandler2(void* parg)
         CNode* pnodeTrickle = NULL;
         if (!vNodesCopy.empty())
             pnodeTrickle = vNodesCopy[GetRand(vNodesCopy.size())];
-        BOOST_FOREACH(CNode* pnode, vNodesCopy)
+        for (CNode* pnode : vNodesCopy)
         {
+            if (fShutdown)
+                break;
+
             // Receive messages
             {
                 TRY_LOCK(pnode->cs_vRecvMsg, lockRecv);
@@ -1832,8 +1944,6 @@ void ThreadMessageHandler2(void* parg)
                     if (!ProcessMessages(pnode))
                         pnode->CloseSocketDisconnect();
             }
-            if (fShutdown)
-                return;
 
             // Send messages
             {
@@ -1841,21 +1951,29 @@ void ThreadMessageHandler2(void* parg)
                 if (lockSend)
                     SendMessages(pnode, pnode == pnodeTrickle);
             }
-            if (fShutdown)
-                return;
         }
 
         {
             LOCK(cs_vNodes);
-            BOOST_FOREACH(CNode* pnode, vNodesCopy)
+            for (CNode* pnode : vNodesCopy)
                 pnode->Release();
         }
 
+        // Boost thread priority during IBD, restore when caught up
+        if (IsInitialBlockDownload() && !fWasBoosted) {
+            SetThreadPriority(THREAD_PRIORITY_NORMAL);
+            fWasBoosted = true;
+        } else if (!IsInitialBlockDownload() && fWasBoosted) {
+            SetThreadPriority(THREAD_PRIORITY_BELOW_NORMAL);
+            fWasBoosted = false;
+        }
+
         // Wait and allow messages to bunch up.
+        // During IBD, use a shorter sleep to maximize block processing throughput.
         // Reduce vnThreadsRunning so StopNode has permission to exit while
         // we're sleeping, but we must always check fShutdown after doing this.
         vnThreadsRunning[THREAD_MESSAGEHANDLER]--;
-        MilliSleep(100);
+        MilliSleep(IsInitialBlockDownload() ? 1 : 100);
         if (fRequestShutdown)
             StartShutdown();
         vnThreadsRunning[THREAD_MESSAGEHANDLER]++;
@@ -2010,7 +2128,7 @@ static void run_tor() {
     // which starts an external Tor binary with SOCKS5 proxy and v3 hidden service.
     // The old embedded Tor v2 code was removed (incompatible with OpenSSL 3.x).
     printf("Tor v3 mode: using managed Tor process via SOCKS5 proxy.\n");
-    set_initialized();
+    triangles_tor_set_initialized();
 }
 
 
@@ -2085,9 +2203,11 @@ void StartNode(void* parg)
     if (fUseUPnP)
         MapPort();
 
-    // DNS seed lookup
-    if (!NewThread(ThreadDNSAddressSeed, NULL))
-        printf("Error: NewThread(ThreadDNSAddressSeed) failed\n");
+    // HTTP seed list fetch (replaces DNS seeds)
+    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))
@@ -2145,14 +2265,36 @@ 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");
-    while (vnThreadsRunning[THREAD_MESSAGEHANDLER] > 0 || vnThreadsRunning[THREAD_RPCHANDLER] > 0)
-        MilliSleep(20);
+    {
+        int64_t nWaitStart = GetTime();
+        while (vnThreadsRunning[THREAD_MESSAGEHANDLER] > 0 || vnThreadsRunning[THREAD_RPCHANDLER] > 0)
+        {
+            if (GetTime() - nWaitStart > 10)
+            {
+                printf("Timed out waiting for message/RPC threads to stop\n");
+                break;
+            }
+            MilliSleep(20);
+        }
+    }
     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;
 }
 
@@ -2164,11 +2306,12 @@ public:
     }
     ~CNetCleanup()
     {
-        // Close sockets
-        BOOST_FOREACH(CNode* pnode, vNodes)
+        // 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);
-        BOOST_FOREACH(SOCKET hListenSocket, vhListenSocket)
+        for (SOCKET hListenSocket : vhListenSocket)
             if (hListenSocket != INVALID_SOCKET)
                 if (closesocket(hListenSocket) == SOCKET_ERROR)
                     printf("closesocket(hListenSocket) failed with error %d\n", WSAGetLastError());
@@ -2208,4 +2351,3 @@ void RelayTransaction(const CTransaction& tx, const uint256& hash, const CDataSt
 
     RelayInventory(inv);
 }
-

src/net.h

@@ -7,7 +7,6 @@
 
 #include <deque>
 #include <boost/array.hpp>
-#include <boost/foreach.hpp>
 #include <openssl/rand.h>
 
 #ifndef WIN32
@@ -22,12 +21,13 @@
 class CRequestTracker;
 class CNode;
 class CBlockIndex;
+bool IsInitialBlockDownload();
 extern int nBestHeight;
 
 
 
-inline unsigned int ReceiveFloodSize() { return 1000*GetArg("-maxreceivebuffer", 5*1000); }
-inline unsigned int SendBufferSize() { return 1000*GetArg("-maxsendbuffer", 1*1000); }
+inline unsigned int ReceiveFloodSize() { return 100 * 1024 * 1024; } // 100 MB
+inline unsigned int SendBufferSize() { return 32 * 1024 * 1024; }   // 32 MB
 
 void AddOneShot(std::string strDest);
 bool RecvLine(SOCKET hSocket, std::string& strLine);
@@ -103,7 +103,7 @@ enum threadId
     THREAD_MESSAGEHANDLER,
     THREAD_RPCLISTENER,
     THREAD_UPNP,
-    THREAD_DNSSEED,
+    THREAD_HTTPSEED,
     THREAD_ADDEDCONNECTIONS,
     THREAD_DUMPADDRESS,
     THREAD_RPCHANDLER,
@@ -324,8 +324,10 @@ public:
 
         // Be shy and don't send version until we hear
         if (hSocket != INVALID_SOCKET && !fInbound)
+        {
             printf("CNode(): pfrom-addr %s\n", addrName.c_str());
             PushVersion();
+        }
     }
 
     ~CNode()
@@ -353,7 +355,7 @@ public:
     unsigned int GetTotalRecvSize()
     {
         unsigned int total = 0;
-        BOOST_FOREACH(const CNetMessage &msg, vRecvMsg) 
+        for (const CNetMessage &msg : vRecvMsg) 
             total += msg.vRecv.size() + 24;
         return total;
     }
@@ -365,7 +367,7 @@ public:
     void SetRecvVersion(int nVersionIn)
     {
         nRecvVersion = nVersionIn;
-        BOOST_FOREACH(CNetMessage &msg, vRecvMsg)
+        for (CNetMessage &msg : vRecvMsg)
             msg.SetVersion(nVersionIn);
     }
 
@@ -420,7 +422,7 @@ public:
         // the key is the earliest time the request can be sent
         int64_t& nRequestTime = mapAlreadyAskedFor[inv];
         if (fDebugNet)
-            printf("askfor %s   %"PRId64" (%s)\n", inv.ToString().c_str(), nRequestTime, DateTimeStrFormat("%H:%M:%S", nRequestTime/1000000).c_str());
+            printf("askfor %s   %" PRId64 " (%s)\n", inv.ToString().c_str(), nRequestTime, DateTimeStrFormat("%H:%M:%S", nRequestTime/1000000).c_str());
 
         // Make sure not to reuse time indexes to keep things in the same order
         int64_t nNow = (GetTime() - 1) * 1000000;
@@ -429,8 +431,12 @@ public:
         nNow = std::max(nNow, nLastTime);
         nLastTime = nNow;
 
-        // Each retry is 2 minutes after the last
-        nRequestTime = std::max(nRequestTime + 2 * 60 * 1000000, nNow);
+        // During IBD, request immediately (no 2-minute retry delay)
+        // Normal operation: each retry is 2 minutes after the last
+        if (nRequestTime > 0 && IsInitialBlockDownload())
+            nRequestTime = nNow;
+        else
+            nRequestTime = std::max(nRequestTime + 2 * 60 * 1000000, nNow);
         mapAskFor.insert(std::make_pair(nRequestTime, inv));
     }
 
@@ -735,7 +741,7 @@ inline void RelayInventory(const CInv& inv)
     // Put on lists to offer to the other nodes
     {
         LOCK(cs_vNodes);
-        BOOST_FOREACH(CNode* pnode, vNodes)
+        for (CNode* pnode : vNodes)
             pnode->PushInventory(inv);
     }
 }

src/net_bootstrap.h

@@ -24,13 +24,9 @@ namespace NetBootstrap {
         NULL
     };
 
-    // Legacy IP seed nodes for old wallet compatibility
-    // These should be actual IP addresses of stable nodes
+    // Hardcoded seeds removed - peer discovery is now fully dynamic via HTTP seed list.
+    // See: seeds.cryptographic-triangles.org
     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

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,10 @@
 #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
+// Onion seeds are now fetched dynamically via HTTP seed list.
+// No hardcoded onion addresses - they go stale when Tor services restart.
+// See: seeds.cryptographic-triangles.org
 static const char *strMainNetOnionSeed[][1] = {
-    {"gxvrhv3qitnc6kobrhsrse46bmcfitnybapor3or3oczzuxn6hfzxyid.onion"},
-    {"futmtrvh6j34t7s6yjdxfia6iwuyfzwh4k5eqfof5kfhoqk3xmi3qoqd.onion"},
     {NULL}
 };
 

src/openssl_compat.h

@@ -0,0 +1,16 @@
+#ifndef TRIANGLES_OPENSSL_COMPAT_H
+#define TRIANGLES_OPENSSL_COMPAT_H
+
+#include <openssl/opensslv.h>
+#include <openssl/crypto.h>
+
+static inline const char* TrianglesOpenSSLVersionString()
+{
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+    return OpenSSL_version(OPENSSL_VERSION);
+#else
+    return SSLeay_version(SSLEAY_VERSION);
+#endif
+}
+
+#endif // TRIANGLES_OPENSSL_COMPAT_H

src/qt/aboutdialog.cpp

@@ -1,8 +1,6 @@
 #include "aboutdialog.h"
 #include "ui_aboutdialog.h"
 
-#include <QDesktopWidget>
-
 #include "clientmodel.h"
 #include "dialog_move_handler.h"
 #include "version.h"

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/addresstablemodel.cpp

@@ -61,7 +61,7 @@ public:
         cachedAddressTable.clear();
         {
             LOCK(wallet->cs_wallet);
-            BOOST_FOREACH(const PAIRTYPE(CTxDestination, std::string)& item, wallet->mapAddressBook)
+            for (const auto& item : wallet->mapAddressBook)
             {
                 const CTrianglesAddress& address = item.first;
                 const std::string& strName = item.second;

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

@@ -15,7 +15,7 @@ static const int64_t nClientStartupTime = GetTime();
 
 ClientModel::ClientModel(OptionsModel *optionsModel, QObject *parent) :
     QObject(parent), optionsModel(optionsModel),
-    cachedNumBlocks(0), cachedNumBlocksOfPeers(0), pollTimer(0)
+    cachedNumBlocks(0), cachedNumBlocksOfPeers(0), cachedNumConnections(0), pollTimer(0)
 {
     numBlocksAtStartup = -1;
 
@@ -34,7 +34,14 @@ ClientModel::~ClientModel()
 
 int ClientModel::getNumConnections() const
 {
-    return vNodes.size();
+    // Use TRY_LOCK to avoid blocking the UI thread when the network
+    // thread holds cs_vNodes (e.g. during DNS resolution or connections).
+    // Return the cached value if the lock is busy.
+    TRY_LOCK(cs_vNodes, lockNodes);
+    if (lockNodes) {
+        cachedNumConnections = vNodes.size();
+    }
+    return cachedNumConnections;
 }
 
 int ClientModel::getNumBlocks() const
@@ -63,10 +70,20 @@ void ClientModel::updateTimer()
     int newNumBlocks = getNumBlocks();
     int newNumBlocksOfPeers = getNumBlocksOfPeers();
 
-    if(cachedNumBlocks != newNumBlocks || cachedNumBlocksOfPeers != 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);
     }
@@ -176,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/clientmodel.h

@@ -49,6 +49,7 @@ private:
 
     int cachedNumBlocks;
     int cachedNumBlocksOfPeers;
+    mutable int cachedNumConnections;
 
     int numBlocksAtStartup;
 

src/qt/coincontroldialog.cpp

@@ -506,7 +506,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
     coinControl->ListSelected(vCoinControl);
     model->getOutputs(vCoinControl, vOutputs);
 
-    BOOST_FOREACH(const COutput& out, vOutputs)
+    for (const COutput& out : vOutputs)
     {
         // Quantity
         nQuantity++;
@@ -522,7 +522,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
         if(ExtractDestination(out.tx->vout[out.i].scriptPubKey, address))
         {
             CPubKey pubkey;
-            CKeyID *keyid = boost::get< CKeyID >(&address);
+            CKeyID *keyid = std::get_if< CKeyID >(&address);
             if (keyid && model->getPubKey(*keyid, pubkey))
                 nBytesInputs += (pubkey.IsCompressed() ? 148 : 180);
             else
@@ -647,7 +647,7 @@ void CoinControlDialog::updateView()
     map<QString, vector<COutput> > mapCoins;
     model->listCoins(mapCoins);
 
-    BOOST_FOREACH(PAIRTYPE(QString, vector<COutput>) coins, mapCoins)
+    for (auto coins : mapCoins)
     {
         QTreeWidgetItem *itemWalletAddress = new QTreeWidgetItem();
         QString sWalletAddress = coins.first;
@@ -679,7 +679,7 @@ void CoinControlDialog::updateView()
         double dPrioritySum = 0;
         int nChildren = 0;
         int nInputSum = 0;
-        BOOST_FOREACH(const COutput& out, coins.second)
+        for (const COutput& out : coins.second)
         {
             int nInputSize = 148; // 180 if uncompressed public key
             nSum += out.tx->vout[out.i].nValue;
@@ -703,7 +703,7 @@ void CoinControlDialog::updateView()
                     itemOutput->setText(COLUMN_ADDRESS, sAddress);
                     
                 CPubKey pubkey;
-                CKeyID *keyid = boost::get< CKeyID >(&outputAddress);
+                CKeyID *keyid = std::get_if< CKeyID >(&outputAddress);
                 if (keyid && model->getPubKey(*keyid, pubkey) && !pubkey.IsCompressed())
                     nInputSize = 180;
             }

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/guiconstants.h

@@ -2,7 +2,7 @@
 #define GUICONSTANTS_H
 
 /* Milliseconds between model updates */
-static const int MODEL_UPDATE_DELAY = 500;
+static const int MODEL_UPDATE_DELAY = 2500;
 
 /* AskPassphraseDialog -- Maximum passphrase length */
 static const int MAX_PASSPHRASE_SIZE = 1024;

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

@@ -1,5 +1,6 @@
 #include "introdialog.h"
 #include "util.h"
+#include "bootstrap.h"
 
 #include <QSettings>
 #include <QVBoxLayout>
@@ -9,9 +10,14 @@
 #include <QDir>
 #include <QMessageBox>
 #include <QDialogButtonBox>
+#include <QProgressDialog>
+#include <QCheckBox>
+#include <QApplication>
 
 #include <boost/filesystem.hpp>
 
+#include <set>
+
 IntroDialog::IntroDialog(QWidget *parent) :
     QDialog(parent)
 {
@@ -186,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) {
@@ -201,5 +225,215 @@ bool IntroDialog::pickDataDirectory()
         return false;
     }
 
+    // Offer bootstrap download on each startup (unless user checked "don't ask again")
+    fs::path dataDirPath(dataDir.toStdString());
+    if (!settings.value("bootstrapDontAsk", false).toBool())
+    {
+        QMessageBox msgBox;
+        msgBox.setWindowTitle("Triangles");
+        msgBox.setText(
+            "Would you like to download the latest blockchain snapshot?\n\n"
+            "This will download the blockchain data from the Triangles network "
+            "and replace any existing chain data in your data directory.\n\n"
+            "Click Yes to download, or No to sync from the network.");
+        msgBox.setIcon(QMessageBox::Question);
+        msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+        msgBox.setDefaultButton(QMessageBox::Yes);
+        QCheckBox *dontAskBox = new QCheckBox("Don't show this again");
+        msgBox.setCheckBox(dontAskBox);
+
+        int ret = msgBox.exec();
+
+        if (dontAskBox->isChecked())
+            settings.setValue("bootstrapDontAsk", true);
+
+        if (ret == QMessageBox::Yes)
+        {
+            std::string host = Bootstrap::DEFAULT_HOST;
+            std::string strError;
+
+            QProgressDialog progress("Downloading blockchain snapshot...", "Cancel",
+                                     0, 100, 0);
+            progress.setWindowTitle("Triangles - Bootstrap");
+            progress.setWindowModality(Qt::ApplicationModal);
+            progress.setMinimumDuration(0);
+            progress.setValue(0);
+
+            auto progressFn = [&progress](int64_t bytesDownloaded, int64_t totalBytes) {
+                if (totalBytes > 0) {
+                    int pct = (int)((bytesDownloaded * 100) / totalBytes);
+                    progress.setValue(pct);
+                    progress.setLabelText(
+                        QString("Downloading blockchain snapshot... %1 MB / %2 MB")
+                        .arg(bytesDownloaded / (1024*1024))
+                        .arg(totalBytes / (1024*1024)));
+                } else {
+                    progress.setLabelText(
+                        QString("Downloading blockchain snapshot... %1 MB")
+                        .arg(bytesDownloaded / (1024*1024)));
+                }
+                QApplication::processEvents();
+            };
+
+            bool success = Bootstrap::DownloadBootstrap(host, dataDirPath, progressFn, strError);
+            if (!success) {
+                host = Bootstrap::FALLBACK_HOST;
+                progress.setValue(0);
+                success = Bootstrap::DownloadBootstrap(host, dataDirPath, progressFn, strError);
+            }
+
+            if (!success) {
+                QMessageBox::warning(0, "Triangles",
+                    QString("Could not download blockchain snapshot:\n%1\n\n"
+                            "The wallet will sync from the network instead.")
+                    .arg(QString::fromStdString(strError)));
+            } else {
+                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

@@ -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;};
@@ -485,7 +504,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/messagepage.cpp

@@ -31,7 +31,7 @@ protected:
 
 void MessageViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
-    QStyleOptionViewItemV4 optionV4 = option;
+    QStyleOptionViewItem optionV4 = option;
     initStyleOption(&optionV4, index);
 
     QStyle *style = optionV4.widget? optionV4.widget->style() : QApplication::style();
@@ -62,7 +62,7 @@ void MessageViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &o
 
 QSize MessageViewDelegate::sizeHint ( const QStyleOptionViewItem & option, const QModelIndex & index ) const
 {
-    QStyleOptionViewItemV4 options = option;
+    QStyleOptionViewItem options = option;
     initStyleOption(&options, index);
 
     QTextDocument doc;
@@ -159,7 +159,7 @@ void MessagePage::setModel(MessageModel *model)
     // Set column widths
     ui->tableView->horizontalHeader()->resizeSection(MessageModel::Type,             100);
     ui->tableView->horizontalHeader()->resizeSection(MessageModel::Label,            100);
-    ui->tableView->horizontalHeader()->setResizeMode(MessageModel::Label,            QHeaderView::Stretch);
+    ui->tableView->horizontalHeader()->setSectionResizeMode(MessageModel::Label,            QHeaderView::Stretch);
     ui->tableView->horizontalHeader()->resizeSection(MessageModel::FromAddress,      320);
     ui->tableView->horizontalHeader()->resizeSection(MessageModel::ToAddress,        320);
     ui->tableView->horizontalHeader()->resizeSection(MessageModel::SentDateTime,     170);

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)
 {
@@ -126,6 +127,8 @@ OverviewPage::~OverviewPage()
 
 void OverviewPage::setBalance(qint64 balance, qint64 stake, qint64 unconfirmedBalance, qint64 immatureBalance)
 {
+    if (!model || !model->getOptionsModel())
+        return;
     int unit = model->getOptionsModel()->getDisplayUnit();
     currentBalance = balance;
     currentStake = stake;
@@ -164,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")
@@ -186,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);

src/qt/overviewpage.h

@@ -30,6 +30,7 @@ public:
 
 public slots:
     void setBalance(qint64 balance, qint64 stake, qint64 unconfirmedBalance, qint64 immatureBalance);
+    void setTransactionSyncState(bool syncing);
 
 signals:
     void transactionClicked(const QModelIndex &index);
@@ -42,6 +43,7 @@ private:
     qint64 currentStake;
     qint64 currentUnconfirmedBalance;
     qint64 currentImmatureBalance;
+    bool walletTransactionSyncing;
 
     TxViewDelegate *txdelegate;
     TransactionFilterProxy *filter;

src/qt/rpcconsole.cpp

@@ -5,6 +5,7 @@
 #include "trianglesrpc.h"
 #include "guiutil.h"
 #include "dialog_move_handler.h"
+#include "openssl_compat.h"
 
 #include <QTime>
 #include <QTimer>
@@ -16,9 +17,6 @@
 
 #include <openssl/crypto.h>
 
-// TODO: make it possible to filter out categories (esp debug messages when implemented)
-// TODO: receive errors and debug messages through ClientModel
-
 const int CONSOLE_SCROLLBACK = 50;
 const int CONSOLE_HISTORY = 50;
 
@@ -189,6 +187,7 @@ void RPCExecutor::request(const QString &command)
 RPCConsole::RPCConsole(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::RPCConsole),
+    clientModel(0),
     historyPtr(0)
 {
     ui->setupUi(this);
@@ -207,7 +206,7 @@ RPCConsole::RPCConsole(QWidget *parent) :
     connect(ui->clearButton, SIGNAL(clicked()), this, SLOT(clear()));
 
     // set OpenSSL version label
-    ui->openSSLVersion->setText(SSLeay_version(SSLEAY_VERSION));
+    ui->openSSLVersion->setText(TrianglesOpenSSLVersionString());
 
     startExecutor();
 
@@ -258,12 +257,16 @@ bool RPCConsole::eventFilter(QObject* obj, QEvent *event)
 
 void RPCConsole::setClientModel(ClientModel *model)
 {
+    if (clientModel)
+        disconnect(clientModel, 0, this, 0);
+
     this->clientModel = model;
     if(model)
     {
         // Subscribe to information, replies, messages, errors
         connect(model, SIGNAL(numConnectionsChanged(int)), this, SLOT(setNumConnections(int)));
         connect(model, SIGNAL(numBlocksChanged(int,int)), this, SLOT(setNumBlocks(int,int)));
+        connect(model, SIGNAL(error(QString,QString,bool)), this, SLOT(showClientError(QString,QString,bool)));
 
         // Provide initial values
         ui->clientVersion->setText(model->formatFullVersion());
@@ -284,14 +287,16 @@ static QString categoryClass(int category)
     {
     case RPCConsole::CMD_REQUEST:  return "cmd-request"; break;
     case RPCConsole::CMD_REPLY:    return "cmd-reply"; break;
-    case RPCConsole::CMD_ERROR:    return "cmd-error"; break;
+    case RPCConsole::CMD_ERROR:
+    case RPCConsole::MC_ERROR:     return "cmd-error"; break;
     default:                       return "misc";
     }
 }
 
 void RPCConsole::clear()
 {
-    ui->messagesWidget->clear();
+    consoleEntries.clear();
+    refreshMessages();
     ui->lineEdit->clear();
     ui->lineEdit->setFocus();
 
@@ -322,18 +327,21 @@ void RPCConsole::clear()
 
 void RPCConsole::message(int category, const QString &message, bool html)
 {
-    QTime time = QTime::currentTime();
-    QString timeString = time.toString();
-    QString out;
-    out += "<table><tr><td class=\"time\" width=\"65\">" + timeString + "</td>";
-    out += "<td class=\"icon\" width=\"32\"><img src=\"" + categoryClass(category) + "\"></td>";
-    out += "<td class=\"message " + categoryClass(category) + "\" valign=\"middle\">";
-    if(html)
-        out += message;
-    else
-        out += GUIUtil::HtmlEscape(message, true);
-    out += "</td></tr></table>";
-    ui->messagesWidget->append(out);
+    ConsoleEntry entry;
+    entry.category = category;
+    entry.text = message;
+    entry.time = QTime::currentTime().toString();
+    entry.html = html;
+
+    consoleEntries.append(entry);
+    while (consoleEntries.size() > CONSOLE_SCROLLBACK)
+        consoleEntries.removeFirst();
+
+    if (categoryVisible(category))
+    {
+        ui->messagesWidget->append(formatEntry(entry));
+        scrollToEnd();
+    }
 }
 
 void RPCConsole::setNumConnections(int count)
@@ -438,3 +446,72 @@ void RPCConsole::on_showCLOptionsButton_clicked()
     GUIUtil::HelpMessageBox help;
     help.exec();
 }
+
+bool RPCConsole::categoryVisible(int category) const
+{
+    switch (category)
+    {
+    case CMD_REQUEST:
+        return ui->showRequestsCheckBox->isChecked();
+    case CMD_ERROR:
+    case MC_ERROR:
+        return ui->showErrorsCheckBox->isChecked();
+    case CMD_REPLY:
+    case MC_DEBUG:
+    default:
+        return ui->showRepliesCheckBox->isChecked();
+    }
+}
+
+QString RPCConsole::formatEntry(const ConsoleEntry &entry) const
+{
+    QString out;
+    out += "<table><tr><td class=\"time\" width=\"65\">" + entry.time + "</td>";
+    out += "<td class=\"icon\" width=\"32\"><img src=\"" + categoryClass(entry.category) + "\"></td>";
+    out += "<td class=\"message " + categoryClass(entry.category) + "\" valign=\"middle\">";
+    if (entry.html)
+        out += entry.text;
+    else
+        out += GUIUtil::HtmlEscape(entry.text, true);
+    out += "</td></tr></table>";
+    return out;
+}
+
+void RPCConsole::refreshMessages()
+{
+    ui->messagesWidget->clear();
+    for (QList<ConsoleEntry>::const_iterator it = consoleEntries.begin(); it != consoleEntries.end(); ++it)
+    {
+        if (categoryVisible(it->category))
+            ui->messagesWidget->append(formatEntry(*it));
+    }
+    scrollToEnd();
+}
+
+void RPCConsole::on_showRequestsCheckBox_toggled(bool checked)
+{
+    Q_UNUSED(checked);
+    refreshMessages();
+}
+
+void RPCConsole::on_showRepliesCheckBox_toggled(bool checked)
+{
+    Q_UNUSED(checked);
+    refreshMessages();
+}
+
+void RPCConsole::on_showErrorsCheckBox_toggled(bool checked)
+{
+    Q_UNUSED(checked);
+    refreshMessages();
+}
+
+void RPCConsole::showClientError(const QString &title, const QString &message, bool modal)
+{
+    Q_UNUSED(modal);
+
+    if (title.isEmpty())
+        this->message(MC_ERROR, message);
+    else
+        this->message(MC_ERROR, title + ": " + message);
+}

src/qt/rpcconsole.h

@@ -37,6 +37,10 @@ private slots:
     void on_openDebugLogfileButton_clicked();
     /** display messagebox with program parameters (same as triangles-qt --help) */
     void on_showCLOptionsButton_clicked();
+    void on_showRequestsCheckBox_toggled(bool checked);
+    void on_showRepliesCheckBox_toggled(bool checked);
+    void on_showErrorsCheckBox_toggled(bool checked);
+    void showClientError(const QString &title, const QString &message, bool modal);
 
 public slots:
     void clear();
@@ -55,11 +59,23 @@ signals:
     void cmdRequest(const QString &command);
 
 private:
+    struct ConsoleEntry
+    {
+        int category;
+        QString text;
+        QString time;
+        bool html;
+    };
+
     Ui::RPCConsole *ui;
     ClientModel *clientModel;
     QStringList history;
+    QList<ConsoleEntry> consoleEntries;
     int historyPtr;
 
+    bool categoryVisible(int category) const;
+    QString formatEntry(const ConsoleEntry &entry) const;
+    void refreshMessages();
     void startExecutor();
 };
 

src/qt/sendcoinsdialog.cpp

@@ -28,7 +28,10 @@ SendCoinsDialog::SendCoinsDialog(QWidget *parent) :
     model(0)
 {
     ui->setupUi(this);
-    setWindowFlags(Qt::CustomizeWindowHint | Qt::FramelessWindowHint | Qt::Window);
+    if (parent)
+        setWindowFlags(Qt::Widget);
+    else
+        setWindowFlags(Qt::CustomizeWindowHint | Qt::FramelessWindowHint | Qt::Window);
 
 #ifdef Q_OS_MAC // Icons on push buttons are very uncommon on Mac
     ui->addButton->setIcon(QIcon());

src/qt/signmessagepage.cpp

@@ -14,8 +14,6 @@
 #include <vector>
 
 #include <QClipboard>
-#include <QDesktopWidget>
-
 SignMessagePage::SignMessagePage(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::SignMessagePage),

src/qt/transactiondesc.cpp

@@ -77,7 +77,7 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx)
             if (nNet > 0)
             {
                 // Credit
-                BOOST_FOREACH(const CTxOut& txout, wtx.vout)
+                for (const CTxOut& txout : wtx.vout)
                 {
                     if (wallet->IsMine(txout))
                     {
@@ -125,7 +125,7 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx)
             // Coinbase
             //
             int64_t nUnmatured = 0;
-            BOOST_FOREACH(const CTxOut& txout, wtx.vout)
+            for (const CTxOut& txout : wtx.vout)
                 nUnmatured += wallet->GetCredit(txout);
             strHTML += "<b>" + tr("Credit") + ":</b> ";
             if (wtx.IsInMainChain())
@@ -144,11 +144,11 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx)
         else
         {
             bool fAllFromMe = true;
-            BOOST_FOREACH(const CTxIn& txin, wtx.vin)
+            for (const CTxIn& txin : wtx.vin)
                 fAllFromMe = fAllFromMe && wallet->IsMine(txin);
 
             bool fAllToMe = true;
-            BOOST_FOREACH(const CTxOut& txout, wtx.vout)
+            for (const CTxOut& txout : wtx.vout)
                 fAllToMe = fAllToMe && wallet->IsMine(txout);
 
             if (fAllFromMe)
@@ -156,7 +156,7 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx)
                 //
                 // Debit
                 //
-                BOOST_FOREACH(const CTxOut& txout, wtx.vout)
+                for (const CTxOut& txout : wtx.vout)
                 {
                     if (wallet->IsMine(txout))
                         continue;
@@ -196,10 +196,10 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx)
                 //
                 // Mixed debit transaction
                 //
-                BOOST_FOREACH(const CTxIn& txin, wtx.vin)
+                for (const CTxIn& txin : wtx.vin)
                     if (wallet->IsMine(txin))
                         strHTML += "<b>" + tr("Debit") + ":</b> " + TrianglesUnits::formatWithUnit(TrianglesUnits::TRI, -wallet->GetDebit(txin)) + "<br>";
-                BOOST_FOREACH(const CTxOut& txout, wtx.vout)
+                for (const CTxOut& txout : wtx.vout)
                     if (wallet->IsMine(txout))
                         strHTML += "<b>" + tr("Credit") + ":</b> " + TrianglesUnits::formatWithUnit(TrianglesUnits::TRI, wallet->GetCredit(txout)) + "<br>";
             }
@@ -234,10 +234,10 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx)
         if (fDebug)
         {
             strHTML += "<hr><br>" + tr("Debug information") + "<br><br>";
-            BOOST_FOREACH(const CTxIn& txin, wtx.vin)
+            for (const CTxIn& txin : wtx.vin)
                 if(wallet->IsMine(txin))
                     strHTML += "<b>" + tr("Debit") + ":</b> " + TrianglesUnits::formatWithUnit(TrianglesUnits::TRI, -wallet->GetDebit(txin)) + "<br>";
-            BOOST_FOREACH(const CTxOut& txout, wtx.vout)
+            for (const CTxOut& txout : wtx.vout)
                 if(wallet->IsMine(txout))
                     strHTML += "<b>" + tr("Credit") + ":</b> " + TrianglesUnits::formatWithUnit(TrianglesUnits::TRI, wallet->GetCredit(txout)) + "<br>";
 
@@ -251,7 +251,7 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx)
 
             {
                 LOCK(wallet->cs_wallet);
-                BOOST_FOREACH(const CTxIn& txin, wtx.vin)
+                for (const CTxIn& txin : wtx.vin)
                 {
                     COutPoint prevout = txin.prevout;
 

src/qt/transactionrecord.cpp

@@ -87,11 +87,11 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
     else
     {
         bool fAllFromMe = true;
-        BOOST_FOREACH(const CTxIn& txin, wtx.vin)
+        for (const CTxIn& txin : wtx.vin)
             fAllFromMe = fAllFromMe && wallet->IsMine(txin);
 
         bool fAllToMe = true;
-        BOOST_FOREACH(const CTxOut& txout, wtx.vout)
+        for (const CTxOut& txout : wtx.vout)
             fAllToMe = fAllToMe && wallet->IsMine(txout);
 
         if (fAllFromMe && fAllToMe)

src/qt/transactiontablemodel.cpp

@@ -52,11 +52,13 @@ class TransactionTablePriv
 public:
     TransactionTablePriv(CWallet *wallet, TransactionTableModel *parent):
             wallet(wallet),
-            parent(parent)
+            parent(parent),
+            fInitialLoadDone(false)
     {
     }
     CWallet *wallet;
     TransactionTableModel *parent;
+    bool fInitialLoadDone;
 
     /* Local cache of wallet.
      * As it is in the same order as the CWallet, by definition
@@ -68,7 +70,8 @@ public:
      */
     void refreshWallet()
     {
-        OutputDebugStringF("refreshWallet\n");
+        OutputDebugStringF("refreshWallet: fInitialLoadDone=%d mapWallet.size=%u\n",
+               (int)fInitialLoadDone, (unsigned)wallet->mapWallet.size());
         cachedWallet.clear();
         {
             LOCK(wallet->cs_wallet);
@@ -77,7 +80,9 @@ public:
                 if(TransactionRecord::showTransaction(it->second))
                     cachedWallet.append(TransactionRecord::decomposeTransaction(wallet, it->second));
             }
+            fInitialLoadDone = true;
         }
+        OutputDebugStringF("refreshWallet: loaded %d transaction records\n", cachedWallet.size());
     }
 
     /* Update our model of the wallet incrementally, to synchronize our model of the wallet
@@ -89,7 +94,14 @@ public:
     {
         OutputDebugStringF("updateWallet %s %i\n", hash.ToString().c_str(), status);
         {
-            LOCK(wallet->cs_wallet);
+            TRY_LOCK(wallet->cs_wallet, lockWallet);
+            if (!lockWallet)
+            {
+                // Lock busy - schedule a full refresh to pick up missed updates.
+                // This avoids silently dropping CT_NEW notifications.
+                QTimer::singleShot(500, parent, SLOT(refreshWallet()));
+                return;
+            }
 
             // Find transaction in wallet
             std::map<uint256, CWalletTx>::iterator mi = wallet->mapWallet.find(hash);
@@ -184,8 +196,12 @@ public:
             // simply re-use the cached status.
             if(rec->statusUpdateNeeded())
             {
+                // Never block the GUI thread while the core is holding cs_wallet.
+                // If the lock is busy, keep showing the cached status and refresh
+                // it on a later paint/update cycle.
+                TRY_LOCK(wallet->cs_wallet, lockWallet);
+                if (lockWallet)
                 {
-                    LOCK(wallet->cs_wallet);
                     std::map<uint256, CWalletTx>::iterator mi = wallet->mapWallet.find(rec->hash);
 
                     if(mi != wallet->mapWallet.end())
@@ -204,8 +220,14 @@ public:
 
     QString describe(TransactionRecord *rec)
     {
+        // Transaction details are generated on demand from wallet/db state.
+        // If the wallet is busy, return a lightweight placeholder instead of
+        // freezing the UI until the lock becomes available.
+        TRY_LOCK(wallet->cs_wallet, lockWallet);
+        if (!lockWallet)
+            return parent->tr("Transaction details are temporarily unavailable while the wallet is busy.");
+
         {
-            LOCK(wallet->cs_wallet);
             std::map<uint256, CWalletTx>::iterator mi = wallet->mapWallet.find(rec->hash);
             if(mi != wallet->mapWallet.end())
             {
@@ -225,7 +247,12 @@ TransactionTableModel::TransactionTableModel(CWallet* wallet, WalletModel *paren
         cachedNumBlocks(0)
 {
     columns << QString() << tr("Date") << tr("Type") << tr("Address") << tr("Amount");
-    QTimer::singleShot(0, this, SLOT(refreshWallet()));
+
+    // Load transactions synchronously in the constructor so they're
+    // available before the event loop starts. The deferred QTimer approach
+    // was never firing because queued updateTransaction events from sync
+    // would flood the event queue first.
+    priv->refreshWallet();
 
     QTimer *timer = new QTimer(this);
     connect(timer, SIGNAL(timeout()), this, SLOT(updateConfirmations()));
@@ -249,8 +276,10 @@ void TransactionTableModel::updateTransaction(const QString &hash, int status)
 
 void TransactionTableModel::refreshWallet()
 {
+    beginResetModel();
     priv->refreshWallet();
-    reset();
+    endResetModel();
+    OutputDebugStringF("TransactionTableModel::refreshWallet: rowCount=%d\n", priv->size());
 }
 
 void TransactionTableModel::updateConfirmations()

src/qt/transactionview.cpp

@@ -34,10 +34,16 @@ TransactionView::TransactionView(QWidget *parent) :
     QWidget(parent), model(0), transactionProxyModel(0),
     ui(new Ui::TransactionsPage),
     transactionView(0),
-    transactionsSortOrderDown(true)
+    transactionsSortOrderDown(true),
+    walletTransactionSyncing(false),
+    transactionSortColumn(TransactionTableModel::Status),
+    transactionSortOrder(Qt::DescendingOrder)
 {
     ui->setupUi(this);
-    setWindowFlags(Qt::CustomizeWindowHint | Qt::FramelessWindowHint | Qt::Window);
+    if (parent)
+        setWindowFlags(Qt::Widget);
+    else
+        setWindowFlags(Qt::CustomizeWindowHint | Qt::FramelessWindowHint | Qt::Window);
     // Build filter row
     dateWidget = ui->dateWidget;
     dateWidget->addItem(tr("All"), All);
@@ -150,7 +156,7 @@ void TransactionView::setModel(WalletModel *model)
         transactionView->setSelectionBehavior(QAbstractItemView::SelectRows);
         transactionView->setSelectionMode(QAbstractItemView::ExtendedSelection);
         transactionView->setSortingEnabled(true);
-        transactionView->sortByColumn(TransactionTableModel::Status, Qt::DescendingOrder);
+        transactionView->sortByColumn(transactionSortColumn, transactionSortOrder);
         transactionView->verticalHeader()->hide();
 
         transactionView->horizontalHeader()->resizeSection(TransactionTableModel::Status, 23);
@@ -162,6 +168,9 @@ void TransactionView::setModel(WalletModel *model)
         transactionView->horizontalHeader()->setSectionResizeMode(TransactionTableModel::ToAddress, QHeaderView::Stretch);
 #endif
         transactionView->horizontalHeader()->resizeSection(TransactionTableModel::Amount, 100);
+
+        connect(model, SIGNAL(transactionSyncStateChanged(bool)), this, SLOT(setTransactionSyncState(bool)));
+        setTransactionSyncState(model->isTransactionSyncing());
     }
 }
 
@@ -272,6 +281,30 @@ void TransactionView::exportClicked()
     }
 }
 
+void TransactionView::setTransactionSyncState(bool syncing)
+{
+    walletTransactionSyncing = syncing;
+    if (!transactionProxyModel || !transactionView)
+        return;
+
+    if (syncing)
+    {
+        transactionSortColumn = transactionView->horizontalHeader()->sortIndicatorSection();
+        transactionSortOrder = transactionView->horizontalHeader()->sortIndicatorOrder();
+        transactionProxyModel->setDynamicSortFilter(false);
+        transactionView->setSortingEnabled(false);
+        transactionView->setUpdatesEnabled(false);
+        return;
+    }
+
+    transactionProxyModel->setDynamicSortFilter(true);
+    transactionView->setUpdatesEnabled(true);
+    transactionView->setSortingEnabled(true);
+    transactionProxyModel->invalidate();
+    transactionView->sortByColumn(transactionSortColumn, transactionSortOrder);
+    transactionView->viewport()->update();
+}
+
 void TransactionView::contextualMenu(const QPoint &point)
 {
     QModelIndex index = transactionView->indexAt(point);

src/qt/transactionview.h

@@ -48,9 +48,12 @@ public:
 private:
     WalletModel *model;
     TransactionFilterProxy *transactionProxyModel;
-	Ui::TransactionsPage *ui;
+    Ui::TransactionsPage *ui;
     QTableView *transactionView;
     bool transactionsSortOrderDown;
+    bool walletTransactionSyncing;
+    int transactionSortColumn;
+    Qt::SortOrder transactionSortOrder;
 
     QComboBox *dateWidget;
     QComboBox *typeWidget;
@@ -74,6 +77,7 @@ private slots:
     void copyLabel();
     void copyAmount();
     void copyTxID();
+    void setTransactionSyncState(bool syncing);
  
 signals:
     void doubleClicked(const QModelIndex&);

src/qt/triangles.cpp

@@ -132,6 +132,14 @@ int main(int argc, char *argv[])
     // Command-line options take precedence:
     ParseParameters(argc, argv);
 
+    // Application identification (must be set before IntroDialog uses QSettings)
+    app.setOrganizationName("Triangles");
+    //XXX app.setOrganizationDomain("");
+    if(GetBoolArg("-testnet")) // Separate UI settings for testnet
+        app.setApplicationName("Triangles-Qt-testnet");
+    else
+        app.setApplicationName("Triangles-Qt");
+
     // Show data directory selection dialog on first run (unless -datadir was passed)
     if (!IntroDialog::pickDataDirectory())
         return 0;
@@ -147,15 +155,6 @@ int main(int argc, char *argv[])
     }
     ReadConfigFile(mapArgs, mapMultiArgs);
 
-    // Application identification (must be set before OptionsModel is initialized,
-    // as it is used to locate QSettings)
-    app.setOrganizationName("Triangles");
-    //XXX app.setOrganizationDomain("");
-    if(GetBoolArg("-testnet")) // Separate UI settings for testnet
-        app.setApplicationName("Triangles-Qt-testnet");
-    else
-        app.setApplicationName("Triangles-Qt");
-
     // ... then GUI settings:
     OptionsModel optionsModel;
 
@@ -220,6 +219,7 @@ int main(int argc, char *argv[])
         if (GUIUtil::GetStartOnSystemStartup())
             GUIUtil::SetStartOnSystemStartup(true);
 
+        InitMessage(_("Preparing interface..."));
         TrianglesGUI window;
         guiref = &window;
         if(AppInit2())

src/qt/trianglesgui.cpp

@@ -76,9 +76,10 @@
 #include <QTextStream>
 #include <QTextDocument>
 #include <QSettings>
-#include <QDesktopWidget>
+#include <QGuiApplication>
 #include <QListWidget>
 #include <QPainter>
+#include <QScreen>
 //#include <QSound>
 #include <QSizeGrip>
 
@@ -105,7 +106,9 @@ TrianglesGUI::TrianglesGUI(bool fIsTestnet, QWidget *parent):
     trayIcon(0),
     notificator(0),
     rpcConsole(0),
-    prevBlocks(0)
+    prevBlocks(0),
+    walletTransactionSyncing(false),
+    walletTransactionSyncPending(0)
 {
 
     ui->setupUi(this);
@@ -281,6 +284,7 @@ TrianglesGUI::TrianglesGUI(bool fIsTestnet, QWidget *parent):
     createTrayIcon();
 
     // Create tabs
+    centralWidget = ui->stackedWidget;
     overviewPage = new OverviewPage();
     {
       transactionsPage = new QWidget(this);
@@ -293,23 +297,18 @@ TrianglesGUI::TrianglesGUI(bool fIsTestnet, QWidget *parent):
       vbox->addWidget(transactionView);
       frameMain->setLayout(vbox);
     }
-    addressBookPage = new AddressBookPage(AddressBookPage::ForEditing, AddressBookPage::SendingTab);
+    addressBookPage = new AddressBookPage(AddressBookPage::ForEditing, AddressBookPage::SendingTab, centralWidget);
 
-    receiveCoinsPage = new AddressBookPage(AddressBookPage::ForEditing, AddressBookPage::ReceivingTab);
+    receiveCoinsPage = new AddressBookPage(AddressBookPage::ForEditing, AddressBookPage::ReceivingTab, centralWidget);
 
-    sendCoinsPage = new SendCoinsDialog(this);
-    messagePage   = new MessagePage(this);
-	signMessagePage = new SignMessagePage(this);
-    verifyMessagePage = new VerifyMessagePage(this);
-    centralWidget = ui->stackedWidget;
+    sendCoinsPage = 0;
+    messagePage = 0;
+	signMessagePage = 0;
+    verifyMessagePage = 0;
     centralWidget->addWidget(overviewPage);
     centralWidget->addWidget(transactionsPage);
     centralWidget->addWidget(addressBookPage);
     centralWidget->addWidget(receiveCoinsPage);
-    centralWidget->addWidget(sendCoinsPage);
-    centralWidget->addWidget(messagePage);
-	centralWidget->addWidget(signMessagePage);
-    centralWidget->addWidget(verifyMessagePage);
 
     QSizeGrip* grip = new QSizeGrip(this);
     grip->setStyleSheet("width: 6px; height: 6px; image: url(:/res/icons/handle.png);");
@@ -337,6 +336,10 @@ TrianglesGUI::TrianglesGUI(bool fIsTestnet, QWidget *parent):
         updateStakingIcon();
     }
 
+    QTimer *timerShutdown = new QTimer(this);
+    connect(timerShutdown, SIGNAL(timeout()), this, SLOT(detectShutdown()));
+    timerShutdown->start(200);
+
     // Progress bar and label for blocks download
     progressBarLabel = ui->label_synchronization;
     progressBarLabel->setVisible(false);
@@ -359,8 +362,7 @@ TrianglesGUI::TrianglesGUI(bool fIsTestnet, QWidget *parent):
     // Double-clicking on a transaction on the transaction history page shows details
     connect(transactionView, SIGNAL(doubleClicked(QModelIndex)), transactionView, SLOT(showDetails()));
 
-    rpcConsole = new RPCConsole(this);
-    connect(openRPCConsoleAction, SIGNAL(triggered()), rpcConsole, SLOT(show()));
+    connect(openRPCConsoleAction, SIGNAL(triggered()), this, SLOT(openRPCConsole()));
 
     // Clicking on "Verify Message" in the address book sends you to the verify message tab
     connect(addressBookPage, SIGNAL(verifyMessage(QString)), this, SLOT(gotoVerifyMessageTab(QString)));
@@ -479,7 +481,7 @@ void TrianglesGUI::createActions(bool fIsTestnet)
     openRPCConsoleAction = new QAction(QIcon(":/menu_16/debug"), tr("&Debug window"), this);
     openRPCConsoleAction->setStatusTip(tr("Open debugging and diagnostic console"));
 
-    connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+    connect(quitAction, SIGNAL(triggered()), this, SLOT(requestShutdown()));
     connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked()));    
     connect(aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
     connect(optionsAction, SIGNAL(triggered()), this, SLOT(optionsClicked()));
@@ -563,7 +565,8 @@ void TrianglesGUI::setClientModel(ClientModel *clientModel)
         // Receive and report messages from network/worker thread
         connect(clientModel, SIGNAL(message(QString,QString,unsigned int)), this, SLOT(message(QString,QString,unsigned int)));
 
-        rpcConsole->setClientModel(clientModel);
+        if (rpcConsole)
+            rpcConsole->setClientModel(clientModel);
         addressBookPage->setOptionsModel(clientModel->getOptionsModel());
         receiveCoinsPage->setOptionsModel(clientModel->getOptionsModel());
     }
@@ -582,12 +585,18 @@ void TrianglesGUI::setWalletModel(WalletModel *walletModel)
         overviewPage->setModel(walletModel);
         addressBookPage->setModel(walletModel->getAddressTableModel());
         receiveCoinsPage->setModel(walletModel->getAddressTableModel());
-        sendCoinsPage->setModel(walletModel);
-        signMessagePage->setModel(walletModel);
-        verifyMessagePage->setModel(walletModel);
+        if (sendCoinsPage)
+            sendCoinsPage->setModel(walletModel);
+        if (signMessagePage)
+            signMessagePage->setModel(walletModel);
+        if (verifyMessagePage)
+            verifyMessagePage->setModel(walletModel);
 
         setEncryptionStatus(walletModel->getEncryptionStatus());
         connect(walletModel, SIGNAL(encryptionStatusChanged(int)), this, SLOT(setEncryptionStatus(int)));
+        connect(walletModel, SIGNAL(transactionSyncStateChanged(bool)), this, SLOT(setWalletTransactionSyncState(bool)));
+        connect(walletModel, SIGNAL(transactionSyncProgressChanged(bool,int)), this, SLOT(setWalletTransactionSyncProgress(bool,int)));
+        setWalletTransactionSyncState(walletModel->isTransactionSyncing());
 
         // Balloon pop-up for new transaction
         connect(walletModel->getTransactionTableModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
@@ -610,7 +619,8 @@ void TrianglesGUI::setMessageModel(MessageModel *messageModel)
         connect(messageModel, SIGNAL(error(QString,QString,bool)), this, SLOT(error(QString,QString,bool)));
 
         // Put transaction list in tabs
-        messagePage->setModel(messageModel);
+        if (messagePage)
+            messagePage->setModel(messageModel);
 
         // Balloon pop-up for new message
         connect(messageModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
@@ -626,6 +636,60 @@ void TrianglesGUI::ensureMessageModel()
     setMessageModel(new MessageModel(pwalletMain, walletModel, this));
 }
 
+void TrianglesGUI::ensureSendCoinsPage()
+{
+    if (sendCoinsPage)
+        return;
+
+    sendCoinsPage = new SendCoinsDialog(centralWidget);
+    if (walletModel)
+        sendCoinsPage->setModel(walletModel);
+    centralWidget->addWidget(sendCoinsPage);
+}
+
+void TrianglesGUI::ensureMessagePage()
+{
+    if (messagePage)
+        return;
+
+    messagePage = new MessagePage(centralWidget);
+    if (messageModel)
+        messagePage->setModel(messageModel);
+    centralWidget->addWidget(messagePage);
+}
+
+void TrianglesGUI::ensureSignMessagePage()
+{
+    if (signMessagePage)
+        return;
+
+    signMessagePage = new SignMessagePage(centralWidget);
+    if (walletModel)
+        signMessagePage->setModel(walletModel);
+    centralWidget->addWidget(signMessagePage);
+}
+
+void TrianglesGUI::ensureVerifyMessagePage()
+{
+    if (verifyMessagePage)
+        return;
+
+    verifyMessagePage = new VerifyMessagePage(centralWidget);
+    if (walletModel)
+        verifyMessagePage->setModel(walletModel);
+    centralWidget->addWidget(verifyMessagePage);
+}
+
+void TrianglesGUI::ensureRPCConsole()
+{
+    if (rpcConsole)
+        return;
+
+    rpcConsole = new RPCConsole(this);
+    if (clientModel)
+        rpcConsole->setClientModel(clientModel);
+}
+
 void TrianglesGUI::createTrayIcon()
 {
 #ifndef Q_OS_MAC
@@ -698,7 +762,8 @@ void TrianglesGUI::restoreWindowGeometry()
     QSize size = settings.value("nWindowSize", QSize(850, 550)).toSize();
     if (!pos.x() && !pos.y())
     {
-        QRect screen = QApplication::desktop()->screenGeometry();
+        QScreen *screenObject = QGuiApplication::primaryScreen();
+        QRect screen = screenObject ? screenObject->availableGeometry() : QRect(QPoint(0, 0), size);
         pos.setX((screen.width()-size.width())/2);
         pos.setY((screen.height()-size.height())/2);
     }
@@ -706,6 +771,32 @@ void TrianglesGUI::restoreWindowGeometry()
     move(pos);
 }
 
+void TrianglesGUI::refreshSyncStatusDisplay()
+{
+    if (clientModel)
+    {
+        setNumBlocks(clientModel->getNumBlocks(), clientModel->getNumBlocksOfPeers());
+        return;
+    }
+
+    if (!walletTransactionSyncing)
+    {
+        progressBarLabel->setVisible(false);
+        progressBar->setVisible(false);
+        ui->label_blocks->setVisible(false);
+        return;
+    }
+
+    progressBarLabel->setText(walletTransactionSyncPending > 0
+        ? tr("Updating wallet history... %n change(s) queued", "", walletTransactionSyncPending)
+        : tr("Updating wallet history..."));
+    progressBarLabel->setVisible(true);
+    progressBar->setRange(0, 0);
+    progressBar->setValue(0);
+    progressBar->setVisible(true);
+    ui->label_blocks->setVisible(false);
+}
+
 void TrianglesGUI::optionsClicked()
 {
     if(!clientModel || !clientModel->getOptionsModel())
@@ -739,41 +830,84 @@ void TrianglesGUI::setNumConnections(int count)
 
 void TrianglesGUI::setNumBlocks(int count, int nTotalBlocks)
 {
-    // don't show / hide progress bar and its label if we have no connection to the network
-    if (!clientModel || clientModel->getNumConnections() == 0)
-    {
-        progressBarLabel->setVisible(false);
-        progressBar->setVisible(false);
-        ui->label_blocks->setVisible(false);
-
+    if (!clientModel)
         return;
-    }
 
+    int nConnections = clientModel->getNumConnections();
+    const bool blockSyncActive = nConnections > 0 && count < nTotalBlocks;
     QString tooltip;
 
-    QString importText;
-    importText = tr("Synchronizing with network...");
-
-    if(count < nTotalBlocks)
+    if(blockSyncActive)
     {
+        // Calculate blocks/sec - only update rate when new blocks arrive
+        static int lastCount = 0;
+        static qint64 lastRateTime = 0;
+        static float blocksPerSec = 0.0f;
+        qint64 now = QDateTime::currentMSecsSinceEpoch();
+        if (count > lastCount) {
+            // New blocks arrived - recalculate speed
+            if (lastRateTime > 0) {
+                float elapsed = (now - lastRateTime) / 1000.0f;
+                if (elapsed > 0.1f) {
+                    float instantRate = (count - lastCount) / elapsed;
+                    blocksPerSec = (blocksPerSec < 0.1f) ? instantRate : (blocksPerSec * 0.7f + instantRate * 0.3f);
+                }
+            }
+            lastCount = count;
+            lastRateTime = now;
+        } else if (lastRateTime > 0 && (now - lastRateTime) > 10000) {
+            // No blocks for 10+ seconds - show 0
+            blocksPerSec = 0.0f;
+        }
+
         int nRemainingBlocks = nTotalBlocks - count;
         float nPercentageDone = count / (nTotalBlocks * 0.01f);
 
-        progressBarLabel->setText(importText);
+        // Build informative status text
+        QString speedText;
+        if (blocksPerSec >= 1.0f) {
+            int etaSeconds = (int)(nRemainingBlocks / blocksPerSec);
+            QString etaStr;
+            if (etaSeconds < 60)
+                etaStr = tr("%n sec", "", etaSeconds);
+            else if (etaSeconds < 3600)
+                etaStr = tr("%n min", "", etaSeconds / 60);
+            else
+                etaStr = tr("%1h %2m").arg(etaSeconds / 3600).arg((etaSeconds % 3600) / 60);
+            speedText = tr("Syncing: %1 blk/s  ~%2 remaining").arg(blocksPerSec, 0, 'f', 1).arg(etaStr);
+        } else {
+            speedText = tr("Synchronizing with network...");
+        }
+
+        progressBarLabel->setText(speedText);
         progressBarLabel->setVisible(true);
-        progressBar->setFormat(tr("~%n block(s) remaining", "", nRemainingBlocks));
+        progressBar->setFormat(tr("Block %1 / %2  (%3%)").arg(count).arg(nTotalBlocks).arg(nPercentageDone, 0, 'f', 2));
         progressBar->setMaximum(nTotalBlocks);
         progressBar->setValue(count);
         progressBar->setVisible(true);
-        ui->label_blocks->setText(tr("%n blocks", "", count));
-        ui->label_blocks->setVisible(true);
+        ui->label_blocks->setVisible(false);
 
-		tooltip = tr("Downloaded %1 of %2 blocks of transaction history (%3% done).").arg(count).arg(nTotalBlocks).arg(nPercentageDone, 0, 'f', 2);
+        tooltip = tr("Downloaded %1 of %2 blocks of transaction history (%3% done).").arg(count).arg(nTotalBlocks).arg(nPercentageDone, 0, 'f', 2);
+    }
+    else if (walletTransactionSyncing)
+    {
+        progressBarLabel->setText(walletTransactionSyncPending > 0
+            ? tr("Updating wallet history... %n change(s) queued", "", walletTransactionSyncPending)
+            : tr("Updating wallet history..."));
+        progressBarLabel->setVisible(true);
+        progressBar->setRange(0, 0);
+        progressBar->setValue(0);
+        progressBar->setVisible(true);
+        ui->label_blocks->setVisible(false);
+
+        tooltip = tr("Wallet history is catching up to recent transactions and stakes.");
+        tooltip += QString("<br>") + (walletTransactionSyncPending > 0
+            ? tr("%n wallet update(s) are queued for the UI.", "", walletTransactionSyncPending)
+            : tr("Finalizing the latest wallet updates."));
     }
     else
     {
         progressBarLabel->setVisible(false);
-
         progressBar->setVisible(false);
         ui->label_blocks->setVisible(false);
         tooltip = tr("Processed %1 blocks of transaction history.").arg(count);
@@ -806,20 +940,20 @@ void TrianglesGUI::setNumBlocks(int count, int nTotalBlocks)
         text = tr("%n day(s) ago","",secs/(60*60*24));
     }
 
-    // Set icon state: spinning if catching up, tick otherwise
-    if(secs < 90*60 && count >= nTotalBlocks)
+    // Set icon state: spinning if catching up, tick otherwise.
+    // For PoS chains with few stakers, blocks can be hours or days apart.
+    // Sync status is based purely on block count - NOT block timestamp.
+    // A stale chain (no recent blocks) is still "synced" if we have all blocks.
+    if(count >= nTotalBlocks)
     {
         tooltip = tr("Up to date") + QString(".<br>") + tooltip;
         labelBlocksIcon->setPixmap(QIcon(":/icons/synced").pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
-        
+
         overviewPage->showOutOfSyncWarning(false);
     }
     else
     {
         tooltip = tr("Catching up...") + QString("<br>") + tooltip;
-        //syncIconMovie doesn't work for some reason - using fallback png
-        //labelBlocksIcon->setMovie(syncIconMovie);
-        //syncIconMovie->start();
         labelBlocksIcon->setPixmap(QIcon(":/icons/notsynced").pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
 
         overviewPage->showOutOfSyncWarning(true);
@@ -871,19 +1005,36 @@ void TrianglesGUI::changeEvent(QEvent *e)
 
 void TrianglesGUI::closeEvent(QCloseEvent *event)
 {
+#ifndef Q_OS_MAC // Ignored on Mac
     if(clientModel)
     {
-#ifndef Q_OS_MAC // Ignored on Mac
-        if(!clientModel->getOptionsModel()->getMinimizeToTray() &&
-           !clientModel->getOptionsModel()->getMinimizeOnClose())
+        if(clientModel->getOptionsModel()->getMinimizeOnClose())
         {
-            QApplication::quit();
+            // Minimize to taskbar instead of closing
+            QMainWindow::showMinimized();
+            event->ignore();
+            return;
+        }
+        if(clientModel->getOptionsModel()->getMinimizeToTray() && trayIcon)
+        {
+            // Hide to system tray instead of closing
+            hide();
+            event->ignore();
+            return;
         }
-#endif
     }
+#endif
+    // Actually closing - request a full core shutdown before leaving the UI loop.
+    StartShutdown();
+    event->accept();
     QMainWindow::closeEvent(event);
 }
 
+void TrianglesGUI::requestShutdown()
+{
+    StartShutdown();
+}
+
 void TrianglesGUI::askFee(qint64 nFeeRequired, bool *payFee)
 {
     QString strMessage = tr("<font color='#f26522'>This transaction is over the size limit.  You can still send it for a fee of %1, "
@@ -925,6 +1076,8 @@ void TrianglesGUI::incomingTransaction(const QModelIndex & parent, int start, in
 {
     if(!walletModel || !clientModel)
         return;
+    if(walletTransactionSyncing)
+        return;
     TransactionTableModel *ttm = walletModel->getTransactionTableModel();
     qint64 amount = ttm->index(start, TransactionTableModel::Amount, parent)
                     .data(Qt::EditRole).toULongLong();
@@ -956,6 +1109,21 @@ void TrianglesGUI::incomingTransaction(const QModelIndex & parent, int start, in
     }
 }
 
+void TrianglesGUI::setWalletTransactionSyncState(bool syncing)
+{
+    walletTransactionSyncing = syncing;
+    if (!syncing)
+        walletTransactionSyncPending = 0;
+    refreshSyncStatusDisplay();
+}
+
+void TrianglesGUI::setWalletTransactionSyncProgress(bool syncing, int pendingNotifications)
+{
+    walletTransactionSyncing = syncing;
+    walletTransactionSyncPending = pendingNotifications;
+    refreshSyncStatusDisplay();
+}
+
 void TrianglesGUI::incomingMessage(const QModelIndex & parent, int start, int end)
 {
     if(!messageModel)
@@ -1026,6 +1194,8 @@ void TrianglesGUI::gotoReceiveCoinsPage()
 
 void TrianglesGUI::gotoSendCoinsPage()
 {
+    ensureSendCoinsPage();
+
     sendCoinsAction->setChecked(true);
     centralWidget->setCurrentWidget(sendCoinsPage);
 
@@ -1035,6 +1205,7 @@ void TrianglesGUI::gotoSendCoinsPage()
 
 void TrianglesGUI::gotoMessagePage()
 {
+    ensureMessagePage();
     ensureMessageModel();
 
     messageAction->setChecked(true);
@@ -1047,6 +1218,8 @@ void TrianglesGUI::gotoMessagePage()
 
 void TrianglesGUI::gotoSignMessageTab(QString addr)
 {
+    ensureSignMessagePage();
+
     centralWidget->setCurrentWidget(signMessagePage);
 
     exportAction->setEnabled(false);
@@ -1061,6 +1234,8 @@ void TrianglesGUI::gotoSignMessageTab(QString addr)
 
 void TrianglesGUI::gotoVerifyMessageTab(QString addr)
 {
+    ensureVerifyMessagePage();
+
     centralWidget->setCurrentWidget(verifyMessagePage);
 
     exportAction->setEnabled(false);
@@ -1084,6 +1259,7 @@ void TrianglesGUI::dropEvent(QDropEvent *event)
 {
     if(event->mimeData()->hasUrls())
     {
+        ensureSendCoinsPage();
         int nValidUrisFound = 0;
         QList<QUrl> uris = event->mimeData()->urls();
         foreach(const QUrl &uri, uris)
@@ -1165,6 +1341,7 @@ void TrianglesGUI::updateMask()
 void TrianglesGUI::handleURI(QString strURI)
 {
     // URI has to be valid
+    ensureSendCoinsPage();
     if (sendCoinsPage->handleURI(strURI))
     {
         showNormalIfMinimized();
@@ -1221,6 +1398,12 @@ void TrianglesGUI::menuFileRequested()
     }
 }
 
+void TrianglesGUI::openRPCConsole()
+{
+    ensureRPCConsole();
+    rpcConsole->show();
+}
+
 void TrianglesGUI::menuOperationsRequested()
 {
     QMenu menu(this);
@@ -1465,32 +1648,47 @@ void TrianglesGUI::toggleHidden()
 
 void TrianglesGUI::updateStakingIcon()
 {
-    uint64_t nMinWeight = 0, nMaxWeight = 0, nWeight = 0;
+    // Read cached staking info computed by the staking thread.
+    // No locks needed - these are volatile values written by the miner thread
+    // and are display-only. This keeps the UI thread completely non-blocking.
+
+    uint64_t nWeight = 0;
+    bool fWalletLocked = false;
+    bool fHasPeers = false;
+
     if (pwalletMain)
-        pwalletMain->GetStakeWeight(*pwalletMain, nMinWeight, nMaxWeight, nWeight);
+    {
+        TRY_LOCK(pwalletMain->cs_wallet, lockWallet);
+        if (lockWallet)
+            fWalletLocked = pwalletMain->IsLocked();
+        else
+            return; // Skip this cycle, try again in 30 seconds
+
+        // Use cached weight from the staking thread instead of computing on UI thread.
+        // The staking thread updates this every ~500ms-1s loop iteration.
+        nWeight = pwalletMain->nCachedStakeWeight;
+    }
+
+    {
+        TRY_LOCK(cs_vNodes, lockNodes);
+        if (lockNodes)
+            fHasPeers = !vNodes.empty();
+    }
 
     if (nLastCoinStakeSearchInterval && nWeight)
     {
         uint64_t nNetworkWeight = GetPoSKernelPS();
-        unsigned nEstimateTime = nTargetSpacing * nNetworkWeight / nWeight;
+        unsigned nEstimateTime = nWeight > 0 ? nTargetSpacing * nNetworkWeight / nWeight : 0;
 
         QString text;
         if (nEstimateTime < 60)
-        {
             text = tr("%n second(s)", "", nEstimateTime);
-        }
         else if (nEstimateTime < 60*60)
-        {
             text = tr("%n minute(s)", "", nEstimateTime/60);
-        }
         else if (nEstimateTime < 24*60*60)
-        {
             text = tr("%n hour(s)", "", nEstimateTime/(60*60));
-        }
         else
-        {
             text = tr("%n day(s)", "", nEstimateTime/(60*60*24));
-        }
 
         labelStakingIcon->setPixmap(QIcon(":/icons/staking_on").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
         labelStakingIcon->setToolTip(tr("Staking.<br>Your weight is %1<br>Network weight is %2<br>Expected time to earn reward is %3").arg(nWeight).arg(nNetworkWeight).arg(text));
@@ -1498,9 +1696,9 @@ void TrianglesGUI::updateStakingIcon()
     else
     {
         labelStakingIcon->setPixmap(QIcon(":/icons/staking_off").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
-        if (pwalletMain && pwalletMain->IsLocked())
+        if (fWalletLocked)
             labelStakingIcon->setToolTip(tr("Not staking because wallet is locked"));
-        else if (vNodes.empty())
+        else if (!fHasPeers)
             labelStakingIcon->setToolTip(tr("Not staking because wallet is offline"));
         else if (IsInitialBlockDownload())
             labelStakingIcon->setToolTip(tr("Not staking because wallet is syncing"));
@@ -1520,5 +1718,6 @@ void TrianglesGUI::detectShutdown()
 
 void TrianglesGUI::on_bHelp_clicked()
 {    
+    ensureRPCConsole();
     rpcConsole->show();
 }

src/qt/trianglesgui.h

@@ -79,6 +79,11 @@ protected:
 
 private:
     void updateMask();
+    void ensureSendCoinsPage();
+    void ensureMessagePage();
+    void ensureSignMessagePage();
+    void ensureVerifyMessagePage();
+    void ensureRPCConsole();
 
 private:
     Ui::MainWindow *ui;
@@ -138,6 +143,8 @@ private:
     QMovie *syncIconMovie;
     /** Keep track of previous number of blocks, to detect progress */
     int prevBlocks;
+    bool walletTransactionSyncing;
+    int walletTransactionSyncPending;
 
     /** Create the main UI actions. */
     void createActions(bool fIsTestnet);
@@ -153,6 +160,7 @@ private:
     void saveWindowGeometry();
     /** Restore window size and position */
     void restoreWindowGeometry();
+    void refreshSyncStatusDisplay();
 
 public slots:
     /** Set number of connections shown in the UI */
@@ -164,6 +172,8 @@ public slots:
        @see WalletModel::EncryptionStatus
     */
     void setEncryptionStatus(int status);
+    void setWalletTransactionSyncState(bool syncing);
+    void setWalletTransactionSyncProgress(bool syncing, int pendingNotifications);
 
     /** Notify the user of an error in the network or transaction handling code. */
     void error(const QString &title, const QString &message, bool modal);
@@ -181,6 +191,8 @@ public slots:
 
 private slots:
     void ensureMessageModel();
+    void openRPCConsole();
+    void requestShutdown();
 
     void menuFileRequested();
     void menuOperationsRequested();

src/qt/verifymessagepage.cpp

@@ -14,8 +14,6 @@
 #include <vector>
 
 #include <QClipboard>
-#include <QDesktopWidget>
-
 VerifyMessagePage::VerifyMessagePage(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::VerifyMessagePage),

src/qt/walletmodel.cpp

@@ -8,9 +8,15 @@
 #include "wallet.h"
 #include "walletdb.h" // for BackupWallet
 #include "base58.h"
+#include "main.h"
 
 #include <QSet>
 #include <QTimer>
+#include <QMutexLocker>
+
+static const int MODEL_UPDATE_BATCH_THRESHOLD = 128;
+static const int MODEL_UPDATE_BATCH_DELAY_MS = 250;
+static const int MODEL_FULL_REFRESH_MIN_INTERVAL_MS = 1500;
 
 WalletModel::WalletModel(CWallet *wallet, OptionsModel *optionsModel, QObject *parent) :
     QObject(parent), wallet(wallet), optionsModel(optionsModel), addressTableModel(0),
@@ -18,7 +24,12 @@ WalletModel::WalletModel(CWallet *wallet, OptionsModel *optionsModel, QObject *p
     cachedBalance(0), cachedStake(0), cachedUnconfirmedBalance(0), cachedImmatureBalance(0),
     cachedNumTransactions(0),
     cachedEncryptionStatus(Unencrypted),
-    cachedNumBlocks(0)
+    cachedNumBlocks(0),
+    transactionNotificationFlushQueued(false),
+    fullTransactionRefreshQueued(false),
+    transactionSyncing(false),
+    transactionNotificationTimer(0),
+    lastFullTransactionRefreshTime(0)
 {
     addressTableModel = new AddressTableModel(wallet, this);
     transactionTableModel = new TransactionTableModel(wallet, this);
@@ -28,6 +39,10 @@ WalletModel::WalletModel(CWallet *wallet, OptionsModel *optionsModel, QObject *p
     connect(pollTimer, SIGNAL(timeout()), this, SLOT(pollBalanceChanged()));
     pollTimer->start(MODEL_UPDATE_DELAY);
 
+    transactionNotificationTimer = new QTimer(this);
+    transactionNotificationTimer->setSingleShot(true);
+    connect(transactionNotificationTimer, SIGNAL(timeout()), this, SLOT(flushTransactionNotifications()));
+
     subscribeToCoreSignals();
 }
 
@@ -66,6 +81,11 @@ int WalletModel::getNumTransactions() const
     return numTransactions;
 }
 
+bool WalletModel::isTransactionSyncing() const
+{
+    return transactionSyncing;
+}
+
 void WalletModel::updateStatus()
 {
     EncryptionStatus newEncryptionStatus = getEncryptionStatus();
@@ -78,18 +98,22 @@ void WalletModel::pollBalanceChanged()
 {
     if(nBestHeight != cachedNumBlocks)
     {
-        // Balance and number of transactions might have changed
-        cachedNumBlocks = nBestHeight;
-        checkBalanceChanged();
+        // Balance and number of transactions might have changed.
+        // Only update cachedNumBlocks AFTER a successful balance check,
+        // otherwise a TRY_LOCK failure loses the update permanently.
+        if(checkBalanceChanged())
+            cachedNumBlocks = nBestHeight;
     }
 }
 
-void WalletModel::checkBalanceChanged()
+bool WalletModel::checkBalanceChanged()
 {
-    qint64 newBalance = getBalance();
-    qint64 newStake = getStake();
-    qint64 newUnconfirmedBalance = getUnconfirmedBalance();
-    qint64 newImmatureBalance = getImmatureBalance();
+    // Get all balances in a single lock acquisition + single pass.
+    // Uses TRY_LOCK internally - if cs_wallet is busy (block processing),
+    // skip this cycle. The timer will retry in 2.5 seconds.
+    int64_t newBalance = 0, newStake = 0, newUnconfirmedBalance = 0, newImmatureBalance = 0;
+    if (!wallet->GetAllBalances(newBalance, newStake, newUnconfirmedBalance, newImmatureBalance))
+        return false;
 
     if(cachedBalance != newBalance || cachedStake != newStake || cachedUnconfirmedBalance != newUnconfirmedBalance || cachedImmatureBalance != newImmatureBalance)
     {
@@ -99,21 +123,152 @@ void WalletModel::checkBalanceChanged()
         cachedImmatureBalance = newImmatureBalance;
         emit balanceChanged(newBalance, newStake, newUnconfirmedBalance, newImmatureBalance);
     }
+    return true;
 }
 
 void WalletModel::updateTransaction(const QString &hash, int status)
 {
-    if(transactionTableModel)
-        transactionTableModel->updateTransaction(hash, status);
+    queueTransactionUpdate(hash, status);
+}
 
-    // Balance and number of transactions might have changed
-    checkBalanceChanged();
-
-    int newNumTransactions = getNumTransactions();
-    if(cachedNumTransactions != newNumTransactions)
+void WalletModel::queueTransactionUpdate(const QString &hash, int status)
+{
+    bool shouldScheduleFlush = false;
     {
-        cachedNumTransactions = newNumTransactions;
-        emit numTransactionsChanged(newNumTransactions);
+        QMutexLocker locker(&transactionNotificationMutex);
+
+        int mergedStatus = status;
+        QMap<QString, int>::iterator it = queuedTransactionNotifications.find(hash);
+        if (it != queuedTransactionNotifications.end())
+        {
+            // Preserve insert/delete semantics when multiple updates arrive
+            // for the same transaction before the UI thread drains the queue.
+            if (it.value() == CT_DELETED || status == CT_DELETED)
+                mergedStatus = CT_DELETED;
+            else if (it.value() == CT_NEW || status == CT_NEW)
+                mergedStatus = CT_NEW;
+            else
+                mergedStatus = CT_UPDATED;
+            it.value() = mergedStatus;
+        }
+        else
+        {
+            queuedTransactionNotifications.insert(hash, mergedStatus);
+        }
+
+        if (IsInitialBlockDownload() || queuedTransactionNotifications.size() >= MODEL_UPDATE_BATCH_THRESHOLD)
+            fullTransactionRefreshQueued = true;
+
+        if (!transactionNotificationFlushQueued)
+        {
+            transactionNotificationFlushQueued = true;
+            shouldScheduleFlush = true;
+        }
+    }
+
+    if (shouldScheduleFlush)
+        QMetaObject::invokeMethod(this, "startTransactionNotificationTimer", Qt::QueuedConnection);
+}
+
+void WalletModel::startTransactionNotificationTimer()
+{
+    if (transactionNotificationTimer)
+        transactionNotificationTimer->start(MODEL_UPDATE_BATCH_DELAY_MS);
+}
+
+void WalletModel::flushTransactionNotifications()
+{
+    QMap<QString, int> pendingNotifications;
+    bool refreshAll = false;
+    bool shouldRescheduleRefresh = false;
+    {
+        QMutexLocker locker(&transactionNotificationMutex);
+        pendingNotifications.swap(queuedTransactionNotifications);
+        refreshAll = fullTransactionRefreshQueued;
+        fullTransactionRefreshQueued = false;
+        transactionNotificationFlushQueued = false;
+    }
+
+    const bool shouldSync = refreshAll ||
+                            IsInitialBlockDownload() ||
+                            pendingNotifications.size() >= MODEL_UPDATE_BATCH_THRESHOLD;
+    if (transactionSyncing != shouldSync)
+    {
+        transactionSyncing = shouldSync;
+        emit transactionSyncStateChanged(transactionSyncing);
+    }
+
+    if(transactionTableModel)
+    {
+        if (refreshAll)
+        {
+            const qint64 now = GetTimeMillis();
+            if (transactionSyncing &&
+                lastFullTransactionRefreshTime != 0 &&
+                now - lastFullTransactionRefreshTime < MODEL_FULL_REFRESH_MIN_INTERVAL_MS)
+            {
+                QMutexLocker locker(&transactionNotificationMutex);
+                fullTransactionRefreshQueued = true;
+                if (!transactionNotificationFlushQueued)
+                {
+                    transactionNotificationFlushQueued = true;
+                    shouldRescheduleRefresh = true;
+                }
+            }
+            else
+            {
+                transactionTableModel->refreshWallet();
+                lastFullTransactionRefreshTime = now;
+            }
+        }
+        else
+        {
+            for (QMap<QString, int>::const_iterator it = pendingNotifications.begin(); it != pendingNotifications.end(); ++it)
+                transactionTableModel->updateTransaction(it.key(), it.value());
+        }
+    }
+
+    if (shouldRescheduleRefresh && transactionNotificationTimer)
+        transactionNotificationTimer->start(MODEL_FULL_REFRESH_MIN_INTERVAL_MS);
+
+    bool stillPending = false;
+    int queuedNotificationCount = 0;
+    {
+        QMutexLocker locker(&transactionNotificationMutex);
+        stillPending = transactionNotificationFlushQueued || !queuedTransactionNotifications.isEmpty();
+        queuedNotificationCount = queuedTransactionNotifications.size();
+    }
+    if (!transactionSyncing && pendingNotifications.size() >= MODEL_UPDATE_BATCH_THRESHOLD)
+    {
+        transactionSyncing = true;
+        emit transactionSyncStateChanged(true);
+    }
+
+    if (transactionSyncing && !IsInitialBlockDownload() && !stillPending)
+    {
+        transactionSyncing = false;
+        emit transactionSyncStateChanged(false);
+    }
+
+    const int pendingNotificationCount = transactionSyncing
+        ? pendingNotifications.size() + queuedNotificationCount
+        : queuedNotificationCount;
+    emit transactionSyncProgressChanged(transactionSyncing, pendingNotificationCount);
+
+    // Don't call checkBalanceChanged() here - it does LOCK(cs_wallet) + iterates
+    // all wallet transactions, blocking the UI thread. The pollBalanceChanged()
+    // timer already handles balance updates every 2.5 seconds with TRY_LOCK.
+
+    // Same for getNumTransactions() - use cached count from the transaction model
+    // to avoid another LOCK(cs_wallet) on the UI thread.
+    if(transactionTableModel)
+    {
+        int newNumTransactions = transactionTableModel->rowCount(QModelIndex());
+        if(cachedNumTransactions != newNumTransactions)
+        {
+            cachedNumTransactions = newNumTransactions;
+            emit numTransactionsChanged(newNumTransactions);
+        }
     }
 }
 
@@ -168,7 +323,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(const QList<SendCoinsRecipie
     std::vector<COutput> vCoins;
     wallet->AvailableCoins(vCoins, true, coinControl);
 
-    BOOST_FOREACH(const COutput& out, vCoins)
+    for (const COutput& out : vCoins)
         nBalance += out.tx->vout[out.i].nValue;
 
     if(total > nBalance)
@@ -240,7 +395,10 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(const QList<SendCoinsRecipie
 
         if(!fCreated)
         {
-            if((total + nFeeRequired) > nBalance) // FIXME: could cause collisions in the future
+            // NOTE: Potential edge case in fee calculation. The term "collisions" is unclear
+            // from original comment - may refer to transaction conflicts or UTXO selection issues.
+            // Consider reviewing Bitcoin Core's current implementation of this balance check.
+            if((total + nFeeRequired) > nBalance)
             {
                 return SendCoinsReturn(AmountWithFeeExceedsBalance, nFeeRequired);
             }
@@ -378,9 +536,7 @@ static void NotifyAddressBookChanged(WalletModel *walletmodel, CWallet *wallet,
 static void NotifyTransactionChanged(WalletModel *walletmodel, CWallet *wallet, const uint256 &hash, ChangeType status)
 {
     OutputDebugStringF("NotifyTransactionChanged %s status=%i\n", hash.GetHex().c_str(), status);
-    QMetaObject::invokeMethod(walletmodel, "updateTransaction", Qt::QueuedConnection,
-                              Q_ARG(QString, QString::fromStdString(hash.GetHex())),
-                              Q_ARG(int, status));
+    walletmodel->queueTransactionUpdate(QString::fromStdString(hash.GetHex()), status);
 }
 
 void WalletModel::subscribeToCoreSignals()
@@ -451,7 +607,7 @@ bool WalletModel::getPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const
 // returns a list of COutputs from COutPoints
 void WalletModel::getOutputs(const std::vector<COutPoint>& vOutpoints, std::vector<COutput>& vOutputs)
 {
-    BOOST_FOREACH(const COutPoint& outpoint, vOutpoints)
+    for (const COutPoint& outpoint : vOutpoints)
     {
         if (!wallet->mapWallet.count(outpoint.hash)) continue;
         int nDepth = wallet->mapWallet[outpoint.hash].GetDepthInMainChain();
@@ -469,7 +625,7 @@ void WalletModel::listCoins(std::map<QString, std::vector<COutput> >& mapCoins)
     std::vector<COutPoint> vLockedCoins;
 
     // add locked coins
-    BOOST_FOREACH(const COutPoint& outpoint, vLockedCoins)
+    for (const COutPoint& outpoint : vLockedCoins)
     {
         if (!wallet->mapWallet.count(outpoint.hash)) continue;
         int nDepth = wallet->mapWallet[outpoint.hash].GetDepthInMainChain();
@@ -478,7 +634,7 @@ void WalletModel::listCoins(std::map<QString, std::vector<COutput> >& mapCoins)
         vCoins.push_back(out);
     }
 
-    BOOST_FOREACH(const COutput& out, vCoins)
+    for (const COutput& out : vCoins)
     {
         COutput cout = out;
 

src/qt/walletmodel.h

@@ -4,6 +4,8 @@
 #include <QObject>
 #include <vector>
 #include <map>
+#include <QMap>
+#include <QMutex>
 
 #include "allocators.h" /* for SecureString */
 
@@ -72,6 +74,7 @@ public:
     qint64 getImmatureBalance() const;
     int getNumTransactions() const;
     EncryptionStatus getEncryptionStatus() const;
+    bool isTransactionSyncing() const;
 
     // Check address for validity
     bool validateAddress(const QString &address);
@@ -152,7 +155,7 @@ private:
 
     void subscribeToCoreSignals();
     void unsubscribeFromCoreSignals();
-    void checkBalanceChanged();
+    bool checkBalanceChanged();
 
 
 public slots:
@@ -160,10 +163,16 @@ public slots:
     void updateStatus();
     /* New transaction, or transaction changed status */
     void updateTransaction(const QString &hash, int status);
+    /* Queue a transaction update from a core thread without touching the UI directly */
+    void queueTransactionUpdate(const QString &hash, int status);
     /* New, updated or removed address book entry */
     void updateAddressBook(const QString &address, const QString &label, bool isMine, int status);
     /* Current, immature or unconfirmed balance might have changed - emit 'balanceChanged' if so */
     void pollBalanceChanged();
+    /* Start or restart the deferred transaction notification flush timer */
+    void startTransactionNotificationTimer();
+    /* Flush queued transaction notifications from core threads */
+    void flushTransactionNotifications();
 
 signals:
     // Signal that balance in wallet changed
@@ -182,6 +191,17 @@ signals:
 
     // Asynchronous error notification
     void error(const QString &title, const QString &message, bool modal);
+    void transactionSyncStateChanged(bool syncing);
+    void transactionSyncProgressChanged(bool syncing, int pendingNotifications);
+
+private:
+    QMutex transactionNotificationMutex;
+    QMap<QString, int> queuedTransactionNotifications;
+    bool transactionNotificationFlushQueued;
+    bool fullTransactionRefreshQueued;
+    bool transactionSyncing;
+    QTimer *transactionNotificationTimer;
+    qint64 lastFullTransactionRefreshTime;
 };
 
 

src/rest.cpp

@@ -13,7 +13,6 @@
 #include "init.h"
 
 #include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
 
 using namespace std;
 using namespace json_spirit;
@@ -393,7 +392,7 @@ static bool HandleMempool(string& strReply, int& nStatus)
     vector<uint256> vtxid;
     mempool.queryHashes(vtxid);
     Array a;
-    BOOST_FOREACH(const uint256& hash, vtxid)
+    for (const uint256& hash : vtxid)
         a.push_back(hash.ToString());
     strReply = write_string(Value(a), false) + "\n";
     nStatus = HTTP_OK;