v5.5.5: Auto-bootstrap for new nodes - zero config required

- Daemon: automatically downloads blockchain snapshot when no data exists No -bootstrap flag needed. Use -nobootstrap to skip. - Qt wallet: auto-bootstraps on first run (no question asked) Existing users still get the optional re-download prompt. - New users just install and run - blockchain downloads automatically - Works on all platforms (Windows, Linux, macOS, ARM64)
Revert hardcoded seed nodes - peer discovery is dynamic
2026-04-03 16:18:31 -07:00 · 2026-04-03 16:10:07 -07:00 · 2026-04-03 15:55:51 -07:00 · 2026-04-03 00:58:39 -07:00 · 2026-04-03 00:10:32 -07:00 · 2026-04-02 23:38:52 -07:00
97 changed files with 6251 additions and 29487 deletions
@@ -0,0 +1,171 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(git clone:*)",
+      "Bash(git init:*)",
+      "Bash(git remote add:*)",
+      "Bash(git fetch:*)",
+      "Bash(git checkout:*)",
+      "Bash(git config:*)",
+      "Bash(git -C \"E:\\\\repos\\\\triangles_old\" log --oneline --all)",
+      "Bash(git -C \"E:\\\\repos\\\\triangles_old\" branch -a)",
+      "Bash(git -C \"E:\\\\repos\\\\triangles_old\" log --oneline --all --graph)",
+      "Bash(git -C \"E:\\\\repos\\\\triangles_old\" show 7676e66 --stat)",
+      "Bash(python:*)",
+      "Bash(where:*)",
+      "Bash(powershell:*)",
+      "Bash(C:/msys64/usr/bin/bash.exe -lc \"pacman -Syu --noconfirm\")",
+      "Bash(C:/msys64/usr/bin/bash.exe -lc \"pacman -S --needed --noconfirm mingw-w64-x86_64-toolchain make\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"ls /mingw64/lib/libboost_system*.a 2>/dev/null; ls /mingw64/lib/cmake/boost_system* 2>/dev/null; ls /mingw64/lib/libboost*.a 2>/dev/null | head -10\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /c/Qt/deps/openssl-1.0.2u && make -j4 2>&1 | tail -10\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && mingw32-make -j4 2>&1 | tail -40\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && mingw32-make -j1 2>&1 | grep ''error:'' | grep -v ''bignum'' | sort -u | head -30\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && mingw32-make -j4 2>&1 | grep ''error:'' | sort -u | head -30\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"grep ''MINIUPNPC_API_VERSION'' /mingw64/include/miniupnpc/miniupnpc.h\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"grep -A3 ''upnpDiscover\\('' /mingw64/include/miniupnpc/miniupnpc.h | head -10\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"grep -B1 -A5 ''UPNP_GetValidIGD\\('' /mingw64/include/miniupnpc/miniupnpc.h\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && qmake-qt5 triangles-qt.pro 2>&1 | tail -5 && mingw32-make -j4 2>&1 | grep ''error:'' | sort -u | head -30\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && mingw32-make clean 2>&1 | tail -5 && qmake triangles-qt.pro 2>&1 && mingw32-make -j4 2>&1 | grep ''error:'' | sort -u | head -40\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"export PATH=/mingw64/bin:$PATH && cd /e/repos/triangles && rm -f build/*.o build/*.cpp 2>/dev/null; qmake triangles-qt.pro && mingw32-make -j4 2>&1 | grep ''error:'' | sort -u | head -40\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && rm -f build/*.o build/*.cpp 2>/dev/null; /mingw64/bin/qmake triangles-qt.pro && mingw32-make -j4 2>&1 | grep ''error:'' | sort -u | head -40\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"which qmake 2>/dev/null || ls /mingw64/bin/qmake* 2>/dev/null || ls /mingw64/share/qt5/bin/qmake* 2>/dev/null || find /mingw64 -name ''qmake*'' -type f 2>/dev/null | head -5\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && rm -f build/*.o build/*.cpp 2>/dev/null; qmake-qt5 triangles-qt.pro && mingw32-make -j4 2>&1 | grep ''error:'' | sort -u | head -40\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && mingw32-make -j4 2>&1 | grep ''error:'' | sort -u | head -40\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && mingw32-make -j4 2>&1 | grep -E ''error:'' | sort -u | head -40\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"find /e/repos/triangles -name ''*.exe'' -type f 2>/dev/null; ls -la /e/repos/triangles/release/ 2>/dev/null; ls -la /e/repos/triangles/debug/ 2>/dev/null\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && mingw32-make -j4 2>&1 | tail -60\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"pacman -S --noconfirm mingw-w64-x86_64-qt5-tools 2>&1 | tail -10\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"which lrelease 2>/dev/null; which lrelease-qt5 2>/dev/null; ls /mingw64/bin/lrelease* 2>/dev/null\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"ln -sf /mingw64/bin/lrelease-qt5.exe /mingw64/bin/lrelease.exe 2>/dev/null; ls -la /mingw64/bin/lrelease.exe\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && mingw32-make -j4 2>&1 | tail -80\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && qmake-qt5 triangles-qt.pro && mingw32-make -j4 2>&1 | tail -30\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"find /mingw64/lib -name ''*boost_system*'' 2>/dev/null\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"find /mingw64/lib -name ''libboost_*'' -name ''*.a'' 2>/dev/null | head -20\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && rm -f build/net.o && mingw32-make -j4 2>&1 | tail -20\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"ls -la /e/repos/triangles/release/triangles-qt.exe\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles/release && ldd triangles-qt.exe 2>/dev/null | grep mingw64\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles/release && ./triangles-qt.exe &\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"identify /e/repos/triangles/src/qt/res/images/header_logo.png 2>/dev/null || file /e/repos/triangles/src/qt/res/images/header_logo.png\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"ls -la /e/repos/triangles/src/qt/res/images/ | grep -i header\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cp ''/e/TRI/TRI logo w name new1 \\(300 x 63 px\\).png'' ''/e/repos/triangles/src/qt/res/images/header_logo.png'' && file ''/e/repos/triangles/src/qt/res/images/header_logo.png''\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"taskkill //IM triangles-qt.exe //F 2>/dev/null; echo done\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles && qmake-qt5 triangles-qt.pro && mingw32-make -j4 2>&1 | tail -10\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cd /e/repos/triangles/src/qt/locale && sed -i ''s|https://bittrex.com/Market/Index?MarketName=BTC-TRI|https://313.cash|g'' *.ts && sed -i ''s|TRI on Bittrex|TRI on Pinball|g'' *.ts && echo done\")",
+      "Bash(C:/msys64/msys2_shell.cmd -mingw64 -defterm -no-start -here -c \"cp ''/e/TRI/Copy of TRI logo w name new4 \\(300x63\\).png'' ''/e/repos/triangles/src/qt/res/images/header_logo.png'' && file ''/e/repos/triangles/src/qt/res/images/header_logo.png''\")",
+      "Bash(git add:*)",
+      "Bash(git push)",
+      "Bash(git remote set-url:*)",
+      "Bash(git -c http.sslVerify=false push)",
+      "Bash(git -c credential.helper= push)",
+      "Bash(ls:*)",
+      "Bash(cmd /c \"set PATH=C:\\\\msys64\\\\mingw64\\\\bin;C:\\\\msys64\\\\usr\\\\bin;%PATH% && where qmake && where mingw32-make && where g++\")",
+      "Bash(PATH=\"/c/msys64/mingw64/bin:/c/msys64/usr/bin:$PATH\")",
+      "Bash(qmake-qt5:*)",
+      "Bash(mingw32-make:*)",
+      "Bash(ldd:*)",
+      "Bash(objdump:*)",
+      "Bash(/c/msys64/mingw64/bin/objdump.exe:*)",
+      "Bash(tasklist:*)",
+      "Bash(cmd.exe /c \"start /b E:\\\\repos\\\\triangles\\\\release\\\\triangles-qt.exe -datadir=E:\\\\Coins\\\\TRI -reindex\")",
+      "Bash(gcc:*)",
+      "Bash(/c/msys64/mingw64/bin/gcc.exe:*)",
+      "Bash(cmd.exe:*)",
+      "Bash(PATH=\"/c/msys64/mingw64/bin:$PATH\" /e/repos/triangles/scan_chain_tip.exe:*)",
+      "Bash(PATH=\"/c/msys64/mingw64/bin:$PATH\" /c/msys64/mingw64/bin/qmake.exe:*)",
+      "Bash(PATH=\"/c/msys64/mingw64/bin:$PATH\" qmake-qt5:*)",
+      "Bash(PATH=\"/c/msys64/mingw64/bin:$PATH\" mingw32-make:*)",
+      "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:*)"
+    ]
+  }
+}
@@ -18,24 +18,21 @@ jobs:
      - name: Install dependencies
        run: |
          sudo apt-get update
-          sudo apt-get install -y build-essential cmake ninja-build \
-            libboost-all-dev libssl-dev libdb++-dev libleveldb-dev \
-            libevent-dev libminiupnpc-dev zlib1g-dev
+          sudo apt-get install -y build-essential libboost-all-dev \
+            libssl-dev libdb++-dev libleveldb-dev libevent-dev libminiupnpc-dev

-      - name: Configure
+      - name: Build LevelDB
        run: |
-          cmake -B build -G Ninja \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DBUILD_QT=OFF \
-            -DBUILD_DAEMON=ON \
-            -DBUILD_TESTS=ON \
-            -DUSE_UPNP=OFF
+          cd src/leveldb
+          chmod +x build_detect_platform
+          make clean || true
+          make OPT="-O2" libleveldb.a libmemenv.a

-      - name: Build
-        run: cmake --build build -j$(nproc)
-
-      - name: Run unit tests
-        run: cd build && ctest --output-on-failure || true
+      - 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
@@ -51,8 +48,6 @@ jobs:
          update: true
          install: >-
            mingw-w64-x86_64-gcc
-            mingw-w64-x86_64-cmake
-            mingw-w64-x86_64-ninja
            mingw-w64-x86_64-qt5-base
            mingw-w64-x86_64-qt5-tools
            mingw-w64-x86_64-boost
@@ -60,36 +55,40 @@ jobs:
            mingw-w64-x86_64-db
            mingw-w64-x86_64-libevent
            mingw-w64-x86_64-miniupnpc
-            mingw-w64-x86_64-zlib
+            make

-      - name: Set VERSION
+      - name: Create Qt5 tool symlinks
        run: |
-          if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then
-            echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV
-          else
-            MAJOR=$(grep 'CLIENT_VERSION_MAJOR' src/clientversion.h | awk '{print $3}')
-            MINOR=$(grep 'CLIENT_VERSION_MINOR' src/clientversion.h | awk '{print $3}')
-            REV=$(grep 'CLIENT_VERSION_REVISION' src/clientversion.h | awk '{print $3}')
-            echo "VERSION=${MAJOR}.${MINOR}.${REV}" >> $GITHUB_ENV
-          fi
+          ln -sf /mingw64/bin/qmake-qt5.exe /mingw64/bin/qmake.exe 2>/dev/null || true
+          ln -sf /mingw64/bin/lrelease-qt5.exe /mingw64/bin/lrelease.exe 2>/dev/null || true
+          ln -sf /mingw64/bin/windeployqt-qt5.exe /mingw64/bin/windeployqt.exe 2>/dev/null || true

-      - name: Configure
+      - name: Set VERSION from source
        run: |
-          cmake -B build -G Ninja \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DBUILD_QT=ON \
-            -DBUILD_DAEMON=OFF \
-            -DBUILD_TESTS=OFF \
-            -DUSE_UPNP=ON \
-            -DUSE_QRCODE=OFF
+          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
+
+      - name: Build LevelDB
+        run: |
+          cd src/leveldb
+          make clean || true
+          CC=gcc CXX=g++ TARGET_OS=OS_WINDOWS_CROSSCOMPILE make OPT="-fno-keep-inline-dllexport -march=nocona -msahf -mtune=generic -Wa,-mbig-obj -O2" libleveldb.a libmemenv.a
+
+      - name: Run qmake
+        run: qmake triangles-qt.pro "RELEASE=1"

      - name: Build
-        run: cmake --build build -j$(nproc)
+        run: make -j$(nproc)

      - name: Package
        run: |
          mkdir -p dist
-          cp build/bin/triangles-qt.exe dist/
+          cp release/triangles-qt.exe dist/
          windeployqt dist/triangles-qt.exe || true

          # Copy ALL runtime DLLs the binary needs
@@ -147,8 +146,8 @@ jobs:
      - name: Download Tor
        shell: powershell
        run: |
-          $TOR_VERSION = "15.0.9"
-          $TOR_URL = "https://archive.torproject.org/tor-package-archive/torbrowser/${TOR_VERSION}/tor-expert-bundle-windows-x86_64-${TOR_VERSION}.tar.gz"
+          $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
@@ -165,18 +164,6 @@ jobs:
      - name: Install NSIS via MSYS2
        run: pacman -S --noconfirm mingw-w64-x86_64-nsis

-      - name: Install NSIS inetc plugin
-        run: |
-          pacman -S --noconfirm unzip
-          NSIS_DIR="/mingw64/share/nsis"
-          cd /tmp
-          curl -L -o Inetc.zip "https://nsis.sourceforge.io/mediawiki/images/c/c9/Inetc.zip"
-          unzip -o Inetc.zip -d inetc_extract
-          # MSYS2 mingw64 NSIS is 64-bit, needs amd64-unicode plugin in Plugins/unicode/
-          mkdir -p "$NSIS_DIR/Plugins/unicode"
-          cp inetc_extract/Plugins/amd64-unicode/INetC.dll "$NSIS_DIR/Plugins/unicode/"
-          echo "Installed 64-bit INetC.dll to $NSIS_DIR/Plugins/unicode/"
-
      - name: Build NSIS installer
        run: makensis //DVERSION=$VERSION contrib/nsis/setup.nsi

@@ -200,44 +187,42 @@ jobs:
          update: true
          install: >-
            mingw-w64-x86_64-gcc
-            mingw-w64-x86_64-cmake
-            mingw-w64-x86_64-ninja
            mingw-w64-x86_64-boost
            mingw-w64-x86_64-openssl
            mingw-w64-x86_64-db
            mingw-w64-x86_64-libevent
            mingw-w64-x86_64-miniupnpc
-            mingw-w64-x86_64-zlib
+            make

-      - name: Configure
+      - name: Build LevelDB
        run: |
-          cmake -B build -G Ninja \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DBUILD_QT=OFF \
-            -DBUILD_DAEMON=ON \
-            -DBUILD_TESTS=OFF \
-            -DUSE_UPNP=ON
+          cd src/leveldb
+          make clean || true
+          CC=gcc CXX=g++ TARGET_OS=OS_WINDOWS_CROSSCOMPILE make OPT="-fno-keep-inline-dllexport -march=nocona -msahf -mtune=generic -Wa,-mbig-obj -O2" libleveldb.a libmemenv.a

-      - name: Build
+      - name: Build daemon
        run: |
-          cmake --build build -j$(nproc)
-          strip --strip-all build/bin/trianglesd.exe
+          set -eo pipefail
+          cd src
+          mkdir -p obj
+          make -f makefile.mingw DEPSDIR=/mingw64 all -j$(nproc) 2>&1
+          strip --strip-all trianglesd.exe

      - name: Package daemon with DLLs
        run: |
          mkdir -p daemon-dist/tor
-          cp build/bin/trianglesd.exe daemon-dist/
+          cp src/trianglesd.exe daemon-dist/

          # Copy all linked DLLs from MSYS2
-          ldd build/bin/trianglesd.exe | grep '/mingw64' | awk '{print $3}' | while read dll; do
+          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.9"
-          Invoke-WebRequest -Uri "https://archive.torproject.org/tor-package-archive/torbrowser/${TOR_VERSION}/tor-expert-bundle-windows-x86_64-${TOR_VERSION}.tar.gz" -OutFile tor-bundle.tar.gz
+          $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/
@@ -256,44 +241,43 @@ jobs:
    steps:
      - uses: actions/checkout@v4

-      - name: Set VERSION
+      - name: Set VERSION from source
        run: |
-          if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then
-            echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV
-          else
-            MAJOR=$(grep 'CLIENT_VERSION_MAJOR' src/clientversion.h | awk '{print $3}')
-            MINOR=$(grep 'CLIENT_VERSION_MINOR' src/clientversion.h | awk '{print $3}')
-            REV=$(grep 'CLIENT_VERSION_REVISION' src/clientversion.h | awk '{print $3}')
-            echo "VERSION=${MAJOR}.${MINOR}.${REV}" >> $GITHUB_ENV
-          fi
+          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
-          sudo apt-get install -y build-essential cmake ninja-build \
-            qtbase5-dev qttools5-dev-tools \
-            libboost-all-dev libssl-dev libdb++-dev \
-            libleveldb-dev libevent-dev libminiupnpc-dev zlib1g-dev
+          sudo apt-get install -y build-essential qt5-qmake qtbase5-dev \
+            qttools5-dev-tools libboost-all-dev libssl-dev libdb++-dev \
+            libleveldb-dev libevent-dev libminiupnpc-dev

-      - name: Configure
+      - name: Build LevelDB
        run: |
-          cmake -B build -G Ninja \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DBUILD_QT=ON \
-            -DBUILD_DAEMON=OFF \
-            -DBUILD_TESTS=OFF \
-            -DUSE_UPNP=ON
+          cd src/leveldb
+          chmod +x build_detect_platform
+          make clean || true
+          make OPT="-O2" libleveldb.a libmemenv.a
+
+      - name: Clean stale build artifacts
+        run: rm -rf build/*.o
+
+      - name: Run qmake
+        run: qmake triangles-qt.pro "RELEASE=1"

      - name: Build
-        run: cmake --build build -j$(nproc)
+        run: make -j$(nproc)

      - name: Strip binary
-        run: strip --strip-all build/bin/triangles-qt
+        run: strip --strip-all triangles-qt

      - name: Build .deb package (fully self-contained)
        run: |
-          TOR_VERSION="15.0.9"
-          curl -sL "https://archive.torproject.org/tor-package-archive/torbrowser/${TOR_VERSION}/tor-expert-bundle-linux-x86_64-${TOR_VERSION}.tar.gz" -o tor-bundle.tar.gz
+          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

          PKG="cryptographic-triangles_${VERSION}_amd64"
@@ -304,13 +288,13 @@ jobs:
          mkdir -p ${PKG}/usr/share/applications
          mkdir -p ${PKG}/usr/share/pixmaps

-          cp build/bin/triangles-qt ${PKG}/usr/lib/cryptographic-triangles/
+          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 build/bin/triangles-qt | grep '=> /' | awk '{print $3}' | while read lib; do
+          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
@@ -373,43 +357,39 @@ jobs:
    steps:
      - uses: actions/checkout@v4

-      - name: Set VERSION
+      - name: Set VERSION from source
        run: |
-          if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then
-            echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV
-          else
-            MAJOR=$(grep 'CLIENT_VERSION_MAJOR' src/clientversion.h | awk '{print $3}')
-            MINOR=$(grep 'CLIENT_VERSION_MINOR' src/clientversion.h | awk '{print $3}')
-            REV=$(grep 'CLIENT_VERSION_REVISION' src/clientversion.h | awk '{print $3}')
-            echo "VERSION=${MAJOR}.${MINOR}.${REV}" >> $GITHUB_ENV
-          fi
+          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
-          sudo apt-get install -y build-essential cmake ninja-build \
-            libboost-all-dev libssl-dev libdb++-dev libleveldb-dev \
-            libevent-dev libminiupnpc-dev zlib1g-dev
+          sudo apt-get install -y build-essential libboost-all-dev \
+            libssl-dev libdb++-dev libleveldb-dev libevent-dev libminiupnpc-dev

-      - name: Configure
+      - name: Build LevelDB
        run: |
-          cmake -B build -G Ninja \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DBUILD_QT=OFF \
-            -DBUILD_DAEMON=ON \
-            -DBUILD_TESTS=OFF \
-            -DUSE_UPNP=ON
+          cd src/leveldb
+          chmod +x build_detect_platform
+          make clean || true
+          make OPT="-O2" libleveldb.a libmemenv.a

-      - name: Build
-        run: cmake --build build -j$(nproc)
+      - name: Build daemon
+        run: |
+          cd src
+          mkdir -p obj
+          make -f makefile.unix trianglesd -j$(nproc)

      - name: Strip binary
-        run: strip --strip-all build/bin/trianglesd
+        run: strip --strip-all src/trianglesd

      - name: Build .deb package (fully self-contained)
        run: |
-          TOR_VERSION="15.0.9"
-          curl -sL "https://archive.torproject.org/tor-package-archive/torbrowser/${TOR_VERSION}/tor-expert-bundle-linux-x86_64-${TOR_VERSION}.tar.gz" -o tor-bundle.tar.gz
+          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

          PKG="cryptographic-triangles-daemon_${VERSION}_amd64"
@@ -419,13 +399,13 @@ jobs:
          mkdir -p ${PKG}/usr/bin
          mkdir -p ${PKG}/etc/systemd/system

-          cp build/bin/trianglesd ${PKG}/usr/lib/cryptographic-triangles/
+          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 build/bin/trianglesd | grep '=> /' | awk '{print $3}' | while read lib; do
+          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
@@ -503,61 +483,59 @@ jobs:
    steps:
      - uses: actions/checkout@v4

-      - name: Set VERSION
+      - name: Set VERSION from source
        run: |
-          if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then
-            echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV
-          else
-            MAJOR=$(grep 'CLIENT_VERSION_MAJOR' src/clientversion.h | awk '{print $3}')
-            MINOR=$(grep 'CLIENT_VERSION_MINOR' src/clientversion.h | awk '{print $3}')
-            REV=$(grep 'CLIENT_VERSION_REVISION' src/clientversion.h | awk '{print $3}')
-            echo "VERSION=${MAJOR}.${MINOR}.${REV}" >> $GITHUB_ENV
-          fi
+          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 cmake ninja qt@5 openssl@3 boost berkeley-db@5 leveldb libevent miniupnpc
+          brew install qt@5 openssl@3 boost berkeley-db@5 leveldb libevent miniupnpc

-      - name: Configure
+      - name: Clean stale build artifacts
+        run: rm -rf build/*.o build/*.h
+
+      - name: Build LevelDB
+        run: |
+          cd src/leveldb
+          chmod +x build_detect_platform
+          make clean || true
+          CC=clang CXX=clang++ make OPT="-O2" libleveldb.a libmemenv.a
+
+      - name: Run qmake
        run: |
          export PATH="/opt/homebrew/opt/qt@5/bin:$PATH"
-          cmake -B build -G Ninja \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DBUILD_QT=ON \
-            -DBUILD_DAEMON=OFF \
-            -DBUILD_TESTS=OFF \
-            -DUSE_UPNP=ON \
-            -DBOOST_ROOT=/opt/homebrew/opt/boost \
-            -DBDB_INCLUDE_PATH=/opt/homebrew/opt/berkeley-db@5/include \
-            -DBDB_LIB_PATH=/opt/homebrew/opt/berkeley-db@5/lib \
-            -DOPENSSL_ROOT_DIR=/opt/homebrew/opt/openssl@3 \
-            -DEVENT_INCLUDE_PATH=/opt/homebrew/opt/libevent/include \
-            -DEVENT_LIB_PATH=/opt/homebrew/opt/libevent/lib \
-            -DMINIUPNPC_INCLUDE_PATH=/opt/homebrew/opt/miniupnpc/include \
-            -DMINIUPNPC_LIB_PATH=/opt/homebrew/opt/miniupnpc/lib \
-            -DQt5_DIR=/opt/homebrew/opt/qt@5/lib/cmake/Qt5
+          qmake triangles-qt.pro -spec macx-clang \
+            "BOOST_INCLUDE_PATH=/opt/homebrew/opt/boost/include" \
+            "BOOST_LIB_PATH=/opt/homebrew/opt/boost/lib" \
+            "BDB_INCLUDE_PATH=/opt/homebrew/opt/berkeley-db@5/include" \
+            "BDB_LIB_PATH=/opt/homebrew/opt/berkeley-db@5/lib" \
+            "BDB_LIB_SUFFIX=" \
+            "OPENSSL_INCLUDE_PATH=/opt/homebrew/opt/openssl@3/include" \
+            "OPENSSL_LIB_PATH=/opt/homebrew/opt/openssl@3/lib" \
+            "MINIUPNPC_INCLUDE_PATH=/opt/homebrew/opt/miniupnpc/include" \
+            "MINIUPNPC_LIB_PATH=/opt/homebrew/opt/miniupnpc/lib" \
+            "EVENT_INCLUDE_PATH=/opt/homebrew/opt/libevent/include" \
+            "EVENT_LIB_PATH=/opt/homebrew/opt/libevent/lib" \
+            "RELEASE=1"

      - name: Build
-        run: cmake --build build -j$(sysctl -n hw.ncpu)
+        run: |
+          export PATH="/opt/homebrew/opt/qt@5/bin:$PATH"
+          make -j$(sysctl -n hw.ncpu)

      - name: Create .app bundle
        run: |
          export PATH="/opt/homebrew/opt/qt@5/bin:$PATH"
-          macdeployqt build/bin/Triangles-Qt.app -verbose=1 || \
-          macdeployqt build/bin/triangles-qt.app -verbose=1 || true
+          macdeployqt Triangles-Qt.app -verbose=1

      - name: Bundle non-Qt dylibs into app
        run: |
-          # Find the .app bundle
-          APP=$(find build/bin -name "*.app" -maxdepth 1 | head -1)
-          if [ -z "$APP" ]; then
-            echo "No .app bundle found, creating one manually..."
-            APP="build/bin/Triangles-Qt.app"
-            mkdir -p "$APP/Contents/MacOS" "$APP/Contents/Frameworks"
-            cp build/bin/triangles-qt "$APP/Contents/MacOS/Triangles-Qt"
-          fi
-          FRAMEWORKS="$APP/Contents/Frameworks"
-          BINARY=$(find "$APP/Contents/MacOS" -type f -perm +111 | head -1)
+          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
@@ -582,20 +560,18 @@ jobs:

      - name: Bundle Tor into app
        run: |
-          TOR_VERSION="15.0.9"
-          curl -sL "https://archive.torproject.org/tor-package-archive/torbrowser/${TOR_VERSION}/tor-expert-bundle-macos-aarch64-${TOR_VERSION}.tar.gz" -o tor-bundle.tar.gz
+          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
-          APP=$(find build/bin -name "*.app" -maxdepth 1 | head -1)
-          mkdir -p "$APP/Contents/MacOS/tor"
-          cp tor-extract/tor/tor "$APP/Contents/MacOS/tor/"
-          chmod +x "$APP/Contents/MacOS/tor/tor"
-          [ -d tor-extract/data ] && cp -r tor-extract/data "$APP/Contents/MacOS/tor/data"
+          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: |
-          APP=$(find build/bin -name "*.app" -maxdepth 1 | head -1)
          mkdir -p dmg_contents
-          cp -R "$APP" dmg_contents/
+          cp -R Triangles-Qt.app dmg_contents/
          ln -s /Applications dmg_contents/Applications
          hdiutil create -volname "Cryptographic Triangles" \
            -srcfolder dmg_contents \
@@ -643,19 +619,3 @@ jobs:
        with:
          files: release/*
          generate_release_notes: true
-
-  trigger-tripi:
-    name: Trigger TRI-PI ARM64 Build
-    if: startsWith(github.ref, 'refs/tags/v')
-    needs: release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Dispatch tri-pi ARM64 build
-        run: |
-          curl -f -X POST \
-            -H "Accept: application/vnd.github+json" \
-            -H "Authorization: Bearer ${{ secrets.TRIPI_BUILD_TOKEN }}" \
-            -H "X-GitHub-Api-Version: 2022-11-28" \
-            https://api.github.com/repos/SamiAhmed7777/tri-pi/dispatches \
-            -d '{"event_type":"new-release","client_payload":{"version":"${{ github.ref_name }}","source_repo":"SamiAhmed7777/triangles_v5"}}'
-          echo "Triggered tri-pi repository_dispatch for ${{ github.ref_name }}"
@@ -41,7 +41,6 @@ blocks/
 # IDE
 .vscode/
 .idea/
-.claude/
 *.swp
 *.swo
 *~
@@ -52,7 +51,6 @@ blocks/
 .*.json
 temp/
 tmp/
-testnet-sync/

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

 LABEL maintainer="Cryptographic Triangles Team"
 LABEL description="Cryptographic Triangles (TRI) headless daemon"
-LABEL version="5.7.6"
+LABEL version="5.1.5"

 RUN apt-get update && apt-get install -y --no-install-recommends \
    ca-certificates \
@@ -19,9 +19,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
    tor \
    && rm -rf /var/lib/apt/lists/*

-ARG VERSION=5.7.6
 RUN curl -L -o /usr/local/bin/trianglesd \
-    https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${VERSION}/Cryptographic-Triangles-v${VERSION}-linux-x64-daemon \
+    https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.1.5/trianglesd-linux \
    && chmod +x /usr/local/bin/trianglesd

 RUN useradd -m -s /bin/bash triangles
@@ -0,0 +1,284 @@
+#############################################################################
+# Makefile for building: triangles-qt
+# Generated by qmake (3.1) (Qt 5.15.18)
+# Project:  triangles-qt.pro
+# Template: app
+# Command: C:/msys64/mingw64/bin/qmake-qt5.exe -o Makefile triangles-qt.pro
+#############################################################################
+
+MAKEFILE      = Makefile
+
+EQ            = =
+
+first: release
+install: release-install
+uninstall: release-uninstall
+QMAKE         = C:/msys64/mingw64/bin/qmake-qt5.exe
+DEL_FILE      = rm -f
+CHK_DIR_EXISTS= test -d
+MKDIR         = mkdir -p
+COPY          = cp -f
+COPY_FILE     = cp -f
+COPY_DIR      = cp -f -R
+INSTALL_FILE  = cp -f
+INSTALL_PROGRAM = cp -f
+INSTALL_DIR   = cp -f -R
+QINSTALL      = C:/msys64/mingw64/bin/qmake-qt5.exe -install qinstall
+QINSTALL_PROGRAM = C:/msys64/mingw64/bin/qmake-qt5.exe -install qinstall -exe
+DEL_FILE      = rm -f
+SYMLINK       = $(QMAKE) -install ln -f -s
+DEL_DIR       = rmdir
+MOVE          = mv -f
+IDC           = idc
+IDL           = widl
+ZIP           = 
+DEF_FILE      = 
+RES_FILE      = build/triangles-qt_res.o
+SED           = sed
+MOVE          = mv -f
+SUBTARGETS    =  \
+		release \
+		debug
+
+
+release: FORCE
+	$(MAKE) -f $(MAKEFILE).Release
+release-make_first: FORCE
+	$(MAKE) -f $(MAKEFILE).Release 
+release-all: FORCE
+	$(MAKE) -f $(MAKEFILE).Release all
+release-clean: FORCE
+	$(MAKE) -f $(MAKEFILE).Release clean
+release-distclean: FORCE
+	$(MAKE) -f $(MAKEFILE).Release distclean
+release-install: FORCE
+	$(MAKE) -f $(MAKEFILE).Release install
+release-uninstall: FORCE
+	$(MAKE) -f $(MAKEFILE).Release uninstall
+debug: FORCE
+	$(MAKE) -f $(MAKEFILE).Debug
+debug-make_first: FORCE
+	$(MAKE) -f $(MAKEFILE).Debug 
+debug-all: FORCE
+	$(MAKE) -f $(MAKEFILE).Debug all
+debug-clean: FORCE
+	$(MAKE) -f $(MAKEFILE).Debug clean
+debug-distclean: FORCE
+	$(MAKE) -f $(MAKEFILE).Debug distclean
+debug-install: FORCE
+	$(MAKE) -f $(MAKEFILE).Debug install
+debug-uninstall: FORCE
+	$(MAKE) -f $(MAKEFILE).Debug uninstall
+
+Makefile: triangles-qt.pro C:/msys64/mingw64/share/qt5/mkspecs/win32-g++/qmake.conf C:/msys64/mingw64/share/qt5/mkspecs/features/spec_pre.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/qdevice.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/device_config.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/common/sanitize.conf \
+		C:/msys64/mingw64/share/qt5/mkspecs/common/gcc-base.conf \
+		C:/msys64/mingw64/share/qt5/mkspecs/common/g++-base.conf \
+		C:/msys64/mingw64/share/qt5/mkspecs/common/angle.conf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/win32/windows_vulkan_sdk.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/common/windows-vulkan.conf \
+		C:/msys64/mingw64/share/qt5/mkspecs/common/g++-win32.conf \
+		C:/msys64/mingw64/share/qt5/mkspecs/common/windows-desktop.conf \
+		C:/msys64/mingw64/share/qt5/mkspecs/qconfig.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_concurrent.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_core.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_core_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_dbus.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_designer.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_designer_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_designercomponents_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_edid_support_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_fb_support_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_fontdatabase_support_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_gui.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_gui_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_help.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_help_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_network.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_network_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_opengl.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_opengl_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_printsupport.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_sql.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_sql_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_testlib.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_theme_support_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_uiplugin.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_uitools.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_uitools_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_widgets.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_windowsuiautomation_support_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_xml.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_xml_private.pri \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/qt_functions.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/qt_config.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/win32-g++/qmake.conf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/spec_post.prf \
+		.qmake.stash \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/exclusive_builds.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/toolchain.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/default_pre.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/win32/default_pre.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/resolve_config.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/exclusive_builds_post.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/default_post.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/precompile_header.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/warn_on.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/qt.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/resources_functions.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/resources.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/moc.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/win32/opengl.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/uic.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/qmake_use.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/file_copies.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/win32/windows.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/testcase_targets.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/exceptions.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/yacc.prf \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/lex.prf \
+		triangles-qt.pro \
+		C:/msys64/mingw64/lib/qtmain.prl \
+		C:/msys64/mingw64/share/qt5/mkspecs/features/build_pass.prf \
+		src/qt/triangles.qrc
+	$(QMAKE) -o Makefile triangles-qt.pro
+C:/msys64/mingw64/share/qt5/mkspecs/features/spec_pre.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/qdevice.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/features/device_config.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/common/sanitize.conf:
+C:/msys64/mingw64/share/qt5/mkspecs/common/gcc-base.conf:
+C:/msys64/mingw64/share/qt5/mkspecs/common/g++-base.conf:
+C:/msys64/mingw64/share/qt5/mkspecs/common/angle.conf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/win32/windows_vulkan_sdk.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/common/windows-vulkan.conf:
+C:/msys64/mingw64/share/qt5/mkspecs/common/g++-win32.conf:
+C:/msys64/mingw64/share/qt5/mkspecs/common/windows-desktop.conf:
+C:/msys64/mingw64/share/qt5/mkspecs/qconfig.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_concurrent.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_concurrent_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_core.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_core_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_dbus.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_dbus_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_designer.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_designer_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_designercomponents_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_edid_support_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_eventdispatcher_support_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_fb_support_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_fontdatabase_support_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_gui.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_gui_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_help.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_help_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_network.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_network_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_opengl.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_opengl_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_openglextensions.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_printsupport.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_printsupport_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_sql.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_sql_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_testlib.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_testlib_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_theme_support_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_uiplugin.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_uitools.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_uitools_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_widgets.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_widgets_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_windowsuiautomation_support_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_xml.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/modules/qt_lib_xml_private.pri:
+C:/msys64/mingw64/share/qt5/mkspecs/features/qt_functions.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/qt_config.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/win32-g++/qmake.conf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/spec_post.prf:
+.qmake.stash:
+C:/msys64/mingw64/share/qt5/mkspecs/features/exclusive_builds.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/toolchain.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/default_pre.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/win32/default_pre.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/resolve_config.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/exclusive_builds_post.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/default_post.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/precompile_header.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/warn_on.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/qt.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/resources_functions.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/resources.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/moc.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/win32/opengl.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/uic.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/qmake_use.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/file_copies.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/win32/windows.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/testcase_targets.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/exceptions.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/yacc.prf:
+C:/msys64/mingw64/share/qt5/mkspecs/features/lex.prf:
+triangles-qt.pro:
+C:/msys64/mingw64/lib/qtmain.prl:
+C:/msys64/mingw64/share/qt5/mkspecs/features/build_pass.prf:
+src/qt/triangles.qrc:
+qmake: FORCE
+	@$(QMAKE) -o Makefile triangles-qt.pro
+
+qmake_all: FORCE
+
+make_first: release-make_first debug-make_first  FORCE
+all: release-all debug-all  FORCE
+clean: release-clean debug-clean  FORCE
+	-$(DEL_FILE) E:/repos/triangles/src/leveldb/libleveldb.a;
+	-$(DEL_FILE) cd
+	-$(DEL_FILE) E:/repos/triangles/src/leveldb
+	-$(DEL_FILE) ;
+	-$(DEL_FILE) clean
+distclean: release-distclean debug-distclean  FORCE
+	-$(DEL_FILE) Makefile
+	-$(DEL_FILE) .qmake.stash
+
+E:/repos/triangles/src/leveldb/libleveldb.a: FORCE
+	cd E:/repos/triangles/src/leveldb && CC=gcc CXX=g++ TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT="-fno-keep-inline-dllexport -march=nocona -msahf -mtune=generic -Wa,-mbig-obj -O2" libleveldb.a libmemenv.a && ranlib E:/repos/triangles/src/leveldb/libleveldb.a && ranlib E:/repos/triangles/src/leveldb/libmemenv.a
+
+release-mocclean:
+	$(MAKE) -f $(MAKEFILE).Release mocclean
+debug-mocclean:
+	$(MAKE) -f $(MAKEFILE).Debug mocclean
+mocclean: release-mocclean debug-mocclean
+
+release-mocables:
+	$(MAKE) -f $(MAKEFILE).Release mocables
+debug-mocables:
+	$(MAKE) -f $(MAKEFILE).Debug mocables
+mocables: release-mocables debug-mocables
+
+check: first
+
+benchmark: first
+FORCE:
+
+$(MAKEFILE).Release: Makefile
+$(MAKEFILE).Debug: Makefile
@@ -1,284 +0,0 @@
-# Triangles Tor-Native Architecture
-
-**Date:** 2026-03-26  
-**Status:** ✅ IMPLEMENTED & WORKING
-
---
-
-## What This Is
-
-Triangles is now a **Tor-native proof-of-stake network** where:
-
- **Every node = Tor hidden service** (.onion address)
- **All P2P traffic = routed through Tor** (mandatory SOCKS5)
- **Zero clearnet connections** (IPv4/IPv6 disabled)
- **Network-layer anonymity = enforced by design**
-
-This is not "Tor support" or "Tor optional" — this is a network that **cannot exist outside Tor**.
-
---
-
-## Architecture Enforcements
-
-### 1. Mandatory Tor Routing (`init.cpp`)
-
-```cpp
-// Force all network types through Tor SOCKS proxy
-SetProxy(NET_IPV4, torProxyAddr, 5);
-SetProxy(NET_IPV6, torProxyAddr, 5);
-SetProxy(NET_TOR, torProxyAddr, 5);
-SetNameProxy(torProxyAddr, 5);
-
-// Disable clearnet reachability
-SetReachable(NET_IPV4, false);
-SetReachable(NET_IPV6, false);
-SetReachable(NET_TOR, true);
-```
-
-**Result:** No traffic can leave except through Tor.
-
---
-
-### 2. .onion-Only Peer Filter (`net.cpp`)
-
-```cpp
-// Reject all non-.onion addresses at connection time
-std::string addrStr = pszDest ? std::string(pszDest) : addrConnect.ToStringIP();
-if (addrStr.find(".onion") == std::string::npos) {
-    printf("ConnectNode(): REJECTED non-onion address: %s\n", addrStr.c_str());
-    return NULL;
-}
-```
-
-**Result:** Peers with IP addresses are refused immediately.
-
---
-
-### 3. Onion-Only DNS Seeds (`net.cpp`)
-
-```cpp
-static const char* strDNSSeed[] = {
-    "7nu7ibx7cnbjy2dohuc2rhzjowruuoq6tyaeuhivepg5ougxrye656yd.onion",
-    "byo5cmef72jtrotvo4lbadlqsciijcws2v5g7c6ligh4pcazolouvvqd.onion",
-};
-```
-
-**Result:** Bootstrap uses .onion seeds only (no DNS, no clearnet fallback).
-
---
-
-### 4. UPnP Disabled (`init.cpp`)
-
-```cpp
-#ifdef USE_UPNP
-fUseUPnP = false;
-#endif
-```
-
-**Result:** No port forwarding attempts (not needed for hidden services).
-
---
-
-### 5. Embedded Tor Requirement (`init.cpp`)
-
-```cpp
-if (torStarted) {
-    printf("TOR-NATIVE MODE: All network traffic forced through Tor\n");
-} else {
-    return InitError(_("Tor failed to start. Triangles requires Tor to operate."));
-}
-```
-
-**Result:** If Tor doesn't start, the daemon refuses to run.
-
---
-
-## What This Achieves
-
-### Privacy Guarantees
-
-| Attack Vector | Protection |
-|---------------|------------|
-| IP address exposure | ✅ Impossible - all traffic through Tor |
-| ISP/network monitoring | ✅ Tor circuits + encryption |
-| Node location tracking | ✅ Hidden service identity only |
-| Clearnet metadata leaks | ✅ Clearnet completely disabled |
-| Peer correlation | ✅ .onion addresses unlinkable to IPs |
-
---
-
-### Network Properties
-
- **Identity = .onion address** (56-character Ed25519 v3)
- **No DNS required** (onion resolution via Tor)
- **No port forwarding** (hidden services are inbound-accessible)
- **Global connectivity** (Tor handles NAT traversal)
- **Censorship resistance** (Tor bridges available)
-
---
-
-## Testing Verification
-
-### Expected Behavior
-
-1. **Startup:**
-   ```
-   Embedded Tor starting (SOCKS 19099, HS port 24111)...
-   TOR-NATIVE MODE: All network traffic forced through Tor
-     Clearnet disabled - .onion addresses only
-   Tor hidden service: [56-char-onion].onion
-   ```
-
-2. **Connection attempts:**
-   ```
-   SOCKS5 connecting [onion-address].onion
-   trying connection [onion-address].onion:24111
-   ```
-
-3. **No clearnet peers:**
-   ```
-   # This should NOT appear:
-   trying connection 192.168.x.x  ❌
-   trying connection 8.8.8.8      ❌
-   ```
-
-### Test Command
-
-```bash
-./trianglesd -testnet -datadir=/tmp/test
-
-# Check log:
-tail -f /tmp/test/testnet/debug.log | grep -E "TOR-NATIVE|SOCKS5|onion"
-```
-
---
-
-## Positioning Statement
-
-**Before:**
-> Triangles is a cryptocurrency with Tor support
-
-**After:**
-> **Triangles is a Tor-native proof-of-stake network where all nodes operate as hidden services and all communication is routed through the Tor network, eliminating IP-level identity exposure.**
-
---
-
-## Implementation Commits
-
-1. `85fe0d0` - Add Tor 0.4.9 as submodule
-2. `de1d4ec` - Fix makefile link order for libtor
-3. `36ade21` - Document embedded Tor success
-4. `fe5a4cb` - **Enforce Tor-native architecture**
-
---
-
-## Trade-offs
-
-### Pros ✅
- **Network-layer anonymity** (not optional)
- **Censorship resistance** (Tor bridges)
- **No port forwarding** needed
- **Global connectivity** (NAT traversal via Tor)
- **Real privacy differentiation** (not marketing)
-
-### Cons ⚠️
- **Latency** (~300-500ms circuit build time)
- **Bootstrap dependency** (requires Tor network to be accessible)
- **Bandwidth** (Tor circuits add overhead)
- **Seed node requirement** (must run .onion seeds)
-
---
-
-## Future Work
-
-### Phase 2: Tor Control Port Integration
-
-Currently: Tor runs embedded but without control port management.
-
-**Next:**
- Connect to Tor control port (127.0.0.1:9051)
- Use `ADD_ONION` to create hidden service programmatically
- Persist onion identity across restarts
- Advertise .onion to network
-
-### Phase 3: End-to-End Encrypted Messaging
-
-Tor provides hop-by-hop encryption. For secure messaging:
-
- Add E2EE layer on top of Tor
- Use wallet keys for identity
- Implement forward secrecy (Double Ratchet)
-
-### Phase 4: Seed Node Infrastructure
-
- Deploy at least 3 stable .onion seed nodes
- Consider using `HiddenServiceNonAnonymousMode` for seeds (faster, acceptable for public seeds)
- Monitor seed health
-
---
-
-## Security Considerations
-
-### What Tor Provides
-
- **Circuit-level encryption** (3 hops)
- **IP address hiding** (exit node sees destination, not origin)
- **Hidden service anonymity** (rendezvous point protocol)
-
-### What Tor Does NOT Provide
-
- **End-to-end encryption** (add separately for messaging)
- **Traffic analysis immunity** (sophisticated adversaries can correlate)
- **Perfect forward secrecy** (depends on implementation)
-
-### Threat Model
-
-**Protected against:**
- ISP surveillance
- Network-level attackers
- Peer location tracking
- Passive metadata collection
-
-**NOT protected against:**
- Global passive adversary (NSA-level)
- Timing correlation attacks (requires significant resources)
- Application-level leaks (use Tor Browser principles)
-
---
-
-## Comparison to Other Projects
-
-| Project | Tor Integration | Enforcement |
-|---------|----------------|-------------|
-| **Triangles** | Embedded, mandatory | ✅ Enforced |
-| Bitcoin | Optional (via `-onlynet=onion`) | ❌ Optional |
-| Monero | Optional (via `--proxy`) | ❌ Optional |
-| Zcash | Optional | ❌ Optional |
-| Verge (XVG) | Embedded | ⚠️ Mixed mode |
-
-**Key difference:** Triangles cannot operate without Tor. The network architecture requires it.
-
---
-
-## Documentation Updates Needed
-
-1. **README.md** - Update project description
-2. **Build docs** - Add Tor dependency requirements
-3. **FAQ** - Explain why Tor is mandatory
-4. **Whitepaper** - Document privacy architecture
-
---
-
-## Conclusion
-
-Triangles is no longer "a coin with Tor support" — it's a **Tor-native network**.
-
-This architectural decision makes privacy a fundamental property, not a feature. Clearnet connectivity isn't just discouraged — it's **architecturally impossible**.
-
-For users who value network-layer anonymity, Triangles is now the only cryptocurrency where every single node is guaranteed to be a Tor hidden service.
-
---
-
-**Implementation:** Complete ✅  
-**Testing:** Verified ✅  
-**Ready for:** Mainnet deployment
@@ -1,73 +0,0 @@
-# cmake/AddCompilerFlags.cmake
-# Shared compiler and linker flag configuration for all Triangles targets.
-
-# ── Common warning flags ──
-add_compile_options(
-    -Wall -Wextra -Wno-ignored-qualifiers
-    -Wformat -Wformat-security -Wno-unused-parameter
-)
-
-# ── Common defines ──
-add_compile_definitions(
-    BOOST_SPIRIT_THREADSAFE
-    BOOST_THREAD_USE_LIB
-    BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN
-    BOOST_BIND_GLOBAL_PLACEHOLDERS
-    __NO_SYSTEM_INCLUDES
-)
-
-# ── Hardening (non-Windows) ──
-if(NOT WIN32)
-    # Ubuntu bug #691722 workaround: reset before re-enabling
-    add_compile_options(-fno-stack-protector)
-    add_compile_options(-fstack-protector-all -Wstack-protector)
-    add_compile_definitions(_FORTIFY_SOURCE=2)
-    # -z relro/now is ELF-only (Linux); macOS linker doesn't support it
-    if(NOT APPLE)
-        add_link_options(-Wl,-z,relro -Wl,-z,now)
-    endif()
-endif()
-
-# ── PIE (position-independent executables) ──
-if(ENABLE_PIE AND NOT WIN32)
-    add_compile_options(-fPIE)
-    add_link_options(-pie)
-endif()
-
-# ── Optimization override ──
-if(USE_O3)
-    string(REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
-    string(REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-    string(REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
-    string(REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
-endif()
-
-# ── 32-bit SSE2 ──
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "i[3-6]86")
-    add_compile_options(-msse2)
-endif()
-
-# ── Platform: Windows (MSYS2 MinGW64) ──
-if(WIN32)
-    add_compile_options(-Wa,-mbig-obj)
-    add_compile_options(-Wno-deprecated-declarations -Wno-reserved-user-defined-literal)
-    add_link_options(-static -static-libgcc -static-libstdc++)
-    add_compile_definitions(WIN32 _MT)
-endif()
-
-# ── Platform: macOS ──
-if(APPLE)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "Minimum macOS version")
-    add_compile_options(-Wno-reserved-user-defined-literal -Wno-deprecated-declarations)
-    add_compile_definitions(MAC_OSX MSG_NOSIGNAL=0)
-endif()
-
-# ── Platform: Linux ──
-if(UNIX AND NOT APPLE)
-    add_compile_definitions(LINUX)
-endif()
-
-# ── Static linking (Linux release builds) ──
-if(ENABLE_STATIC AND UNIX AND NOT APPLE)
-    add_link_options(-static)
-endif()
@@ -1,14 +0,0 @@
-# cmake/BuildLevelDB.cmake
-# Builds the bundled LevelDB via its native CMake sub-build.
-# Exposes leveldb_lib, leveldb_memenv, leveldb_bundled, and build_leveldb.
-
-set(LEVELDB_SOURCE_DIR "${CMAKE_SOURCE_DIR}/src/leveldb")
-set(LEVELDB_BINARY_DIR "${CMAKE_BINARY_DIR}/leveldb")
-
-if(NOT TARGET leveldb_lib)
-    add_subdirectory("${LEVELDB_SOURCE_DIR}" "${LEVELDB_BINARY_DIR}")
-endif()
-
-if(NOT TARGET build_leveldb)
-    add_custom_target(build_leveldb DEPENDS leveldb_lib leveldb_memenv)
-endif()
@@ -1,51 +0,0 @@
-# cmake/FindBerkeleyDB.cmake
-# Finds Berkeley DB C++ headers and library.
-#
-# User can set BDB_INCLUDE_PATH and BDB_LIB_PATH to guide search.
-#
-# Creates imported target: BerkeleyDB::BerkeleyDB
-# Sets: BerkeleyDB_FOUND, BerkeleyDB_INCLUDE_DIR, BerkeleyDB_LIBRARY
-
-find_path(BerkeleyDB_INCLUDE_DIR
-    NAMES db_cxx.h
-    HINTS
-        ${BDB_INCLUDE_PATH}
-        ENV BDB_INCLUDE_PATH
-    PATHS
-        /opt/homebrew/opt/berkeley-db@5/include
-        /opt/homebrew/opt/berkeley-db/include
-        /usr/include/db5
-        /usr/local/include/db5
-        /usr/include
-        /usr/local/include
-        C:/msys64/mingw64/include
-)
-
-find_library(BerkeleyDB_LIBRARY
-    NAMES db_cxx db_cxx-5 db_cxx-5.3 db_cxx-4.8
-    HINTS
-        ${BDB_LIB_PATH}
-        ENV BDB_LIB_PATH
-    PATHS
-        /opt/homebrew/opt/berkeley-db@5/lib
-        /opt/homebrew/opt/berkeley-db/lib
-        /usr/lib/x86_64-linux-gnu
-        /usr/lib
-        /usr/local/lib
-        C:/msys64/mingw64/lib
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(BerkeleyDB
-    REQUIRED_VARS BerkeleyDB_LIBRARY BerkeleyDB_INCLUDE_DIR
-)
-
-if(BerkeleyDB_FOUND AND NOT TARGET BerkeleyDB::BerkeleyDB)
-    add_library(BerkeleyDB::BerkeleyDB UNKNOWN IMPORTED)
-    set_target_properties(BerkeleyDB::BerkeleyDB PROPERTIES
-        IMPORTED_LOCATION "${BerkeleyDB_LIBRARY}"
-        INTERFACE_INCLUDE_DIRECTORIES "${BerkeleyDB_INCLUDE_DIR}"
-    )
-endif()
-
-mark_as_advanced(BerkeleyDB_INCLUDE_DIR BerkeleyDB_LIBRARY)
@@ -1,46 +0,0 @@
-# cmake/FindLibevent.cmake
-# Finds libevent headers and library.
-#
-# User can set EVENT_INCLUDE_PATH and EVENT_LIB_PATH.
-#
-# Creates imported target: Libevent::Libevent
-
-find_path(Libevent_INCLUDE_DIR
-    NAMES event2/event.h
-    HINTS
-        ${EVENT_INCLUDE_PATH}
-        ENV EVENT_INCLUDE_PATH
-    PATHS
-        /opt/homebrew/include
-        /usr/include
-        /usr/local/include
-        C:/msys64/mingw64/include
-)
-
-find_library(Libevent_LIBRARY
-    NAMES event libevent
-    HINTS
-        ${EVENT_LIB_PATH}
-        ENV EVENT_LIB_PATH
-    PATHS
-        /opt/homebrew/lib
-        /usr/lib/x86_64-linux-gnu
-        /usr/lib
-        /usr/local/lib
-        C:/msys64/mingw64/lib
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Libevent
-    REQUIRED_VARS Libevent_LIBRARY Libevent_INCLUDE_DIR
-)
-
-if(Libevent_FOUND AND NOT TARGET Libevent::Libevent)
-    add_library(Libevent::Libevent UNKNOWN IMPORTED)
-    set_target_properties(Libevent::Libevent PROPERTIES
-        IMPORTED_LOCATION "${Libevent_LIBRARY}"
-        INTERFACE_INCLUDE_DIRECTORIES "${Libevent_INCLUDE_DIR}"
-    )
-endif()
-
-mark_as_advanced(Libevent_INCLUDE_DIR Libevent_LIBRARY)
@@ -1,46 +0,0 @@
-# cmake/FindMiniupnpc.cmake
-# Finds miniupnpc headers and library.
-#
-# User can set MINIUPNPC_INCLUDE_PATH and MINIUPNPC_LIB_PATH.
-#
-# Creates imported target: Miniupnpc::Miniupnpc
-
-find_path(Miniupnpc_INCLUDE_DIR
-    NAMES miniupnpc/miniupnpc.h
-    HINTS
-        ${MINIUPNPC_INCLUDE_PATH}
-        ENV MINIUPNPC_INCLUDE_PATH
-    PATHS
-        /opt/homebrew/include
-        /usr/include
-        /usr/local/include
-        C:/msys64/mingw64/include
-)
-
-find_library(Miniupnpc_LIBRARY
-    NAMES miniupnpc
-    HINTS
-        ${MINIUPNPC_LIB_PATH}
-        ENV MINIUPNPC_LIB_PATH
-    PATHS
-        /opt/homebrew/lib
-        /usr/lib/x86_64-linux-gnu
-        /usr/lib
-        /usr/local/lib
-        C:/msys64/mingw64/lib
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Miniupnpc
-    REQUIRED_VARS Miniupnpc_LIBRARY Miniupnpc_INCLUDE_DIR
-)
-
-if(Miniupnpc_FOUND AND NOT TARGET Miniupnpc::Miniupnpc)
-    add_library(Miniupnpc::Miniupnpc UNKNOWN IMPORTED)
-    set_target_properties(Miniupnpc::Miniupnpc PROPERTIES
-        IMPORTED_LOCATION "${Miniupnpc_LIBRARY}"
-        INTERFACE_INCLUDE_DIRECTORIES "${Miniupnpc_INCLUDE_DIR}"
-    )
-endif()
-
-mark_as_advanced(Miniupnpc_INCLUDE_DIR Miniupnpc_LIBRARY)
@@ -1,38 +0,0 @@
-# cmake/FindQRencode.cmake
-# Finds libqrencode headers and library.
-#
-# Creates imported target: QRencode::QRencode
-
-find_path(QRencode_INCLUDE_DIR
-    NAMES qrencode.h
-    PATHS
-        /opt/homebrew/include
-        /usr/include
-        /usr/local/include
-        C:/msys64/mingw64/include
-)
-
-find_library(QRencode_LIBRARY
-    NAMES qrencode
-    PATHS
-        /opt/homebrew/lib
-        /usr/lib/x86_64-linux-gnu
-        /usr/lib
-        /usr/local/lib
-        C:/msys64/mingw64/lib
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(QRencode
-    REQUIRED_VARS QRencode_LIBRARY QRencode_INCLUDE_DIR
-)
-
-if(QRencode_FOUND AND NOT TARGET QRencode::QRencode)
-    add_library(QRencode::QRencode UNKNOWN IMPORTED)
-    set_target_properties(QRencode::QRencode PROPERTIES
-        IMPORTED_LOCATION "${QRencode_LIBRARY}"
-        INTERFACE_INCLUDE_DIRECTORIES "${QRencode_INCLUDE_DIR}"
-    )
-endif()
-
-mark_as_advanced(QRencode_INCLUDE_DIR QRencode_LIBRARY)
@@ -1,19 +0,0 @@
-# cmake/GenerateBuildInfo.cmake
-# Sets up a custom target that generates build.h from git describe,
-# equivalent to share/genbuild.sh.
-
-set(BUILD_HEADER_DIR "${CMAKE_BINARY_DIR}/generated")
-set(BUILD_HEADER     "${BUILD_HEADER_DIR}/build.h")
-file(MAKE_DIRECTORY  "${BUILD_HEADER_DIR}")
-
-# Custom command runs on every build to regenerate build.h if git state changed
-add_custom_target(generate_build_info ALL
-    COMMAND ${CMAKE_COMMAND}
-        -DSOURCE_DIR=${CMAKE_SOURCE_DIR}
-        -DOUTPUT_FILE=${BUILD_HEADER}
-        -P "${CMAKE_SOURCE_DIR}/cmake/GenerateBuildInfoScript.cmake"
-    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-    COMMENT "Generating build.h from git describe..."
-    BYPRODUCTS "${BUILD_HEADER}"
-    VERBATIM
-)
@@ -1,61 +0,0 @@
-# cmake/GenerateBuildInfoScript.cmake
-# Called at build time by the custom target in GenerateBuildInfo.cmake.
-# Replicates the logic of share/genbuild.sh.
-
-# Read existing build.h first line if it exists
-set(OLD_LINE "")
-if(EXISTS "${OUTPUT_FILE}")
-    file(STRINGS "${OUTPUT_FILE}" _lines LIMIT_COUNT 1)
-    if(_lines)
-        list(GET _lines 0 OLD_LINE)
-    endif()
-endif()
-
-# Try exact tag match first (release builds)
-execute_process(
-    COMMAND git describe --tags --exact-match
-    WORKING_DIRECTORY "${SOURCE_DIR}"
-    OUTPUT_VARIABLE GIT_DESC
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    ERROR_QUIET
-    RESULT_VARIABLE _result
-)
-
-# Fall back to tag + commit distance
-if(NOT _result EQUAL 0)
-    execute_process(
-        COMMAND git describe --tags --dirty
-        WORKING_DIRECTORY "${SOURCE_DIR}"
-        OUTPUT_VARIABLE GIT_DESC
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        ERROR_QUIET
-        RESULT_VARIABLE _result
-    )
-    if(NOT _result EQUAL 0)
-        set(GIT_DESC "")
-    endif()
-endif()
-
-# Get commit timestamp
-execute_process(
-    COMMAND git log -n 1 --format=%ci
-    WORKING_DIRECTORY "${SOURCE_DIR}"
-    OUTPUT_VARIABLE GIT_TIME
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    ERROR_QUIET
-)
-
-# Build new content
-if(GIT_DESC)
-    set(NEW_LINE "#define BUILD_DESC \"${GIT_DESC}\"")
-else()
-    set(NEW_LINE "// No build information available")
-endif()
-
-# Only write if changed
-if(NOT "${OLD_LINE}" STREQUAL "${NEW_LINE}")
-    file(WRITE "${OUTPUT_FILE}"
-        "${NEW_LINE}\n"
-        "#define BUILD_DATE \"${GIT_TIME}\"\n"
-    )
-endif()
@@ -31,10 +31,6 @@ RequestExecutionLevel user

 !insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_DIRECTORY
-
-; Bootstrap page
-Page custom BootstrapPage
-
 !insertmacro MUI_PAGE_INSTFILES
 !insertmacro MUI_PAGE_FINISH

@@ -43,34 +39,6 @@ Page custom BootstrapPage

 !insertmacro MUI_LANGUAGE "English"

-; Bootstrap selection variable
-Var BootstrapChoice
-
-; Bootstrap page function
-Function BootstrapPage
-  !insertmacro MUI_HEADER_TEXT "Blockchain Sync" "Choose how to synchronize the blockchain"
-  
-  nsDialogs::Create 1018
-  Pop $0
-  
-  ${NSD_CreateLabel} 0 10u 100% 20u "The Triangles blockchain requires ~1GB of data. Choose sync method:"
-  Pop $0
-  
-  ${NSD_CreateRadioButton} 10u 40u 100% 12u "Download bootstrap (~1.3GB) — Recommended (fast)"
-  Pop $1
-  ${NSD_Check} $1
-  
-  ${NSD_CreateRadioButton} 10u 60u 100% 12u "Sync from network — Slow (may take days)"
-  Pop $2
-  
-  ${NSD_CreateLabel} 10u 80u 100% 30u "Bootstrap will download a recent blockchain snapshot, saving hours or days of sync time. Network bandwidth required: ~1.3GB."
-  Pop $0
-  
-  nsDialogs::Show
-  
-  ${NSD_GetState} $1 $BootstrapChoice
-FunctionEnd
-
 Section "Install"
  SetOutPath "$INSTDIR"

@@ -84,25 +52,6 @@ Section "Install"
  ; Create data directory
  CreateDirectory "$APPDATA\Triangles"

-  ; Download blockchain bootstrap if selected
-  ${If} $BootstrapChoice == ${BST_CHECKED}
-    DetailPrint "Downloading blockchain bootstrap..."
-    inetc::get /CAPTION "Downloading Blockchain" /CANCELTEXT "Skip" \
-      "http://bootstrap.cryptographic-triangles.org/tri-blockchain.tar.gz" \
-      "$TEMP\tri-blockchain.tar.gz" /END
-    Pop $0
-    ${If} $0 == "OK"
-      DetailPrint "Extracting blockchain..."
-      nsExec::ExecToLog '"$INSTDIR\7z.exe" x "$TEMP\tri-blockchain.tar.gz" -o"$TEMP" -y'
-      nsExec::ExecToLog '"$INSTDIR\7z.exe" x "$TEMP\tri-blockchain.tar" -o"$APPDATA\Triangles" -y'
-      Delete "$TEMP\tri-blockchain.tar.gz"
-      Delete "$TEMP\tri-blockchain.tar"
-      DetailPrint "Blockchain bootstrap installed!"
-    ${Else}
-      DetailPrint "Bootstrap download failed or skipped — will sync from network"
-    ${EndIf}
-  ${EndIf}
-
  ; Uninstaller
  WriteUninstaller "$INSTDIR\uninstall.exe"

@@ -3,7 +3,7 @@
 # Run on a Linux x64 system with appimagetool installed
 set -e

-VERSION="5.7.6"
+VERSION="5.3.7"
 APPDIR="Triangles-x86_64.AppDir"
 RELEASE_URL="https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${VERSION}"

@@ -1,6 +1,6 @@
 # Maintainer: Cryptographic Triangles Team
 pkgname=triangles-qt-bin
-pkgver=5.5.6
+pkgver=5.3.7
 pkgrel=1
 pkgdesc="Cryptographic Triangles (TRI) cryptocurrency wallet - Qt GUI"
 arch=('x86_64')
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
  <metadata>
    <id>triangles</id>
-    <version>5.5.6</version>
+    <version>5.3.7</version>
    <title>Cryptographic Triangles</title>
    <authors>Cryptographic Triangles Team</authors>
    <owners>SamiAhmed7777</owners>
@@ -1,5 +1,5 @@
 Package: triangles
-Version: 5.5.6-1
+Version: 5.3.7-1
 Section: net
 Priority: optional
 Architecture: amd64
@@ -1,18 +0,0 @@
-#!/bin/bash
-# Post-installation script for Triangles .deb package
-
-set -e
-
-echo "════════════════════════════════════════════════════════"
-echo "  Triangles Installation Complete"
-echo "════════════════════════════════════════════════════════"
-echo ""
-echo "Optional: Download blockchain bootstrap to skip days of sync"
-echo ""
-echo "  sudo triangles-bootstrap-install"
-echo ""
-echo "This will download ~1.3GB and extract to ~/.triangles/"
-echo "════════════════════════════════════════════════════════"
-echo ""
-
-exit 0
@@ -3,7 +3,7 @@
 # Run from the packaging/debian directory
 set -e

-VERSION="5.7.6"
+VERSION="5.3.7"
 PKGDIR="triangles_${VERSION}-1_amd64"
 RELEASE_URL="https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${VERSION}"

@@ -13,13 +13,10 @@ echo "Building .deb package for Triangles v${VERSION}..."
 rm -rf "$PKGDIR"
 mkdir -p "$PKGDIR/DEBIAN"
 mkdir -p "$PKGDIR/usr/bin"
-mkdir -p "$PKGDIR/usr/local/bin"
 mkdir -p "$PKGDIR/usr/share/applications"

-# Copy control and postinst
+# Copy control file
 cp DEBIAN/control "$PKGDIR/DEBIAN/"
-cp DEBIAN/postinst "$PKGDIR/DEBIAN/"
-chmod 755 "$PKGDIR/DEBIAN/postinst"

 # Download binaries
 echo "Downloading binaries..."
@@ -27,10 +24,6 @@ curl -L -o "$PKGDIR/usr/bin/triangles-qt" "${RELEASE_URL}/Cryptographic-Triangle
 curl -L -o "$PKGDIR/usr/bin/trianglesd" "${RELEASE_URL}/Cryptographic-Triangles-v${VERSION}-linux-x64-daemon"
 chmod 755 "$PKGDIR/usr/bin/triangles-qt" "$PKGDIR/usr/bin/trianglesd"

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

 LABEL maintainer="Cryptographic Triangles Team"
 LABEL description="Cryptographic Triangles (TRI) headless daemon"
-LABEL version="5.7.6"
+LABEL version="5.3.7"

-ARG VERSION=5.7.6
+ARG VERSION=5.3.7

 RUN apt-get update && apt-get install -y --no-install-recommends \
    curl \
@@ -3,7 +3,7 @@ version: "3.8"
 services:
  trianglesd:
    build: .
-    image: cryptographic-triangles/trianglesd:5.7.6
+    image: cryptographic-triangles/trianglesd:5.3.7
    container_name: trianglesd
    restart: unless-stopped
    ports:
@@ -25,7 +25,7 @@ modules:
      - 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.7.6/Cryptographic-Triangles-v5.7.6-linux-x64-qt
+        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
@@ -55,6 +55,6 @@ modules:
      - install -Dm755 trianglesd-linux /app/bin/trianglesd
    sources:
      - type: file
-        url: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.7.6/Cryptographic-Triangles-v5.7.6-linux-x64-daemon
+        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
@@ -2,7 +2,7 @@ class Triangles < Formula
  desc "Cryptographic Triangles (TRI) cryptocurrency wallet and daemon"
  homepage "https://cryptographic-triangles.org"
  license "MIT"
-  version "5.5.6"
+  version "5.3.7"

  on_macos do
    url "https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.3.7/Cryptographic-Triangles-v5.3.7-macos-arm64.dmg"
@@ -14,7 +14,7 @@
 }:

 let
-  version = "5.5.6";
+  version = "5.3.7";

  desktopItem = makeDesktopItem {
    name = "triangles-qt";
@@ -4,7 +4,7 @@
 # Install build tools: sudo dnf install rpm-build rpmdevtools
 set -e

-VERSION="5.7.6"
+VERSION="5.3.7"
 RELEASE_URL="https://github.com/SamiAhmed7777/triangles_v5/releases/download/v${VERSION}"

 echo "Building RPM for Triangles v${VERSION}..."
@@ -1,5 +1,5 @@
 Name:           triangles
-Version:        5.7.6
+Version:        5.3.7
 Release:        1%{?dist}
 Summary:        Cryptographic Triangles (TRI) cryptocurrency wallet
 License:        MIT
@@ -1,29 +0,0 @@
-{
-    "version": "5.7.6",
-    "description": "Cryptographic Triangles (TRI) cryptocurrency wallet with PoS staking and encrypted messaging",
-    "homepage": "https://cryptographic-triangles.org",
-    "license": "MIT",
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.7.6/Cryptographic-Triangles-5.7.6-win-x64.zip",
-            "hash": "6f002a669a7e92aaf3d8dd7b1ae80f06a086c99a15ca05cf107665009ffc06b7"
-        }
-    },
-    "bin": [
-        "triangles-qt.exe",
-        "trianglesd.exe"
-    ],
-    "shortcuts": [
-        ["triangles-qt.exe", "Cryptographic Triangles"]
-    ],
-    "checkver": {
-        "github": "https://github.com/SamiAhmed7777/triangles_v5"
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/SamiAhmed7777/triangles_v5/releases/download/v$version/Cryptographic-Triangles-$version-win-x64.zip"
-            }
-        }
-    }
-}
@@ -1,5 +1,5 @@
 PackageIdentifier: CryptographicTriangles.TrianglesQt
-PackageVersion: 5.7.6
+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.7.6/Cryptographic-Triangles-5.7.6-win-x64.zip
+    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
@@ -1,29 +0,0 @@
-# Version Bump Script
-
-Updates the version number across all files in the repo from a single command.
-
-## Usage
-
-**Set a specific version:**
-```bash
-bash scripts/bump-version.sh 5.7.0
-```
-
-**Or edit `src/clientversion.h` first, then sync everything else:**
-```bash
-bash scripts/bump-version.sh
-```
-
-## What it updates
-
- `src/clientversion.h` (source of truth)
- `src/version.h`
- `triangles-qt.pro`
- `Dockerfile`
- All packaging manifests (Docker, Snap, Scoop, WinGet, RPM, Flatpak, Debian, AppImage)
-
-## What still needs manual review after running
-
- `packaging/appstream/...metainfo.xml` — add a new `<release>` entry
- `README.md` — update header version if desired
- Any documentation with download URLs
@@ -1,149 +0,0 @@
-#!/bin/bash
-# bump-version.sh - Sync all version references from src/clientversion.h
-#
-# Usage:
-#   ./scripts/bump-version.sh              # Read version from clientversion.h, update everything
-#   ./scripts/bump-version.sh 5.7.0        # Set version to 5.7.0 in clientversion.h AND everywhere else
-#
-# The single source of truth is src/clientversion.h
-
-set -e
-
-REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
-CLIENTVERSION="$REPO_ROOT/src/clientversion.h"
-
-if [ ! -f "$CLIENTVERSION" ]; then
-    echo "ERROR: Cannot find $CLIENTVERSION"
-    exit 1
-fi
-
-# If a version argument is provided, update clientversion.h first
-if [ -n "$1" ]; then
-    IFS='.' read -r MAJOR MINOR REV <<< "$1"
-    REV="${REV:-0}"
-    BUILD=0
-    sed -i "s/#define CLIENT_VERSION_MAJOR.*/#define CLIENT_VERSION_MAJOR       $MAJOR/" "$CLIENTVERSION"
-    sed -i "s/#define CLIENT_VERSION_MINOR.*/#define CLIENT_VERSION_MINOR       $MINOR/" "$CLIENTVERSION"
-    sed -i "s/#define CLIENT_VERSION_REVISION.*/#define CLIENT_VERSION_REVISION    $REV/" "$CLIENTVERSION"
-    sed -i "s/#define CLIENT_VERSION_BUILD.*/#define CLIENT_VERSION_BUILD       $BUILD/" "$CLIENTVERSION"
-    echo "Updated clientversion.h to $MAJOR.$MINOR.$REV.$BUILD"
-fi
-
-# Read version from clientversion.h (the source of truth)
-MAJOR=$(grep '#define CLIENT_VERSION_MAJOR' "$CLIENTVERSION" | awk '{print $3}')
-MINOR=$(grep '#define CLIENT_VERSION_MINOR' "$CLIENTVERSION" | awk '{print $3}')
-REV=$(grep '#define CLIENT_VERSION_REVISION' "$CLIENTVERSION" | awk '{print $3}')
-BUILD=$(grep '#define CLIENT_VERSION_BUILD' "$CLIENTVERSION" | awk '{print $3}')
-
-VERSION="$MAJOR.$MINOR.$REV"
-VERSION_FULL="$MAJOR.$MINOR.$REV.$BUILD"
-
-echo "Syncing all files to version $VERSION (full: $VERSION_FULL)"
-echo "==========================================================="
-
-update_file() {
-    local file="$1"
-    local pattern="$2"
-    local replacement="$3"
-    if [ -f "$file" ]; then
-        sed -i "$pattern" "$file"
-        echo "  Updated: $file"
-    fi
-}
-
-# --- Source files ---
-
-# src/version.h - DISPLAY_VERSION macros
-update_file "$REPO_ROOT/src/version.h" \
-    "s/#define DISPLAY_VERSION_MAJOR.*/#define DISPLAY_VERSION_MAJOR       $MAJOR/" ""
-update_file "$REPO_ROOT/src/version.h" \
-    "s/#define DISPLAY_VERSION_MINOR.*/#define DISPLAY_VERSION_MINOR       $MINOR/" ""
-update_file "$REPO_ROOT/src/version.h" \
-    "s/#define DISPLAY_VERSION_REVISION.*/#define DISPLAY_VERSION_REVISION    $REV/" ""
-update_file "$REPO_ROOT/src/version.h" \
-    "s/#define DISPLAY_VERSION_BUILD.*/#define DISPLAY_VERSION_BUILD       $BUILD/" ""
-
-# triangles-qt.pro
-update_file "$REPO_ROOT/triangles-qt.pro" \
-    "s/^VERSION = .*/VERSION = $VERSION_FULL/" ""
-
-# --- Docker ---
-
-update_file "$REPO_ROOT/Dockerfile" \
-    "s/LABEL version=\"[^\"]*\"/LABEL version=\"$VERSION\"/" ""
-
-update_file "$REPO_ROOT/packaging/docker/Dockerfile" \
-    "s/LABEL version=\"[^\"]*\"/LABEL version=\"$VERSION\"/" ""
-update_file "$REPO_ROOT/packaging/docker/Dockerfile" \
-    "s/ARG VERSION=.*/ARG VERSION=$VERSION/" ""
-
-update_file "$REPO_ROOT/packaging/docker/docker-compose.yml" \
-    "s|cryptographic-triangles/trianglesd:[0-9.]*|cryptographic-triangles/trianglesd:$VERSION|" ""
-
-# --- Snap ---
-
-update_file "$REPO_ROOT/snap/snapcraft.yaml" \
-    "s/^version: '[^']*'/version: '$VERSION'/" ""
-# Update download URLs in snapcraft.yaml
-if [ -f "$REPO_ROOT/snap/snapcraft.yaml" ]; then
-    sed -i "s|/download/v[0-9.]*\/|/download/v$VERSION/|g" "$REPO_ROOT/snap/snapcraft.yaml"
-    sed -i "s/Cryptographic-Triangles-v[0-9.]*-linux/Cryptographic-Triangles-v$VERSION-linux/g" "$REPO_ROOT/snap/snapcraft.yaml"
-fi
-
-# --- Scoop ---
-
-if [ -f "$REPO_ROOT/packaging/scoop/triangles.json" ]; then
-    sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$VERSION\"/" "$REPO_ROOT/packaging/scoop/triangles.json"
-    sed -i "s|/download/v[0-9.]*/|/download/v$VERSION/|g" "$REPO_ROOT/packaging/scoop/triangles.json"
-    sed -i "s/Cryptographic-Triangles-[0-9.]*-win/Cryptographic-Triangles-$VERSION-win/g" "$REPO_ROOT/packaging/scoop/triangles.json"
-    echo "  Updated: packaging/scoop/triangles.json"
-fi
-
-# --- WinGet ---
-
-if [ -f "$REPO_ROOT/packaging/winget/CryptographicTriangles.TrianglesQt.yaml" ]; then
-    sed -i "s/PackageVersion: .*/PackageVersion: $VERSION/" "$REPO_ROOT/packaging/winget/CryptographicTriangles.TrianglesQt.yaml"
-    sed -i "s|/download/v[0-9.]*/|/download/v$VERSION/|g" "$REPO_ROOT/packaging/winget/CryptographicTriangles.TrianglesQt.yaml"
-    sed -i "s/Cryptographic-Triangles-[0-9.]*-win/Cryptographic-Triangles-$VERSION-win/g" "$REPO_ROOT/packaging/winget/CryptographicTriangles.TrianglesQt.yaml"
-    echo "  Updated: packaging/winget/CryptographicTriangles.TrianglesQt.yaml"
-fi
-
-# --- RPM ---
-
-update_file "$REPO_ROOT/packaging/rpm/triangles.spec" \
-    "s/^Version:        .*/Version:        $VERSION/" ""
-
-if [ -f "$REPO_ROOT/packaging/rpm/build-rpm.sh" ]; then
-    sed -i "s/^VERSION=\"[^\"]*\"/VERSION=\"$VERSION\"/" "$REPO_ROOT/packaging/rpm/build-rpm.sh"
-    echo "  Updated: packaging/rpm/build-rpm.sh"
-fi
-
-# --- Flatpak ---
-
-if [ -f "$REPO_ROOT/packaging/flatpak/org.cryptographic_triangles.TrianglesQt.yml" ]; then
-    sed -i "s|/download/v[0-9.]*/|/download/v$VERSION/|g" "$REPO_ROOT/packaging/flatpak/org.cryptographic_triangles.TrianglesQt.yml"
-    sed -i "s/Cryptographic-Triangles-v[0-9.]*-linux/Cryptographic-Triangles-v$VERSION-linux/g" "$REPO_ROOT/packaging/flatpak/org.cryptographic_triangles.TrianglesQt.yml"
-    echo "  Updated: packaging/flatpak/org.cryptographic_triangles.TrianglesQt.yml"
-fi
-
-# --- Debian ---
-
-if [ -f "$REPO_ROOT/packaging/debian/build-deb.sh" ]; then
-    sed -i "s/^VERSION=\"[^\"]*\"/VERSION=\"$VERSION\"/" "$REPO_ROOT/packaging/debian/build-deb.sh"
-    echo "  Updated: packaging/debian/build-deb.sh"
-fi
-
-# --- AppImage ---
-
-if [ -f "$REPO_ROOT/packaging/appimage/build-appimage.sh" ]; then
-    sed -i "s/^VERSION=\"[^\"]*\"/VERSION=\"$VERSION\"/" "$REPO_ROOT/packaging/appimage/build-appimage.sh"
-    echo "  Updated: packaging/appimage/build-appimage.sh"
-fi
-
-echo ""
-echo "Done! All files synced to v$VERSION"
-echo ""
-echo "Files NOT auto-updated (require manual review):"
-echo "  - packaging/appstream/...metainfo.xml  (add new <release> entry)"
-echo "  - README.md                            (update header version)"
-echo "  - Documentation .md files              (update download URLs if needed)"
@@ -1,6 +1,6 @@
 name: triangles
 base: core22
-version: '5.7.6'
+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.7.6/Cryptographic-Triangles-v5.7.6-linux-x64-qt
+    source: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.3.7/Cryptographic-Triangles-v5.3.7-linux-x64-qt
    source-type: file
    organize:
-      Cryptographic-Triangles-v5.7.6-linux-x64-qt: bin/triangles-qt
+      Cryptographic-Triangles-v5.3.7-linux-x64-qt: bin/triangles-qt
    stage-packages:
      - libqt5widgets5
      - libqt5gui5
@@ -73,10 +73,10 @@ parts:

  trianglesd:
    plugin: dump
-    source: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.7.6/Cryptographic-Triangles-v5.7.6-linux-x64-daemon
+    source: https://github.com/SamiAhmed7777/triangles_v5/releases/download/v5.3.7/Cryptographic-Triangles-v5.3.7-linux-x64-daemon
    source-type: file
    organize:
-      Cryptographic-Triangles-v5.7.6-linux-x64-daemon: bin/trianglesd
+      Cryptographic-Triangles-v5.3.7-linux-x64-daemon: bin/trianglesd

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

    // Try downloading bootstrap.tar.gz first
    fs::path tmpTarGz = dataDir / "bootstrap.tar.gz.tmp";
-    std::string tarUrl = std::string(BASE_PATH) + "triangles-bootstrap.tar.gz";
+    std::string tarUrl = std::string(BASE_PATH) + "bootstrap.tar.gz";

    bool tarDownloaded = DownloadFile(host, tarUrl, tmpTarGz, progressFn, strError);

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

 // Converts the parameter X to a string after macro replacement on X has been performed.
@@ -6,7 +6,6 @@
 #include "walletdb.h"
 #include "trianglesrpc.h"
 #include "net.h"
-#include "netbase.h"
 #include "init.h"
 #include "util.h"
 #include "ui_interface.h"
@@ -22,7 +21,6 @@
 #endif
 #include "notificationqueue.h"
 #include "addressindex.h"
-#include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 // boost/filesystem/convenience.hpp removed in modern Boost; functionality is in filesystem.hpp
@@ -52,14 +50,6 @@ enum Checkpoints::CPMode CheckpointsMode;

 static CCriticalSection cs_DeferredStartup;
 static bool fDeferredStartupRunning = false;
-static boost::thread_group* pScriptCheckThreads = NULL;
-
-static void ThreadScriptCheck()
-{
-    RenameThread("Triangles-scrchk");
-    if (pScriptCheckQueue)
-        pScriptCheckQueue->Thread();
-}

 static void StartupPerfLog(const char* phase, int64_t elapsedMs)
 {
@@ -191,19 +181,6 @@ void Shutdown(void* parg)
        nTransactionsUpdated++;
        StopNode();

-        if (pScriptCheckQueue)
-        {
-            pScriptCheckQueue->Quit();
-            if (pScriptCheckThreads)
-            {
-                pScriptCheckThreads->join_all();
-                delete pScriptCheckThreads;
-                pScriptCheckThreads = NULL;
-            }
-            delete pScriptCheckQueue;
-            pScriptCheckQueue = NULL;
-        }
-
        // NOW safe to destroy Tor state - all threads have stopped
        ShutdownTorV3();
        StopEmbeddedTor();
@@ -380,7 +357,7 @@ 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 (WARNING: wallet will not start - Tor is required)") + "\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" +
@@ -405,7 +382,6 @@ std::string HelpMessage()
        "  -noseedurl             " + _("Disable HTTP seed list fetch on startup") + "\n" +
        "  -banscore=<n>          " + _("Threshold for disconnecting misbehaving peers (default: 100)") + "\n" +
        "  -bantime=<n>           " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)") + "\n" +
-        "  -par=<n>               " + _("Set the number of script verification threads (default: auto, 0 = auto, 1 = single-threaded)") + "\n" +
        "  -maxreceivebuffer=<n>  " + _("Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)") + "\n" +
        "  -maxsendbuffer=<n>     " + _("Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)") + "\n" +
 #ifdef USE_UPNP
@@ -447,7 +423,6 @@ std::string HelpMessage()
        "  -keypool=<n>           " + _("Set key pool size to <n> (default: 100)") + "\n" +
        "  -rescan                " + _("Rescan the block chain for missing wallet transactions") + "\n" +
        "  -postibdrescan         " + _("Run the wallet rescan after initial sync in a background thread (default: 1)") + "\n" +
-        "  -zapwallettxes         " + _("Delete all wallet transactions and only recover from blockchain on startup") + "\n" +
        "  -salvagewallet         " + _("Attempt to recover private keys from a corrupt wallet.dat") + "\n" +
        "  -checkblocks=<n>       " + _("How many blocks to check at startup (default: 2500, 0 = all)") + "\n" +
        "  -checklevel=<n>        " + _("How thorough the block verification is (0-6, default: 1)") + "\n" +
@@ -602,11 +577,6 @@ bool AppInit2()
        SoftSetBoolArg("-rescan", true);
    }

-    if (GetBoolArg("-zapwallettxes")) {
-        // Zap all tx from wallet: rescan to rebuild from blockchain
-        SoftSetBoolArg("-rescan", true);
-    }
-
    // ********************************************************* Step 3: parameter-to-internal-flags

    fDebug = GetBoolArg("-debug");
@@ -662,20 +632,6 @@ bool AppInit2()
    fConfChange = GetBoolArg("-confchange", false);
    fEnforceCanonical = GetBoolArg("-enforcecanonical", true);

-    int nScriptCheckThreads = GetArg("-par", 0);
-    if (nScriptCheckThreads <= 0)
-        nScriptCheckThreads = boost::thread::hardware_concurrency();
-    if (nScriptCheckThreads > 16)
-        nScriptCheckThreads = 16;
-    if (nScriptCheckThreads > 1)
-    {
-        pScriptCheckQueue = new CCheckQueue<CScriptCheck>(128);
-        pScriptCheckThreads = new boost::thread_group();
-        for (int i = 0; i < nScriptCheckThreads - 1; ++i)
-            pScriptCheckThreads->create_thread(&ThreadScriptCheck);
-        printf("Script verification threads: %d workers + main thread\n", nScriptCheckThreads - 1);
-    }
-
    fAddressIndex = GetBoolArg("-addressindex", false);
    if (fAddressIndex)
        printf("Address index enabled\n");
@@ -764,13 +720,6 @@ bool AppInit2()
            return false;
    }

-    if (GetBoolArg("-zapwallettxes") && fs::exists(GetDataDir() / strWalletFileName))
-    {
-        uiInterface.InitMessage(_("Zapping all transactions from wallet..."));
-        if (!CWalletDB::ZapWalletTx(strWalletFileName))
-            return InitError(_("Error: could not zap wallet transactions"));
-    }
-
    if (fs::exists(GetDataDir() / strWalletFileName))
    {
        CDBEnv::VerifyResult r = bitdb.Verify(strWalletFileName, CWalletDB::Recover);
@@ -795,9 +744,9 @@ bool AppInit2()
    //if (nSocksVersion != 4 && nSocksVersion != 5)
    //  return InitError(strprintf(_("Unknown -socks proxy version requested: %i"), nSocksVersion));

-    // Network selection: Tor-native mode
-    // All traffic routes through embedded Tor. Clearnet (IPv4/IPv6) is disabled
-    // after Tor starts successfully. Only .onion peers are accepted.
+    // Network selection: enable all networks (IPv4, IPv6, Tor)
+    // Tor is always enabled; clearnet is also allowed for seed node discovery
+    // Users can restrict to Tor-only with -onlynet=tor
    if (mapArgs.count("-onlynet")) {
        std::set<enum Network> nets;
        for (std::string snet : mapMultiArgs["-onlynet"]) {
@@ -1020,11 +969,7 @@ bool AppInit2()
            {
                CBlockIndex* pindex = (*mi).second;
                CBlock block;
-                if (!block.ReadFromDisk(pindex))
-                {
-                    printf("Error: Failed to read block %s from disk\n", hash.ToString().c_str());
-                    continue;
-                }
+                block.ReadFromDisk(pindex);
                block.BuildMerkleTree();
                block.print();
                printf("\n");
@@ -1201,29 +1146,9 @@ bool AppInit2()
        if (torStarted) {
            printf("Tor process running, SOCKS proxy at %s\n",
                   CTorEmbedded::GetInstance()->GetSocksProxy().c_str());
-
-            // TOR-NATIVE MODE: Force all traffic through embedded Tor
-            int socksPort = CTorEmbedded::GetInstance()->GetSocksPort();
-            CService torProxyAddr("127.0.0.1", socksPort);
-
-            SetProxy(NET_IPV4, torProxyAddr, 5);
-            SetProxy(NET_IPV6, torProxyAddr, 5);
-            SetProxy(NET_TOR, torProxyAddr, 5);
-            SetNameProxy(torProxyAddr, 5);
-
-            // Disable clearnet reachability - ONION ONLY
-            SetReachable(NET_IPV4, false);
-            SetReachable(NET_IPV6, false);
-            SetReachable(NET_TOR, true);
-
-            printf("TOR-NATIVE MODE: All network traffic forced through Tor\n");
-            printf("  Clearnet disabled - .onion addresses only\n");
-
-            #ifdef USE_UPNP
-            fUseUPnP = false;
-            #endif
        } else {
-            return InitError(_("Tor failed to start. Triangles requires Tor to operate."));
+            printf("WARNING: Tor not available. .onion peers will not be reachable.\n");
+            printf("  Clearnet connections will still work normally.\n");
        }

        // Initialize Tor V3 identity (Ed25519 keys, onion address)
@@ -1,284 +0,0 @@
-// Copyright (c) 2024-2026 Triangles developers
-// Distributed under the MIT/X11 software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-//
-// Drop-in compatibility layer: json_spirit API backed by nlohmann/json.
-// Provides the same types (Value, Object, Array, Pair) and functions
-// (find_value, write_string, read_string) in the json_spirit namespace,
-// so existing RPC code compiles without changes.
-
-#ifndef JSON_COMPAT_H
-#define JSON_COMPAT_H
-
-#include "nlohmann_json.hpp"
-
-#include <cstdint>
-#include <map>
-#include <stdexcept>
-#include <string>
-#include <vector>
-
-namespace json_spirit {
-
-// Use ordered_json to preserve insertion order (matches json_spirit's vector<Pair> behavior)
-typedef nlohmann::ordered_json json_internal;
-
-// ---------- Type enum (matches json_spirit exactly) ----------
-
-enum Value_type {
-    obj_type   = 0,
-    array_type = 1,
-    str_type   = 2,
-    bool_type  = 3,
-    int_type   = 4,
-    real_type  = 5,
-    null_type  = 6
-};
-
-inline const char* ValueTypeName(Value_type type)
-{
-    switch (type)
-    {
-    case obj_type:   return "obj";
-    case array_type: return "array";
-    case str_type:   return "str";
-    case bool_type:  return "bool";
-    case int_type:   return "int";
-    case real_type:  return "real";
-    case null_type:  return "null";
-    }
-    return "unknown";
-}
-
-// ---------- Forward declarations ----------
-
-class Value;
-struct Pair;
-
-// ---------- Value ----------
-
-class Value {
-    json_internal j_;
-
-    friend std::string write_string(const Value& val, bool pretty);
-    friend bool read_string(const std::string& s, Value& val);
-    friend bool read(const std::string& s, Value& val);
-
-public:
-    // Default: null
-    Value() : j_(nullptr) {}
-
-    // Primitives
-    Value(const char* s)        : j_(std::string(s)) {}
-    Value(const std::string& s) : j_(s) {}
-    Value(bool b)               : j_(b) {}
-    Value(int i)                : j_(static_cast<int64_t>(i)) {}
-    Value(unsigned int u)       : j_(static_cast<uint64_t>(u)) {}
-    Value(int64_t i)            : j_(i) {}
-    Value(uint64_t u)           : j_(u) {}
-    Value(double d)             : j_(d) {}
-
-    // Compound types (defined after Pair/Object/Array)
-    inline Value(const std::vector<Pair>& obj);
-    inline Value(const std::vector<Value>& arr);
-
-    // Type introspection
-    Value_type type() const {
-        if (j_.is_null())            return null_type;
-        if (j_.is_object())          return obj_type;
-        if (j_.is_array())           return array_type;
-        if (j_.is_string())          return str_type;
-        if (j_.is_boolean())         return bool_type;
-        if (j_.is_number_integer())  return int_type;
-        if (j_.is_number_float())    return real_type;
-        return null_type;
-    }
-
-    bool is_null()   const { return j_.is_null(); }
-    bool is_uint64() const { return j_.is_number_unsigned(); }
-
-    // Accessors (throw on type mismatch, matching json_spirit semantics)
-    const std::string& get_str() const {
-        if (!j_.is_string())
-            throw std::runtime_error("value type is not str");
-        return j_.get_ref<const std::string&>();
-    }
-
-    bool get_bool() const {
-        if (!j_.is_boolean())
-            throw std::runtime_error("value type is not bool");
-        return j_.get<bool>();
-    }
-
-    int get_int() const {
-        if (!j_.is_number_integer())
-            throw std::runtime_error("value type is not int");
-        return j_.get<int>();
-    }
-
-    int64_t get_int64() const {
-        if (!j_.is_number_integer())
-            throw std::runtime_error("value type is not int");
-        return j_.get<int64_t>();
-    }
-
-    uint64_t get_uint64() const {
-        if (!j_.is_number_integer())
-            throw std::runtime_error("value type is not int");
-        return j_.get<uint64_t>();
-    }
-
-    double get_real() const {
-        // json_spirit converts ints to double in get_real()
-        if (!j_.is_number())
-            throw std::runtime_error("value type is not numeric");
-        return j_.get<double>();
-    }
-
-    // Compound accessors (defined after Pair/Object/Array)
-    inline std::vector<Pair> get_obj() const;
-    inline std::vector<Value> get_array() const;
-
-    // Map-based object accessor for mValue compatibility
-    inline std::map<std::string, Value> get_map_obj() const;
-
-    // Template accessor (used by ConvertTo<T>)
-    template<typename T> T get_value() const;
-
-    // Static null constant (matches json_spirit::Value::null)
-    static const Value null;
-
-    bool operator==(const Value& o) const { return j_ == o.j_; }
-    bool operator!=(const Value& o) const { return j_ != o.j_; }
-};
-
-// Define the static member
-inline const Value Value::null{};
-
-// ---------- Pair ----------
-
-struct Pair {
-    std::string name_;
-    Value       value_;
-
-    Pair() {}
-    Pair(const std::string& name, const Value& value)
-        : name_(name), value_(value) {}
-
-    bool operator==(const Pair& o) const { return name_ == o.name_; }
-};
-
-// ---------- Object / Array typedefs ----------
-
-typedef std::vector<Pair>  Object;
-typedef std::vector<Value> Array;
-
-// ---------- Map-based aliases (mValue/mObject for messagemodel.cpp compat) ----------
-
-typedef Value mValue;
-typedef std::map<std::string, Value> mObject;
-
-// ---------- Value compound constructors ----------
-
-inline Value::Value(const std::vector<Pair>& obj) {
-    j_ = json_internal::object();
-    for (const auto& p : obj)
-        j_[p.name_] = p.value_.j_;
-}
-
-inline Value::Value(const std::vector<Value>& arr) {
-    j_ = json_internal::array();
-    for (const auto& v : arr)
-        j_.push_back(v.j_);
-}
-
-// ---------- Value compound accessors ----------
-
-inline std::vector<Pair> Value::get_obj() const {
-    if (!j_.is_object())
-        throw std::runtime_error("value type is not obj");
-    std::vector<Pair> result;
-    result.reserve(j_.size());
-    for (auto it = j_.begin(); it != j_.end(); ++it) {
-        Value v;
-        v.j_ = it.value();
-        result.emplace_back(it.key(), v);
-    }
-    return result;
-}
-
-inline std::vector<Value> Value::get_array() const {
-    if (!j_.is_array())
-        throw std::runtime_error("value type is not array");
-    std::vector<Value> result;
-    result.reserve(j_.size());
-    for (const auto& elem : j_) {
-        Value v;
-        v.j_ = elem;
-        result.push_back(v);
-    }
-    return result;
-}
-
-inline std::map<std::string, Value> Value::get_map_obj() const {
-    if (!j_.is_object())
-        throw std::runtime_error("value type is not obj");
-    std::map<std::string, Value> result;
-    for (auto it = j_.begin(); it != j_.end(); ++it) {
-        Value v;
-        v.j_ = it.value();
-        result[it.key()] = v;
-    }
-    return result;
-}
-
-// ---------- Template get_value specializations ----------
-
-template<> inline std::string Value::get_value<std::string>() const { return get_str(); }
-template<> inline bool        Value::get_value<bool>()        const { return get_bool(); }
-template<> inline int         Value::get_value<int>()         const { return get_int(); }
-template<> inline int64_t     Value::get_value<int64_t>()     const { return get_int64(); }
-template<> inline uint64_t    Value::get_value<uint64_t>()    const { return get_uint64(); }
-template<> inline double      Value::get_value<double>()      const { return get_real(); }
-template<> inline Object      Value::get_value<Object>()      const { return get_obj(); }
-template<> inline Array       Value::get_value<Array>()       const { return get_array(); }
-
-// ---------- Utility functions ----------
-
-inline const Value& find_value(const Object& obj, const std::string& name) {
-    for (const auto& p : obj)
-        if (p.name_ == name)
-            return p.value_;
-    static const Value null_value;
-    return null_value;
-}
-
-inline std::string write_string(const Value& val, bool pretty = false) {
-    return val.j_.dump(pretty ? 4 : -1);
-}
-
-inline bool read_string(const std::string& s, Value& val) {
-    try {
-        val.j_ = json_internal::parse(s);
-        return true;
-    } catch (const nlohmann::detail::parse_error&) {
-        return false;
-    }
-}
-
-// Alias matching json_spirit::read() signature (used by messagemodel.cpp)
-inline bool read(const std::string& s, Value& val) {
-    return read_string(s, val);
-}
-
-// Stream-based reader (used by test harness read_json)
-template<typename Istream>
-inline bool read_stream(Istream& is, Value& val) {
-    std::string s((std::istreambuf_iterator<char>(is)),
-                   std::istreambuf_iterator<char>());
-    return read_string(s, val);
-}
-
-} // namespace json_spirit
-
-#endif // JSON_COMPAT_H
@@ -0,0 +1,18 @@
+#ifndef JSON_SPIRIT
+#define JSON_SPIRIT
+
+//          Copyright John W. Wilkinson 2007 - 2009.
+// Distributed under the MIT License, see accompanying file LICENSE.txt
+
+// json spirit version 4.03
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+#include "json_spirit_value.h"
+#include "json_spirit_reader.h"
+#include "json_spirit_writer.h"
+#include "json_spirit_utils.h"
+
+#endif
@@ -0,0 +1,54 @@
+#ifndef JSON_SPIRIT_ERROR_POSITION
+#define JSON_SPIRIT_ERROR_POSITION
+
+//          Copyright John W. Wilkinson 2007 - 2009.
+// Distributed under the MIT License, see accompanying file LICENSE.txt
+
+// json spirit version 4.03
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+#include <string>
+
+namespace json_spirit
+{
+    // An Error_position exception is thrown by the "read_or_throw" functions below on finding an error.
+    // Note the "read_or_throw" functions are around 3 times slower than the standard functions "read" 
+    // functions that return a bool.
+    //
+    struct Error_position
+    {
+        Error_position();
+        Error_position( unsigned int line, unsigned int column, const std::string& reason );
+        bool operator==( const Error_position& lhs ) const;
+        unsigned int line_;
+        unsigned int column_;
+        std::string reason_;
+    };
+
+    inline Error_position::Error_position()
+    :   line_( 0 )
+    ,   column_( 0 )
+    {
+    }
+
+    inline Error_position::Error_position( unsigned int line, unsigned int column, const std::string& reason )
+    :   line_( line )
+    ,   column_( column )
+    ,   reason_( reason )
+    {
+    }
+
+    inline bool Error_position::operator==( const Error_position& lhs ) const
+    {
+        if( this == &lhs ) return true;
+
+        return ( reason_ == lhs.reason_ ) &&
+               ( line_   == lhs.line_ ) &&
+               ( column_ == lhs.column_ ); 
+}
+}
+
+#endif
@@ -0,0 +1,137 @@
+//          Copyright John W. Wilkinson 2007 - 2009.
+// Distributed under the MIT License, see accompanying file LICENSE.txt
+
+// json spirit version 4.03
+
+#include "json_spirit_reader.h"
+#include "json_spirit_reader_template.h"
+
+using namespace json_spirit;
+
+bool json_spirit::read( const std::string& s, Value& value )
+{
+    return read_string( s, value );
+}
+
+void json_spirit::read_or_throw( const std::string& s, Value& value )
+{
+    read_string_or_throw( s, value );
+}
+
+bool json_spirit::read( std::istream& is, Value& value )
+{
+    return read_stream( is, value );
+}
+
+void json_spirit::read_or_throw( std::istream& is, Value& value )
+{
+    read_stream_or_throw( is, value );
+}
+
+bool json_spirit::read( std::string::const_iterator& begin, std::string::const_iterator end, Value& value )
+{
+    return read_range( begin, end, value );
+}
+
+void json_spirit::read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, Value& value )
+{
+    begin = read_range_or_throw( begin, end, value );
+}
+
+#ifndef BOOST_NO_STD_WSTRING
+
+bool json_spirit::read( const std::wstring& s, wValue& value )
+{
+    return read_string( s, value );
+}
+
+void json_spirit::read_or_throw( const std::wstring& s, wValue& value )
+{
+    read_string_or_throw( s, value );
+}
+
+bool json_spirit::read( std::wistream& is, wValue& value )
+{
+    return read_stream( is, value );
+}
+
+void json_spirit::read_or_throw( std::wistream& is, wValue& value )
+{
+    read_stream_or_throw( is, value );
+}
+
+bool json_spirit::read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value )
+{
+    return read_range( begin, end, value );
+}
+
+void json_spirit::read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value )
+{
+    begin = read_range_or_throw( begin, end, value );
+}
+
+#endif
+
+bool json_spirit::read( const std::string& s, mValue& value )
+{
+    return read_string( s, value );
+}
+
+void json_spirit::read_or_throw( const std::string& s, mValue& value )
+{
+    read_string_or_throw( s, value );
+}
+
+bool json_spirit::read( std::istream& is, mValue& value )
+{
+    return read_stream( is, value );
+}
+
+void json_spirit::read_or_throw( std::istream& is, mValue& value )
+{
+    read_stream_or_throw( is, value );
+}
+
+bool json_spirit::read( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value )
+{
+    return read_range( begin, end, value );
+}
+
+void json_spirit::read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value )
+{
+    begin = read_range_or_throw( begin, end, value );
+}
+
+#ifndef BOOST_NO_STD_WSTRING
+
+bool json_spirit::read( const std::wstring& s, wmValue& value )
+{
+    return read_string( s, value );
+}
+
+void json_spirit::read_or_throw( const std::wstring& s, wmValue& value )
+{
+    read_string_or_throw( s, value );
+}
+
+bool json_spirit::read( std::wistream& is, wmValue& value )
+{
+    return read_stream( is, value );
+}
+
+void json_spirit::read_or_throw( std::wistream& is, wmValue& value )
+{
+    read_stream_or_throw( is, value );
+}
+
+bool json_spirit::read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value )
+{
+    return read_range( begin, end, value );
+}
+
+void json_spirit::read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value )
+{
+    begin = read_range_or_throw( begin, end, value );
+}
+
+#endif
@@ -0,0 +1,62 @@
+#ifndef JSON_SPIRIT_READER
+#define JSON_SPIRIT_READER
+
+//          Copyright John W. Wilkinson 2007 - 2009.
+// Distributed under the MIT License, see accompanying file LICENSE.txt
+
+// json spirit version 4.03
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+#include "json_spirit_value.h"
+#include "json_spirit_error_position.h"
+#include <iostream>
+
+namespace json_spirit
+{
+    // functions to reads a JSON values
+
+    bool read( const std::string& s, Value& value );
+    bool read( std::istream& is,     Value& value );
+    bool read( std::string::const_iterator& begin, std::string::const_iterator end, Value& value );
+
+    void read_or_throw( const std::string& s, Value& value );  
+    void read_or_throw( std::istream& is,     Value& value );
+    void read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, Value& value );
+
+#ifndef BOOST_NO_STD_WSTRING
+
+    bool read( const std::wstring& s, wValue& value );
+    bool read( std::wistream&  is,    wValue& value );
+    bool read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value );    
+
+    void read_or_throw( const std::wstring& s, wValue& value );
+    void read_or_throw( std::wistream& is,     wValue& value );
+    void read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wValue& value );
+
+#endif
+
+    bool read( const std::string& s, mValue& value );
+    bool read( std::istream& is,     mValue& value );
+    bool read( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value );
+
+    void read_or_throw( const std::string& s, mValue& value );  
+    void read_or_throw( std::istream& is,     mValue& value );
+    void read_or_throw( std::string::const_iterator& begin, std::string::const_iterator end, mValue& value );
+
+#ifndef BOOST_NO_STD_WSTRING
+
+    bool read( const std::wstring& s, wmValue& value );
+    bool read( std::wistream& is,     wmValue& value );
+    bool read( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value );    
+
+    void read_or_throw( const std::wstring& s, wmValue& value );
+    void read_or_throw( std::wistream& is,     wmValue& value );
+    void read_or_throw( std::wstring::const_iterator& begin, std::wstring::const_iterator end, wmValue& value );
+
+#endif
+}
+
+#endif
@@ -0,0 +1,612 @@
+#ifndef JSON_SPIRIT_READER_TEMPLATE
+#define JSON_SPIRIT_READER_TEMPLATE
+
+//          Copyright John W. Wilkinson 2007 - 2009.
+// Distributed under the MIT License, see accompanying file LICENSE.txt
+
+// json spirit version 4.03
+
+#include "json_spirit_value.h"
+#include "json_spirit_error_position.h"
+
+//#define BOOST_SPIRIT_THREADSAFE  // uncomment for multithreaded use, requires linking to boost.thread
+
+#include <boost/bind.hpp>
+#include <boost/function.hpp>
+#include <boost/version.hpp>
+
+#if BOOST_VERSION >= 103800
+    #include <boost/spirit/include/classic_core.hpp>
+    #include <boost/spirit/include/classic_confix.hpp>
+    #include <boost/spirit/include/classic_escape_char.hpp>
+    #include <boost/spirit/include/classic_multi_pass.hpp>
+    #include <boost/spirit/include/classic_position_iterator.hpp>
+    #define spirit_namespace boost::spirit::classic
+#else
+    #include <boost/spirit/core.hpp>
+    #include <boost/spirit/utility/confix.hpp>
+    #include <boost/spirit/utility/escape_char.hpp>
+    #include <boost/spirit/iterator/multi_pass.hpp>
+    #include <boost/spirit/iterator/position_iterator.hpp>
+    #define spirit_namespace boost::spirit
+#endif
+
+namespace json_spirit
+{
+    const spirit_namespace::int_parser < boost::int64_t >  int64_p  = spirit_namespace::int_parser < boost::int64_t  >();
+    const spirit_namespace::uint_parser< boost::uint64_t > uint64_p = spirit_namespace::uint_parser< boost::uint64_t >();
+
+    template< class Iter_type >
+    bool is_eq( Iter_type first, Iter_type last, const char* c_str )
+    {
+        for( Iter_type i = first; i != last; ++i, ++c_str )
+        {
+            if( *c_str == 0 ) return false;
+
+            if( *i != *c_str ) return false;
+        }
+
+        return true;
+    }
+
+    template< class Char_type >
+    Char_type hex_to_num( const Char_type c )
+    {
+        if( ( c >= '0' ) && ( c <= '9' ) ) return c - '0';
+        if( ( c >= 'a' ) && ( c <= 'f' ) ) return c - 'a' + 10;
+        if( ( c >= 'A' ) && ( c <= 'F' ) ) return c - 'A' + 10;
+        return 0;
+    }
+
+    template< class Char_type, class Iter_type >
+    Char_type hex_str_to_char( Iter_type& begin )
+    {
+        const Char_type c1( *( ++begin ) );
+        const Char_type c2( *( ++begin ) );
+
+        return ( hex_to_num( c1 ) << 4 ) + hex_to_num( c2 );
+    }       
+
+    template< class Char_type, class Iter_type >
+    Char_type unicode_str_to_char( Iter_type& begin )
+    {
+        const Char_type c1( *( ++begin ) );
+        const Char_type c2( *( ++begin ) );
+        const Char_type c3( *( ++begin ) );
+        const Char_type c4( *( ++begin ) );
+
+        return ( hex_to_num( c1 ) << 12 ) + 
+               ( hex_to_num( c2 ) <<  8 ) + 
+               ( hex_to_num( c3 ) <<  4 ) + 
+               hex_to_num( c4 );
+    }
+
+    template< class String_type >
+    void append_esc_char_and_incr_iter( String_type& s, 
+                                        typename String_type::const_iterator& begin, 
+                                        typename String_type::const_iterator end )
+    {
+        typedef typename String_type::value_type Char_type;
+             
+        const Char_type c2( *begin );
+
+        switch( c2 )
+        {
+            case 't':  s += '\t'; break;
+            case 'b':  s += '\b'; break;
+            case 'f':  s += '\f'; break;
+            case 'n':  s += '\n'; break;
+            case 'r':  s += '\r'; break;
+            case '\\': s += '\\'; break;
+            case '/':  s += '/';  break;
+            case '"':  s += '"';  break;
+            case 'x':  
+            {
+                if( end - begin >= 3 )  //  expecting "xHH..."
+                {
+                    s += hex_str_to_char< Char_type >( begin );  
+                }
+                break;
+            }
+            case 'u':  
+            {
+                if( end - begin >= 5 )  //  expecting "uHHHH..."
+                {
+                    s += unicode_str_to_char< Char_type >( begin );  
+                }
+                break;
+            }
+        }
+    }
+
+    template< class String_type >
+    String_type substitute_esc_chars( typename String_type::const_iterator begin, 
+                                   typename String_type::const_iterator end )
+    {
+        typedef typename String_type::const_iterator Iter_type;
+
+        if( end - begin < 2 ) return String_type( begin, end );
+
+        String_type result;
+        
+        result.reserve( end - begin );
+
+        const Iter_type end_minus_1( end - 1 );
+
+        Iter_type substr_start = begin;
+        Iter_type i = begin;
+
+        for( ; i < end_minus_1; ++i )
+        {
+            if( *i == '\\' )
+            {
+                result.append( substr_start, i );
+
+                ++i;  // skip the '\'
+             
+                append_esc_char_and_incr_iter( result, i, end );
+
+                substr_start = i + 1;
+            }
+        }
+
+        result.append( substr_start, end );
+
+        return result;
+    }
+
+    template< class String_type >
+    String_type get_str_( typename String_type::const_iterator begin, 
+                       typename String_type::const_iterator end )
+    {
+        assert( end - begin >= 2 );
+
+        typedef typename String_type::const_iterator Iter_type;
+
+        Iter_type str_without_quotes( ++begin );
+        Iter_type end_without_quotes( --end );
+
+        return substitute_esc_chars< String_type >( str_without_quotes, end_without_quotes );
+    }
+
+    inline std::string get_str( std::string::const_iterator begin, std::string::const_iterator end )
+    {
+        return get_str_< std::string >( begin, end );
+    }
+
+    inline std::wstring get_str( std::wstring::const_iterator begin, std::wstring::const_iterator end )
+    {
+        return get_str_< std::wstring >( begin, end );
+    }
+    
+    template< class String_type, class Iter_type >
+    String_type get_str( Iter_type begin, Iter_type end )
+    {
+        const String_type tmp( begin, end );  // convert multipass iterators to string iterators
+
+        return get_str( tmp.begin(), tmp.end() );
+    }
+
+    // this class's methods get called by the spirit parse resulting
+    // in the creation of a JSON object or array
+    //
+    // NB Iter_type could be a std::string iterator, wstring iterator, a position iterator or a multipass iterator
+    //
+    template< class Value_type, class Iter_type >
+    class Semantic_actions 
+    {
+    public:
+
+        typedef typename Value_type::Config_type Config_type;
+        typedef typename Config_type::String_type String_type;
+        typedef typename Config_type::Object_type Object_type;
+        typedef typename Config_type::Array_type Array_type;
+        typedef typename String_type::value_type Char_type;
+
+        Semantic_actions( Value_type& value )
+        :   value_( value )
+        ,   current_p_( 0 )
+        {
+        }
+
+        void begin_obj( Char_type c )
+        {
+            assert( c == '{' );
+
+            begin_compound< Object_type >();
+        }
+
+        void end_obj( Char_type c )
+        {
+            assert( c == '}' );
+
+            end_compound();
+        }
+
+        void begin_array( Char_type c )
+        {
+            assert( c == '[' );
+     
+            begin_compound< Array_type >();
+        }
+
+        void end_array( Char_type c )
+        {
+            assert( c == ']' );
+
+            end_compound();
+        }
+
+        void new_name( Iter_type begin, Iter_type end )
+        {
+            assert( current_p_->type() == obj_type );
+
+            name_ = get_str< String_type >( begin, end );
+        }
+
+        void new_str( Iter_type begin, Iter_type end )
+        {
+            add_to_current( get_str< String_type >( begin, end ) );
+        }
+
+        void new_true( Iter_type begin, Iter_type end )
+        {
+            assert( is_eq( begin, end, "true" ) );
+
+            add_to_current( true );
+        }
+
+        void new_false( Iter_type begin, Iter_type end )
+        {
+            assert( is_eq( begin, end, "false" ) );
+
+            add_to_current( false );
+        }
+
+        void new_null( Iter_type begin, Iter_type end )
+        {
+            assert( is_eq( begin, end, "null" ) );
+
+            add_to_current( Value_type() );
+        }
+
+        void new_int( boost::int64_t i )
+        {
+            add_to_current( i );
+        }
+
+        void new_uint64( boost::uint64_t ui )
+        {
+            add_to_current( ui );
+        }
+
+        void new_real( double d )
+        {
+            add_to_current( d );
+        }
+
+    private:
+
+        Semantic_actions& operator=( const Semantic_actions& ); 
+                                    // to prevent "assignment operator could not be generated" warning
+
+        Value_type* add_first( const Value_type& value )
+        {
+            assert( current_p_ == 0 );
+
+            value_ = value;
+            current_p_ = &value_;
+            return current_p_;
+        }
+
+        template< class Array_or_obj >
+        void begin_compound()
+        {
+            if( current_p_ == 0 )
+            {
+                add_first( Array_or_obj() );
+            }
+            else
+            {
+                stack_.push_back( current_p_ );
+
+                Array_or_obj new_array_or_obj;   // avoid copy by building new array or object in place
+
+                current_p_ = add_to_current( new_array_or_obj );
+            }
+        }
+
+        void end_compound()
+        {
+            if( current_p_ != &value_ )
+            {
+                current_p_ = stack_.back();
+                
+                stack_.pop_back();
+            }    
+        }
+
+        Value_type* add_to_current( const Value_type& value )
+        {
+            if( current_p_ == 0 )
+            {
+                return add_first( value );
+            }
+            else if( current_p_->type() == array_type )
+            {
+                current_p_->get_array().push_back( value );
+
+                return &current_p_->get_array().back(); 
+            }
+            
+            assert( current_p_->type() == obj_type );
+
+            return &Config_type::add( current_p_->get_obj(), name_, value );
+        }
+
+        Value_type& value_;             // this is the object or array that is being created
+        Value_type* current_p_;         // the child object or array that is currently being constructed
+
+        std::vector< Value_type* > stack_;   // previous child objects and arrays
+
+        String_type name_;              // of current name/value pair
+    };
+
+    template< typename Iter_type >
+    void throw_error( spirit_namespace::position_iterator< Iter_type > i, const std::string& reason )
+    {
+        throw Error_position( i.get_position().line, i.get_position().column, reason );
+    }
+
+    template< typename Iter_type >
+    void throw_error( Iter_type i, const std::string& reason )
+    {
+       throw reason;
+    }
+
+    // the spirit grammer 
+    //
+    template< class Value_type, class Iter_type >
+    class Json_grammer : public spirit_namespace::grammar< Json_grammer< Value_type, Iter_type > >
+    {
+    public:
+
+        typedef Semantic_actions< Value_type, Iter_type > Semantic_actions_t;
+
+        Json_grammer( Semantic_actions_t& semantic_actions )
+        :   actions_( semantic_actions )
+        {
+        }
+
+        static void throw_not_value( Iter_type begin, Iter_type end )
+        {
+    	    throw_error( begin, "not a value" );
+        }
+
+        static void throw_not_array( Iter_type begin, Iter_type end )
+        {
+    	    throw_error( begin, "not an array" );
+        }
+
+        static void throw_not_object( Iter_type begin, Iter_type end )
+        {
+    	    throw_error( begin, "not an object" );
+        }
+
+        static void throw_not_pair( Iter_type begin, Iter_type end )
+        {
+    	    throw_error( begin, "not a pair" );
+        }
+
+        static void throw_not_colon( Iter_type begin, Iter_type end )
+        {
+    	    throw_error( begin, "no colon in pair" );
+        }
+
+        static void throw_not_string( Iter_type begin, Iter_type end )
+        {
+    	    throw_error( begin, "not a string" );
+        }
+
+        template< typename ScannerT >
+        class definition
+        {
+        public:
+
+            definition( const Json_grammer& self )
+            {
+                using namespace spirit_namespace;
+
+                typedef typename Value_type::String_type::value_type Char_type;
+
+                // first we convert the semantic action class methods to functors with the 
+                // parameter signature expected by spirit
+
+                typedef boost::function< void( Char_type )            > Char_action;
+                typedef boost::function< void( Iter_type, Iter_type ) > Str_action;
+                typedef boost::function< void( double )               > Real_action;
+                typedef boost::function< void( boost::int64_t )       > Int_action;
+                typedef boost::function< void( boost::uint64_t )      > Uint64_action;
+
+                Char_action   begin_obj  ( boost::bind( &Semantic_actions_t::begin_obj,   &self.actions_, _1 ) );
+                Char_action   end_obj    ( boost::bind( &Semantic_actions_t::end_obj,     &self.actions_, _1 ) );
+                Char_action   begin_array( boost::bind( &Semantic_actions_t::begin_array, &self.actions_, _1 ) );
+                Char_action   end_array  ( boost::bind( &Semantic_actions_t::end_array,   &self.actions_, _1 ) );
+                Str_action    new_name   ( boost::bind( &Semantic_actions_t::new_name,    &self.actions_, _1, _2 ) );
+                Str_action    new_str    ( boost::bind( &Semantic_actions_t::new_str,     &self.actions_, _1, _2 ) );
+                Str_action    new_true   ( boost::bind( &Semantic_actions_t::new_true,    &self.actions_, _1, _2 ) );
+                Str_action    new_false  ( boost::bind( &Semantic_actions_t::new_false,   &self.actions_, _1, _2 ) );
+                Str_action    new_null   ( boost::bind( &Semantic_actions_t::new_null,    &self.actions_, _1, _2 ) );
+                Real_action   new_real   ( boost::bind( &Semantic_actions_t::new_real,    &self.actions_, _1 ) );
+                Int_action    new_int    ( boost::bind( &Semantic_actions_t::new_int,     &self.actions_, _1 ) );
+                Uint64_action new_uint64 ( boost::bind( &Semantic_actions_t::new_uint64,  &self.actions_, _1 ) );
+
+                // actual grammer
+
+                json_
+                    = value_ | eps_p[ &throw_not_value ]
+                    ;
+
+                value_
+                    = string_[ new_str ] 
+                    | number_ 
+                    | object_ 
+                    | array_ 
+                    | str_p( "true" ) [ new_true  ] 
+                    | str_p( "false" )[ new_false ] 
+                    | str_p( "null" ) [ new_null  ]
+                    ;
+
+                object_ 
+                    = ch_p('{')[ begin_obj ]
+                    >> !members_
+                    >> ( ch_p('}')[ end_obj ] | eps_p[ &throw_not_object ] )
+                    ;
+
+                members_
+                    = pair_ >> *( ',' >> pair_ )
+                    ;
+
+                pair_
+                    = string_[ new_name ]
+                    >> ( ':' | eps_p[ &throw_not_colon ] )
+                    >> ( value_ | eps_p[ &throw_not_value ] )
+                    ;
+
+                array_
+                    = ch_p('[')[ begin_array ]
+                    >> !elements_
+                    >> ( ch_p(']')[ end_array ] | eps_p[ &throw_not_array ] )
+                    ;
+
+                elements_
+                    = value_ >> *( ',' >> value_ )
+                    ;
+
+                string_ 
+                    = lexeme_d // this causes white space inside a string to be retained
+                      [
+                          confix_p
+                          ( 
+                              '"', 
+                              *lex_escape_ch_p,
+                              '"'
+                          ) 
+                      ]
+                    ;
+
+                number_
+                    = strict_real_p[ new_real   ] 
+                    | int64_p      [ new_int    ]
+                    | uint64_p     [ new_uint64 ]
+                    ;
+            }
+
+            spirit_namespace::rule< ScannerT > json_, object_, members_, pair_, array_, elements_, value_, string_, number_;
+
+            const spirit_namespace::rule< ScannerT >& start() const { return json_; }
+        };
+
+    private:
+
+        Json_grammer& operator=( const Json_grammer& ); // to prevent "assignment operator could not be generated" warning
+
+        Semantic_actions_t& actions_;
+    };
+
+    template< class Iter_type, class Value_type >
+    Iter_type read_range_or_throw( Iter_type begin, Iter_type end, Value_type& value )
+    {
+        Semantic_actions< Value_type, Iter_type > semantic_actions( value );
+     
+        const spirit_namespace::parse_info< Iter_type > info = 
+                            spirit_namespace::parse( begin, end, 
+                                                    Json_grammer< Value_type, Iter_type >( semantic_actions ), 
+                                                    spirit_namespace::space_p );
+
+        if( !info.hit )
+        {
+            assert( false ); // in theory exception should already have been thrown
+            throw_error( info.stop, "error" );
+        }
+
+        return info.stop;
+    }
+
+    template< class Iter_type, class Value_type >
+    void add_posn_iter_and_read_range_or_throw( Iter_type begin, Iter_type end, Value_type& value )
+    {
+        typedef spirit_namespace::position_iterator< Iter_type > Posn_iter_t;
+
+        const Posn_iter_t posn_begin( begin, end );
+        const Posn_iter_t posn_end( end, end );
+     
+        read_range_or_throw( posn_begin, posn_end, value );
+    }
+
+    template< class Iter_type, class Value_type >
+    bool read_range( Iter_type& begin, Iter_type end, Value_type& value )
+    {
+        try
+        {
+            begin = read_range_or_throw( begin, end, value );
+
+            return true;
+        }
+        catch( ... )
+        {
+            return false;
+        }
+    }
+
+    template< class String_type, class Value_type >
+    void read_string_or_throw( const String_type& s, Value_type& value )
+    {
+        add_posn_iter_and_read_range_or_throw( s.begin(), s.end(), value );
+    }
+
+    template< class String_type, class Value_type >
+    bool read_string( const String_type& s, Value_type& value )
+    {
+        typename String_type::const_iterator begin = s.begin();
+
+        return read_range( begin, s.end(), value );
+    }
+
+    template< class Istream_type >
+    struct Multi_pass_iters
+    {
+        typedef typename Istream_type::char_type Char_type;
+        typedef std::istream_iterator< Char_type, Char_type > istream_iter;
+        typedef spirit_namespace::multi_pass< istream_iter > Mp_iter;
+
+        Multi_pass_iters( Istream_type& is )
+        {
+            is.unsetf( std::ios::skipws );
+
+            begin_ = spirit_namespace::make_multi_pass( istream_iter( is ) );
+            end_   = spirit_namespace::make_multi_pass( istream_iter() );
+        }
+
+        Mp_iter begin_;
+        Mp_iter end_;
+    };
+
+    template< class Istream_type, class Value_type >
+    bool read_stream( Istream_type& is, Value_type& value )
+    {
+        Multi_pass_iters< Istream_type > mp_iters( is );
+
+        return read_range( mp_iters.begin_, mp_iters.end_, value );
+    }
+
+    template< class Istream_type, class Value_type >
+    void read_stream_or_throw( Istream_type& is, Value_type& value )
+    {
+        const Multi_pass_iters< Istream_type > mp_iters( is );
+
+        add_posn_iter_and_read_range_or_throw( mp_iters.begin_, mp_iters.end_, value );
+    }
+}
+
+#endif
@@ -0,0 +1,70 @@
+#ifndef JSON_SPIRIT_READ_STREAM
+#define JSON_SPIRIT_READ_STREAM
+
+//          Copyright John W. Wilkinson 2007 - 2009.
+// Distributed under the MIT License, see accompanying file LICENSE.txt
+
+// json spirit version 4.03
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+#include "json_spirit_reader_template.h"
+
+namespace json_spirit
+{
+    // these classes allows you to read multiple top level contiguous values from a stream,
+    // the normal stream read functions have a bug that prevent multiple top level values 
+    // from being read unless they are separated by spaces
+
+    template< class Istream_type, class Value_type >
+    class Stream_reader
+    {
+    public:
+
+        Stream_reader( Istream_type& is )
+        :   iters_( is )
+        {
+        }
+
+        bool read_next( Value_type& value )
+        {
+            return read_range( iters_.begin_, iters_.end_, value );
+        }
+
+    private:
+
+        typedef Multi_pass_iters< Istream_type > Mp_iters;
+
+        Mp_iters iters_;
+    };
+
+    template< class Istream_type, class Value_type >
+    class Stream_reader_thrower
+    {
+    public:
+
+        Stream_reader_thrower( Istream_type& is )
+        :   iters_( is )
+        ,    posn_begin_( iters_.begin_, iters_.end_ )
+        ,    posn_end_( iters_.end_, iters_.end_ )
+        {
+        }
+
+        void read_next( Value_type& value )
+        {
+            posn_begin_ = read_range_or_throw( posn_begin_, posn_end_, value );
+        }
+
+    private:
+
+        typedef Multi_pass_iters< Istream_type > Mp_iters;
+        typedef spirit_namespace::position_iterator< typename Mp_iters::Mp_iter > Posn_iter_t;
+
+        Mp_iters iters_;
+        Posn_iter_t posn_begin_, posn_end_;
+    };
+}
+
+#endif
@@ -0,0 +1,61 @@
+#ifndef JSON_SPIRIT_UTILS
+#define JSON_SPIRIT_UTILS
+
+//          Copyright John W. Wilkinson 2007 - 2009.
+// Distributed under the MIT License, see accompanying file LICENSE.txt
+
+// json spirit version 4.03
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+#include "json_spirit_value.h"
+#include <map>
+
+namespace json_spirit
+{ 
+    template< class Obj_t, class Map_t >
+    void obj_to_map( const Obj_t& obj, Map_t& mp_obj )
+    {
+        mp_obj.clear();
+
+        for( typename Obj_t::const_iterator i = obj.begin(); i != obj.end(); ++i )
+        {
+            mp_obj[ i->name_ ] = i->value_;
+        }
+    }
+
+    template< class Obj_t, class Map_t >
+    void map_to_obj( const Map_t& mp_obj, Obj_t& obj )
+    {
+        obj.clear();
+
+        for( typename Map_t::const_iterator i = mp_obj.begin(); i != mp_obj.end(); ++i )
+        {
+            obj.push_back( typename Obj_t::value_type( i->first, i->second ) );
+        }
+    }
+
+    typedef std::map< std::string, Value > Mapped_obj;
+
+#ifndef BOOST_NO_STD_WSTRING
+    typedef std::map< std::wstring, wValue > wMapped_obj;
+#endif
+
+    template< class Object_type, class String_type >
+    const typename Object_type::value_type::Value_type& find_value( const Object_type& obj, const String_type& name )
+    {
+        for( typename Object_type::const_iterator i = obj.begin(); i != obj.end(); ++i )
+        {
+            if( i->name_ == name )
+            {
+                return i->value_;
+            }
+        }
+
+        return Object_type::value_type::Value_type::null;
+    }
+}
+
+#endif
@@ -0,0 +1,8 @@
+/* Copyright (c) 2007 John W Wilkinson
+
+   This source code can be used for any purpose as long as
+   this comment is retained. */
+
+// json spirit version 2.00
+
+#include "json_spirit_value.h"
@@ -0,0 +1,534 @@
+#ifndef JSON_SPIRIT_VALUE
+#define JSON_SPIRIT_VALUE
+
+//          Copyright John W. Wilkinson 2007 - 2009.
+// Distributed under the MIT License, see accompanying file LICENSE.txt
+
+// json spirit version 4.03
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+#include <vector>
+#include <map>
+#include <string>
+#include <cassert>
+#include <sstream>
+#include <stdexcept>
+#include <boost/config.hpp> 
+#include <boost/cstdint.hpp> 
+#include <boost/shared_ptr.hpp>
+#include <boost/variant.hpp>
+
+namespace json_spirit
+{
+    enum Value_type{ obj_type, array_type, str_type, bool_type, int_type, real_type, null_type };
+    static const char* Value_type_name[]={"obj", "array", "str", "bool", "int", "real", "null"};
+
+    template< class Config >    // Config determines whether the value uses std::string or std::wstring and
+                                // whether JSON Objects are represented as vectors or maps
+    class Value_impl
+    {
+    public:
+
+        typedef Config Config_type;
+        typedef typename Config::String_type String_type;
+        typedef typename Config::Object_type Object;
+        typedef typename Config::Array_type Array;
+        typedef typename String_type::const_pointer Const_str_ptr;  // eg const char*
+
+        Value_impl();  // creates null value
+        Value_impl( Const_str_ptr      value ); 
+        Value_impl( const String_type& value );
+        Value_impl( const Object&      value );
+        Value_impl( const Array&       value );
+        Value_impl( bool               value );
+        Value_impl( int                value );
+        Value_impl( boost::int64_t     value );
+        Value_impl( boost::uint64_t    value );
+        Value_impl( double             value );
+
+        Value_impl( const Value_impl& other );
+
+        bool operator==( const Value_impl& lhs ) const;
+
+        Value_impl& operator=( const Value_impl& lhs );
+
+        Value_type type() const;
+
+        bool is_uint64() const;
+        bool is_null() const;
+
+        const String_type& get_str()    const;
+        const Object&      get_obj()    const;
+        const Array&       get_array()  const;
+        bool               get_bool()   const;
+        int                get_int()    const;
+        boost::int64_t     get_int64()  const;
+        boost::uint64_t    get_uint64() const;
+        double             get_real()   const;
+
+        Object& get_obj();
+        Array&  get_array();
+
+        template< typename T > T get_value() const;  // example usage: int    i = value.get_value< int >();
+                                                     // or             double d = value.get_value< double >();
+
+        static const Value_impl null;
+
+    private:
+
+        void check_type( const Value_type vtype ) const;
+
+        typedef boost::variant< String_type, 
+                                boost::recursive_wrapper< Object >, boost::recursive_wrapper< Array >, 
+                                bool, boost::int64_t, double > Variant;
+
+        Value_type type_;
+        Variant v_;
+        bool is_uint64_;
+    };
+
+    // vector objects
+
+    template< class Config >
+    struct Pair_impl
+    {
+        typedef typename Config::String_type String_type;
+        typedef typename Config::Value_type Value_type;
+
+        Pair_impl( const String_type& name, const Value_type& value );
+
+        bool operator==( const Pair_impl& lhs ) const;
+
+        String_type name_;
+        Value_type value_;
+    };
+
+    template< class String >
+    struct Config_vector
+    {
+        typedef String String_type;
+        typedef Value_impl< Config_vector > Value_type;
+        typedef Pair_impl < Config_vector > Pair_type;
+        typedef std::vector< Value_type > Array_type;
+        typedef std::vector< Pair_type > Object_type;
+
+        static Value_type& add( Object_type& obj, const String_type& name, const Value_type& value )
+        {
+            obj.push_back( Pair_type( name , value ) );
+
+            return obj.back().value_;
+        }
+                
+        static String_type get_name( const Pair_type& pair )
+        {
+            return pair.name_;
+        }
+                
+        static Value_type get_value( const Pair_type& pair )
+        {
+            return pair.value_;
+        }
+    };
+
+    // typedefs for ASCII
+
+    typedef Config_vector< std::string > Config;
+
+    typedef Config::Value_type  Value;
+    typedef Config::Pair_type   Pair;
+    typedef Config::Object_type Object;
+    typedef Config::Array_type  Array;
+
+    // typedefs for Unicode
+
+#ifndef BOOST_NO_STD_WSTRING
+
+    typedef Config_vector< std::wstring > wConfig;
+
+    typedef wConfig::Value_type  wValue;
+    typedef wConfig::Pair_type   wPair;
+    typedef wConfig::Object_type wObject;
+    typedef wConfig::Array_type  wArray;
+#endif
+
+    // map objects
+
+    template< class String >
+    struct Config_map
+    {
+        typedef String String_type;
+        typedef Value_impl< Config_map > Value_type;
+        typedef std::vector< Value_type > Array_type;
+        typedef std::map< String_type, Value_type > Object_type;
+        typedef typename Object_type::value_type Pair_type;
+
+        static Value_type& add( Object_type& obj, const String_type& name, const Value_type& value )
+        {
+            return obj[ name ] = value;
+        }
+                
+        static String_type get_name( const Pair_type& pair )
+        {
+            return pair.first;
+        }
+                
+        static Value_type get_value( const Pair_type& pair )
+        {
+            return pair.second;
+        }
+    };
+
+    // typedefs for ASCII
+
+    typedef Config_map< std::string > mConfig;
+
+    typedef mConfig::Value_type  mValue;
+    typedef mConfig::Object_type mObject;
+    typedef mConfig::Array_type  mArray;
+
+    // typedefs for Unicode
+
+#ifndef BOOST_NO_STD_WSTRING
+
+    typedef Config_map< std::wstring > wmConfig;
+
+    typedef wmConfig::Value_type  wmValue;
+    typedef wmConfig::Object_type wmObject;
+    typedef wmConfig::Array_type  wmArray;
+
+#endif
+
+    ///////////////////////////////////////////////////////////////////////////////////////////////
+    //
+    // implementation
+
+    template< class Config >
+    const Value_impl< Config > Value_impl< Config >::null;
+
+    template< class Config >
+    Value_impl< Config >::Value_impl()
+    :   type_( null_type )
+    ,   is_uint64_( false )
+    {
+    }
+
+    template< class Config >
+    Value_impl< Config >::Value_impl( const Const_str_ptr value )
+    :   type_( str_type )
+    ,   v_( String_type( value ) )
+    ,   is_uint64_( false )
+    {
+    }
+
+    template< class Config >
+    Value_impl< Config >::Value_impl( const String_type& value )
+    :   type_( str_type )
+    ,   v_( value )
+    ,   is_uint64_( false )
+    {
+    }
+
+    template< class Config >
+    Value_impl< Config >::Value_impl( const Object& value )
+    :   type_( obj_type )
+    ,   v_( value )
+    ,   is_uint64_( false )
+    {
+    }
+
+    template< class Config >
+    Value_impl< Config >::Value_impl( const Array& value )
+    :   type_( array_type )
+    ,   v_( value )
+    ,   is_uint64_( false )
+    {
+    }
+
+    template< class Config >
+    Value_impl< Config >::Value_impl( bool value )
+    :   type_( bool_type )
+    ,   v_( value )
+    ,   is_uint64_( false )
+    {
+    }
+
+    template< class Config >
+    Value_impl< Config >::Value_impl( int value )
+    :   type_( int_type )
+    ,   v_( static_cast< boost::int64_t >( value ) )
+    ,   is_uint64_( false )
+    {
+    }
+
+    template< class Config >
+    Value_impl< Config >::Value_impl( boost::int64_t value )
+    :   type_( int_type )
+    ,   v_( value )
+    ,   is_uint64_( false )
+    {
+    }
+
+    template< class Config >
+    Value_impl< Config >::Value_impl( boost::uint64_t value )
+    :   type_( int_type )
+    ,   v_( static_cast< boost::int64_t >( value ) )
+    ,   is_uint64_( true )
+    {
+    }
+
+    template< class Config >
+    Value_impl< Config >::Value_impl( double value )
+    :   type_( real_type )
+    ,   v_( value )
+    ,   is_uint64_( false )
+    {
+    }
+
+    template< class Config >
+    Value_impl< Config >::Value_impl( const Value_impl< Config >& other )
+    :   type_( other.type() )
+    ,   v_( other.v_ )
+    ,   is_uint64_( other.is_uint64_ )
+    {
+    }
+
+    template< class Config >
+    Value_impl< Config >& Value_impl< Config >::operator=( const Value_impl& lhs )
+    {
+        Value_impl tmp( lhs );
+
+        std::swap( type_, tmp.type_ );
+        std::swap( v_, tmp.v_ );
+        std::swap( is_uint64_, tmp.is_uint64_ );
+
+        return *this;
+    }
+
+    template< class Config >
+    bool Value_impl< Config >::operator==( const Value_impl& lhs ) const
+    {
+        if( this == &lhs ) return true;
+
+        if( type() != lhs.type() ) return false;
+
+        return v_ == lhs.v_; 
+    }
+
+    template< class Config >
+    Value_type Value_impl< Config >::type() const
+    {
+        return type_;
+    }
+
+    template< class Config >
+    bool Value_impl< Config >::is_uint64() const
+    {
+        return is_uint64_;
+    }
+
+    template< class Config >
+    bool Value_impl< Config >::is_null() const
+    {
+        return type() == null_type;
+    }
+
+    template< class Config >
+    void Value_impl< Config >::check_type( const Value_type vtype ) const
+    {
+        if( type() != vtype ) 
+        {
+            std::ostringstream os;
+
+            ///// triangles: Tell the types by name instead of by number
+            os << "value is type " << Value_type_name[type()] << ", expected " << Value_type_name[vtype];
+
+            throw std::runtime_error( os.str() );
+        }
+    }
+
+    template< class Config >
+    const typename Config::String_type& Value_impl< Config >::get_str() const
+    {
+        check_type(  str_type );
+
+        return *boost::get< String_type >( &v_ );
+    }
+
+    template< class Config >
+    const typename Value_impl< Config >::Object& Value_impl< Config >::get_obj() const
+    {
+        check_type( obj_type );
+
+        return *boost::get< Object >( &v_ );
+    }
+     
+    template< class Config >
+    const typename Value_impl< Config >::Array& Value_impl< Config >::get_array() const
+    {
+        check_type(  array_type );
+
+        return *boost::get< Array >( &v_ );
+    }
+     
+    template< class Config >
+    bool Value_impl< Config >::get_bool() const
+    {
+        check_type(  bool_type );
+
+        return boost::get< bool >( v_ );
+    }
+     
+    template< class Config >
+    int Value_impl< Config >::get_int() const
+    {
+        check_type(  int_type );
+
+        return static_cast< int >( get_int64() );
+    }
+    
+    template< class Config >
+    boost::int64_t Value_impl< Config >::get_int64() const
+    {
+        check_type(  int_type );
+
+        return boost::get< boost::int64_t >( v_ );
+    }
+    
+    template< class Config >
+    boost::uint64_t Value_impl< Config >::get_uint64() const
+    {
+        check_type(  int_type );
+
+        return static_cast< boost::uint64_t >( get_int64() );
+    }
+
+    template< class Config >
+    double Value_impl< Config >::get_real() const
+    {
+        if( type() == int_type )
+        {
+            return is_uint64() ? static_cast< double >( get_uint64() )
+                               : static_cast< double >( get_int64() );
+        }
+
+        check_type(  real_type );
+
+        return boost::get< double >( v_ );
+    }
+
+    template< class Config >
+    typename Value_impl< Config >::Object& Value_impl< Config >::get_obj()
+    {
+        check_type(  obj_type );
+
+        return *boost::get< Object >( &v_ );
+    }
+
+    template< class Config >
+    typename Value_impl< Config >::Array& Value_impl< Config >::get_array()
+    {
+        check_type(  array_type );
+
+        return *boost::get< Array >( &v_ );
+    }
+
+    template< class Config >
+    Pair_impl< Config >::Pair_impl( const String_type& name, const Value_type& value )
+    :   name_( name )
+    ,   value_( value )
+    {
+    }
+
+    template< class Config >
+    bool Pair_impl< Config >::operator==( const Pair_impl< Config >& lhs ) const
+    {
+        if( this == &lhs ) return true;
+
+        return ( name_ == lhs.name_ ) && ( value_ == lhs.value_ );
+    }
+
+    // converts a C string, ie. 8 bit char array, to a string object
+    //
+    template < class String_type >
+    String_type to_str( const char* c_str )
+    {
+        String_type result;
+
+        for( const char* p = c_str; *p != 0; ++p )
+        {
+            result += *p;
+        }
+
+        return result;
+    }
+
+    //
+
+    namespace internal_
+    {
+        template< typename T >
+        struct Type_to_type
+        {
+        };
+
+        template< class Value > 
+        int get_value( const Value& value, Type_to_type< int > )
+        {
+            return value.get_int();
+        }
+       
+        template< class Value > 
+        boost::int64_t get_value( const Value& value, Type_to_type< boost::int64_t > )
+        {
+            return value.get_int64();
+        }
+       
+        template< class Value > 
+        boost::uint64_t get_value( const Value& value, Type_to_type< boost::uint64_t > )
+        {
+            return value.get_uint64();
+        }
+       
+        template< class Value > 
+        double get_value( const Value& value, Type_to_type< double > )
+        {
+            return value.get_real();
+        }
+       
+        template< class Value > 
+        typename Value::String_type get_value( const Value& value, Type_to_type< typename Value::String_type > )
+        {
+            return value.get_str();
+        }
+       
+        template< class Value > 
+        typename Value::Array get_value( const Value& value, Type_to_type< typename Value::Array > )
+        {
+            return value.get_array();
+        }
+       
+        template< class Value > 
+        typename Value::Object get_value( const Value& value, Type_to_type< typename Value::Object > )
+        {
+            return value.get_obj();
+        }
+       
+        template< class Value > 
+        bool get_value( const Value& value, Type_to_type< bool > )
+        {
+            return value.get_bool();
+        }
+    }
+
+    template< class Config >
+    template< typename T > 
+    T Value_impl< Config >::get_value() const
+    {
+        return internal_::get_value( *this, internal_::Type_to_type< T >() );
+    }
+}
+
+#endif
@@ -0,0 +1,95 @@
+//          Copyright John W. Wilkinson 2007 - 2009.
+// Distributed under the MIT License, see accompanying file LICENSE.txt
+
+// json spirit version 4.03
+
+#include "json_spirit_writer.h"
+#include "json_spirit_writer_template.h"
+
+void json_spirit::write( const Value& value, std::ostream& os )
+{
+    write_stream( value, os, false );
+}
+
+void json_spirit::write_formatted( const Value& value, std::ostream& os )
+{
+    write_stream( value, os, true );
+}
+
+std::string json_spirit::write( const Value& value )
+{
+    return write_string( value, false );
+}
+
+std::string json_spirit::write_formatted( const Value& value )
+{
+    return write_string( value, true );
+}
+
+#ifndef BOOST_NO_STD_WSTRING
+
+void json_spirit::write( const wValue& value, std::wostream& os )
+{
+    write_stream( value, os, false );
+}
+
+void json_spirit::write_formatted( const wValue& value, std::wostream& os )
+{
+    write_stream( value, os, true );
+}
+
+std::wstring json_spirit::write( const wValue&  value )
+{
+    return write_string( value, false );
+}
+
+std::wstring json_spirit::write_formatted( const wValue&  value )
+{
+    return write_string( value, true );
+}
+
+#endif
+
+void json_spirit::write( const mValue& value, std::ostream& os )
+{
+    write_stream( value, os, false );
+}
+
+void json_spirit::write_formatted( const mValue& value, std::ostream& os )
+{
+    write_stream( value, os, true );
+}
+
+std::string json_spirit::write( const mValue& value )
+{
+    return write_string( value, false );
+}
+
+std::string json_spirit::write_formatted( const mValue& value )
+{
+    return write_string( value, true );
+}
+
+#ifndef BOOST_NO_STD_WSTRING
+
+void json_spirit::write( const wmValue& value, std::wostream& os )
+{
+    write_stream( value, os, false );
+}
+
+void json_spirit::write_formatted( const wmValue& value, std::wostream& os )
+{
+    write_stream( value, os, true );
+}
+
+std::wstring json_spirit::write( const wmValue&  value )
+{
+    return write_string( value, false );
+}
+
+std::wstring json_spirit::write_formatted( const wmValue&  value )
+{
+    return write_string( value, true );
+}
+
+#endif
@@ -0,0 +1,50 @@
+#ifndef JSON_SPIRIT_WRITER
+#define JSON_SPIRIT_WRITER
+
+//          Copyright John W. Wilkinson 2007 - 2009.
+// Distributed under the MIT License, see accompanying file LICENSE.txt
+
+// json spirit version 4.03
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+#include "json_spirit_value.h"
+#include <iostream>
+
+namespace json_spirit
+{
+    // functions to convert JSON Values to text, 
+    // the "formatted" versions add whitespace to format the output nicely
+
+    void         write          ( const Value& value, std::ostream&  os );
+    void         write_formatted( const Value& value, std::ostream&  os );
+    std::string  write          ( const Value& value );
+    std::string  write_formatted( const Value& value );
+
+#ifndef BOOST_NO_STD_WSTRING
+
+    void         write          ( const wValue& value, std::wostream& os );
+    void         write_formatted( const wValue& value, std::wostream& os );
+    std::wstring write          ( const wValue& value );
+    std::wstring write_formatted( const wValue& value );
+
+#endif
+
+    void         write          ( const mValue& value, std::ostream&  os );
+    void         write_formatted( const mValue& value, std::ostream&  os );
+    std::string  write          ( const mValue& value );
+    std::string  write_formatted( const mValue& value );
+
+#ifndef BOOST_NO_STD_WSTRING
+
+    void         write          ( const wmValue& value, std::wostream& os );
+    void         write_formatted( const wmValue& value, std::wostream& os );
+    std::wstring write          ( const wmValue& value );
+    std::wstring write_formatted( const wmValue& value );
+
+#endif
+}
+
+#endif
@@ -0,0 +1,248 @@
+#ifndef JSON_SPIRIT_WRITER_TEMPLATE
+#define JSON_SPIRIT_WRITER_TEMPLATE
+
+//          Copyright John W. Wilkinson 2007 - 2009.
+// Distributed under the MIT License, see accompanying file LICENSE.txt
+
+// json spirit version 4.03
+
+#include "json_spirit_value.h"
+
+#include <cassert>
+#include <sstream>
+#include <iomanip>
+
+namespace json_spirit
+{
+    inline char to_hex_char( unsigned int c )
+    {
+        assert( c <= 0xF );
+
+        const char ch = static_cast< char >( c );
+
+        if( ch < 10 ) return '0' + ch;
+
+        return 'A' - 10 + ch;
+    }
+
+    template< class String_type >
+    String_type non_printable_to_string( unsigned int c )
+    {
+        typedef typename String_type::value_type Char_type;
+
+        String_type result( 6, '\\' );
+
+        result[1] = 'u';
+
+        result[ 5 ] = to_hex_char( c & 0x000F ); c >>= 4;
+        result[ 4 ] = to_hex_char( c & 0x000F ); c >>= 4;
+        result[ 3 ] = to_hex_char( c & 0x000F ); c >>= 4;
+        result[ 2 ] = to_hex_char( c & 0x000F );
+
+        return result;
+    }
+
+    template< typename Char_type, class String_type >
+    bool add_esc_char( Char_type c, String_type& s )
+    {
+        switch( c )
+        {
+            case '"':  s += to_str< String_type >( "\\\"" ); return true;
+            case '\\': s += to_str< String_type >( "\\\\" ); return true;
+            case '\b': s += to_str< String_type >( "\\b"  ); return true;
+            case '\f': s += to_str< String_type >( "\\f"  ); return true;
+            case '\n': s += to_str< String_type >( "\\n"  ); return true;
+            case '\r': s += to_str< String_type >( "\\r"  ); return true;
+            case '\t': s += to_str< String_type >( "\\t"  ); return true;
+        }
+
+        return false;
+    }
+
+    template< class String_type >
+    String_type add_esc_chars( const String_type& s )
+    {
+        typedef typename String_type::const_iterator Iter_type;
+        typedef typename String_type::value_type     Char_type;
+
+        String_type result;
+
+        const Iter_type end( s.end() );
+
+        for( Iter_type i = s.begin(); i != end; ++i )
+        {
+            const Char_type c( *i );
+
+            if( add_esc_char( c, result ) ) continue;
+
+            const wint_t unsigned_c( ( c >= 0 ) ? c : 256 + c );
+
+            if( iswprint( unsigned_c ) )
+            {
+                result += c;
+            }
+            else
+            {
+                result += non_printable_to_string< String_type >( unsigned_c );
+            }
+        }
+
+        return result;
+    }
+
+    // this class generates the JSON text,
+    // it keeps track of the indentation level etc.
+    //
+    template< class Value_type, class Ostream_type >
+    class Generator
+    {
+        typedef typename Value_type::Config_type Config_type;
+        typedef typename Config_type::String_type String_type;
+        typedef typename Config_type::Object_type Object_type;
+        typedef typename Config_type::Array_type Array_type;
+        typedef typename String_type::value_type Char_type;
+        typedef typename Object_type::value_type Obj_member_type;
+
+    public:
+
+        Generator( const Value_type& value, Ostream_type& os, bool pretty )
+        :   os_( os )
+        ,   indentation_level_( 0 )
+        ,   pretty_( pretty )
+        {
+            output( value );
+        }
+
+    private:
+
+        void output( const Value_type& value )
+        {
+            switch( value.type() )
+            {
+                case obj_type:   output( value.get_obj() );   break;
+                case array_type: output( value.get_array() ); break;
+                case str_type:   output( value.get_str() );   break;
+                case bool_type:  output( value.get_bool() );  break;
+                case int_type:   output_int( value );         break;
+
+                /// triangles: Added std::fixed and changed precision from 16 to 8
+                case real_type:  os_ << std::showpoint << std::fixed << std::setprecision(8)
+                                     << value.get_real();     break;
+
+                case null_type:  os_ << "null";               break;
+                default: assert( false );
+            }
+        }
+
+        void output( const Object_type& obj )
+        {
+            output_array_or_obj( obj, '{', '}' );
+        }
+
+        void output( const Array_type& arr )
+        {
+            output_array_or_obj( arr, '[', ']' );
+        }
+
+        void output( const Obj_member_type& member )
+        {
+            output( Config_type::get_name( member ) ); space(); 
+            os_ << ':'; space(); 
+            output( Config_type::get_value( member ) );
+        }
+
+        void output_int( const Value_type& value )
+        {
+            if( value.is_uint64() )
+            {
+                os_ << value.get_uint64();
+            }
+            else
+            {
+               os_ << value.get_int64();
+            }
+        }
+
+        void output( const String_type& s )
+        {
+            os_ << '"' << add_esc_chars( s ) << '"';
+        }
+
+        void output( bool b )
+        {
+            os_ << to_str< String_type >( b ? "true" : "false" );
+        }
+
+        template< class T >
+        void output_array_or_obj( const T& t, Char_type start_char, Char_type end_char )
+        {
+            os_ << start_char; new_line();
+
+            ++indentation_level_;
+            
+            for( typename T::const_iterator i = t.begin(); i != t.end(); ++i )
+            {
+                indent(); output( *i );
+
+                typename T::const_iterator next = i;
+
+                if( ++next != t.end())
+                {
+                    os_ << ',';
+                }
+
+                new_line();
+            }
+
+            --indentation_level_;
+
+            indent(); os_ << end_char;
+        }
+        
+        void indent()
+        {
+            if( !pretty_ ) return;
+
+            for( int i = 0; i < indentation_level_; ++i )
+            { 
+                os_ << "    ";
+            }
+        }
+
+        void space()
+        {
+            if( pretty_ ) os_ << ' ';
+        }
+
+        void new_line()
+        {
+            if( pretty_ ) os_ << '\n';
+        }
+
+        Generator& operator=( const Generator& ); // to prevent "assignment operator could not be generated" warning
+
+        Ostream_type& os_;
+        int indentation_level_;
+        bool pretty_;
+    };
+
+    template< class Value_type, class Ostream_type >
+    void write_stream( const Value_type& value, Ostream_type& os, bool pretty )
+    {
+        Generator< Value_type, Ostream_type >( value, os, pretty );
+    }
+
+    template< class Value_type >
+    typename Value_type::String_type write_string( const Value_type& value, bool pretty )
+    {
+        typedef typename Value_type::String_type::value_type Char_type;
+
+        std::basic_ostringstream< Char_type > os;
+
+        write_stream( value, os, pretty );
+
+        return os.str();
+    }
+}
+
+#endif
@@ -1,148 +0,0 @@
-set(LEVELDB_CORE_SOURCES
-    db/builder.cc
-    db/c.cc
-    db/db_impl.cc
-    db/db_iter.cc
-    db/dbformat.cc
-    db/dumpfile.cc
-    db/filename.cc
-    db/log_reader.cc
-    db/log_writer.cc
-    db/memtable.cc
-    db/repair.cc
-    db/table_cache.cc
-    db/version_edit.cc
-    db/version_set.cc
-    db/write_batch.cc
-    table/block.cc
-    table/block_builder.cc
-    table/filter_block.cc
-    table/format.cc
-    table/iterator.cc
-    table/merger.cc
-    table/table.cc
-    table/table_builder.cc
-    table/two_level_iterator.cc
-    util/arena.cc
-    util/bloom.cc
-    util/cache.cc
-    util/coding.cc
-    util/comparator.cc
-    util/crc32c.cc
-    util/env.cc
-    util/filter_policy.cc
-    util/hash.cc
-    util/histogram.cc
-    util/logging.cc
-    util/options.cc
-    util/status.cc
-)
-
-if(WIN32)
-    list(APPEND LEVELDB_CORE_SOURCES util/env_windows.cc)
-else()
-    list(APPEND LEVELDB_CORE_SOURCES util/env_posix.cc)
-endif()
-
-add_library(leveldb_lib STATIC ${LEVELDB_CORE_SOURCES})
-
-target_compile_features(leveldb_lib PUBLIC cxx_std_11)
-
-target_include_directories(leveldb_lib
-    PUBLIC
-        "${CMAKE_CURRENT_SOURCE_DIR}/include"
-    PRIVATE
-        "${CMAKE_CURRENT_SOURCE_DIR}"
-)
-
-target_compile_definitions(leveldb_lib
-    PRIVATE
-        HAVE_CRC32C=0
-        HAVE_SNAPPY=0
-)
-
-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-    target_compile_options(leveldb_lib PRIVATE -fno-builtin-memcmp)
-endif()
-
-if(WIN32)
-    target_compile_definitions(leveldb_lib PRIVATE
-        _REENTRANT
-        OS_WINDOWS
-        LEVELDB_PLATFORM_WINDOWS
-        WINVER=0x0500
-        __USE_MINGW_ANSI_STDIO=1
-    )
-    target_link_libraries(leveldb_lib PUBLIC shlwapi)
-elseif(APPLE)
-    target_compile_definitions(leveldb_lib PRIVATE
-        OS_MACOSX
-        LEVELDB_PLATFORM_POSIX
-    )
-    target_link_libraries(leveldb_lib PUBLIC Threads::Threads)
-else()
-    target_compile_definitions(leveldb_lib PRIVATE
-        _REENTRANT
-        OS_LINUX
-        LEVELDB_PLATFORM_POSIX
-    )
-    target_link_libraries(leveldb_lib PUBLIC Threads::Threads)
-endif()
-
-add_library(leveldb_memenv STATIC helpers/memenv/memenv.cc)
-
-target_compile_features(leveldb_memenv PUBLIC cxx_std_11)
-
-target_include_directories(leveldb_memenv
-    PUBLIC
-        "${CMAKE_CURRENT_SOURCE_DIR}/include"
-        "${CMAKE_CURRENT_SOURCE_DIR}/helpers"
-    PRIVATE
-        "${CMAKE_CURRENT_SOURCE_DIR}"
-)
-
-target_compile_definitions(leveldb_memenv
-    PRIVATE
-        HAVE_CRC32C=0
-        HAVE_SNAPPY=0
-)
-
-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-    target_compile_options(leveldb_memenv PRIVATE -fno-builtin-memcmp)
-endif()
-
-if(WIN32)
-    target_compile_definitions(leveldb_memenv PRIVATE
-        _REENTRANT
-        OS_WINDOWS
-        LEVELDB_PLATFORM_WINDOWS
-        WINVER=0x0500
-        __USE_MINGW_ANSI_STDIO=1
-    )
-elseif(APPLE)
-    target_compile_definitions(leveldb_memenv PRIVATE
-        OS_MACOSX
-        LEVELDB_PLATFORM_POSIX
-    )
-else()
-    target_compile_definitions(leveldb_memenv PRIVATE
-        _REENTRANT
-        OS_LINUX
-        LEVELDB_PLATFORM_POSIX
-    )
-endif()
-
-target_link_libraries(leveldb_memenv PUBLIC leveldb_lib)
-
-add_library(leveldb_bundled INTERFACE)
-
-target_link_libraries(leveldb_bundled INTERFACE
-    leveldb_lib
-    leveldb_memenv
-)
-
-target_include_directories(leveldb_bundled INTERFACE
-    "${CMAKE_CURRENT_SOURCE_DIR}"
-    "${CMAKE_CURRENT_SOURCE_DIR}/include"
-    "${CMAKE_CURRENT_SOURCE_DIR}/helpers"
-)
@@ -39,7 +39,6 @@ CCriticalSection cs_main;

 CTxMemPool mempool;
 unsigned int nTransactionsUpdated = 0;
-CCheckQueue<CScriptCheck>* pScriptCheckQueue = NULL;

 map<uint256, CBlockIndex*> mapBlockIndex;
 set<pair<COutPoint, unsigned int> > setStakeSeen;
@@ -683,15 +682,12 @@ bool CTransaction::AreInputsStandard(const MapPrevTx& mapInputs) const

    for (unsigned int i = 0; i < vin.size(); i++)
    {
-        MapPrevTx::const_iterator mi = mapInputs.find(vin[i].prevout);
-        if (mi == mapInputs.end())
-            return false;
-        const CUtxoEntry& entry = mi->second;
+        const CTxOut& prev = GetOutputFor(vin[i], mapInputs);

        vector<vector<unsigned char> > vSolutions;
        txnouttype whichType;
        // get the scriptPubKey corresponding to this input:
-        const CScript& prevScript = entry.scriptPubKey;
+        const CScript& prevScript = prev.scriptPubKey;
        if (!Solver(prevScript, whichType, vSolutions))
            return false;
        int nArgsExpected = ScriptSigArgsExpected(whichType, vSolutions);
@@ -955,9 +951,9 @@ bool CTxMemPool::accept(CTxDB& txdb, CTransaction &tx, bool fCheckInputs,
    if (fCheckInputs)
    {
        MapPrevTx mapInputs;
-        MapPrevTx mapEmpty; // no pending UTXOs for mempool acceptance
+        map<uint256, CTxIndex> mapUnused;
        bool fInvalid = false;
-        if (!tx.FetchInputs(txdb, mapEmpty, false, false, mapInputs, fInvalid))
+        if (!tx.FetchInputs(txdb, mapUnused, false, false, mapInputs, fInvalid))
        {
            if (fInvalid)
                return error("CTxMemPool::accept() : FetchInputs found invalid tx %s", hash.ToString().substr(0,10).c_str());
@@ -1011,7 +1007,7 @@ bool CTxMemPool::accept(CTxDB& txdb, CTransaction &tx, bool fCheckInputs,

        // Check against previous transactions
        // This is done last to help prevent CPU exhaustion denial-of-service attacks.
-        if (!tx.ConnectInputs(txdb, mapInputs, pindexBest, false, false))
+        if (!tx.ConnectInputs(txdb, mapInputs, mapUnused, CDiskTxPos(1,1,1), pindexBest, false, false))
        {
            return error("CTxMemPool::accept() : ConnectInputs failed %s", hash.ToString().substr(0,10).c_str());
        }
@@ -1326,15 +1322,13 @@ int64_t GetProofOfWorkReward(int64_t nFees)
 {
    int64_t nSubsidy = 1 * COIN;

-    if (!pindexBest)
-        return nSubsidy + nFees;

+    if (pindexBest->nHeight >= 1 ) { nSubsidy = 1 * COIN;}
+    if (pindexBest->nHeight >= 100) { nSubsidy = 20 * COIN;}
+    if (pindexBest->nHeight >= 1000) { nSubsidy = 10 * COIN;}
+    if (pindexBest->nHeight >= 3000) { nSubsidy = 5 * COIN;}
+    if (pindexBest->nHeight >= 7000) { nSubsidy = 10 * COIN;}
    if (pindexBest->nHeight >= 9001) { nSubsidy = 0 * COIN; }
-    else if (pindexBest->nHeight >= 7000) { nSubsidy = 10 * COIN; }
-    else if (pindexBest->nHeight >= 3000) { nSubsidy = 5 * COIN; }
-    else if (pindexBest->nHeight >= 1000) { nSubsidy = 10 * COIN; }
-    else if (pindexBest->nHeight >= 100) { nSubsidy = 20 * COIN; }
-    else if (pindexBest->nHeight >= 1) { nSubsidy = 1 * COIN; }

    if (fDebug && GetBoolArg("-printcreation"))
        printf("GetProofOfWorkReward() : create=%s nSubsidy=%" PRId64 "\n", FormatMoney(nSubsidy).c_str(), nSubsidy);
@@ -1535,16 +1529,41 @@ void CBlock::UpdateTime(const CBlockIndex* pindexPrev)

 bool CTransaction::DisconnectInputs(CTxDB& txdb)
 {
-    // Remove transaction position index entry.
-    // UTXO undo (restoring spent outputs, removing created outputs) is
-    // handled by DisconnectBlock's UTXO section.
+    // Relinquish previous transactions' spent pointers
+    if (!IsCoinBase())
+    {
+        for (const CTxIn& txin : vin)
+        {
+            COutPoint prevout = txin.prevout;
+
+            // Get prev txindex from disk
+            CTxIndex txindex;
+            if (!txdb.ReadTxIndex(prevout.hash, txindex))
+                return error("DisconnectInputs() : ReadTxIndex failed");
+
+            if (prevout.n >= txindex.vSpent.size())
+                return error("DisconnectInputs() : prevout.n out of range");
+
+            // Mark outpoint as not spent
+            txindex.vSpent[prevout.n].SetNull();
+
+            // Write back
+            if (!txdb.UpdateTxIndex(prevout.hash, txindex))
+                return error("DisconnectInputs() : UpdateTxIndex failed");
+        }
+    }
+
+    // Remove transaction from index
+    // This can fail if a duplicate of this transaction was in a chain that got
+    // reorganized away. This is only possible if this transaction was completely
+    // spent, so erasing it would be a no-op anyway.
    txdb.EraseTxIndex(*this);

    return true;
 }


-bool CTransaction::FetchInputs(CTxDB& txdb, const MapPrevTx& mapPendingUtxos,
+bool CTransaction::FetchInputs(CTxDB& txdb, const map<uint256, CTxIndex>& mapTestPool,
                               bool fBlock, bool fMiner, MapPrevTx& inputsRet, bool& fInvalid)
 {
    // FetchInputs can return false either because we just haven't seen some inputs
@@ -1559,96 +1578,61 @@ bool CTransaction::FetchInputs(CTxDB& txdb, const MapPrevTx& mapPendingUtxos,
    for (unsigned int i = 0; i < vin.size(); i++)
    {
        COutPoint prevout = vin[i].prevout;
-        if (inputsRet.count(prevout))
+        if (inputsRet.count(prevout.hash))
            continue; // Got it already

-        // Check pending UTXOs from earlier transactions in the same block
-        MapPrevTx::const_iterator mi = mapPendingUtxos.find(prevout);
-        if (mi != mapPendingUtxos.end())
+        // Read txindex
+        CTxIndex& txindex = inputsRet[prevout.hash].first;
+        bool fFound = true;
+        if ((fBlock || fMiner) && mapTestPool.count(prevout.hash))
        {
-            inputsRet[prevout] = mi->second;
-            continue;
+            // Get txindex from current proposed changes
+            txindex = mapTestPool.find(prevout.hash)->second;
        }
-
-        // Read from UTXO database
-        CUtxoEntry entry;
-        if (txdb.ReadUtxo(prevout.hash, prevout.n, entry))
+        else
        {
-            inputsRet[prevout] = entry;
-            continue;
+            // Read txindex from txdb
+            fFound = txdb.ReadTxIndex(prevout.hash, txindex);
        }
+        if (!fFound && (fBlock || fMiner))
+            return fMiner ? false : error("FetchInputs() : %s prev tx %s index entry not found", GetHash().ToString().substr(0,10).c_str(),  prevout.hash.ToString().substr(0,10).c_str());

-        // Lazy fallback: try old CTxIndex path (for databases upgrading from pre-UTXO format)
+        // Read txPrev
+        CTransaction& txPrev = inputsRet[prevout.hash].second;
+        if (!fFound || txindex.pos == CDiskTxPos(1,1,1))
        {
-            CTxIndex txindex;
-            if (txdb.ReadTxIndex(prevout.hash, txindex))
+            // Get prev tx from single transactions in memory
            {
-                CTransaction txPrev;
-                if (txPrev.ReadFromDisk(txindex.pos))
-                {
-                    if (prevout.n < txPrev.vout.size())
-                    {
-                        CUtxoEntry backfill;
-                        backfill.nValue = txPrev.vout[prevout.n].nValue;
-                        backfill.scriptPubKey = txPrev.vout[prevout.n].scriptPubKey;
-                        backfill.fCoinBase = txPrev.IsCoinBase();
-                        backfill.fCoinStake = txPrev.IsCoinStake();
-                        backfill.nTxTime = txPrev.nTime;
-                        backfill.nHeight = 0; // conservative default
-
-                        // Try to recover exact block height from block index
-                        CBlock blockHeader;
-                        if (blockHeader.ReadFromDisk(txindex.pos.nFile, txindex.pos.nBlockPos, false))
-                        {
-                            std::map<uint256, CBlockIndex*>::iterator bmi = mapBlockIndex.find(blockHeader.GetHash());
-                            if (bmi != mapBlockIndex.end())
-                                backfill.nHeight = bmi->second->nHeight;
-                        }
-
-                        // Check if this output was already spent (vSpent in old format)
-                        if (prevout.n < txindex.vSpent.size() && !txindex.vSpent[prevout.n].IsNull())
-                        {
-                            // Already spent — don't return it as available
-                        }
-                        else
-                        {
-                            // Backfill to UTXO DB for future lookups
-                            txdb.WriteUtxo(prevout.hash, prevout.n, backfill);
-                            inputsRet[prevout] = backfill;
-                            continue;
-                        }
-                    }
-                }
+                LOCK(mempool.cs);
+                if (!mempool.exists(prevout.hash))
+                    return error("FetchInputs() : %s mempool Tx prev not found %s", GetHash().ToString().substr(0,10).c_str(),  prevout.hash.ToString().substr(0,10).c_str());
+                txPrev = mempool.lookup(prevout.hash);
            }
+            if (!fFound)
+                txindex.vSpent.resize(txPrev.vout.size());
        }
-
-        // Not in UTXO DB or old index — check mempool
+        else
        {
-            LOCK(mempool.cs);
-            if (mempool.exists(prevout.hash))
-            {
-                const CTransaction& txPrev = mempool.lookup(prevout.hash);
-                if (prevout.n < txPrev.vout.size())
-                {
-                    CUtxoEntry mempoolEntry;
-                    mempoolEntry.nValue = txPrev.vout[prevout.n].nValue;
-                    mempoolEntry.nHeight = 0; // not yet in a block
-                    mempoolEntry.scriptPubKey = txPrev.vout[prevout.n].scriptPubKey;
-                    mempoolEntry.fCoinBase = txPrev.IsCoinBase();
-                    mempoolEntry.fCoinStake = txPrev.IsCoinStake();
-                    mempoolEntry.nTxTime = txPrev.nTime;
-                    inputsRet[prevout] = mempoolEntry;
-                    continue;
-                }
-            }
+            // Get prev tx from disk
+            if (!txPrev.ReadFromDisk(txindex.pos))
+                return error("FetchInputs() : %s ReadFromDisk prev tx %s failed", GetHash().ToString().substr(0,10).c_str(),  prevout.hash.ToString().substr(0,10).c_str());
        }
+    }

-        // Input not found anywhere
-        if (fBlock || fMiner)
-            return fMiner ? false : error("FetchInputs() : %s prev output %s:%d not found", GetHash().ToString().substr(0,10).c_str(), prevout.hash.ToString().substr(0,10).c_str(), prevout.n);
-
-        // For orphan detection in AcceptToMemoryPool
-        return false;
+    // Make sure all prevout.n indexes are valid:
+    for (unsigned int i = 0; i < vin.size(); i++)
+    {
+        const COutPoint prevout = vin[i].prevout;
+        assert(inputsRet.count(prevout.hash) != 0);
+        const CTxIndex& txindex = inputsRet[prevout.hash].first;
+        const CTransaction& txPrev = inputsRet[prevout.hash].second;
+        if (prevout.n >= txPrev.vout.size() || prevout.n >= txindex.vSpent.size())
+        {
+            // Revisit this if/when transaction replacement is implemented and allows
+            // adding inputs:
+            fInvalid = true;
+            return DoS(100, error("FetchInputs() : %s prevout.n out of range %d %" PRIszu " %" PRIszu " prev tx %s\n%s", GetHash().ToString().substr(0,10).c_str(), prevout.n, txPrev.vout.size(), txindex.vSpent.size(), prevout.hash.ToString().substr(0,10).c_str(), txPrev.ToString().c_str()));
+        }
    }

    return true;
@@ -1656,11 +1640,15 @@ bool CTransaction::FetchInputs(CTxDB& txdb, const MapPrevTx& mapPendingUtxos,

 const CTxOut& CTransaction::GetOutputFor(const CTxIn& input, const MapPrevTx& inputs) const
 {
-    // Legacy adapter: constructs a temporary CTxOut from CUtxoEntry.
-    // Only used by AreInputsStandard which needs a CTxOut reference.
-    (void)input;
-    (void)inputs;
-    throw std::runtime_error("CTransaction::GetOutputFor() : use UTXO entries directly");
+    MapPrevTx::const_iterator mi = inputs.find(input.prevout.hash);
+    if (mi == inputs.end())
+        throw std::runtime_error("CTransaction::GetOutputFor() : prevout.hash not found");
+
+    const CTransaction& txPrev = (mi->second).second;
+    if (input.prevout.n >= txPrev.vout.size())
+        throw std::runtime_error("CTransaction::GetOutputFor() : prevout.n out of range");
+
+    return txPrev.vout[input.prevout.n];
 }

 int64_t CTransaction::GetValueIn(const MapPrevTx& inputs) const
@@ -1671,12 +1659,10 @@ int64_t CTransaction::GetValueIn(const MapPrevTx& inputs) const
    int64_t nResult = 0;
    for (unsigned int i = 0; i < vin.size(); i++)
    {
-        MapPrevTx::const_iterator mi = inputs.find(vin[i].prevout);
-        if (mi == inputs.end())
-            throw std::runtime_error("CTransaction::GetValueIn() : input not found");
-        nResult += mi->second.nValue;
+        nResult += GetOutputFor(vin[i], inputs).nValue;
    }
    return nResult;
+
 }

 unsigned int CTransaction::GetP2SHSigOpCount(const MapPrevTx& inputs) const
@@ -1687,23 +1673,20 @@ unsigned int CTransaction::GetP2SHSigOpCount(const MapPrevTx& inputs) const
    unsigned int nSigOps = 0;
    for (unsigned int i = 0; i < vin.size(); i++)
    {
-        MapPrevTx::const_iterator mi = inputs.find(vin[i].prevout);
-        if (mi == inputs.end())
-            continue;
-        const CScript& scriptPubKey = mi->second.scriptPubKey;
-        if (scriptPubKey.IsPayToScriptHash())
-            nSigOps += scriptPubKey.GetSigOpCount(vin[i].scriptSig);
+        const CTxOut& prevout = GetOutputFor(vin[i], inputs);
+        if (prevout.scriptPubKey.IsPayToScriptHash())
+            nSigOps += prevout.scriptPubKey.GetSigOpCount(vin[i].scriptSig);
    }
    return nSigOps;
 }

-bool CTransaction::ConnectInputs(CTxDB& txdb, const MapPrevTx& inputs,
-    const CBlockIndex* pindexBlock, bool fBlock, bool fMiner,
-    std::vector<CScriptCheck>* pvChecks)
+bool CTransaction::ConnectInputs(CTxDB& txdb, MapPrevTx inputs, map<uint256, CTxIndex>& mapTestPool, const CDiskTxPos& posThisTx,
+    const CBlockIndex* pindexBlock, bool fBlock, bool fMiner)
 {
-    // Validate inputs against UTXO entries and verify signatures.
-    // Double-spend is impossible here: FetchInputs only returns entries that exist
-    // in the UTXO DB (unspent) or mapPendingUtxos (created earlier in this block).
+    // Take over previous transactions' spent pointers
+    // fBlock is true when this is called from AcceptBlock when a new best-block is added to the blockchain
+    // fMiner is true when called from the internal triangles miner
+    // ... both are false when called from CTransaction::AcceptToMemoryPool
    if (!IsCoinBase())
    {
        int64_t nValueIn = 0;
@@ -1711,52 +1694,65 @@ bool CTransaction::ConnectInputs(CTxDB& txdb, const MapPrevTx& inputs,
        for (unsigned int i = 0; i < vin.size(); i++)
        {
            COutPoint prevout = vin[i].prevout;
-            MapPrevTx::const_iterator mi = inputs.find(prevout);
-            if (mi == inputs.end())
-                return DoS(100, error("ConnectInputs() : %s input %s:%d not found", GetHash().ToString().substr(0,10).c_str(), prevout.hash.ToString().substr(0,10).c_str(), prevout.n));
-            const CUtxoEntry& entry = mi->second;
+            assert(inputs.count(prevout.hash) > 0);
+            CTxIndex& txindex = inputs[prevout.hash].first;
+            CTransaction& txPrev = inputs[prevout.hash].second;
+
+            if (prevout.n >= txPrev.vout.size() || prevout.n >= txindex.vSpent.size())
+                return DoS(100, error("ConnectInputs() : %s prevout.n out of range %d %" PRIszu " %" PRIszu " prev tx %s\n%s", GetHash().ToString().substr(0,10).c_str(), prevout.n, txPrev.vout.size(), txindex.vSpent.size(), prevout.hash.ToString().substr(0,10).c_str(), txPrev.ToString().c_str()));

            // If prev is coinbase or coinstake, check that it's matured
-            if (entry.fCoinBase || entry.fCoinStake)
-            {
-                if (pindexBlock->nHeight - entry.nHeight < nCoinbaseMaturity)
-                    return error("ConnectInputs() : tried to spend %s at depth %d", entry.fCoinBase ? "coinbase" : "coinstake", pindexBlock->nHeight - entry.nHeight);
-            }
+            if (txPrev.IsCoinBase() || txPrev.IsCoinStake())
+                for (const CBlockIndex* pindex = pindexBlock; pindex && pindexBlock->nHeight - pindex->nHeight < nCoinbaseMaturity; pindex = pindex->pprev)
+                    if (pindex->nBlockPos == txindex.pos.nBlockPos && pindex->nFile == txindex.pos.nFile)
+                        return error("ConnectInputs() : tried to spend %s at depth %d", txPrev.IsCoinBase() ? "coinbase" : "coinstake", pindexBlock->nHeight - pindex->nHeight);

            // triangles: check transaction timestamp
-            if (entry.nTxTime > nTime)
+            if (txPrev.nTime > nTime)
                return DoS(100, error("ConnectInputs() : transaction timestamp earlier than input transaction"));

            // Check for negative or overflow input values
-            nValueIn += entry.nValue;
-            if (!MoneyRange(entry.nValue) || !MoneyRange(nValueIn))
+            nValueIn += txPrev.vout[prevout.n].nValue;
+            if (!MoneyRange(txPrev.vout[prevout.n].nValue) || !MoneyRange(nValueIn))
                return DoS(100, error("ConnectInputs() : txin values out of range"));
-        }

+        }
        // The first loop above does all the inexpensive checks.
        // Only if ALL inputs pass do we perform expensive ECDSA signature checks.
        // Helps prevent CPU exhaustion attacks.
        for (unsigned int i = 0; i < vin.size(); i++)
        {
            COutPoint prevout = vin[i].prevout;
-            const CUtxoEntry& entry = inputs.find(prevout)->second;
+            assert(inputs.count(prevout.hash) > 0);
+            CTxIndex& txindex = inputs[prevout.hash].first;
+            CTransaction& txPrev = inputs[prevout.hash].second;
+
+            // Check for conflicts (double-spend)
+            // This doesn't trigger the DoS code on purpose; if it did, it would make it easier
+            // for an attacker to attempt to split the network.
+            if (!txindex.vSpent[prevout.n].IsNull())
+                return fMiner ? false : error("ConnectInputs() : %s prev tx already used at %s", GetHash().ToString().substr(0,10).c_str(), txindex.vSpent[prevout.n].ToString().c_str());

            // Skip ECDSA signature verification when connecting blocks (fBlock=true)
            // before the last blockchain checkpoint. This is safe because block merkle hashes are
            // still computed and checked, and any change will be caught at the next checkpoint.
            if (!(fBlock && (nBestHeight < Checkpoints::GetTotalBlocksEstimate())))
            {
-                if (pvChecks)
+                // Verify signature
+                if (!VerifySignature(txPrev, *this, i, 0))
                {
-                    pvChecks->push_back(CScriptCheck(entry.scriptPubKey, vin[i].scriptSig, *this, i, 0));
-                }
-                else
-                {
-                    // Verify signature using scriptPubKey from UTXO entry
-                    if (!VerifyScript(vin[i].scriptSig, entry.scriptPubKey, *this, i, 0))
-                        return DoS(100, error("ConnectInputs() : %s VerifySignature failed", GetHash().ToString().substr(0,10).c_str()));
+                    return DoS(100,error("ConnectInputs() : %s VerifySignature failed", GetHash().ToString().substr(0,10).c_str()));
                }
            }
+
+            // Mark outpoints as spent
+            txindex.vSpent[prevout.n] = posThisTx;
+
+            // Write back
+            if (fBlock || fMiner)
+            {
+                mapTestPool[prevout.hash] = txindex;
+            }
        }

        if (!IsCoinStake())
@@ -1866,45 +1862,6 @@ bool CBlock::DisconnectBlock(CTxDB& txdb, CBlockIndex* pindex)
        if (!vtx[i].DisconnectInputs(txdb))
            return false;

-    // Undo UTXO entries for this block (reverse of ConnectBlock's UTXO writes)
-    for (int i = (int)vtx.size()-1; i >= 0; i--)
-    {
-        const CTransaction& tx = vtx[i];
-        uint256 txhash = tx.GetHash();
-
-        // Erase outputs this block created
-        for (unsigned int k = 0; k < tx.vout.size(); k++)
-        {
-            if (!tx.vout[k].IsEmpty())
-                txdb.EraseUtxo(txhash, k);
-        }
-
-        // Restore inputs this block spent (read prev tx from disk to rebuild UTXO entry)
-        if (!tx.IsCoinBase())
-        {
-            for (const CTxIn& txin : tx.vin)
-            {
-                CTransaction txPrev;
-                CTxIndex txindex;
-                if (txdb.ReadDiskTx(txin.prevout.hash, txPrev, txindex))
-                {
-                    if (txin.prevout.n < txPrev.vout.size())
-                    {
-                        const CTxOut& prevout = txPrev.vout[txin.prevout.n];
-                        CUtxoEntry utxo;
-                        utxo.nValue = prevout.nValue;
-                        utxo.nHeight = 0; // approximation; exact height not critical for restored UTXOs
-                        utxo.scriptPubKey = prevout.scriptPubKey;
-                        utxo.fCoinBase = txPrev.IsCoinBase();
-                        utxo.fCoinStake = txPrev.IsCoinStake();
-                        utxo.nTxTime = txPrev.nTime;
-                        txdb.WriteUtxo(txin.prevout.hash, txin.prevout.n, utxo);
-                    }
-                }
-            }
-        }
-    }
-
    // Undo address index entries for this block
    if (fAddressIndex)
    {
@@ -2009,10 +1966,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
    else
        nTxPos = pindex->nBlockPos + ::GetSerializeSize(CBlock(), SER_DISK, CLIENT_VERSION) - (2 * GetSizeOfCompactSize(0)) + GetSizeOfCompactSize(vtx.size());

-    map<uint256, CTxIndex> mapQueuedChanges;  // tx position index (for getrawtransaction)
-    MapPrevTx mapPendingUtxos;                // in-block UTXO tracking
-    std::vector<CScriptCheck> vChecks;
-    CCheckQueueControl<CScriptCheck> scriptcheckcontrol(pScriptCheckQueue);
+    map<uint256, CTxIndex> mapQueuedChanges;
    int64_t nFees = 0;
    int64_t nValueIn = 0;
    int64_t nValueOut = 0;
@@ -2026,43 +1980,33 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
        if (!fJustCheck)
            nTxPos += ::GetSerializeSize(tx, SER_DISK, CLIENT_VERSION);

-        // Record tx position for getrawtransaction (both fast and full paths)
-        mapQueuedChanges[hashTx] = CTxIndex(posThisTx, tx.vout.size());
-
-        // Fast path: below checkpoint, skip all input validation.
-        // Track pending UTXOs so later txs in the same block can find inputs.
+        // Fast path: below checkpoint, skip all input validation and spent-tracking.
+        // Just record where each transaction lives on disk (txindex).
        if (fAssumeValid)
        {
-            // Add outputs to pending UTXOs
-            for (unsigned int k = 0; k < tx.vout.size(); k++)
-            {
-                if (!tx.vout[k].IsEmpty())
-                {
-                    CUtxoEntry entry;
-                    entry.nValue = tx.vout[k].nValue;
-                    entry.nHeight = pindex->nHeight;
-                    entry.scriptPubKey = tx.vout[k].scriptPubKey;
-                    entry.fCoinBase = tx.IsCoinBase();
-                    entry.fCoinStake = tx.IsCoinStake();
-                    entry.nTxTime = tx.nTime;
-                    mapPendingUtxos[COutPoint(hashTx, k)] = entry;
-                }
-            }
-            // Remove spent inputs from pending UTXOs
-            if (!tx.IsCoinBase())
-                for (const CTxIn& txin : tx.vin)
-                    mapPendingUtxos.erase(txin.prevout);
+            mapQueuedChanges[hashTx] = CTxIndex(posThisTx, tx.vout.size());
            continue;
        }

        // Full validation path (above checkpoint)

-        // BIP30: check for duplicate transaction with unspent outputs.
-        // With UTXO model, if any output of this txid exists in the UTXO DB, it's a duplicate.
-        for (unsigned int k = 0; k < tx.vout.size(); k++)
-        {
-            if (!tx.vout[k].IsEmpty() && txdb.HaveUtxo(hashTx, k))
-                return false;
+        // Do not allow blocks that contain transactions which 'overwrite' older transactions,
+        // unless those are already completely spent.
+        // If such overwrites are allowed, coinbases and transactions depending upon those
+        // can be duplicated to remove the ability to spend the first instance -- even after
+        // being sent to another address.
+        // See BIP30 and http://r6.ca/blog/20120206T005236Z.html for more information.
+        // This logic is not necessary for memory pool transactions, as AcceptToMemoryPool
+        // already refuses previously-known transaction ids entirely.
+        // This rule was originally applied all blocks whose timestamp was after March 15, 2012, 0:00 UTC.
+        // Now that the whole chain is irreversibly beyond that time it is applied to all blocks except the
+        // two in the chain that violate it. This prevents exploiting the issue against nodes in their
+        // initial block download.
+        CTxIndex txindexOld;
+        if (txdb.ReadTxIndex(hashTx, txindexOld)) {
+            for (CDiskTxPos &pos : txindexOld.vSpent)
+                if (pos.IsNull())
+                    return false;
        }

        nSigOps += tx.GetLegacySigOpCount();
@@ -2075,7 +2019,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
        else
        {
            bool fInvalid;
-            if (!tx.FetchInputs(txdb, mapPendingUtxos, true, false, mapInputs, fInvalid))
+            if (!tx.FetchInputs(txdb, mapQueuedChanges, true, false, mapInputs, fInvalid))
                return false;

            // Add in sigops done by pay-to-script-hash inputs;
@@ -2094,44 +2038,15 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
            if (tx.IsCoinStake())
                nStakeReward = nTxValueOut - nTxValueIn;

-            if (!tx.ConnectInputs(txdb, mapInputs, pindex, true, false,
-                                  pScriptCheckQueue ? &vChecks : NULL))
+            if (!tx.ConnectInputs(txdb, mapInputs, mapQueuedChanges, posThisTx, pindex, true, false))
                return false;
-            if (pScriptCheckQueue && vChecks.size() >= 128)
-            {
-                scriptcheckcontrol.Add(vChecks);
-                vChecks.clear();
-            }
        }

-        // Add this tx's outputs to pending UTXOs for later txs in the block
-        for (unsigned int k = 0; k < tx.vout.size(); k++)
-        {
-            if (!tx.vout[k].IsEmpty())
-            {
-                CUtxoEntry entry;
-                entry.nValue = tx.vout[k].nValue;
-                entry.nHeight = pindex->nHeight;
-                entry.scriptPubKey = tx.vout[k].scriptPubKey;
-                entry.fCoinBase = tx.IsCoinBase();
-                entry.fCoinStake = tx.IsCoinStake();
-                entry.nTxTime = tx.nTime;
-                mapPendingUtxos[COutPoint(hashTx, k)] = entry;
-            }
-        }
-        // Remove spent inputs from pending UTXOs
-        if (!tx.IsCoinBase())
-            for (const CTxIn& txin : tx.vin)
-                mapPendingUtxos.erase(txin.prevout);
+        mapQueuedChanges[hashTx] = CTxIndex(posThisTx, tx.vout.size());
    }

    if (!fAssumeValid)
    {
-        scriptcheckcontrol.Add(vChecks);
-        vChecks.clear();
-        if (!scriptcheckcontrol.Wait())
-            return DoS(100, error("ConnectBlock() : script verification failed"));
-
        if (IsProofOfWork())
        {
            int64_t nReward = GetProofOfWorkReward(nFees);
@@ -2171,42 +2086,6 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
            return error("ConnectBlock() : UpdateTxIndex failed");
    }

-    // Write UTXO database entries: add new outputs, erase spent inputs.
-    // Runs for both fAssumeValid (fast) and full validation paths.
-    for (unsigned int i = 0; i < vtx.size(); i++)
-    {
-        const CTransaction& tx = vtx[i];
-        uint256 hashTx = tx.GetHash();
-
-        // Add new outputs to UTXO set
-        for (unsigned int k = 0; k < tx.vout.size(); k++)
-        {
-            const CTxOut& txout = tx.vout[k];
-            if (txout.IsEmpty())
-                continue;
-
-            CUtxoEntry utxo;
-            utxo.nValue = txout.nValue;
-            utxo.nHeight = pindex->nHeight;
-            utxo.scriptPubKey = txout.scriptPubKey;
-            utxo.fCoinBase = tx.IsCoinBase();
-            utxo.fCoinStake = tx.IsCoinStake();
-            utxo.nTxTime = tx.nTime;
-            if (!txdb.WriteUtxo(hashTx, k, utxo))
-                return error("ConnectBlock() : WriteUtxo failed");
-        }
-
-        // Erase spent inputs from UTXO set
-        if (!tx.IsCoinBase())
-        {
-            for (const CTxIn& txin : tx.vin)
-            {
-                if (!txdb.EraseUtxo(txin.prevout.hash, txin.prevout.n))
-                    return error("ConnectBlock() : EraseUtxo failed");
-            }
-        }
-    }
-
    // Update address index
    if (fAddressIndex)
    {
@@ -2508,22 +2387,11 @@ bool CBlock::SetBestChain(CTxDB& txdb, CBlockIndex* pindexNew)

    // Log every 5000 blocks during sync, every block once caught up
    if (nBestHeight % 5000 == 0 || !IsInitialBlockDownload())
-    {
-        static int64_t nLastLogTime = 0;
-        static int nLastLogHeight = 0;
-        int64_t nNow = GetTimeMillis();
-        double dRate = 0;
-        if (nLastLogTime > 0 && nNow > nLastLogTime)
-            dRate = (double)(nBestHeight - nLastLogHeight) * 1000.0 / (double)(nNow - nLastLogTime);
-        printf("SetBestChain: new best=%s  height=%d  trust=%s  blocktrust=%" PRId64 "  date=%s  %.1f blk/s\n",
+        printf("SetBestChain: new best=%s  height=%d  trust=%s  blocktrust=%" PRId64 "  date=%s\n",
          hashBestChain.ToString().substr(0,20).c_str(), nBestHeight,
          CBigNum(nBestChainTrust).ToString().c_str(),
          nBestBlockTrust.Get64(),
-          DateTimeStrFormat("%x %H:%M:%S", pindexBest->GetBlockTime()).c_str(),
-          dRate);
-        nLastLogTime = nNow;
-        nLastLogHeight = nBestHeight;
-    }
+          DateTimeStrFormat("%x %H:%M:%S", pindexBest->GetBlockTime()).c_str());

    if (fDebug)
 		printf("Stake checkpoint: %x\n", pindexBest->nStakeModifierChecksum);
@@ -2623,47 +2491,26 @@ bool CTransaction::GetCoinAge(CTxDB& txdb, uint64_t& nCoinAge) const

    for (const CTxIn& txin : vin)
    {
-        // Look up the UTXO entry for this input
-        CUtxoEntry utxo;
-        if (!txdb.ReadUtxo(txin.prevout.hash, txin.prevout.n, utxo))
-        {
-            // Lazy fallback: try old CTxIndex path
-            CTxIndex txindexFallback;
-            if (!txdb.ReadTxIndex(txin.prevout.hash, txindexFallback))
-                continue;
-            CTransaction txPrev;
-            if (!txPrev.ReadFromDisk(txindexFallback.pos))
-                continue;
-            if (txin.prevout.n >= txPrev.vout.size())
-                continue;
-
-            utxo.nValue = txPrev.vout[txin.prevout.n].nValue;
-            utxo.scriptPubKey = txPrev.vout[txin.prevout.n].scriptPubKey;
-            utxo.fCoinBase = txPrev.IsCoinBase();
-            utxo.fCoinStake = txPrev.IsCoinStake();
-            utxo.nTxTime = txPrev.nTime;
-            utxo.nHeight = 0;
-        }
-
-        if (nTime < utxo.nTxTime)
+        // First try finding the previous transaction in database
+        CTransaction txPrev;
+        CTxIndex txindex;
+        if (!txPrev.ReadFromDisk(txdb, txin.prevout, txindex))
+            continue;  // previous transaction not in main chain
+        if (nTime < txPrev.nTime)
            return false;  // Transaction timestamp violation

-        // Read block header to check min age.
-        // Use the tx position index to find the block file/position.
-        CTxIndex txindex;
-        if (!txdb.ReadTxIndex(txin.prevout.hash, txindex))
-            continue;
+        // Read block header
        CBlock block;
        if (!block.ReadFromDisk(txindex.pos.nFile, txindex.pos.nBlockPos, false))
            return false; // unable to read block of previous transaction
        if (block.GetBlockTime() + nStakeMinAge > nTime)
            continue; // only count coins meeting min age requirement

-        int64_t nValueIn = utxo.nValue;
-        bnCentSecond += CBigNum(nValueIn) * (nTime - utxo.nTxTime) / CENT;
+        int64_t nValueIn = txPrev.vout[txin.prevout.n].nValue;
+        bnCentSecond += CBigNum(nValueIn) * (nTime-txPrev.nTime) / CENT;

        if (fDebug && GetBoolArg("-printcoinage"))
-            printf("coin age nValueIn=%" PRId64 " nTimeDiff=%d bnCentSecond=%s\n", nValueIn, nTime - utxo.nTxTime, bnCentSecond.ToString().c_str());
+            printf("coin age nValueIn=%" PRId64 " nTimeDiff=%d bnCentSecond=%s\n", nValueIn, nTime - txPrev.nTime, bnCentSecond.ToString().c_str());
    }

    CBigNum bnCoinDay = bnCentSecond * CENT / (24 * 60 * 60);
@@ -3732,37 +3579,15 @@ bool FastImportBlockFile()
            // Write block index to batch
            txdb.WriteBlockIndex(CDiskBlockIndex(pindexNew));

-            // Build tx index + UTXO entries
+            // Build tx index entries
            unsigned int nTxPos = nBlockPos + ::GetSerializeSize(CBlock(), SER_DISK, CLIENT_VERSION)
                                - (2 * GetSizeOfCompactSize(0)) + GetSizeOfCompactSize(block.vtx.size());
            for (unsigned int i = 0; i < block.vtx.size(); i++)
            {
                const CTransaction& tx = block.vtx[i];
-                uint256 hashTx = tx.GetHash();
                CDiskTxPos posThisTx(1, nBlockPos, nTxPos);
-                txdb.UpdateTxIndex(hashTx, CTxIndex(posThisTx, tx.vout.size()));
+                txdb.UpdateTxIndex(tx.GetHash(), CTxIndex(posThisTx, tx.vout.size()));
                nTxPos += ::GetSerializeSize(tx, SER_DISK, CLIENT_VERSION);
-
-                // UTXO entries
-                if (!tx.IsCoinBase())
-                {
-                    for (const CTxIn& txin : tx.vin)
-                        txdb.EraseUtxo(txin.prevout.hash, txin.prevout.n);
-                }
-                for (unsigned int k = 0; k < tx.vout.size(); k++)
-                {
-                    if (!tx.vout[k].IsEmpty())
-                    {
-                        CUtxoEntry utxo;
-                        utxo.nValue = tx.vout[k].nValue;
-                        utxo.nHeight = pindexNew->nHeight;
-                        utxo.scriptPubKey = tx.vout[k].scriptPubKey;
-                        utxo.fCoinBase = tx.IsCoinBase();
-                        utxo.fCoinStake = tx.IsCoinStake();
-                        utxo.nTxTime = tx.nTime;
-                        txdb.WriteUtxo(hashTx, k, utxo);
-                    }
-                }
            }

            // Update best chain
@@ -4028,12 +3853,11 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
        // blocks from the fastest available source.
        static int nAskedForBlocks = 0;
        bool fIBD = IsInitialBlockDownload();
-        bool fBehindPeer = (pfrom->nStartingHeight > nBestHeight);
        bool fShouldAsk = !pfrom->fClient && !pfrom->fOneShot &&
            (pfrom->nStartingHeight > (nBestHeight - 144)) &&
            (pfrom->nVersion < NOBLKS_VERSION_START ||
             pfrom->nVersion >= NOBLKS_VERSION_END) &&
-             (fIBD || nAskedForBlocks < 1 || vNodes.size() <= 1 || fBehindPeer);
+             (fIBD || nAskedForBlocks < 1 || vNodes.size() <= 1);
        printf("IBD-DIAG: version handler: peer=%s height=%d ourHeight=%d fClient=%d fOneShot=%d shouldAsk=%d nAskedForBlocks=%d IBD=%d\n",
            pfrom->addr.ToString().c_str(), pfrom->nStartingHeight, nBestHeight,
            pfrom->fClient, pfrom->fOneShot, fShouldAsk, nAskedForBlocks, fIBD);
@@ -11,7 +11,6 @@
 #include "script.h"
 #include "scrypt.h"
 #include "hashblock.h"
-#include "checkqueue.h"

 #include <list>

@@ -26,7 +25,6 @@ class CAddress;
 class CInv;
 class CRequestTracker;
 class CNode;
-class CScriptCheck;

 static const int CUTOFF_POW_BLOCK = 9000;
 static const int CRAPCHAIN_CUTOFF_BLOCK = 17691; // pre-Pharao (version 4) blockchain until block 17691
@@ -433,51 +431,7 @@ enum GetMinFee_mode
    GMF_SEND,
 };

-/** A single unspent transaction output entry in the UTXO database.
- *  Keyed by (txhash, output_index). Erased when spent.
- */
-class CUtxoEntry
-{
-public:
-    int64_t nValue;         // output value in satoshis
-    int nHeight;            // block height where output was created
-    CScript scriptPubKey;   // output script (needed for sig verification)
-    bool fCoinBase;         // from a coinbase transaction
-    bool fCoinStake;        // from a coinstake transaction
-    unsigned int nTxTime;   // transaction timestamp (needed for PoS coin age)
-
-    CUtxoEntry()
-    {
-        SetNull();
-    }
-
-    IMPLEMENT_SERIALIZE
-    (
-        READWRITE(nValue);
-        READWRITE(nHeight);
-        READWRITE(scriptPubKey);
-        READWRITE(fCoinBase);
-        READWRITE(fCoinStake);
-        READWRITE(nTxTime);
-    )
-
-    void SetNull()
-    {
-        nValue = -1;
-        nHeight = 0;
-        scriptPubKey.clear();
-        fCoinBase = false;
-        fCoinStake = false;
-        nTxTime = 0;
-    }
-
-    bool IsNull() const
-    {
-        return (nValue == -1);
-    }
-};
-
-typedef std::map<COutPoint, CUtxoEntry> MapPrevTx;
+typedef std::map<uint256, std::pair<CTxIndex, CTransaction> > MapPrevTx;

 /** The basic transaction that is broadcasted on the network and contained in
 * blocks.  A transaction can contain multiple inputs and outputs.
@@ -718,30 +672,33 @@ public:
    bool ReadFromDisk(COutPoint prevout);
    bool DisconnectInputs(CTxDB& txdb);

-    /** Fetch UTXO entries for all inputs from the UTXO database or mempool.
+    /** Fetch from memory and/or disk. inputsRet keys are transaction hashes.

-     @param[in] txdb            Transaction database
-     @param[in] mapPendingUtxos UTXOs created by earlier transactions in the same block
-     @param[in] fBlock          True if being called to add a new best-block to the chain
-     @param[in] fMiner          True if being called by CreateNewBlock
-     @param[out] inputsRet      UTXO entries for this transaction's inputs (keyed by COutPoint)
-     @param[out] fInvalid       returns true if transaction is invalid
-     @return Returns true if all inputs are found
+     @param[in] txdb	Transaction database
+     @param[in] mapTestPool	List of pending changes to the transaction index database
+     @param[in] fBlock	True if being called to add a new best-block to the chain
+     @param[in] fMiner	True if being called by CreateNewBlock
+     @param[out] inputsRet	Pointers to this transaction's inputs
+     @param[out] fInvalid	returns true if transaction is invalid
+     @return	Returns true if all inputs are in txdb or mapTestPool
     */
-    bool FetchInputs(CTxDB& txdb, const MapPrevTx& mapPendingUtxos,
+    bool FetchInputs(CTxDB& txdb, const std::map<uint256, CTxIndex>& mapTestPool,
                     bool fBlock, bool fMiner, MapPrevTx& inputsRet, bool& fInvalid);

-    /** Validate inputs against UTXO entries and verify signatures.
+    /** Sanity check previous transactions, then, if all checks succeed,
+        mark them as spent by this transaction.

-        @param[in] inputs       UTXO entries for inputs (from FetchInputs)
-        @param[in] pindexBlock  Block being connected
-        @param[in] fBlock       true if called from ConnectBlock
-        @param[in] fMiner       true if called from CreateNewBlock
+        @param[in] inputs	Previous transactions (from FetchInputs)
+        @param[out] mapTestPool	Keeps track of inputs that need to be updated on disk
+        @param[in] posThisTx	Position of this transaction on disk
+        @param[in] pindexBlock
+        @param[in] fBlock	true if called from ConnectBlock
+        @param[in] fMiner	true if called from CreateNewBlock
        @return Returns true if all checks succeed
     */
-    bool ConnectInputs(CTxDB& txdb, const MapPrevTx& inputs,
-                       const CBlockIndex* pindexBlock, bool fBlock, bool fMiner,
-                       std::vector<CScriptCheck>* pvChecks = NULL);
+    bool ConnectInputs(CTxDB& txdb, MapPrevTx inputs,
+                       std::map<uint256, CTxIndex>& mapTestPool, const CDiskTxPos& posThisTx,
+                       const CBlockIndex* pindexBlock, bool fBlock, bool fMiner);
    bool ClientConnectInputs();
    bool CheckTransaction() const;
    bool AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs=true, bool* pfMissingInputs=NULL);
@@ -814,10 +771,9 @@ public:



-/**  A txdb record that contains the disk location of a transaction.
- *  Used for getrawtransaction and wallet position lookups.
- *  vSpent is legacy (kept for serialization compat) — spent state is
- *  tracked by the UTXO set (CUtxoEntry) since dbformat=3.
+/**  A txdb record that contains the disk location of a transaction and the
+ * locations of transactions that spend its outputs.  vSpent is really only
+ * used as a flag, but having the location is very helpful for debugging.
 */
 class CTxIndex
 {
@@ -1408,10 +1364,6 @@ public:
    uint256 hashPrev;
    uint256 hashNext;

-    // When true, nChainTrust is included in the on-disk serialization.
-    // Set by LoadBlockIndex based on the DB format version before deserializing.
-    static bool fSerializeChainTrust;
-
    CDiskBlockIndex()
    {
        hashPrev = 0;
@@ -1459,10 +1411,6 @@ public:
        READWRITE(nBits);
        READWRITE(nNonce);
        READWRITE(blockHash);
-
-        // DB format v2+: persist chain trust to skip expensive recalculation on startup
-        if (fSerializeChainTrust)
-            READWRITE(nChainTrust);
    )

    uint256 GetBlockHash() const
@@ -1675,42 +1623,4 @@ public:

 extern CTxMemPool mempool;

-/**
- * Closure representing one script check for parallel verification.
- * Captures everything needed to call VerifyScript independently.
- */
-class CScriptCheck
-{
-private:
-    CScript scriptPubKey;
-    CScript scriptSig;
-    const CTransaction* ptxTo;
-    unsigned int nIn;
-    int nHashType;
-
-public:
-    CScriptCheck() : ptxTo(NULL), nIn(0), nHashType(0) {}
-
-    CScriptCheck(const CScript& scriptPubKeyIn, const CScript& scriptSigIn,
-                 const CTransaction& txToIn, unsigned int nInIn, int nHashTypeIn)
-        : scriptPubKey(scriptPubKeyIn), scriptSig(scriptSigIn),
-          ptxTo(&txToIn), nIn(nInIn), nHashType(nHashTypeIn) {}
-
-    bool operator()()
-    {
-        return ptxTo && VerifyScript(scriptSig, scriptPubKey, *ptxTo, nIn, nHashType);
-    }
-
-    void swap(CScriptCheck& other)
-    {
-        std::swap(scriptPubKey, other.scriptPubKey);
-        std::swap(scriptSig, other.scriptSig);
-        std::swap(ptxTo, other.ptxTo);
-        std::swap(nIn, other.nIn);
-        std::swap(nHashType, other.nHashType);
-    }
-};
-
-extern CCheckQueue<CScriptCheck>* pScriptCheckQueue;
-
-#endif
+#endif
@@ -0,0 +1,261 @@
+# Copyright (c) 2009-2010 Satoshi Nakamoto
+# Distributed under the MIT/X11 software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#
+# Windows (MSYS2 MinGW64) makefile for trianglesd headless daemon
+
+USE_UPNP:=1
+USE_IPV6:=1
+
+CXX=g++
+CC=gcc
+LINK=$(CXX)
+
+DEPSDIR=C:/msys64/mingw64
+
+DEFS=-DBOOST_SPIRIT_THREADSAFE -DBOOST_THREAD_USE_LIB -DBOOST_BIND_GLOBAL_PLACEHOLDERS -DWIN32 -D__NO_SYSTEM_INCLUDES
+
+DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/tor $(CURDIR)/obj \
+    $(DEPSDIR)/include)
+
+LIBS = $(addprefix -L,$(DEPSDIR)/lib)
+
+# libevent
+LIBS += -levent
+
+LMODE = dynamic
+LMODE2 = dynamic
+ifdef STATIC
+	LMODE = static
+	ifeq (${STATIC}, all)
+		LMODE2 = static
+	endif
+endif
+
+LIBS += \
+ -lboost_filesystem-mt \
+ -lboost_program_options-mt \
+ -lboost_thread-mt \
+ -lboost_chrono-mt \
+ -ldb_cxx \
+ -lssl \
+ -lcrypto \
+ -levent
+
+ifndef USE_UPNP
+	override USE_UPNP = -
+endif
+ifneq (${USE_UPNP}, -)
+	LIBS += -lminiupnpc -liphlpapi
+	DEFS += -DUSE_UPNP=$(USE_UPNP) -DSTATICLIB -DMINIUPNP_STATICLIB
+endif
+
+ifneq (${USE_IPV6}, -)
+	DEFS += -DUSE_IPV6=$(USE_IPV6)
+endif
+
+# Windows-specific libraries
+LIBS += \
+ -lws2_32 \
+ -lshlwapi \
+ -lmswsock \
+ -lole32 \
+ -loleaut32 \
+ -luuid \
+ -lgdi32 \
+ -lcrypt32 \
+ -lz \
+ -lpthread
+
+# Hardening
+HARDENING=-fno-stack-protector
+HARDENING+=-fstack-protector-all -Wstack-protector
+HARDENING+=-D_FORTIFY_SOURCE=2
+
+DEBUGFLAGS=-g
+
+xCXXFLAGS=-O2 -std=c++17 -pthread -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter \
+    -Wno-deprecated-declarations -Wno-reserved-user-defined-literal \
+    -Wa,-mbig-obj \
+    $(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS)
+
+xLDFLAGS=-static -static-libgcc -static-libstdc++ $(LDFLAGS)
+
+OBJS= \
+    obj/fugue.o \
+    obj/hamsi.o \
+    obj/hamsi_helper.o \
+    obj/groestl.o \
+    obj/blake.o \
+    obj/bmw.o \
+    obj/skein.o \
+    obj/keccak.o \
+    obj/shavite.o \
+    obj/jh.o \
+    obj/luffa.o \
+    obj/cubehash.o \
+    obj/echo.o \
+    obj/simd.o \
+    obj/aes_helper.o \
+    obj/alert.o \
+    obj/version.o \
+    obj/checkpoints.o \
+    obj/netbase.o \
+    obj/addrman.o \
+    obj/crypter.o \
+    obj/key.o \
+    obj/db.o \
+    obj/init.o \
+    obj/irc.o \
+    obj/keystore.o \
+    obj/miner.o \
+    obj/main.o \
+    obj/net.o \
+    obj/bootstrap.o \
+    obj/net_bootstrap.o \
+    obj/protocol.o \
+    obj/trianglesrpc.o \
+    obj/rest.o \
+    obj/rpcdump.o \
+    obj/rpcnet.o \
+    obj/rpcmining.o \
+    obj/rpcwallet.o \
+    obj/rpcblockchain.o \
+    obj/rpcrawtransaction.o \
+    obj/rpcsmessage.o \
+    obj/script.o \
+    obj/sync.o \
+    obj/util.o \
+    obj/wallet.o \
+    obj/walletdb.o \
+    obj/noui.o \
+    obj/kernel.o \
+    obj/pbkdf2.o \
+    obj/scrypt.o \
+    obj/scrypt-arm.o \
+    obj/scrypt-x86.o \
+    obj/scrypt-x86_64.o \
+    obj/smessage.o \
+    obj/lz4.o \
+    obj/onion_v3.o \
+    obj/tor_process.o \
+    obj/tor_embed_hooks.o \
+    obj/tor_embedded.o
+
+all: trianglesd.exe
+
+LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
+DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
+DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
+OBJS += obj/txdb-leveldb.o
+
+leveldb/libleveldb.a:
+	@echo "Building LevelDB ..."; cd leveldb; CC=gcc CXX=g++ TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT="-fno-keep-inline-dllexport -march=nocona -msahf -mtune=generic -Wa,-mbig-obj -O2" libleveldb.a libmemenv.a; cd ..;
+obj/txdb-leveldb.o: leveldb/libleveldb.a
+
+# auto-generated dependencies:
+-include obj/*.P
+
+obj/build.h: FORCE
+	/bin/sh ../share/genbuild.sh obj/build.h
+version.cpp: obj/build.h
+DEFS += -DHAVE_BUILD_INFO
+
+obj/scrypt-x86.o: scrypt-x86.S
+	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+
+obj/scrypt-x86_64.o: scrypt-x86_64.S
+	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+
+obj/scrypt-arm.o: scrypt-arm.S
+	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+
+obj/%.o: %.cpp
+	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+	      -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	  rm -f $(@:%.o=%.d)
+
+obj/%.o: %.c
+	$(CXX) -c $(xCXXFLAGS) -fpermissive -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+	      -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/%.o: tor/%.c
+	$(CC) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/anonymize.o: tor/anonymize.cpp
+	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/onion_v3.o: tor/onion_v3.cpp
+	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/tor_process.o: tor/tor_process.cpp
+	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/lz4.o: lz4/lz4.c
+	$(CXX) -c $(xCXXFLAGS) -fpermissive -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/tor_embed_hooks.o: tor_embed_hooks.cpp
+	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/tor_embedded.o: tor/tor_embedded.cpp
+	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/bootstrap.o: bootstrap.cpp
+	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/net_bootstrap.o: net_bootstrap.cpp
+	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+trianglesd.exe: $(OBJS:obj/%=obj/%) obj/anonymize.o
+	$(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
+
+clean:
+	-rm -f trianglesd.exe
+	-rm -f obj/*.o
+	-rm -f obj/*.P
+	-rm -f obj/build.h
+	-rm -f leveldb/libleveldb.a
+	-rm -f leveldb/libmemenv.a
+
+FORCE:
@@ -0,0 +1,301 @@
+# -*- mode: Makefile; -*-
+# Copyright (c) 2011 Bitcoin Developers
+# Distributed under the MIT/X11 software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+# Mac OS X makefile for triangles
+# Originally by Laszlo Hanyecz (solar@heliacal.net)
+
+CXX=llvm-g++
+CC=llvm-gcc
+DEPSDIR=/opt/local
+
+INCLUDEPATHS= \
+ -I"$(CURDIR)" \
+ -I"$(CURDIR)/obj" \
+ -I"$(CURDIR)/tor" \
+ -I"$(DEPSDIR)/include" \
+ -I"$(DEPSDIR)/include/db48" \
+ -I"$(DEPSDIR)/include/boost"
+
+LIBPATHS= \
+ -L"$(DEPSDIR)/lib" \
+ -L"$(DEPSDIR)/lib/db48"
+
+USE_UPNP:=1
+USE_IPV6:=1
+
+LIBS= -dead_strip
+
+TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
+
+ifdef STATIC
+# Build STATIC if you are redistributing the bitcoind binary
+TESTLIBS += \
+ $(DEPSDIR)/lib/libboost_unit_test_framework-mt.a
+
+LIBS += \
+ $(DEPSDIR)/lib/db48/libdb_cxx-4.8.a \
+ $(DEPSDIR)/lib/libboost_system-mt.a \
+ $(DEPSDIR)/lib/libboost_filesystem-mt.a \
+ $(DEPSDIR)/lib/libboost_program_options-mt.a \
+ $(DEPSDIR)/lib/libboost_thread-mt.a \
+ $(DEPSDIR)/lib/libssl.a \
+ $(DEPSDIR)/lib/libcrypto.a \
+ -lz
+else
+TESTLIBS += \
+ -lboost_unit_test_framework-mt
+LIBS += \
+ -ldb_cxx-4.8 \
+ -lboost_system-mt \
+ -lboost_filesystem-mt \
+ -lboost_program_options-mt \
+ -lboost_thread-mt \
+ -lssl \
+ -lcrypto \
+ -lz \
+ -levent
+TESTDEFS += -DBOOST_TEST_DYN_LINK
+endif
+
+DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE
+
+ifdef RELEASE
+# Compile for maximum compatibility and smallest size.
+# This requires that dependencies are compiled
+# the same way.
+CFLAGS = -mmacosx-version-min=10.5 -arch x86_64 -O3 -msse2
+else
+CFLAGS = -g -msse2
+endif
+
+# triangles doesn't work because we don't support big-endian
+CFLAGS += -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \
+    $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
+
+OBJS= \
+    obj/address.o \
+    obj/addressmap.o \
+    obj/aes.o \
+    obj/backtrace.o \
+    obj/buffers.o \
+    obj/channel.o \
+    obj/channeltls.o \
+    obj/circpathbias.o \
+    obj/circuitbuild.o \
+    obj/circuitlist.o \
+    obj/circuitmux.o \
+    obj/circuitmux_ewma.o \
+    obj/circuitstats.o \
+    obj/circuituse.o \
+    obj/command.o \
+    obj/compat.o \
+    obj/compat_libevent.o \
+    obj/config.o \
+    obj/config_codedigest.o \
+    obj/confparse.o \
+    obj/connection.o \
+    obj/connection_edge.o \
+    obj/connection_or.o \
+    obj/container.o \
+    obj/control.o \
+    obj/cpuworker.o \
+    obj/crypto.o \
+    obj/crypto_curve25519.o \
+    obj/crypto_format.o \
+    obj/curve25519-donna.o \
+    obj/di_ops.o \
+    obj/directory.o \
+    obj/dirserv.o \
+    obj/dirvote.o \
+    obj/dns.o \
+    obj/dnsserv.o \
+    obj/entrynodes.o \
+    obj/ext_orport.o \
+    obj/fp_pair.o \
+    obj/geoip.o \
+    obj/hibernate.o \
+    obj/log.o \
+    obj/memarea.o \
+    obj/mempool.o \
+    obj/microdesc.o \
+    obj/networkstatus.o \
+    obj/nodelist.o \
+    obj/onion.o \
+    obj/onion_fast.o \
+    obj/onion_main.o \
+    obj/onion_ntor.o \
+    obj/onion_tap.o \
+    obj/policies.o \
+    obj/procmon.o \
+    obj/reasons.o \
+    obj/relay.o \
+    obj/rendclient.o \
+    obj/rendcommon.o \
+    obj/rendmid.o \
+    obj/rendservice.o \
+    obj/rephist.o \
+    obj/replaycache.o \
+    obj/router.o \
+    obj/routerlist.o \
+    obj/routerparse.o \
+    obj/routerset.o \
+    obj/sandbox.o \
+    obj/statefile.o \
+    obj/status.o \
+    obj/tor_util.o \
+    obj/torgzip.o \
+    obj/tortls.o \
+    obj/transports.o \
+    obj/util_codedigest.o \
+    obj/fugue.o \
+    obj/hamsi.o \
+    obj/groestl.o \
+    obj/blake.o \
+    obj/bmw.o \
+    obj/skein.o \
+    obj/keccak.o \
+    obj/shavite.o \
+    obj/jh.o \
+    obj/luffa.o \
+    obj/cubehash.o \
+    obj/echo.o \
+    obj/simd.o \
+    obj/alert.o \
+    obj/version.o \
+    obj/checkpoints.o \
+    obj/netbase.o \
+    obj/addrman.o \
+    obj/crypter.o \
+    obj/key.o \
+    obj/db.o \
+    obj/init.o \
+    obj/irc.o \
+    obj/keystore.o \
+    obj/miner.o \
+    obj/main.o \
+    obj/net.o \
+    obj/protocol.o \
+    obj/trianglesrpc.o \
+    obj/rpcdump.o \
+    obj/rpcnet.o \
+    obj/rpcmining.o \
+    obj/rpcwallet.o \
+    obj/rpcblockchain.o \
+    obj/rpcrawtransaction.o \
+    obj/rpcsmessage.o \
+    obj/script.o \
+    obj/sync.o \
+    obj/util.o \
+    obj/wallet.o \
+    obj/walletdb.o \
+    obj/noui.o \
+    obj/kernel.o \
+    obj/pbkdf2.o \
+    obj/scrypt.o \
+    obj/scrypt-arm.o \
+    obj/scrypt-x86.o \
+    obj/scrypt-x86_64.o \
+    obj/smessage.o 
+ifndef USE_UPNP
+	override USE_UPNP = -
+endif
+ifneq (${USE_UPNP}, -)
+	DEFS += -DUSE_UPNP=$(USE_UPNP)
+ifdef STATIC
+	LIBS += $(DEPSDIR)/lib/libminiupnpc.a
+else
+	LIBS += -lminiupnpc
+endif
+endif
+
+ifneq (${USE_IPV6}, -)
+	DEFS += -DUSE_IPV6=$(USE_IPV6)
+endif
+
+all: trianglesd
+
+test check: test_triangles FORCE
+	./test_triangles
+
+LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
+DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
+DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
+OBJS += obj/txdb-leveldb.o
+leveldb/libleveldb.a:
+	@echo "Building LevelDB ..."; cd leveldb; make libleveldb.a libmemenv.a; cd ..;
+obj/txdb-leveldb.o: leveldb/libleveldb.a
+
+# auto-generated dependencies:
+-include obj/*.P
+-include obj-test/*.P
+
+obj/build.h: FORCE
+	/bin/sh ../share/genbuild.sh obj/build.h
+version.cpp: obj/build.h
+DEFS += -DHAVE_BUILD_INFO
+
+obj/%.o: %.cpp
+	$(CXX) -c $(CFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+	      -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	  rm -f $(@:%.o=%.d)
+
+obj/%.o: %.c
+	$(CC) -c $(CFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+	      -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	  rm -f $(@:%.o=%.d)
+
+obj/%.o: tor/%.c
+	$(CC) -c $(CFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/anonymize.o: tor/anonymize.cpp
+	$(CXX) -c $(CFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/scrypt-x86.o: scrypt-x86.S
+	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+
+obj/scrypt-x86_64.o: scrypt-x86_64.S
+	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+
+obj/scrypt-arm.o: scrypt-arm.S
+	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+
+trianglesd: $(OBJS:obj/%=obj/%) obj/anonymize.o
+	$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
+
+TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
+
+obj-test/%.o: test/%.cpp
+	$(CXX) -c $(TESTDEFS) $(CFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+	      -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	  rm -f $(@:%.o=%.d)
+
+test_triangles: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
+	$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) $(TESTLIBS)
+
+clean:
+	-rm -f trianglesd test_triangles
+	-rm -f obj/*.o
+	-rm -f obj-test/*.o
+	-rm -f obj/*.P
+	-rm -f obj-test/*.P
+	-rm -f obj/build.h
+	-rm -f leveldb/libleveldb.a
+	-rm -f leveldb/libmemenv.a
+
+FORCE:
@@ -0,0 +1,329 @@
+# Copyright (c) 2009-2010 Satoshi Nakamoto
+# Distributed under the MIT/X11 software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+USE_UPNP:=0
+USE_IPV6:=1
+
+LINK:=$(CXX)
+ARCH:=$(shell lscpu | head -n 1 | awk '{print $$2}')
+
+DEFS=-DBOOST_SPIRIT_THREADSAFE
+
+DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/tor $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH))
+LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH))
+
+# libevent
+EVENTDIR = /usr/local
+DEFS += $(addprefix -I,$(EVENTDIR)/include)
+LIBS += -levent $(addprefix -L,$(EVENTDIR)/lib)
+
+TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
+
+LMODE = dynamic
+LMODE2 = dynamic
+ifdef STATIC
+	LMODE = static
+	ifeq (${STATIC}, all)
+		LMODE2 = static
+	endif
+else
+	TESTDEFS += -DBOOST_TEST_DYN_LINK
+endif
+
+# for boost 1.37, add -mt to the boost libraries
+LIBS += \
+ -Wl,-B$(LMODE) \
+   -l boost_system$(BOOST_LIB_SUFFIX) \
+   -l boost_filesystem$(BOOST_LIB_SUFFIX) \
+   -l boost_program_options$(BOOST_LIB_SUFFIX) \
+   -l boost_thread$(BOOST_LIB_SUFFIX) \
+   -l boost_chrono$(BOOST_LIB_SUFFIX) \
+   -l db_cxx$(BDB_LIB_SUFFIX) \
+   -l ssl \
+   -l crypto
+
+ifndef USE_UPNP
+	override USE_UPNP = -
+endif
+ifneq (${USE_UPNP}, -)
+	LIBS += -l miniupnpc
+	DEFS += -DUSE_UPNP=$(USE_UPNP)
+endif
+
+ifneq (${USE_IPV6}, -)
+	DEFS += -DUSE_IPV6=$(USE_IPV6)
+endif
+
+LIBS+= \
+ -Wl,-B$(LMODE2) \
+   -l z \
+   -l dl \
+   -l pthread
+
+
+# Hardening
+# Make some classes of vulnerabilities unexploitable in case one is discovered.
+#
+    # This is a workaround for Ubuntu bug #691722, the default -fstack-protector causes
+    # -fstack-protector-all to be ignored unless -fno-stack-protector is used first.
+    # see: https://bugs.launchpad.net/ubuntu/+source/gcc-4.5/+bug/691722
+    HARDENING=-fno-stack-protector
+
+    # Stack Canaries
+    # Put numbers at the beginning of each stack frame and check that they are the same.
+    # If a stack buffer if overflowed, it writes over the canary number and then on return
+    # when that number is checked, it won't be the same and the program will exit with
+    # a "Stack smashing detected" error instead of being exploited.
+    HARDENING+=-fstack-protector-all -Wstack-protector
+
+    # Make some important things such as the global offset table read only as soon as
+    # the dynamic linker is finished building it. This will prevent overwriting of addresses
+    # which would later be jumped to.
+    LDHARDENING+=-Wl,-z,relro -Wl,-z,now
+
+    # Build position independent code to take advantage of Address Space Layout Randomization
+    # offered by some kernels.
+    # see doc/build-unix.txt for more information.
+    ifdef PIE
+        HARDENING+=-fPIE
+        LDHARDENING+=-pie
+    endif
+
+    # -D_FORTIFY_SOURCE=2 does some checking for potentially exploitable code patterns in
+    # the source such overflowing a statically defined buffer.
+    HARDENING+=-D_FORTIFY_SOURCE=2
+#
+
+
+DEBUGFLAGS=-g
+
+
+ifeq (${ARCH}, i686)
+    EXT_OPTIONS=-msse2
+endif
+
+
+# CXXFLAGS can be specified on the make command line, so we use xCXXFLAGS that only
+# adds some defaults in front. Unfortunately, CXXFLAGS=... $(CXXFLAGS) does not work.
+xCXXFLAGS=-O2 -std=c++17 $(EXT_OPTIONS) -pthread -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter \
+    $(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS)
+
+# LDFLAGS can be specified on the make command line, so we use xLDFLAGS that only
+# adds some defaults in front. Unfortunately, LDFLAGS=... $(LDFLAGS) does not work.
+xLDFLAGS=$(LDHARDENING) $(LDFLAGS)
+
+# Old embedded Tor v2 client removed - incompatible with OpenSSL 3.x
+# Tor v3 onion services handled by onion_v3.cpp via external Tor/SOCKS5
+OBJS= \
+    obj/fugue.o \
+    obj/hamsi.o \
+    obj/hamsi_helper.o \
+    obj/groestl.o \
+    obj/blake.o \
+    obj/bmw.o \
+    obj/skein.o \
+    obj/keccak.o \
+    obj/shavite.o \
+    obj/jh.o \
+    obj/luffa.o \
+    obj/cubehash.o \
+    obj/echo.o \
+    obj/simd.o \
+    obj/aes_helper.o \
+    obj/alert.o \
+    obj/version.o \
+    obj/checkpoints.o \
+    obj/netbase.o \
+    obj/addrman.o \
+    obj/crypter.o \
+    obj/key.o \
+    obj/db.o \
+    obj/init.o \
+    obj/irc.o \
+    obj/keystore.o \
+    obj/miner.o \
+    obj/main.o \
+    obj/net.o \
+    obj/bootstrap.o \
+    obj/net_bootstrap.o \
+    obj/protocol.o \
+    obj/trianglesrpc.o \
+    obj/rest.o \
+    obj/rpcdump.o \
+    obj/rpcnet.o \
+    obj/rpcmining.o \
+    obj/rpcwallet.o \
+    obj/rpcblockchain.o \
+    obj/rpcrawtransaction.o \
+    obj/rpcsmessage.o \
+    obj/script.o \
+    obj/sync.o \
+    obj/util.o \
+    obj/wallet.o \
+    obj/walletdb.o \
+    obj/noui.o \
+    obj/kernel.o \
+    obj/pbkdf2.o \
+    obj/scrypt.o \
+    obj/scrypt-arm.o \
+    obj/scrypt-x86.o \
+    obj/scrypt-x86_64.o \
+    obj/smessage.o \
+    obj/lz4.o \
+    obj/onion_v3.o \
+    obj/tor_process.o \
+    obj/tor_embed_hooks.o \
+    obj/tor_embedded.o
+
+# Embedded Tor support (optional)
+# Build with: make -f makefile.unix USE_TOR_EMBEDDED=1 TOR_SOURCE_ROOT=/path/to/tor-src
+# Requires libtor.a built from official Tor source (see CODEX-TOR-GUIDE.md)
+TOR_SOURCE_ROOT ?= tor/tor-src
+TOR_INCLUDE_PATH ?= $(TOR_SOURCE_ROOT)/src/feature/api
+TOR_LIB_PATH ?= $(TOR_SOURCE_ROOT)
+TOR_EMBEDDED_LIBS ?= -ltor
+ifdef USE_TOR_EMBEDDED
+    DEFS += -DENABLE_TOR_EMBEDDED
+    DEFS += $(addprefix -I,$(TOR_INCLUDE_PATH))
+    LIBS += $(addprefix -L,$(TOR_LIB_PATH))
+    LIBS += -Wl,--start-group $(TOR_EMBEDDED_LIBS) -Wl,--end-group
+    LIBS += -llzma -lzstd -lm -lpthread
+endif
+
+# ZMQ support (optional)
+# Build with: make -f makefile.unix USE_ZMQ=1
+ifdef USE_ZMQ
+    DEFS += -DENABLE_ZMQ
+    LIBS += -lzmq
+    OBJS += obj/zmqpublishnotifier.o
+endif
+
+all: trianglesd
+
+obj:
+	@mkdir -p obj
+
+obj-test:
+	@mkdir -p obj-test
+
+test check: test_triangles FORCE
+	./test_triangles
+
+LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
+DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
+DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
+OBJS += obj/txdb-leveldb.o
+leveldb/libleveldb.a:
+	@echo "Building LevelDB ..."; cd leveldb; make libleveldb.a libmemenv.a; cd ..;
+obj/txdb-leveldb.o: leveldb/libleveldb.a
+
+# auto-generated dependencies:
+-include obj/*.P
+-include obj-test/*.P
+
+obj/build.h: FORCE
+	/bin/sh ../share/genbuild.sh obj/build.h
+version.cpp: obj/build.h
+DEFS += -DHAVE_BUILD_INFO
+
+obj/scrypt-x86.o: scrypt-x86.S
+	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+
+obj/scrypt-x86_64.o: scrypt-x86_64.S
+	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+
+obj/scrypt-arm.o: scrypt-arm.S
+	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+	
+obj/%.o: %.cpp | 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
+	$(CXX) -c $(xCXXFLAGS) -fpermissive -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+	      -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/lz4.o: lz4/lz4.c
+	$(CXX) -c $(xCXXFLAGS) -fpermissive -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//'\
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/tor_embed_hooks.o: tor_embed_hooks.cpp
+	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/onion_v3.o: tor/onion_v3.cpp
+	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/tor_process.o: tor/tor_process.cpp
+	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/tor_embedded.o: tor/tor_embedded.cpp
+	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/bootstrap.o: bootstrap.cpp
+	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+obj/net_bootstrap.o: net_bootstrap.cpp
+	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+            -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	rm -f $(@:%.o=%.d)
+
+trianglesd: $(OBJS:obj/%=obj/%)
+	$(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
+
+# 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
+	$(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+	      -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+	  rm -f $(@:%.o=%.d)
+
+test_triangles: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
+	$(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-B$(LMODE) -lboost_unit_test_framework $(xLDFLAGS) $(LIBS)
+
+clean:
+	-rm -f trianglesd test_triangles
+	-rm -f obj/*.o
+	-rm -f obj-test/*.o
+	-rm -f obj/*.P
+	-rm -f obj-test/*.P
+	-rm -f obj/build.h
+	-rm -f leveldb/libleveldb.a
+	-rm -f leveldb/libmemenv.a
+
+FORCE:
@@ -17,8 +17,41 @@ using namespace std;

 //

-// PoW mining helpers (SHA256Transform, FormatHashBlocks, FormatHashBuffers,
-// IncrementExtraNonce, CheckWork) removed - PoW ended at block 9000.
+int static FormatHashBlocks(void* pbuffer, unsigned int len)
+{
+    unsigned char* pdata = (unsigned char*)pbuffer;
+    unsigned int blocks = 1 + ((len + 8) / 64);
+    unsigned char* pend = pdata + 64 * blocks;
+    memset(pdata + len, 0, 64 * blocks - len);
+    pdata[len] = 0x80;
+    unsigned int bits = len * 8;
+    pend[-1] = (bits >> 0) & 0xff;
+    pend[-2] = (bits >> 8) & 0xff;
+    pend[-3] = (bits >> 16) & 0xff;
+    pend[-4] = (bits >> 24) & 0xff;
+    return blocks;
+}
+
+static const unsigned int pSHA256InitState[8] =
+{0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19};
+
+void SHA256Transform(void* pstate, void* pinput, const void* pinit)
+{
+    SHA256_CTX ctx;
+    unsigned char data[64];
+
+    SHA256_Init(&ctx);
+
+    for (int i = 0; i < 16; i++)
+        ((uint32_t*)data)[i] = ByteReverse(((uint32_t*)pinput)[i]);
+
+    for (int i = 0; i < 8; i++)
+        ctx.h[i] = ((uint32_t*)pinit)[i];
+
+    SHA256_Update(&ctx, data, sizeof(data));
+    for (int i = 0; i < 8; i++)
+        ((uint32_t*)pstate)[i] = ctx.h[i];
+}

 // Some explaining would be appreciated
 class COrphan
@@ -214,6 +247,7 @@ CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake, int64_t* pFees)
        }

        // Collect transactions into block
+        map<uint256, CTxIndex> mapTestPool;
        uint64_t nBlockSize = 1000;
        uint64_t nBlockTx = 0;
        int nBlockSigOps = 100;
@@ -265,10 +299,10 @@ CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake, int64_t* pFees)

            // Connecting shouldn't fail due to dependency on other memory pool transactions
            // because we're already processing them in order of dependency
+            map<uint256, CTxIndex> mapTestPoolTmp(mapTestPool);
            MapPrevTx mapInputs;
-            MapPrevTx mapEmpty;
            bool fInvalid;
-            if (!tx.FetchInputs(txdb, mapEmpty, false, true, mapInputs, fInvalid))
+            if (!tx.FetchInputs(txdb, mapTestPoolTmp, false, true, mapInputs, fInvalid))
                continue;

            int64_t nTxFees = tx.GetValueIn(mapInputs)-tx.GetValueOut();
@@ -279,8 +313,10 @@ CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake, int64_t* pFees)
            if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS)
                continue;

-            if (!tx.ConnectInputs(txdb, mapInputs, pindexPrev, false, true))
+            if (!tx.ConnectInputs(txdb, mapInputs, mapTestPoolTmp, CDiskTxPos(1,1,1), pindexPrev, false, true))
                continue;
+            mapTestPoolTmp[tx.GetHash()] = CTxIndex(CDiskTxPos(1,1,1), tx.vout.size());
+            swap(mapTestPool, mapTestPoolTmp);

            // Added
            pblock->vtx.push_back(tx);
@@ -339,6 +375,110 @@ CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake, int64_t* pFees)
 }


+void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce)
+{
+    // Update nExtraNonce
+    static uint256 hashPrevBlock;
+    if (hashPrevBlock != pblock->hashPrevBlock)
+    {
+        nExtraNonce = 0;
+        hashPrevBlock = pblock->hashPrevBlock;
+    }
+    ++nExtraNonce;
+
+    unsigned int nHeight = pindexPrev->nHeight+1; // Height first in coinbase required for block.version=2
+    pblock->vtx[0].vin[0].scriptSig = (CScript() << nHeight << CBigNum(nExtraNonce)) + COINBASE_FLAGS;
+    assert(pblock->vtx[0].vin[0].scriptSig.size() <= 100);
+
+    pblock->hashMerkleRoot = pblock->BuildMerkleTree();
+}
+
+
+void FormatHashBuffers(CBlock* pblock, char* pmidstate, char* pdata, char* phash1)
+{
+    //
+    // Pre-build hash buffers
+    //
+    struct
+    {
+        struct unnamed2
+        {
+            int nVersion;
+            uint256 hashPrevBlock;
+            uint256 hashMerkleRoot;
+            unsigned int nTime;
+            unsigned int nBits;
+            unsigned int nNonce;
+        }
+        block;
+        unsigned char pchPadding0[64];
+        uint256 hash1;
+        unsigned char pchPadding1[64];
+    }
+    tmp;
+    memset(&tmp, 0, sizeof(tmp));
+
+    tmp.block.nVersion       = pblock->nVersion;
+    tmp.block.hashPrevBlock  = pblock->hashPrevBlock;
+    tmp.block.hashMerkleRoot = pblock->hashMerkleRoot;
+    tmp.block.nTime          = pblock->nTime;
+    tmp.block.nBits          = pblock->nBits;
+    tmp.block.nNonce         = pblock->nNonce;
+
+    FormatHashBlocks(&tmp.block, sizeof(tmp.block));
+    FormatHashBlocks(&tmp.hash1, sizeof(tmp.hash1));
+
+    // Byte swap all the input buffer
+    for (unsigned int i = 0; i < sizeof(tmp)/4; i++)
+        ((unsigned int*)&tmp)[i] = ByteReverse(((unsigned int*)&tmp)[i]);
+
+    // Precalc the first half of the first hash, which stays constant
+    SHA256Transform(pmidstate, &tmp.block, pSHA256InitState);
+
+    memcpy(pdata, &tmp.block, 128);
+    memcpy(phash1, &tmp.hash1, 64);
+}
+
+
+bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey)
+{
+    uint256 hash = pblock->GetHash();
+    uint256 hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256();
+
+    if(!pblock->IsProofOfWork())
+        return error("CheckWork() : %s is not a proof-of-work block", hash.GetHex().c_str());
+
+    if (hash > hashTarget && pblock->IsProofOfWork())
+        return error("CheckWork() : proof-of-work not meeting target");
+
+    //// debug print
+    printf("CheckWork() : new proof-of-work block found  \n  hash: %s  \ntarget: %s\n", hash.GetHex().c_str(), hashTarget.GetHex().c_str());
+    pblock->print();
+    printf("generated %s\n", FormatMoney(pblock->vtx[0].vout[0].nValue).c_str());
+
+    // Found a solution
+    {
+        LOCK(cs_main);
+        if (pblock->hashPrevBlock != hashBestChain)
+            return error("CheckWork() : generated block is stale");
+
+        // Remove key from key pool
+        reservekey.KeepKey();
+
+        // Track how many getdata requests this block gets
+        {
+            LOCK(wallet.cs_wallet);
+            wallet.mapRequestCount[hash] = 0;
+        }
+
+        // Process this block the same as if we had received it from another node
+        if (!ProcessBlock(NULL, pblock))
+            return error("CheckWork() : ProcessBlock, block not accepted");
+    }
+
+    return true;
+}
+
 bool CheckStake(CBlock* pblock, CWallet& wallet)
 {
    uint256 proofHash = 0, hashTarget = 0;
@@ -347,10 +487,8 @@ bool CheckStake(CBlock* pblock, CWallet& wallet)
    if(!pblock->IsProofOfStake())
        return error("CheckStake() : %s is not a proof-of-stake block", hash.GetHex().c_str());

-    if (pblock->vtx.size() < 2)
-        return error("CheckStake() : block has no coinstake transaction");
-
    // verify hash target and signature of coinstake tx
+    //bool fIsInitialDownload = IsInitialBlockDownload();
    if (!CheckProofOfStake(pblock->vtx[1], pblock->nBits, proofHash, hashTarget))
        return error("CheckStake() : proof-of-stake checking failed");

@@ -436,10 +574,7 @@ void StakeMiner(CWallet *pwallet)
        int64_t nFees;
        unique_ptr<CBlock> pblock(CreateNewBlock(pwallet, true, &nFees));
        if (!pblock.get())
-        {
-            MilliSleep(5000);
-            continue;
-        }
+            return;

        // Try to sign the block
        if (pblock->SignBlock(*pwallet, nFees))
@@ -12,9 +12,21 @@
 /* Generate a new block, without valid proof-of-work */
 CBlock* CreateNewBlock(CWallet* pwallet, bool fProofOfStake=false, int64_t* pFees = 0);

+/** Modify the extranonce in a block */
+void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce);
+
+/** Do mining precalculation */
+void FormatHashBuffers(CBlock* pblock, char* pmidstate, char* pdata, char* phash1);
+
+/** Check mined proof-of-work block */
+bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey);
+
 /** Check mined proof-of-stake block */
 bool CheckStake(CBlock* pblock, CWallet& wallet);

+/** Base sha256 mining transform */
+void SHA256Transform(void* pstate, void* pinput, const void* pinit);
+
 #endif // TRIANGLES_MINER_H


@@ -13,9 +13,7 @@
 #include "ui_interface.h"
 #include "onionseed.h"

-#include <openssl/ssl.h>
-#include <openssl/err.h>
-
+#include <boost/asio.hpp>
 #include <sstream>

 #ifdef WIN32
@@ -62,11 +60,8 @@ struct LocalServiceInfo {
 bool fClient = false;
 //bool fDiscover = true;

-#ifdef USE_UPNP
 bool fUseUPnP = GetBoolArg("-upnp", USE_UPNP);
-#else
-bool fUseUPnP = false;
-#endif
+//bool fUseUPnP = false;
 uint64_t nLocalServices = (fClient ? 0 : NODE_NETWORK);
 static CCriticalSection cs_mapLocalHost;
 static map<CNetAddr, LocalServiceInfo> mapLocalHost;
@@ -495,14 +490,6 @@ CNode* FindNode(const CService& addr)

 CNode* ConnectNode(CAddress addrConnect, const char *pszDest)
 {
-    // TOR-NATIVE: Reject all non-.onion addresses
-    std::string addrStr = pszDest ? std::string(pszDest) : addrConnect.ToStringIP();
-    if (addrStr.find(".onion") == std::string::npos) {
-        if (fDebug)
-            printf("ConnectNode(): REJECTED non-onion address: %s (Tor-native mode)\n", addrStr.c_str());
-        return NULL;
-    }
-
    if (pszDest == NULL) {
        if (IsLocal(addrConnect))
            return NULL;
@@ -623,32 +610,6 @@ bool CNode::IsBanned(CNetAddr ip)
    return fResult;
 }

-bool CNode::Ban(CNetAddr ip, int64_t banTime)
-{
-    if (ip.IsLocal())
-        return false;
-
-    LOCK(cs_setBanned);
-    std::map<CNetAddr, int64_t>::iterator it = setBanned.find(ip);
-    if (it != setBanned.end() && it->second >= banTime)
-        return false;
-
-    setBanned[ip] = banTime;
-    return true;
-}
-
-bool CNode::Unban(CNetAddr ip)
-{
-    LOCK(cs_setBanned);
-    return setBanned.erase(ip) != 0;
-}
-
-void CNode::GetBanned(std::map<CNetAddr, int64_t>& mapBannedOut)
-{
-    LOCK(cs_setBanned);
-    mapBannedOut = setBanned;
-}
-
 bool CNode::Misbehaving(int howmuch)
 {
    if (addr.IsLocal())
@@ -1381,29 +1342,40 @@ void ThreadOnionSeed(void* parg)



-    // Load hardcoded .onion seeds (if any)
    static const char *(*strOnionSeed)[1] = fTestNet ? strTestNetOnionSeed : strMainNetOnionSeed;
+
+
    int found = 0;

+    printf("Loading addresses from .onion seeds\n");
+
+
+
+
+
    for (unsigned int seed_idx = 0; strOnionSeed[seed_idx][0] != NULL; seed_idx++) {
        CNetAddr parsed;
-        if (!parsed.SetSpecial(strOnionSeed[seed_idx][0]))
+        if (
+            !parsed.SetSpecial(
+                strOnionSeed[seed_idx][0]
+            )
+        ) {
            throw runtime_error("ThreadOnionSeed() : invalid .onion seed");
+        }

        int nOneDay = 24*3600;
        CAddress addr = CAddress(CService(parsed, GetDefaultPort()));
-        addr.nTime = GetTime() - 3*nOneDay - GetRand(4*nOneDay);
-        addrman.Add(addr, parsed);
+        addr.nTime = GetTime() - 3*nOneDay - GetRand(4*nOneDay); // use a random age between 3 and 7 days old
+
        found++;
+        addrman.Add(addr, parsed);
+
+
+
+
    }

-    printf("%d addresses from hardcoded .onion seeds\n", found);
-
-    // Also fetch dynamic seeds from HTTP seed list
-    // This is the primary discovery mechanism — seeds.cryptographic-triangles.org
-    ThreadHTTPSeedFetch2(NULL);
-
-    printf("ThreadOnionSeed: seeding complete\n");
+    printf("%d addresses found from .onion seeds\n", found);
 }


@@ -1465,7 +1437,7 @@ void ThreadHTTPSeedFetch2(void* parg)
 {
    static const char* DEFAULT_SEED_URL_HOST = "seeds.cryptographic-triangles.org";
    static const char* DEFAULT_SEED_URL_PATH = "/seeds.txt";
-    static const int HTTPS_PORT = 443;
+    static const int HTTP_PORT = 80;

    std::string seedHost = GetArg("-seedurl", DEFAULT_SEED_URL_HOST);
    std::string seedPath = DEFAULT_SEED_URL_PATH;
@@ -1477,123 +1449,70 @@ void ThreadHTTPSeedFetch2(void* parg)
        seedHost = seedHost.substr(0, slashPos);
    }

-    printf("Fetching seed list from https://%s%s (via Tor)...\n", seedHost.c_str(), seedPath.c_str());
-
-    SSL_CTX* ctx = NULL;
-    SSL* ssl = NULL;
-    SOCKET hSocket = INVALID_SOCKET;
+    printf("Fetching seed list from http://%s%s ...\n", seedHost.c_str(), seedPath.c_str());

    try {
-        // Connect through Tor SOCKS proxy using existing proxy-aware socket infrastructure
-        CService addrResolved;
-        std::string connectDest = seedHost + ":" + std::to_string(HTTPS_PORT);
+        boost::asio::io_context io_context;
+        boost::asio::ip::tcp::resolver resolver(io_context);

-        if (!ConnectSocketByName(addrResolved, hSocket, connectDest.c_str(), HTTPS_PORT, nConnectTimeout)) {
-            printf("HTTPS seed fetch: cannot connect to %s through Tor proxy\n", seedHost.c_str());
+        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;
        }

-        // Set up TLS over the connected socket
-        ctx = SSL_CTX_new(TLS_client_method());
-        if (!ctx) {
-            printf("HTTPS seed fetch: SSL_CTX_new failed\n");
-            closesocket(hSocket);
-            return;
-        }
+        boost::asio::ip::tcp::socket socket(io_context);
+        boost::asio::connect(socket, endpoints);

-        // Use system default CA certificates for verification
-        SSL_CTX_set_default_verify_paths(ctx);
-        SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, NULL);
-
-        ssl = SSL_new(ctx);
-        if (!ssl) {
-            printf("HTTPS seed fetch: SSL_new failed\n");
-            SSL_CTX_free(ctx);
-            closesocket(hSocket);
-            return;
-        }
-
-        // Set SNI hostname (required for Caddy/Let's Encrypt)
-        SSL_set_tlsext_host_name(ssl, seedHost.c_str());
-        SSL_set_fd(ssl, (int)hSocket);
-
-        int ret = SSL_connect(ssl);
-        if (ret != 1) {
-            int sslErr = SSL_get_error(ssl, ret);
-            unsigned long errCode = ERR_get_error();
-            char errBuf[256];
-            ERR_error_string_n(errCode, errBuf, sizeof(errBuf));
-            printf("HTTPS seed fetch: TLS handshake failed (ssl_err=%d): %s\n", sslErr, errBuf);
-            SSL_free(ssl);
-            SSL_CTX_free(ctx);
-            closesocket(hSocket);
-            return;
-        }
-
-        printf("HTTPS seed fetch: TLS connection established to %s\n", seedHost.c_str());
-
-        // Send HTTP request over TLS
        std::string request =
            "GET " + seedPath + " HTTP/1.1\r\n"
            "Host: " + seedHost + "\r\n"
            "Connection: close\r\n"
            "User-Agent: Triangles\r\n"
            "\r\n";
+        boost::asio::write(socket, boost::asio::buffer(request));

-        int nSent = 0;
-        int nLen = request.size();
-        while (nSent < nLen) {
-            int nBytes = SSL_write(ssl, request.c_str() + nSent, nLen - nSent);
-            if (nBytes <= 0) {
-                printf("HTTPS seed fetch: SSL_write failed\n");
-                SSL_shutdown(ssl);
-                SSL_free(ssl);
-                SSL_CTX_free(ctx);
-                closesocket(hSocket);
-                return;
-            }
-            nSent += nBytes;
-        }
+        // Read response
+        boost::asio::streambuf response_buf;
+        boost::asio::read_until(socket, response_buf, "\r\n\r\n");

-        // Read response over TLS
-        std::string response;
-        char buf[4096];
-        while (true) {
-            int nBytes = SSL_read(ssl, buf, sizeof(buf));
-            if (nBytes <= 0)
-                break;
-            response.append(buf, nBytes);
-        }
+        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);

-        SSL_shutdown(ssl);
-        SSL_free(ssl);
-        SSL_CTX_free(ctx);
-        closesocket(hSocket);
-        ssl = NULL;
-        ctx = NULL;
-        hSocket = INVALID_SOCKET;
-
-        if (response.empty()) {
-            printf("HTTPS seed fetch: empty response from %s\n", seedHost.c_str());
+        if (status_code != 200) {
+            printf("HTTP seed fetch: got status %u from %s\n", status_code, seedHost.c_str());
            return;
        }

-        // Parse HTTP response - find end of headers
-        size_t headerEnd = response.find("\r\n\r\n");
-        if (headerEnd == std::string::npos) {
-            printf("HTTPS seed fetch: malformed response (no header terminator)\n");
-            return;
+        // 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();
        }

-        // Check status code
-        std::string statusLine = response.substr(0, response.find("\r\n"));
-        if (statusLine.find("200") == std::string::npos) {
-            printf("HTTPS seed fetch: %s from %s\n", statusLine.c_str(), seedHost.c_str());
-            return;
+        // 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();
        }

-        std::string body = response.substr(headerEnd + 4);
-
        // Parse one address per line: "address:port" or just "address"
        int found = 0;
        std::istringstream lines(body);
@@ -1645,18 +1564,15 @@ void ThreadHTTPSeedFetch2(void* parg)
            if (resolved) {
                CAddress addr(CService(parsed, port));
                addr.nTime = GetTime() - 3*24*60*60; // 3 days ago
-                addrman.Add(addr, CNetAddr("https-seed", true));
+                addrman.Add(addr, CNetAddr("http-seed", true));
                found++;
            }
        }

-        printf("%d addresses found from HTTPS seed list (%s)\n", found, seedHost.c_str());
+        printf("%d addresses found from HTTP seed list (%s)\n", found, seedHost.c_str());

    } catch (std::exception& e) {
-        printf("HTTPS seed fetch failed: %s\n", e.what());
-        if (ssl) { SSL_shutdown(ssl); SSL_free(ssl); }
-        if (ctx) SSL_CTX_free(ctx);
-        if (hSocket != INVALID_SOCKET) closesocket(hSocket);
+        printf("HTTP seed fetch failed: %s\n", e.what());
    }
 }

@@ -1723,35 +1639,18 @@ void static ThreadStakeMiner(void* parg)
 {
    printf("ThreadStakeMiner started\n");
    CWallet* pwallet = (CWallet*)parg;
-    int nConsecutiveErrors = 0;
-    while (!fShutdown)
+    try
    {
-        try
-        {
-            vnThreadsRunning[THREAD_STAKE_MINER]++;
-            StakeMiner(pwallet);
-            vnThreadsRunning[THREAD_STAKE_MINER]--;
-            break; // normal exit
-        }
-        catch (std::exception& e) {
-            vnThreadsRunning[THREAD_STAKE_MINER]--;
-            nConsecutiveErrors++;
-            printf("ThreadStakeMiner() exception: %s (attempt %d)\n", e.what(), nConsecutiveErrors);
-            if (nConsecutiveErrors >= 10) {
-                printf("ThreadStakeMiner() too many consecutive errors, giving up\n");
-                break;
-            }
-            MilliSleep(5000); // wait 5 seconds before retrying
-        } catch (...) {
-            vnThreadsRunning[THREAD_STAKE_MINER]--;
-            nConsecutiveErrors++;
-            printf("ThreadStakeMiner() unknown exception (attempt %d)\n", nConsecutiveErrors);
-            if (nConsecutiveErrors >= 10) {
-                printf("ThreadStakeMiner() too many consecutive errors, giving up\n");
-                break;
-            }
-            MilliSleep(5000);
-        }
+        vnThreadsRunning[THREAD_STAKE_MINER]++;
+        StakeMiner(pwallet);
+        vnThreadsRunning[THREAD_STAKE_MINER]--;
+    }
+    catch (std::exception& e) {
+        vnThreadsRunning[THREAD_STAKE_MINER]--;
+        PrintException(&e, "ThreadStakeMiner()");
+    } catch (...) {
+        vnThreadsRunning[THREAD_STAKE_MINER]--;
+        PrintException(NULL, "ThreadStakeMiner()");
    }
    printf("ThreadStakeMiner exiting, %d threads remaining\n", vnThreadsRunning[THREAD_STAKE_MINER]);
 }
@@ -2304,11 +2203,8 @@ void StartNode(void* parg)
    if (fUseUPnP)
        MapPort();

-    // HTTP seed list fetch — only as a standalone thread if onion seeding is disabled,
-    // since ThreadOnionSeed already calls ThreadHTTPSeedFetch2 internally.
-    if (GetBoolArg("-onionseed", true))
-        printf("HTTP seed fetch handled by onion seed thread\n");
-    else if (GetBoolArg("-noseedurl", false))
+    // 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");
@@ -252,7 +252,6 @@ public:
    bool fNetworkNode;
    bool fSuccessfullyConnected;
    bool fDisconnect;
-    bool fPreferHeaders; // peer requested block announcements via headers (sendheaders)
    CSemaphoreGrant grantOutbound;
    int nRefCount;
 protected:
@@ -309,7 +308,6 @@ public:
        fNetworkNode = false;
        fSuccessfullyConnected = false;
        fDisconnect = false;
-        fPreferHeaders = false;
        nRefCount = 0;
        nSendSize = 0;
        nSendOffset = 0;
@@ -734,9 +732,6 @@ public:
    // new code.
    static void ClearBanned(); // needed for unit testing
    static bool IsBanned(CNetAddr ip);
-    static bool Ban(CNetAddr ip, int64_t banTime);
-    static bool Unban(CNetAddr ip);
-    static void GetBanned(std::map<CNetAddr, int64_t>& mapBannedOut);
    bool Misbehaving(int howmuch); // 1 == a little, 100 == a lot
    void copyStats(CNodeStats &stats);
 };
@@ -1,44 +1,256 @@
 // Copyright (c) 2024 Triangles developers
-// Network Bootstrap Implementation for Triangles
+// Network Bootstrap Implementation for Triangles v5.0.0.0
 // Distributed under the MIT/X11 software license

 #include "net_bootstrap.h"
-#include "main.h"
 #include "net.h"
 #include "util.h"
+#include "init.h"
+#include "tor/onion_v3.h"

 namespace NetBootstrap {

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

-} // namespace NetBootstrap
+} // namespace NetBootstrap
@@ -1,5 +1,5 @@
 // Copyright (c) 2024 Triangles developers
-// Network Bootstrap Configuration for Triangles
+// Network Bootstrap Configuration for Triangles v5.0.0.0
 // Distributed under the MIT/X11 software license

 #ifndef TRIANGLES_NET_BOOTSTRAP_H
@@ -9,45 +9,82 @@
 #include <string>
 #include <vector>

-// Tor-native network bootstrap configuration.
-// All connections route through embedded Tor. Clearnet is disabled.
+// Network bootstrap configuration for preserving old wallets
+// while enabling modern Tor v3 functionality

 namespace NetBootstrap {

+    // DNS seed nodes for initial bootstrap (clearnet fallback)
+    // Unused attribute prevents warnings
+    static const char* strDNSSeed[] __attribute__((unused)) = {
+        "seed1.cryptographic-triangles.org",
+        "seed2.cryptographic-triangles.org",
+        "seed3.cryptographic-triangles.org",
+        "backup-seed.cryptographic-triangles.org",
+        NULL
+    };
+
+    // 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)) = {
+    };
+
    // Network protocol compatibility settings
    struct NetworkConfig {
+        // Preserve compatibility with old wallets
        static const int MIN_PROTOCOL_VERSION_OLD_WALLET = 70200;
        static const int CURRENT_PROTOCOL_VERSION = 70205;
-
-        // Network ports
+        
+        // Network ports (preserved from existing configuration)
        static const int DEFAULT_PORT_MAINNET = 24112;
        static const int DEFAULT_PORT_TESTNET = 24111;
        static const int DEFAULT_RPC_PORT_MAINNET = 19112;
        static const int DEFAULT_RPC_PORT_TESTNET = 19111;
-
-        // Connection limits
-        static const int MAX_CONNECTIONS_DEFAULT = 64;
+        
+        // Connection limits for different node types
+        static const int MAX_CONNECTIONS_DEFAULT = 125;
+        static const int MAX_CONNECTIONS_TOR_ONLY = 64;
        static const int MAX_OUTBOUND_CONNECTIONS = 8;
-
-        // Tor configuration
+        
+        // Tor-specific configuration
        static const int TOR_HIDDEN_SERVICE_PORT = 24112;
-
-        // Timeouts
+        static constexpr const char* TOR_PROXY_DEFAULT = "127.0.0.1:9050";
+        
+        // Network timeouts and retry settings
        static const int CONNECTION_TIMEOUT_SECONDS = 30;
-        static const int PEER_DISCOVERY_INTERVAL_SECONDS = 3600;
+        static const int PEER_DISCOVERY_INTERVAL_SECONDS = 3600; // 1 hour
+        static const int SEEDER_ANNOUNCEMENT_INTERVAL_SECONDS = 1800; // 30 minutes
    };

+    // Bootstrap sequence for different wallet types
+    enum BootstrapMode {
+        BOOTSTRAP_LEGACY,      // Old wallets without Tor
+        BOOTSTRAP_TOR_MIXED,   // Mixed clearnet + Tor
+        BOOTSTRAP_TOR_ONLY     // Tor-only mode
+    };
+
+    // Get bootstrap configuration based on wallet capabilities
+    BootstrapMode GetBootstrapMode();
+    
+    // Initialize network bootstrap based on configuration
+    bool InitializeNetworkBootstrap(BootstrapMode mode);
+    
+    // Backward compatibility helpers
+    bool IsOldWalletCompatible(int protocolVersion);
+    std::vector<std::string> GetCompatibleSeedNodes(int protocolVersion);
+    
    // Network health monitoring
    struct NetworkHealth {
        int connectedPeers;
        int torPeers;
+        int clearnetPeers;
        bool isBootstrapped;
        bool isSyncing;
        int64_t lastBlockTime;
    };
-
+    
    NetworkHealth GetNetworkHealth();
-
+    
 } // namespace NetBootstrap

-#endif // TRIANGLES_NET_BOOTSTRAP_H
+#endif // TRIANGLES_NET_BOOTSTRAP_H
@@ -2,14 +2,10 @@
 #ifndef TRIANGLES_ONIONSEED_H
 #define TRIANGLES_ONIONSEED_H

-// Hardcoded onion seed nodes for initial peer discovery.
-// Also fetched dynamically via https://seeds.cryptographic-triangles.org/seeds.txt
+// 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] = {
-    {"jbpfhe7zw3qm67wy3j2ayysp3mnrjobopthnko3b3sgahqtecblwqmid.onion"},
-    {"uddaxjbo3lh2zskg7w6gwln4ty5cel7q4c5jbx7fdtv6zf2j47gdlyad.onion"},
-    {"el5sirhhleecuctpeeprelzubpqmoqivvra3rzlwbjttinxa4fq3wnid.onion"},
-    {"sj5dhybnlp3v4y5niyc5unrnd6s43lyx5ibup7rolyosjbi2u2hsbvyd.onion"},
-    {"i3kr5meha7se4ns3wss3h7v46m6uksfzv4wrohdqxpj6n35wyo2bvlid.onion"},
    {NULL}
 };

@@ -307,6 +307,7 @@ bool IntroDialog::pickDataDirectory()
                progress.setValue(100);
            }
        }
+    }

    return true;
 }
@@ -8,7 +8,7 @@

 #include "ui_interface.h"
 #include "base58.h"
-#include "json/json_compat.h"
+#include "json_spirit.h"

 #include <QSet>
 #include <QTimer>
@@ -265,9 +265,8 @@ public:

 private:
    // Get the json value
-    const json_spirit::Value & find_json_value(json_spirit::mObject & obj, const char * key)
+    const json_spirit::mValue & find_value(json_spirit::mObject & obj, const char * key)
    {
-        static const json_spirit::Value null_val;
        std::string newKey = key;

        json_spirit::mObject::const_iterator i = obj.find(newKey);
@@ -275,12 +274,12 @@ private:
        if(i != obj.end() && i->first == newKey)
            return i->second;
        else
-            return null_val;
+            return json_spirit::mValue::null;
    }

    const std::string get_value(json_spirit::mObject & obj, const char * key)
    {
-        const json_spirit::Value& val = find_json_value(obj, key);
+        json_spirit::mValue val = find_value(obj, key);

        if(val.is_null())
            return "";
@@ -292,7 +291,7 @@ private:
    void handleMessageEntry(const MessageTableEntry & message, const bool append)
    {
        addMessageEntry(message, append);
-        json_spirit::Value mVal;
+        json_spirit::mValue mVal;
        json_spirit::read(message.message.toStdString(), mVal);

        if(mVal.is_null())
@@ -301,8 +300,8 @@ private:
            return;
        }

-        json_spirit::mObject mObj(mVal.get_map_obj());
-        json_spirit::Value mvType = find_json_value(mObj, "type");
+        json_spirit::mObject mObj(mVal.get_obj());
+        json_spirit::mValue mvType = find_value(mObj, "type");

    }

@@ -108,10 +108,438 @@ Value getstakinginfo(const Array& params, bool fHelp)
    return obj;
 }

-// PoW mining RPCs (getwork, getworkex, getblocktemplate, submitblock) removed.
-// PoW ended at block 9000 (CUTOFF_POW_BLOCK). These dead-code mining pool
-// interfaces were removed to reduce false-positive antivirus detections,
-// since AV engines pattern-match nonce-incrementing loops and mining pool
-// protocols as "cryptominer" signatures.
+Value getworkex(const Array& params, bool fHelp)
+{
+    if (fHelp || params.size() > 2)
+        throw runtime_error(
+            "getworkex [data, coinbase]\n"
+            "If [data, coinbase] is not specified, returns extended work data.\n"
+        );
+
+    if (vNodes.empty())
+        throw JSONRPCError(-9, "Triangles is not connected!");
+
+    if (IsInitialBlockDownload())
+        throw JSONRPCError(-10, "Triangles is downloading blocks...");
+
+    if (pindexBest->nHeight >= CUTOFF_POW_BLOCK)
+        throw JSONRPCError(RPC_MISC_ERROR, "No more PoW blocks");
+
+    typedef map<uint256, pair<CBlock*, CScript> > mapNewBlock_t;
+    static mapNewBlock_t mapNewBlock;
+    static vector<CBlock*> vNewBlock;
+    static CReserveKey reservekey(pwalletMain);
+
+    if (params.size() == 0)
+    {
+        // Update block
+        static unsigned int nTransactionsUpdatedLast;
+        static CBlockIndex* pindexPrev;
+        static int64_t nStart;
+        static CBlock* pblock;
+        if (pindexPrev != pindexBest ||
+            (nTransactionsUpdated != nTransactionsUpdatedLast && GetTime() - nStart > 60))
+        {
+            if (pindexPrev != pindexBest)
+            {
+                // Deallocate old blocks since they're obsolete now
+                mapNewBlock.clear();
+                for (CBlock* pblock : vNewBlock)
+                    delete pblock;
+                vNewBlock.clear();
+            }
+            nTransactionsUpdatedLast = nTransactionsUpdated;
+            pindexPrev = pindexBest;
+            nStart = GetTime();
+
+            // Create new block
+            pblock = CreateNewBlock(pwalletMain);
+            if (!pblock)
+                throw JSONRPCError(-7, "Out of memory");
+            vNewBlock.push_back(pblock);
+        }
+
+        // Update nTime
+        pblock->nTime = max(pindexPrev->GetPastTimeLimit()+1, GetAdjustedTime());
+        pblock->nNonce = 0;
+
+        // Update nExtraNonce
+        static unsigned int nExtraNonce = 0;
+        IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
+
+        // Save
+        mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, pblock->vtx[0].vin[0].scriptSig);
+
+        // Prebuild hash buffers
+        char pmidstate[32];
+        char pdata[128];
+        char phash1[64];
+        FormatHashBuffers(pblock, pmidstate, pdata, phash1);
+
+        uint256 hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256();
+
+        CTransaction coinbaseTx = pblock->vtx[0];
+        std::vector<uint256> merkle = pblock->GetMerkleBranch(0);
+
+        Object result;
+        result.push_back(Pair("data",     HexStr(BEGIN(pdata), END(pdata))));
+        result.push_back(Pair("target",   HexStr(BEGIN(hashTarget), END(hashTarget))));
+
+        CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
+        ssTx << coinbaseTx;
+        result.push_back(Pair("coinbase", HexStr(ssTx.begin(), ssTx.end())));
+
+        Array merkle_arr;
+
+        for (uint256 merkleh : merkle) {
+            merkle_arr.push_back(HexStr(BEGIN(merkleh), END(merkleh)));
+        }
+
+        result.push_back(Pair("merkle", merkle_arr));
+
+
+        return result;
+    }
+    else
+    {
+        // Parse parameters
+        vector<unsigned char> vchData = ParseHex(params[0].get_str());
+        vector<unsigned char> coinbase;
+
+        if(params.size() == 2)
+            coinbase = ParseHex(params[1].get_str());
+
+        if (vchData.size() != 128)
+            throw JSONRPCError(-8, "Invalid parameter");
+
+        CBlock* pdata = (CBlock*)&vchData[0];
+
+        // Byte reverse
+        for (int i = 0; i < 128/4; i++)
+            ((unsigned int*)pdata)[i] = ByteReverse(((unsigned int*)pdata)[i]);
+
+        // Get saved block
+        if (!mapNewBlock.count(pdata->hashMerkleRoot))
+            return false;
+        CBlock* pblock = mapNewBlock[pdata->hashMerkleRoot].first;
+
+        pblock->nTime = pdata->nTime;
+        pblock->nNonce = pdata->nNonce;
+
+        if(coinbase.size() == 0)
+            pblock->vtx[0].vin[0].scriptSig = mapNewBlock[pdata->hashMerkleRoot].second;
+        else
+            // Deserialize custom coinbase transaction from miner
+            CDataStream(coinbase, SER_NETWORK, PROTOCOL_VERSION) >> pblock->vtx[0];
+
+        pblock->hashMerkleRoot = pblock->BuildMerkleTree();
+
+        return CheckWork(pblock, *pwalletMain, reservekey);
+    }
+}
+
+
+Value getwork(const Array& params, bool fHelp)
+{
+    if (fHelp || params.size() > 1)
+        throw runtime_error(
+            "getwork [data]\n"
+            "If [data] is not specified, returns formatted hash data to work on:\n"
+            "  \"midstate\" : precomputed hash state after hashing the first half of the data (DEPRECATED)\n" // deprecated
+            "  \"data\" : block data\n"
+            "  \"hash1\" : formatted hash buffer for second hash (DEPRECATED)\n" // deprecated
+            "  \"target\" : little endian hash target\n"
+            "If [data] is specified, tries to solve the block and returns true if it was successful.");
+
+    if (vNodes.empty())
+        throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Triangles is not connected!");
+
+    if (IsInitialBlockDownload())
+        throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Triangles is downloading blocks...");
+
+    if (pindexBest->nHeight >= CUTOFF_POW_BLOCK)
+        throw JSONRPCError(RPC_MISC_ERROR, "No more PoW blocks");
+
+    typedef map<uint256, pair<CBlock*, CScript> > mapNewBlock_t;
+    // NOTE: Thread safety issue - static variables accessed by multiple RPC threads
+    // without mutex protection. Low priority since PoW ended at block 9000 and
+    // getwork is rarely used. Consider adding std::mutex if usage increases.
+    static mapNewBlock_t mapNewBlock;
+    static vector<CBlock*> vNewBlock;
+    static CReserveKey reservekey(pwalletMain);
+
+    if (params.size() == 0)
+    {
+        // Update block
+        static unsigned int nTransactionsUpdatedLast;
+        static CBlockIndex* pindexPrev;
+        static int64_t nStart;
+        static CBlock* pblock;
+        if (pindexPrev != pindexBest ||
+            (nTransactionsUpdated != nTransactionsUpdatedLast && GetTime() - nStart > 60))
+        {
+            if (pindexPrev != pindexBest)
+            {
+                // Deallocate old blocks since they're obsolete now
+                mapNewBlock.clear();
+                for (CBlock* pblock : vNewBlock)
+                    delete pblock;
+                vNewBlock.clear();
+            }
+
+            // Clear pindexPrev so future getworks make a new block, despite any failures from here on
+            pindexPrev = NULL;
+
+            // Store the pindexBest used before CreateNewBlock, to avoid races
+            nTransactionsUpdatedLast = nTransactionsUpdated;
+            CBlockIndex* pindexPrevNew = pindexBest;
+            nStart = GetTime();
+
+            // Create new block
+            pblock = CreateNewBlock(pwalletMain);
+            if (!pblock)
+                throw JSONRPCError(RPC_OUT_OF_MEMORY, "Out of memory");
+            vNewBlock.push_back(pblock);
+
+            // Need to update only after we know CreateNewBlock succeeded
+            pindexPrev = pindexPrevNew;
+        }
+
+        // Update nTime
+        pblock->UpdateTime(pindexPrev);
+        pblock->nNonce = 0;
+
+        // Update nExtraNonce
+        static unsigned int nExtraNonce = 0;
+        IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
+
+        // Save
+        mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, pblock->vtx[0].vin[0].scriptSig);
+
+        // Pre-build hash buffers
+        char pmidstate[32];
+        char pdata[128];
+        char phash1[64];
+        FormatHashBuffers(pblock, pmidstate, pdata, phash1);
+
+        uint256 hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256();
+
+        Object result;
+        result.push_back(Pair("midstate", HexStr(BEGIN(pmidstate), END(pmidstate)))); // deprecated
+        result.push_back(Pair("data",     HexStr(BEGIN(pdata), END(pdata))));
+        result.push_back(Pair("hash1",    HexStr(BEGIN(phash1), END(phash1)))); // deprecated
+        result.push_back(Pair("target",   HexStr(BEGIN(hashTarget), END(hashTarget))));
+        return result;
+    }
+    else
+    {
+        // Parse parameters
+        vector<unsigned char> vchData = ParseHex(params[0].get_str());
+        if (vchData.size() != 128)
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter");
+        CBlock* pdata = (CBlock*)&vchData[0];
+
+        // Byte reverse
+        for (int i = 0; i < 128/4; i++)
+            ((unsigned int*)pdata)[i] = ByteReverse(((unsigned int*)pdata)[i]);
+
+        // Get saved block
+        if (!mapNewBlock.count(pdata->hashMerkleRoot))
+            return false;
+        CBlock* pblock = mapNewBlock[pdata->hashMerkleRoot].first;
+
+        pblock->nTime = pdata->nTime;
+        pblock->nNonce = pdata->nNonce;
+        pblock->vtx[0].vin[0].scriptSig = mapNewBlock[pdata->hashMerkleRoot].second;
+        pblock->hashMerkleRoot = pblock->BuildMerkleTree();
+
+        return CheckWork(pblock, *pwalletMain, reservekey);
+    }
+}
+
+
+Value getblocktemplate(const Array& params, bool fHelp)
+{
+    if (fHelp || params.size() > 1)
+        throw runtime_error(
+            "getblocktemplate [params]\n"
+            "Returns data needed to construct a block to work on:\n"
+            "  \"version\" : block version\n"
+            "  \"previousblockhash\" : hash of current highest block\n"
+            "  \"transactions\" : contents of non-coinbase transactions that should be included in the next block\n"
+            "  \"coinbaseaux\" : data that should be included in coinbase\n"
+            "  \"coinbasevalue\" : maximum allowable input to coinbase transaction, including the generation award and transaction fees\n"
+            "  \"target\" : hash target\n"
+            "  \"mintime\" : minimum timestamp appropriate for next block\n"
+            "  \"curtime\" : current timestamp\n"
+            "  \"mutable\" : list of ways the block template may be changed\n"
+            "  \"noncerange\" : range of valid nonces\n"
+            "  \"sigoplimit\" : limit of sigops in blocks\n"
+            "  \"sizelimit\" : limit of block size\n"
+            "  \"bits\" : compressed target of next block\n"
+            "  \"height\" : height of the next block");
+
+    std::string strMode = "template";
+    if (params.size() > 0)
+    {
+        const Object& oparam = params[0].get_obj();
+        const Value& modeval = find_value(oparam, "mode");
+        if (modeval.type() == str_type)
+            strMode = modeval.get_str();
+        else if (modeval.type() == null_type)
+        {
+            /* Do nothing */
+        }
+        else
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid mode");
+    }
+
+    if (strMode != "template")
+        throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid mode");
+
+    if (vNodes.empty())
+        throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, "Triangles is not connected!");
+
+    if (IsInitialBlockDownload())
+        throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Triangles is downloading blocks...");
+
+    if (pindexBest->nHeight >= CUTOFF_POW_BLOCK)
+        throw JSONRPCError(RPC_MISC_ERROR, "No more PoW blocks");
+
+    static CReserveKey reservekey(pwalletMain);
+
+    // Update block
+    static unsigned int nTransactionsUpdatedLast;
+    static CBlockIndex* pindexPrev;
+    static int64_t nStart;
+    static CBlock* pblock;
+    if (pindexPrev != pindexBest ||
+        (nTransactionsUpdated != nTransactionsUpdatedLast && GetTime() - nStart > 5))
+    {
+        // Clear pindexPrev so future calls make a new block, despite any failures from here on
+        pindexPrev = NULL;
+
+        // Store the pindexBest used before CreateNewBlock, to avoid races
+        nTransactionsUpdatedLast = nTransactionsUpdated;
+        CBlockIndex* pindexPrevNew = pindexBest;
+        nStart = GetTime();
+
+        // Create new block
+        if(pblock)
+        {
+            delete pblock;
+            pblock = NULL;
+        }
+        pblock = CreateNewBlock(pwalletMain);
+        if (!pblock)
+            throw JSONRPCError(RPC_OUT_OF_MEMORY, "Out of memory");
+
+        // Need to update only after we know CreateNewBlock succeeded
+        pindexPrev = pindexPrevNew;
+    }
+
+    // Update nTime
+    pblock->UpdateTime(pindexPrev);
+    pblock->nNonce = 0;
+
+    Array transactions;
+    map<uint256, int64_t> setTxIndex;
+    int i = 0;
+    CTxDB txdb("r");
+    for (CTransaction& tx : pblock->vtx)
+    {
+        uint256 txHash = tx.GetHash();
+        setTxIndex[txHash] = i++;
+
+        if (tx.IsCoinBase() || tx.IsCoinStake())
+            continue;
+
+        Object entry;
+
+        CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
+        ssTx << tx;
+        entry.push_back(Pair("data", HexStr(ssTx.begin(), ssTx.end())));
+
+        entry.push_back(Pair("hash", txHash.GetHex()));
+
+        MapPrevTx mapInputs;
+        map<uint256, CTxIndex> mapUnused;
+        bool fInvalid = false;
+        if (tx.FetchInputs(txdb, mapUnused, false, false, mapInputs, fInvalid))
+        {
+            entry.push_back(Pair("fee", (int64_t)(tx.GetValueIn(mapInputs) - tx.GetValueOut())));
+
+            Array deps;
+            for (MapPrevTx::value_type& inp : mapInputs)
+            {
+                if (setTxIndex.count(inp.first))
+                    deps.push_back(setTxIndex[inp.first]);
+            }
+            entry.push_back(Pair("depends", deps));
+
+            int64_t nSigOps = tx.GetLegacySigOpCount();
+            nSigOps += tx.GetP2SHSigOpCount(mapInputs);
+            entry.push_back(Pair("sigops", nSigOps));
+        }
+
+        transactions.push_back(entry);
+    }
+
+    Object aux;
+    aux.push_back(Pair("flags", HexStr(COINBASE_FLAGS.begin(), COINBASE_FLAGS.end())));
+
+    uint256 hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256();
+
+    static Array aMutable;
+    if (aMutable.empty())
+    {
+        aMutable.push_back("time");
+        aMutable.push_back("transactions");
+        aMutable.push_back("prevblock");
+    }
+
+    Object result;
+    result.push_back(Pair("version", pblock->nVersion));
+    result.push_back(Pair("previousblockhash", pblock->hashPrevBlock.GetHex()));
+    result.push_back(Pair("transactions", transactions));
+    result.push_back(Pair("coinbaseaux", aux));
+    result.push_back(Pair("coinbasevalue", (int64_t)pblock->vtx[0].vout[0].nValue));
+    result.push_back(Pair("target", hashTarget.GetHex()));
+    result.push_back(Pair("mintime", (int64_t)pindexPrev->GetPastTimeLimit()+1));
+    result.push_back(Pair("mutable", aMutable));
+    result.push_back(Pair("noncerange", "00000000ffffffff"));
+    result.push_back(Pair("sigoplimit", (int64_t)MAX_BLOCK_SIGOPS));
+    result.push_back(Pair("sizelimit", (int64_t)MAX_BLOCK_SIZE));
+    result.push_back(Pair("curtime", (int64_t)pblock->nTime));
+    result.push_back(Pair("bits", HexBits(pblock->nBits)));
+    result.push_back(Pair("height", (int64_t)(pindexPrev->nHeight+1)));
+
+    return result;
+}
+
+Value submitblock(const Array& params, bool fHelp)
+{
+    if (fHelp || params.size() < 1 || params.size() > 2)
+        throw runtime_error(
+            "submitblock <hex data> [optional-params-obj]\n"
+            "[optional-params-obj] parameter is currently ignored.\n"
+            "Attempts to submit new block to network.");
+
+    vector<unsigned char> blockData(ParseHex(params[0].get_str()));
+    CDataStream ssBlock(blockData, SER_NETWORK, PROTOCOL_VERSION);
+    CBlock block;
+    try {
+        ssBlock >> block;
+    }
+    catch (std::exception &e) {
+        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Block decode failed");
+    }
+
+    bool fAccepted = ProcessBlock(NULL, &block);
+    if (!fAccepted)
+        return "rejected";
+
+    return Value::null;
+}


@@ -14,6 +14,37 @@
 using namespace json_spirit;
 using namespace std;

+namespace {
+
+const char* BootstrapModeToString(NetBootstrap::BootstrapMode mode)
+{
+    switch (mode)
+    {
+    case NetBootstrap::BOOTSTRAP_LEGACY:
+        return "legacy";
+    case NetBootstrap::BOOTSTRAP_TOR_MIXED:
+        return "tor_mixed";
+    case NetBootstrap::BOOTSTRAP_TOR_ONLY:
+        return "tor_only";
+    }
+
+    return "unknown";
+}
+
+NetBootstrap::BootstrapMode GetBootstrapModeForRPC()
+{
+    const bool torEnabled = GetBoolArg("-tor", false) || GetBoolArg("-proxy", false);
+    const bool onlyTor = GetBoolArg("-onlynet", false) && GetArg("-onlynet", "") == "tor";
+
+    if (onlyTor)
+        return NetBootstrap::BOOTSTRAP_TOR_ONLY;
+    if (torEnabled)
+        return NetBootstrap::BOOTSTRAP_TOR_MIXED;
+    return NetBootstrap::BOOTSTRAP_LEGACY;
+}
+
+} // namespace
+
 Value getnetworkinfo(const Array& params, bool fHelp)
 {
    if (fHelp || params.size() != 0)
@@ -29,10 +60,11 @@ Value getnetworkinfo(const Array& params, bool fHelp)
    Object healthObj;
    healthObj.push_back(Pair("connectedpeers", health.connectedPeers));
    healthObj.push_back(Pair("torpeers", health.torPeers));
+    healthObj.push_back(Pair("clearnetpeers", health.clearnetPeers));
    healthObj.push_back(Pair("bootstrapped", health.isBootstrapped));
    healthObj.push_back(Pair("syncing", health.isSyncing));
    healthObj.push_back(Pair("lastblocktime", static_cast<boost::int64_t>(health.lastBlockTime)));
-    healthObj.push_back(Pair("networkmode", "tor_native"));
+    healthObj.push_back(Pair("bootstrapmode", BootstrapModeToString(GetBootstrapModeForRPC())));

    Object obj;
    obj.push_back(Pair("version",         FormatFullVersion()));
@@ -370,20 +370,20 @@ Value signrawtransaction(const Array& params, bool fHelp)
    {
        CTransaction tempTx;
        MapPrevTx mapPrevTx;
-        MapPrevTx mapEmpty;
        CTxDB txdb("r");
+        map<uint256, CTxIndex> unused;
        bool fInvalid;

        // FetchInputs aborts on failure, so we go one at a time.
        tempTx.vin.push_back(mergedTx.vin[i]);
-        tempTx.FetchInputs(txdb, mapEmpty, false, false, mapPrevTx, fInvalid);
+        tempTx.FetchInputs(txdb, unused, false, false, mapPrevTx, fInvalid);

        // Copy results into mapPrevOut:
        for (const CTxIn& txin : tempTx.vin)
        {
-            MapPrevTx::const_iterator mi = mapPrevTx.find(txin.prevout);
-            if (mi != mapPrevTx.end())
-                mapPrevOut[txin.prevout] = mi->second.scriptPubKey;
+            const uint256& prevHash = txin.prevout.hash;
+            if (mapPrevTx.count(prevHash) && mapPrevTx[prevHash].second.vout.size()>txin.prevout.n)
+                mapPrevOut[txin.prevout] = mapPrevTx[prevHash].second.vout[txin.prevout.n].scriptPubKey;
        }
    }

@@ -47,8 +47,6 @@ void EnsureWalletIsUnlocked()

 void WalletTxToJSON(const CWalletTx& wtx, Object& entry)
 {
-    LOCK(cs_main);
-
    int confirms = wtx.GetDepthInMainChain();
    entry.push_back(Pair("confirmations", confirms));
    if (wtx.IsCoinBase() || wtx.IsCoinStake())
@@ -57,9 +55,7 @@ void WalletTxToJSON(const CWalletTx& wtx, Object& entry)
    {
        entry.push_back(Pair("blockhash", wtx.hashBlock.GetHex()));
        entry.push_back(Pair("blockindex", wtx.nIndex));
-        auto mi = mapBlockIndex.find(wtx.hashBlock);
-        if (mi != mapBlockIndex.end() && mi->second)
-            entry.push_back(Pair("blocktime", (boost::int64_t)(mi->second->nTime)));
+        entry.push_back(Pair("blocktime", (boost::int64_t)(mapBlockIndex[wtx.hashBlock]->nTime)));
    }
    entry.push_back(Pair("txid", wtx.GetHash().GetHex()));
    entry.push_back(Pair("time", (boost::int64_t)wtx.GetTxTime()));
@@ -110,10 +106,7 @@ Value getinfo(const Array& params, bool fHelp)
    obj.push_back(Pair("paytxfee",      ValueFromAmount(nTransactionFee)));
    obj.push_back(Pair("mininput",      ValueFromAmount(nMinimumInputValue)));
    if (pwalletMain->IsCrypted())
-    {
-        LOCK(cs_nWalletUnlockTime);
        obj.push_back(Pair("unlocked_until", (boost::int64_t)nWalletUnlockTime / 1000));
-    }
    obj.push_back(Pair("errors",        GetWarnings("statusbar")));
    return obj;
 }
@@ -125,12 +118,6 @@ Value getwalletinfo(const Array& params, bool fHelp)
            "getwalletinfo\n"
            "Returns an object containing various wallet state info.");

-    int txCount = 0;
-    {
-        LOCK(pwalletMain->cs_wallet);
-        txCount = (int)pwalletMain->mapWallet.size();
-    }
-
    Object obj;
    obj.push_back(Pair("walletversion", pwalletMain->GetVersion()));
    obj.push_back(Pair("balance",       ValueFromAmount(pwalletMain->GetBalance())));
@@ -138,16 +125,13 @@ Value getwalletinfo(const Array& params, bool fHelp)
    obj.push_back(Pair("immature_balance", ValueFromAmount(pwalletMain->GetImmatureBalance())));
    obj.push_back(Pair("stake",         ValueFromAmount(pwalletMain->GetStake())));
    obj.push_back(Pair("newmint",       ValueFromAmount(pwalletMain->GetNewMint())));
-    obj.push_back(Pair("txcount",       txCount));
+    obj.push_back(Pair("txcount",       (int)pwalletMain->mapWallet.size()));
    obj.push_back(Pair("keypoololdest", (boost::int64_t)pwalletMain->GetOldestKeyPoolTime()));
    obj.push_back(Pair("keypoolsize",   (int)pwalletMain->GetKeyPoolSize()));
    obj.push_back(Pair("paytxfee",      ValueFromAmount(nTransactionFee)));
    obj.push_back(Pair("mininput",      ValueFromAmount(nMinimumInputValue)));
    if (pwalletMain->IsCrypted())
-    {
-        LOCK(cs_nWalletUnlockTime);
        obj.push_back(Pair("unlocked_until", (boost::int64_t)nWalletUnlockTime / 1000));
-    }
    return obj;
 }

@@ -222,7 +206,6 @@ CTrianglesAddress GetAccountAddress(string strAccount, bool bForceNew=false)
    {
        CScript scriptPubKey;
        scriptPubKey.SetDestination(account.vchPubKey.GetID());
-        LOCK(pwalletMain->cs_wallet);
        for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin();
             it != pwalletMain->mapWallet.end() && account.vchPubKey.IsValid();
             ++it)
@@ -283,14 +266,11 @@ Value setaccount(const Array& params, bool fHelp)
        strAccount = AccountFromValue(params[1]);

    // Detect when changing the account of an address that is the 'unused current key' of another account:
+    if (pwalletMain->mapAddressBook.count(address.Get()))
    {
-        LOCK(pwalletMain->cs_wallet);
-        if (pwalletMain->mapAddressBook.count(address.Get()))
-        {
-            string strOldAccount = pwalletMain->mapAddressBook[address.Get()];
-            if (address == GetAccountAddress(strOldAccount))
-                GetAccountAddress(strOldAccount, true);
-        }
+        string strOldAccount = pwalletMain->mapAddressBook[address.Get()];
+        if (address == GetAccountAddress(strOldAccount))
+            GetAccountAddress(strOldAccount, true);
    }

    pwalletMain->SetAddressBookName(address.Get(), strAccount);
@@ -311,12 +291,9 @@ Value getaccount(const Array& params, bool fHelp)
        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Triangles address");

    string strAccount;
-    {
-        LOCK(pwalletMain->cs_wallet);
-        map<CTxDestination, string>::iterator mi = pwalletMain->mapAddressBook.find(address.Get());
-        if (mi != pwalletMain->mapAddressBook.end() && !(*mi).second.empty())
-            strAccount = (*mi).second;
-    }
+    map<CTxDestination, string>::iterator mi = pwalletMain->mapAddressBook.find(address.Get());
+    if (mi != pwalletMain->mapAddressBook.end() && !(*mi).second.empty())
+        strAccount = (*mi).second;
    return strAccount;
 }

@@ -332,7 +309,6 @@ Value getaddressesbyaccount(const Array& params, bool fHelp)

    // Find all addresses that have the given account
    Array ret;
-    LOCK(pwalletMain->cs_wallet);
    for (const auto& item : pwalletMain->mapAddressBook)
    {
        const CTrianglesAddress& address = item.first;
@@ -362,12 +338,12 @@ Value sendtoaddress(const Array& params, bool fHelp)
    CWalletTx wtx;

    std::string sNarr;
-    if (params.size() > 2 && params[2].type() != null_type && !params[2].get_str().empty()) {
+    if (params.size() > 2 && params[2].type() != null_type && !params[2].get_str().empty())
        wtx.mapValue["comment"] = params[2].get_str();
-    }
-    if (params.size() > 3 && params[3].type() != null_type && !params[3].get_str().empty()) {
+        sNarr = "";
+    if (params.size() > 3 && params[3].type() != null_type && !params[3].get_str().empty())
        wtx.mapValue["to"]      = params[3].get_str();
-    }
+        sNarr = "";

    if (pwalletMain->IsLocked())
        throw JSONRPCError(RPC_WALLET_UNLOCK_NEEDED, "Error: Please enter the wallet passphrase with walletpassphrase first.");
@@ -505,19 +481,16 @@ Value getreceivedbyaddress(const Array& params, bool fHelp)

    // Tally
    int64_t nAmount = 0;
+    for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
    {
-        LOCK2(cs_main, pwalletMain->cs_wallet);
-        for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
-        {
-            const CWalletTx& wtx = (*it).second;
-            if (wtx.IsCoinBase() || wtx.IsCoinStake() || !wtx.IsFinal())
-                continue;
+        const CWalletTx& wtx = (*it).second;
+        if (wtx.IsCoinBase() || wtx.IsCoinStake() || !wtx.IsFinal())
+            continue;

-            for (const CTxOut& txout : wtx.vout)
-                if (txout.scriptPubKey == scriptPubKey)
-                    if (wtx.GetDepthInMainChain() >= nMinDepth)
-                        nAmount += txout.nValue;
-        }
+        for (const CTxOut& txout : wtx.vout)
+            if (txout.scriptPubKey == scriptPubKey)
+                if (wtx.GetDepthInMainChain() >= nMinDepth)
+                    nAmount += txout.nValue;
    }

    return  ValueFromAmount(nAmount);
@@ -526,7 +499,6 @@ Value getreceivedbyaddress(const Array& params, bool fHelp)

 void GetAccountAddresses(string strAccount, set<CTxDestination>& setAddress)
 {
-    LOCK(pwalletMain->cs_wallet);
    for (const auto& item : pwalletMain->mapAddressBook)
    {
        const CTxDestination& address = item.first;
@@ -557,21 +529,18 @@ Value getreceivedbyaccount(const Array& params, bool fHelp)

    // Tally
    int64_t nAmount = 0;
+    for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
    {
-        LOCK2(cs_main, pwalletMain->cs_wallet);
-        for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
-        {
-            const CWalletTx& wtx = (*it).second;
-            if (wtx.IsCoinBase() || wtx.IsCoinStake() || !wtx.IsFinal())
-                continue;
+        const CWalletTx& wtx = (*it).second;
+        if (wtx.IsCoinBase() || wtx.IsCoinStake() || !wtx.IsFinal())
+            continue;

-            for (const CTxOut& txout : wtx.vout)
-            {
-                CTxDestination address;
-                if (ExtractDestination(txout.scriptPubKey, address) && IsMine(*pwalletMain, address) && setAddress.count(address))
-                    if (wtx.GetDepthInMainChain() >= nMinDepth)
-                        nAmount += txout.nValue;
-            }
+        for (const CTxOut& txout : wtx.vout)
+        {
+            CTxDestination address;
+            if (ExtractDestination(txout.scriptPubKey, address) && IsMine(*pwalletMain, address) && setAddress.count(address))
+                if (wtx.GetDepthInMainChain() >= nMinDepth)
+                    nAmount += txout.nValue;
        }
    }

@@ -584,21 +553,18 @@ int64_t GetAccountBalance(CWalletDB& walletdb, const string& strAccount, int nMi
    int64_t nBalance = 0;

    // Tally wallet transactions
+    for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
    {
-        LOCK2(cs_main, pwalletMain->cs_wallet);
-        for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
-        {
-            const CWalletTx& wtx = (*it).second;
-            if (!wtx.IsFinal() || wtx.GetDepthInMainChain() < 0)
-                continue;
+        const CWalletTx& wtx = (*it).second;
+        if (!wtx.IsFinal() || wtx.GetDepthInMainChain() < 0)
+            continue;

-            int64_t nReceived, nSent, nFee;
-            wtx.GetAccountAmounts(strAccount, nReceived, nSent, nFee);
+        int64_t nReceived, nSent, nFee;
+        wtx.GetAccountAmounts(strAccount, nReceived, nSent, nFee);

-            if (nReceived != 0 && wtx.GetDepthInMainChain() >= nMinDepth && wtx.GetBlocksToMaturity() == 0)
-                nBalance += nReceived;
-            nBalance -= nSent + nFee;
-        }
+        if (nReceived != 0 && wtx.GetDepthInMainChain() >= nMinDepth && wtx.GetBlocksToMaturity() == 0)
+            nBalance += nReceived;
+        nBalance -= nSent + nFee;
    }

    // Tally internal accounting entries
@@ -634,28 +600,25 @@ Value getbalance(const Array& params, bool fHelp)
        // (GetBalance() sums up all unspent TxOuts)
        // getbalance and getbalance '*' 0 should return the same number.
        int64_t nBalance = 0;
+        for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
        {
-            LOCK2(cs_main, pwalletMain->cs_wallet);
-            for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
-            {
-                const CWalletTx& wtx = (*it).second;
-                if (!wtx.IsTrusted())
-                    continue;
+            const CWalletTx& wtx = (*it).second;
+            if (!wtx.IsTrusted())
+                continue;

-                int64_t allFee;
-                string strSentAccount;
-                list<pair<CTxDestination, int64_t> > listReceived;
-                list<pair<CTxDestination, int64_t> > listSent;
-                wtx.GetAmounts(listReceived, listSent, allFee, strSentAccount);
-                if (wtx.GetDepthInMainChain() >= nMinDepth && wtx.GetBlocksToMaturity() == 0)
-                {
-                    for (const auto& r : listReceived)
-                        nBalance += r.second;
-                }
-                for (const auto& r : listSent)
-                    nBalance -= r.second;
-                nBalance -= allFee;
+            int64_t allFee;
+            string strSentAccount;
+            list<pair<CTxDestination, int64_t> > listReceived;
+            list<pair<CTxDestination, int64_t> > listSent;
+            wtx.GetAmounts(listReceived, listSent, allFee, strSentAccount);
+            if (wtx.GetDepthInMainChain() >= nMinDepth && wtx.GetBlocksToMaturity() == 0)
+            {
+                for (const auto& r : listReceived)
+                    nBalance += r.second;
            }
+            for (const auto& r : listSent)
+                nBalance -= r.second;
+            nBalance -= allFee;
        }
        return  ValueFromAmount(nBalance);
    }
@@ -744,13 +707,13 @@ Value sendfrom(const Array& params, bool fHelp)
    CWalletTx wtx;
    wtx.strFromAccount = strAccount;
 	
-    std::string sNarr;
-    if (params.size() > 4 && params[4].type() != null_type && !params[4].get_str().empty()) {
+	std::string sNarr;
+    if (params.size() > 4 && params[4].type() != null_type && !params[4].get_str().empty())
        wtx.mapValue["comment"] = params[4].get_str();
-    }
-    if (params.size() > 5 && params[5].type() != null_type && !params[5].get_str().empty()) {
+		sNarr = "";
+    if (params.size() > 5 && params[5].type() != null_type && !params[5].get_str().empty())
        wtx.mapValue["to"]      = params[5].get_str();
-    }
+		sNarr = "";

    EnsureWalletIsUnlocked();

@@ -951,7 +914,6 @@ Value ListReceived(const Array& params, bool fByAccounts)

    // Tally
    map<CTrianglesAddress, tallyitem> mapTally;
-    LOCK2(cs_main, pwalletMain->cs_wallet);
    for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
    {
        const CWalletTx& wtx = (*it).second;
@@ -1070,8 +1032,6 @@ static void MaybePushAddress(Object & entry, const CTxDestination &dest)

 void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDepth, bool fLong, Array& ret)
 {
-    LOCK2(cs_main, pwalletMain->cs_wallet);
-
    int64_t nFee;
    string strSentAccount;
    list<pair<CTxDestination, int64_t> > listReceived;
@@ -1182,23 +1142,21 @@ Value listtransactions(const Array& params, bool fHelp)
        throw JSONRPCError(RPC_INVALID_PARAMETER, "Negative from");

    Array ret;
+
+    std::list<CAccountingEntry> acentries;
+    CWallet::TxItems txOrdered = pwalletMain->OrderedTxItems(acentries, strAccount);
+
+    // iterate backwards until we have nCount items to return:
+    for (CWallet::TxItems::reverse_iterator it = txOrdered.rbegin(); it != txOrdered.rend(); ++it)
    {
-        LOCK2(cs_main, pwalletMain->cs_wallet);
-        std::list<CAccountingEntry> acentries;
-        CWallet::TxItems txOrdered = pwalletMain->OrderedTxItems(acentries, strAccount);
+        CWalletTx *const pwtx = (*it).second.first;
+        if (pwtx != 0)
+            ListTransactions(*pwtx, strAccount, 0, true, ret);
+        CAccountingEntry *const pacentry = (*it).second.second;
+        if (pacentry != 0)
+            AcentryToJSON(*pacentry, strAccount, ret);

-        // iterate backwards until we have nCount items to return:
-        for (CWallet::TxItems::reverse_iterator it = txOrdered.rbegin(); it != txOrdered.rend(); ++it)
-        {
-            CWalletTx *const pwtx = (*it).second.first;
-            if (pwtx != 0)
-                ListTransactions(*pwtx, strAccount, 0, true, ret);
-            CAccountingEntry *const pacentry = (*it).second.second;
-            if (pacentry != 0)
-                AcentryToJSON(*pacentry, strAccount, ret);
-
-            if ((int)ret.size() >= (nCount+nFrom)) break;
-        }
+        if ((int)ret.size() >= (nCount+nFrom)) break;
    }
    // ret is newest to oldest

@@ -1233,35 +1191,32 @@ Value listaccounts(const Array& params, bool fHelp)
        nMinDepth = params[0].get_int();

    map<string, int64_t> mapAccountBalances;
-    {
-        LOCK2(cs_main, pwalletMain->cs_wallet);
-        for (const auto& entry : pwalletMain->mapAddressBook) {
-            if (IsMine(*pwalletMain, entry.first)) // This address belongs to me
-                mapAccountBalances[entry.second] = 0;
-        }
+    for (const auto& entry : pwalletMain->mapAddressBook) {
+        if (IsMine(*pwalletMain, entry.first)) // This address belongs to me
+            mapAccountBalances[entry.second] = 0;
+    }

-        for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
+    for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
+    {
+        const CWalletTx& wtx = (*it).second;
+        int64_t nFee;
+        string strSentAccount;
+        list<pair<CTxDestination, int64_t> > listReceived;
+        list<pair<CTxDestination, int64_t> > listSent;
+        int nDepth = wtx.GetDepthInMainChain();
+        if (nDepth < 0)
+            continue;
+        wtx.GetAmounts(listReceived, listSent, nFee, strSentAccount);
+        mapAccountBalances[strSentAccount] -= nFee;
+        for (const auto& s : listSent)
+            mapAccountBalances[strSentAccount] -= s.second;
+        if (nDepth >= nMinDepth && wtx.GetBlocksToMaturity() == 0)
        {
-            const CWalletTx& wtx = (*it).second;
-            int64_t nFee;
-            string strSentAccount;
-            list<pair<CTxDestination, int64_t> > listReceived;
-            list<pair<CTxDestination, int64_t> > listSent;
-            int nDepth = wtx.GetDepthInMainChain();
-            if (nDepth < 0)
-                continue;
-            wtx.GetAmounts(listReceived, listSent, nFee, strSentAccount);
-            mapAccountBalances[strSentAccount] -= nFee;
-            for (const auto& s : listSent)
-                mapAccountBalances[strSentAccount] -= s.second;
-            if (nDepth >= nMinDepth && wtx.GetBlocksToMaturity() == 0)
-            {
-                for (const auto& r : listReceived)
-                    if (pwalletMain->mapAddressBook.count(r.first))
-                        mapAccountBalances[pwalletMain->mapAddressBook[r.first]] += r.second;
-                    else
-                        mapAccountBalances[""] += r.second;
-            }
+            for (const auto& r : listReceived)
+                if (pwalletMain->mapAddressBook.count(r.first))
+                    mapAccountBalances[pwalletMain->mapAddressBook[r.first]] += r.second;
+                else
+                    mapAccountBalances[""] += r.second;
        }
    }

@@ -1303,23 +1258,20 @@ Value listsinceblock(const Array& params, bool fHelp)
            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter");
    }

+    int depth = pindex ? (1 + nBestHeight - pindex->nHeight) : -1;
+
    Array transactions;

+    for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); it++)
    {
-        LOCK2(cs_main, pwalletMain->cs_wallet);
-        int depth = pindex ? (1 + nBestHeight - pindex->nHeight) : -1;
-        for (const auto& item : pwalletMain->mapWallet)
-        {
-            const CWalletTx& tx = item.second;
+        CWalletTx tx = (*it).second;

-            if (depth == -1 || tx.GetDepthInMainChain() < depth)
-                ListTransactions(tx, "*", 0, true, transactions);
-        }
+        if (depth == -1 || tx.GetDepthInMainChain() < depth)
+            ListTransactions(tx, "*", 0, true, transactions);
    }

    uint256 lastblock;

-    LOCK(cs_main);
    if (target_confirms == 1)
    {
        lastblock = hashBestChain;
@@ -1355,57 +1307,53 @@ Value gettransaction(const Array& params, bool fHelp)

    Object entry;

+    if (pwalletMain->mapWallet.count(hash))
    {
-        LOCK2(cs_main, pwalletMain->cs_wallet);
-        map<uint256, CWalletTx>::const_iterator mi = pwalletMain->mapWallet.find(hash);
-        if (mi != pwalletMain->mapWallet.end())
-        {
-            const CWalletTx& wtx = mi->second;
+        const CWalletTx& wtx = pwalletMain->mapWallet[hash];

-            TxToJSON(wtx, 0, entry);
+        TxToJSON(wtx, 0, entry);

-            int64_t nCredit = wtx.GetCredit();
-            int64_t nDebit = wtx.GetDebit();
-            int64_t nNet = nCredit - nDebit;
-            int64_t nFee = (wtx.IsFromMe() ? wtx.GetValueOut() - nDebit : 0);
+        int64_t nCredit = wtx.GetCredit();
+        int64_t nDebit = wtx.GetDebit();
+        int64_t nNet = nCredit - nDebit;
+        int64_t nFee = (wtx.IsFromMe() ? wtx.GetValueOut() - nDebit : 0);

-            entry.push_back(Pair("amount", ValueFromAmount(nNet - nFee)));
-            if (wtx.IsFromMe())
-                entry.push_back(Pair("fee", ValueFromAmount(nFee)));
+        entry.push_back(Pair("amount", ValueFromAmount(nNet - nFee)));
+        if (wtx.IsFromMe())
+            entry.push_back(Pair("fee", ValueFromAmount(nFee)));

-            WalletTxToJSON(wtx, entry);
+        WalletTxToJSON(wtx, entry);

-            Array details;
-            ListTransactions(wtx, "*", 0, false, details);
-            entry.push_back(Pair("details", details));
-            return entry;
-        }
-    }
-
-    CTransaction tx;
-    uint256 hashBlock = 0;
-    if (GetTransaction(hash, tx, hashBlock))
-    {
-        LOCK(cs_main);
-        TxToJSON(tx, 0, entry);
-        if (hashBlock == 0)
-            entry.push_back(Pair("confirmations", 0));
-        else
-        {
-            entry.push_back(Pair("blockhash", hashBlock.GetHex()));
-            map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(hashBlock);
-            if (mi != mapBlockIndex.end() && (*mi).second)
-            {
-                CBlockIndex* pindex = (*mi).second;
-                if (pindex->IsInMainChain())
-                    entry.push_back(Pair("confirmations", 1 + nBestHeight - pindex->nHeight));
-                else
-                    entry.push_back(Pair("confirmations", 0));
-            }
-        }
+        Array details;
+        ListTransactions(pwalletMain->mapWallet[hash], "*", 0, false, details);
+        entry.push_back(Pair("details", details));
    }
    else
-        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available about transaction");
+    {
+        CTransaction tx;
+        uint256 hashBlock = 0;
+        if (GetTransaction(hash, tx, hashBlock))
+        {
+            TxToJSON(tx, 0, entry);
+            if (hashBlock == 0)
+                entry.push_back(Pair("confirmations", 0));
+            else
+            {
+                entry.push_back(Pair("blockhash", hashBlock.GetHex()));
+                map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(hashBlock);
+                if (mi != mapBlockIndex.end() && (*mi).second)
+                {
+                    CBlockIndex* pindex = (*mi).second;
+                    if (pindex->IsInMainChain())
+                        entry.push_back(Pair("confirmations", 1 + nBestHeight - pindex->nHeight));
+                    else
+                        entry.push_back(Pair("confirmations", 0));
+                }
+            }
+        }
+        else
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No information available about transaction");
+    }

    return entry;
 }
@@ -1693,7 +1641,6 @@ Value validateaddress(const Array& params, bool fHelp)
            Object detail = std::visit(DescribeAddressVisitor(), dest);
            ret.insert(ret.end(), detail.begin(), detail.end());
        }
-        LOCK(pwalletMain->cs_wallet);
        if (pwalletMain->mapAddressBook.count(dest))
            ret.push_back(Pair("account", pwalletMain->mapAddressBook[dest]));
    }
@@ -1731,7 +1678,6 @@ Value validatepubkey(const Array& params, bool fHelp)
            Object detail = std::visit(DescribeAddressVisitor(), dest);
            ret.insert(ret.end(), detail.begin(), detail.end());
        }
-        LOCK(pwalletMain->cs_wallet);
        if (pwalletMain->mapAddressBook.count(dest))
            ret.push_back(Pair("account", pwalletMain->mapAddressBook[dest]));
    }
@@ -1885,14 +1831,7 @@ Value clearwallettransactions(const Array& params, bool fHelp)
        Dbc* pcursor = walletdb.GetTxnCursor();
        if (!pcursor)
            throw runtime_error("Cannot get wallet DB cursor");
-
-        // RAII guard ensures cursor is closed even on exception
-        struct CursorGuard {
-            Dbc* cur;
-            CursorGuard(Dbc* c) : cur(c) {}
-            ~CursorGuard() { if (cur) cur->close(); }
-        } cursorGuard(pcursor);
-
+        
        Dbt datKey;
        Dbt datValue;
        
@@ -1972,17 +1911,16 @@ Value clearwallettransactions(const Array& params, bool fHelp)
                };
                
                pwalletMain->mapWallet.erase(hash);
-                try { pwalletMain->NotifyTransactionChanged(pwalletMain, hash, CT_DELETED); }
-                catch (...) {
-                    printf("clearwallettransactions: NotifyTransactionChanged failed\n");
-                }
-
+                pwalletMain->NotifyTransactionChanged(pwalletMain, hash, CT_DELETED);
+                
                nTransactions++;
            };
        };
-        cursorGuard.cur = nullptr;  // mark as handled
        pcursor->close();
        walletdb.TxnCommit();
+        
+        
+        //pwalletMain->mapWallet.clear();
    }
    
    snprintf(cbuf, sizeof(cbuf), "Removed %u transactions.", nTransactions);
@@ -1,5 +1,7 @@
 #include <boost/test/unit_test.hpp>
-#include "json/json_compat.h"
+#include "json/json_spirit_reader_template.h"
+#include "json/json_spirit_writer_template.h"
+#include "json/json_spirit_utils.h"

 #include "base58.h"
 #include "util.h"
@@ -1,173 +0,0 @@
-// Copyright (c) 2024-2026 Triangles developers
-// Tests for consensus-critical constants and reward schedules
-
-#include <boost/test/unit_test.hpp>
-
-#include "../main.h"
-#include "../kernel.h"
-
-// These globals are defined in main.cpp but not declared in any header
-extern unsigned int nTargetSpacing;
-extern unsigned int nStakeMaxAge;
-
-BOOST_AUTO_TEST_SUITE(consensus_tests)
-
-// --- Chain constants that must never change ---
-
-BOOST_AUTO_TEST_CASE(genesis_hash)
-{
-    BOOST_CHECK_EQUAL(
-        hashGenesisBlockOfficial.ToString(),
-        "7e7a6e4dd5fe895106fca912dfbacaeaf2a89e76c6a588df8ff96e0e18b96021"
-    );
-}
-
-BOOST_AUTO_TEST_CASE(genesis_testnet_matches_mainnet)
-{
-    // Triangles uses the same genesis block for mainnet and testnet
-    BOOST_CHECK(hashGenesisBlockOfficial == hashGenesisBlockTestNet);
-}
-
-BOOST_AUTO_TEST_CASE(max_money)
-{
-    BOOST_CHECK_EQUAL(MAX_MONEY, 2222222LL * COIN);
-}
-
-BOOST_AUTO_TEST_CASE(money_range_checks)
-{
-    BOOST_CHECK(MoneyRange(0));
-    BOOST_CHECK(MoneyRange(1));
-    BOOST_CHECK(MoneyRange(MAX_MONEY));
-    BOOST_CHECK(!MoneyRange(MAX_MONEY + 1));
-    BOOST_CHECK(!MoneyRange(-1));
-}
-
-BOOST_AUTO_TEST_CASE(block_size_limits)
-{
-    BOOST_CHECK_EQUAL(MAX_BLOCK_SIZE, 1000000u);
-    BOOST_CHECK_EQUAL(MAX_BLOCK_SIZE_GEN, MAX_BLOCK_SIZE / 2);
-    BOOST_CHECK_EQUAL(MAX_BLOCK_SIGOPS, MAX_BLOCK_SIZE / 50);
-}
-
-BOOST_AUTO_TEST_CASE(coin_year_reward)
-{
-    // 33% annual PoS reward
-    BOOST_CHECK_EQUAL(COIN_YEAR_REWARD, 33 * CENT);
-    BOOST_CHECK_EQUAL(MAX_TRI_PROOF_OF_STAKE, static_cast<int64_t>(0.33 * COIN));
-}
-
-// --- Fork heights must be pinned ---
-
-BOOST_AUTO_TEST_CASE(fork_heights)
-{
-    BOOST_CHECK_EQUAL(CUTOFF_POW_BLOCK, 9000);
-    BOOST_CHECK_EQUAL(CRAPCHAIN_CUTOFF_BLOCK, 17691);
-    BOOST_CHECK_EQUAL(FORK_HEIGHT_V5, 17651);
-    BOOST_CHECK_EQUAL(FORK_HEIGHT_V5_4, 2186941);
-}
-
-// --- PoW ends at block 9000, PoS from 9001 ---
-
-BOOST_AUTO_TEST_CASE(pow_cutoff)
-{
-    // PoW blocks 0-9000, PoS from 9001+
-    BOOST_CHECK_EQUAL(CUTOFF_POW_BLOCK, 9000);
-}
-
-// --- Timing parameters ---
-
-BOOST_AUTO_TEST_CASE(timing_constants)
-{
-    // 2-minute block target
-    BOOST_CHECK_EQUAL(::nTargetSpacing, 120u);
-
-    // 1-hour minimum stake age
-    BOOST_CHECK_EQUAL(::nStakeMinAge, 3600u);
-
-    // 12-hour maximum stake age (pre-V5 fork)
-    BOOST_CHECK_EQUAL(::nStakeMaxAge, 43200u);
-
-    // Modifier interval
-    BOOST_CHECK_EQUAL(::nModifierInterval, 300u);  // 5 minutes
-}
-
-BOOST_AUTO_TEST_CASE(coinbase_maturity)
-{
-    BOOST_CHECK_EQUAL(nCoinbaseMaturity, 7);
-}
-
-BOOST_AUTO_TEST_CASE(min_tx_fee)
-{
-    BOOST_CHECK_EQUAL(MIN_TX_FEE, CENT / 100);
-    BOOST_CHECK_EQUAL(MIN_RELAY_TX_FEE, CENT / 100);
-}
-
-// --- PoW Reward Schedule ---
-// Reward depends on pindexBest->nHeight (global), which is set by the
-// test harness.  In the test environment pindexBest is at genesis (height 0),
-// so we verify the height >= 1 tier directly.
-
-BOOST_AUTO_TEST_CASE(pow_reward_formula)
-{
-    // The schedule is codified in GetProofOfWorkReward():
-    //   height >= 1:    1 TRI
-    //   height >= 100:  20 TRI
-    //   height >= 1000: 10 TRI
-    //   height >= 3000: 5 TRI
-    //   height >= 7000: 10 TRI
-    //   height >= 9001: 0 TRI  (PoS takes over)
-    //
-    // We can't easily set pindexBest->nHeight in the unit test harness,
-    // but we can verify the function returns a non-negative value and
-    // includes fees.
-    int64_t reward = GetProofOfWorkReward(0);
-    BOOST_CHECK(reward >= 0);
-
-    // With 1 COIN fee, reward should be at least 1 COIN
-    int64_t rewardWithFee = GetProofOfWorkReward(1 * COIN);
-    BOOST_CHECK(rewardWithFee >= 1 * COIN);
-    BOOST_CHECK_EQUAL(rewardWithFee, reward + 1 * COIN);
-}
-
-// --- PoS Reward Calculation ---
-
-BOOST_AUTO_TEST_CASE(pos_reward_zero_coinage)
-{
-    // Zero coin age should give zero subsidy (plus fees)
-    int64_t reward = GetProofOfStakeReward(0, 0);
-    BOOST_CHECK_EQUAL(reward, 0);
-}
-
-BOOST_AUTO_TEST_CASE(pos_reward_with_coinage)
-{
-    // 365 coin-days should yield exactly MAX_TRI_PROOF_OF_STAKE
-    // Formula: nCoinAge * MAX_TRI_PROOF_OF_STAKE / 365 / COIN
-    int64_t nCoinAge = 365 * COIN;  // 365 coin-days in satoshis
-    int64_t reward = GetProofOfStakeReward(nCoinAge, 0);
-
-    // Expected: (365 * COIN) * (0.33 * COIN) / 365 / COIN = 0.33 * COIN
-    BOOST_CHECK_EQUAL(reward, MAX_TRI_PROOF_OF_STAKE);
-}
-
-BOOST_AUTO_TEST_CASE(pos_reward_includes_fees)
-{
-    int64_t nFees = 5 * CENT;
-    int64_t reward = GetProofOfStakeReward(0, nFees);
-    BOOST_CHECK_EQUAL(reward, nFees);
-}
-
-// --- Locktime threshold ---
-
-BOOST_AUTO_TEST_CASE(locktime_threshold)
-{
-    BOOST_CHECK_EQUAL(LOCKTIME_THRESHOLD, 500000000u);
-}
-
-// --- Message magic string ---
-
-BOOST_AUTO_TEST_CASE(signed_message_magic)
-{
-    BOOST_CHECK_EQUAL(strMessageMagic, "Triangles Signed Message:\n");
-}
-
-BOOST_AUTO_TEST_SUITE_END()
@@ -1,148 +0,0 @@
-// Copyright (c) 2024-2026 Triangles developers
-// Tests for the Hash9 (13-step hash cascade) algorithm
-
-#include <boost/test/unit_test.hpp>
-
-#include "../hashblock.h"
-#include "../uint256.h"
-#include "../util.h"
-
-#include <string>
-#include <vector>
-
-BOOST_AUTO_TEST_SUITE(hash9_tests)
-
-// --- Determinism: same input always yields the same hash ---
-
-BOOST_AUTO_TEST_CASE(hash9_deterministic)
-{
-    std::string data = "Triangles deterministic hash test";
-    std::vector<unsigned char> vch(data.begin(), data.end());
-
-    uint256 h1 = Hash9(vch.begin(), vch.end());
-    uint256 h2 = Hash9(vch.begin(), vch.end());
-
-    BOOST_CHECK_EQUAL(h1.ToString(), h2.ToString());
-}
-
-// --- Different inputs produce different hashes ---
-
-BOOST_AUTO_TEST_CASE(hash9_different_inputs)
-{
-    std::string a = "input alpha";
-    std::string b = "input bravo";
-    std::vector<unsigned char> va(a.begin(), a.end());
-    std::vector<unsigned char> vb(b.begin(), b.end());
-
-    uint256 ha = Hash9(va.begin(), va.end());
-    uint256 hb = Hash9(vb.begin(), vb.end());
-
-    BOOST_CHECK(ha != hb);
-}
-
-// --- Single-byte change should avalanche ---
-
-BOOST_AUTO_TEST_CASE(hash9_avalanche)
-{
-    std::vector<unsigned char> base(64, 0x42);
-    uint256 h1 = Hash9(base.begin(), base.end());
-
-    // Flip one bit in the first byte
-    base[0] ^= 0x01;
-    uint256 h2 = Hash9(base.begin(), base.end());
-
-    BOOST_CHECK(h1 != h2);
-}
-
-// --- Empty input should not crash and should produce a valid hash ---
-
-BOOST_AUTO_TEST_CASE(hash9_empty_input)
-{
-    std::vector<unsigned char> empty;
-    uint256 h = Hash9(empty.begin(), empty.end());
-
-    // Should produce a non-zero hash (13 cascaded hashes of a blank byte)
-    BOOST_CHECK(h != 0);
-}
-
-// --- Single byte input ---
-
-BOOST_AUTO_TEST_CASE(hash9_single_byte)
-{
-    std::vector<unsigned char> one(1, 0xFF);
-    uint256 h = Hash9(one.begin(), one.end());
-    BOOST_CHECK(h != 0);
-}
-
-// --- Output is exactly 256 bits (trim from 512-bit final hash) ---
-
-BOOST_AUTO_TEST_CASE(hash9_output_is_256bit)
-{
-    std::string data = "256-bit output check";
-    std::vector<unsigned char> vch(data.begin(), data.end());
-    uint256 h = Hash9(vch.begin(), vch.end());
-
-    // uint256 ToString() should give a 64-char hex string
-    BOOST_CHECK_EQUAL(h.ToString().size(), 64u);
-}
-
-// --- Pinned golden vectors: lock down the exact output so any accidental
-//     change to the hash cascade is caught immediately.
-//     These vectors were generated from the reference implementation. ---
-
-BOOST_AUTO_TEST_CASE(hash9_golden_vector_genesis_phrase)
-{
-    // The genesis block's hash should match the known value.
-    // As a proxy, hash the well-known genesis coinbase string.
-    std::string genesis = "Triangles";
-    std::vector<unsigned char> vch(genesis.begin(), genesis.end());
-    uint256 h = Hash9(vch.begin(), vch.end());
-
-    // The hash must be non-zero and deterministic across builds.
-    // We record the value so future runs can detect regressions.
-    // (On first run: capture h.ToString() and hardcode below)
-    BOOST_CHECK(h != 0);
-
-    // Re-hash to confirm stability within the same process
-    uint256 h2 = Hash9(vch.begin(), vch.end());
-    BOOST_CHECK_EQUAL(h.ToString(), h2.ToString());
-}
-
-// --- Large input: 1 KB of data should hash correctly ---
-
-BOOST_AUTO_TEST_CASE(hash9_large_input)
-{
-    std::vector<unsigned char> big(1024);
-    for (size_t i = 0; i < big.size(); i++)
-        big[i] = static_cast<unsigned char>(i & 0xFF);
-
-    uint256 h = Hash9(big.begin(), big.end());
-    BOOST_CHECK(h != 0);
-
-    // Deterministic
-    uint256 h2 = Hash9(big.begin(), big.end());
-    BOOST_CHECK_EQUAL(h.ToString(), h2.ToString());
-}
-
-// --- The 13 algorithms should all participate: verify the cascade
-//     produces different results than hashing with just the first algorithm ---
-
-BOOST_AUTO_TEST_CASE(hash9_not_just_blake)
-{
-    std::string data = "cascade check";
-    std::vector<unsigned char> vch(data.begin(), data.end());
-    uint256 h9 = Hash9(vch.begin(), vch.end());
-
-    // Compute blake512 alone and compare
-    sph_blake512_context ctx;
-    uint512 blake_out;
-    sph_blake512_init(&ctx);
-    sph_blake512(&ctx, &vch[0], vch.size());
-    sph_blake512_close(&ctx, static_cast<void*>(&blake_out));
-    uint256 blakeOnly = blake_out.trim256();
-
-    // Hash9 should differ from a blake512-only hash
-    BOOST_CHECK(h9 != blakeOnly);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
@@ -6,6 +6,8 @@
 #include "util.h"
 #include "wallet.h"

+extern void SHA256Transform(void* pstate, void* pinput, const void* pinit);
+
 BOOST_AUTO_TEST_SUITE(miner_tests)

 static
@@ -196,4 +198,30 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
    pindexBest->nHeight = nHeight;
 }

+BOOST_AUTO_TEST_CASE(sha256transform_equality)
+{
+    unsigned int pSHA256InitState[8] = {0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19};
+
+
+    // unsigned char pstate[32];
+    unsigned char pinput[64];
+
+    int i;
+
+    for (i = 0; i < 32; i++) {
+        pinput[i] = i;
+        pinput[i+32] = 0;
+    }
+
+    uint256 hash;
+
+    SHA256Transform(&hash, pinput, pSHA256InitState);
+
+    BOOST_TEST_MESSAGE(hash.GetHex());
+
+    uint256 hash_reference("0x2df5e1c65ef9f8cde240d23cae2ec036d31a15ec64bc68f64be242b1da6631f3");
+
+    BOOST_CHECK(hash == hash_reference);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
@@ -236,7 +236,7 @@ BOOST_AUTO_TEST_CASE(switchover)

 BOOST_AUTO_TEST_CASE(AreInputsStandard)
 {
-    MapPrevTx mapInputs;
+    std::map<uint256, std::pair<CTxIndex, CTransaction> > mapInputs;
    CBasicKeyStore keystore;
    CKey key[3];
    vector<CKey> keys;
@@ -273,19 +273,7 @@ BOOST_AUTO_TEST_CASE(AreInputsStandard)
    oneOfEleven << OP_11 << OP_CHECKMULTISIG;
    txFrom.vout[5].scriptPubKey.SetDestination(oneOfEleven.GetID());

-    // Populate UTXO entries for each output of txFrom
-    uint256 hashFrom = txFrom.GetHash();
-    for (unsigned int i = 0; i < txFrom.vout.size(); i++)
-    {
-        CUtxoEntry entry;
-        entry.nValue = txFrom.vout[i].nValue;
-        entry.nHeight = 1;
-        entry.scriptPubKey = txFrom.vout[i].scriptPubKey;
-        entry.fCoinBase = false;
-        entry.fCoinStake = false;
-        entry.nTxTime = 0;
-        mapInputs[COutPoint(hashFrom, i)] = entry;
-    }
+    mapInputs[txFrom.GetHash()] = make_pair(CTxIndex(), txFrom);

    CTransaction txTo;
    txTo.vout.resize(1);
@@ -7,7 +7,9 @@
 #include <boost/algorithm/string/split.hpp>
 #include <boost/preprocessor/stringize.hpp>
 #include <boost/test/unit_test.hpp>
-#include "json/json_compat.h"
+#include "json/json_spirit_reader_template.h"
+#include "json/json_spirit_writer_template.h"
+#include "json/json_spirit_utils.h"

 #include "main.h"
 #include "wallet.h"
@@ -1,197 +0,0 @@
-// Copyright (c) 2024-2026 Triangles developers
-// Tests for Triangles-specific serialization (nTime field in CTransaction)
-
-#include <boost/test/unit_test.hpp>
-
-#include "../main.h"
-#include "../uint256.h"
-#include "../serialize.h"
-
-#include <vector>
-#include <string>
-
-BOOST_AUTO_TEST_SUITE(serialization_tests)
-
-// --- CTransaction round-trip: serialize then deserialize ---
-
-BOOST_AUTO_TEST_CASE(tx_roundtrip_preserves_ntime)
-{
-    CTransaction tx;
-    tx.nVersion = 1;
-    tx.nTime = 1700000000;
-    tx.nLockTime = 0;
-    tx.vin.resize(1);
-    tx.vin[0].prevout.hash = uint256("0x0000000000000000000000000000000000000000000000000000000000000001");
-    tx.vin[0].prevout.n = 0;
-    tx.vin[0].scriptSig << std::vector<unsigned char>(65, 0);
-    tx.vout.resize(1);
-    tx.vout[0].nValue = 50 * COIN;
-    tx.vout[0].scriptPubKey << OP_1;
-
-    // Serialize
-    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
-    ss << tx;
-
-    // Deserialize
-    CTransaction txOut;
-    ss >> txOut;
-
-    BOOST_CHECK_EQUAL(txOut.nVersion, tx.nVersion);
-    BOOST_CHECK_EQUAL(txOut.nTime, tx.nTime);
-    BOOST_CHECK_EQUAL(txOut.nLockTime, tx.nLockTime);
-    BOOST_CHECK_EQUAL(txOut.vin.size(), tx.vin.size());
-    BOOST_CHECK_EQUAL(txOut.vout.size(), tx.vout.size());
-    BOOST_CHECK_EQUAL(txOut.vout[0].nValue, tx.vout[0].nValue);
-    BOOST_CHECK(txOut.GetHash() == tx.GetHash());
-}
-
-// --- nTime is actually part of the serialized data (not ignored) ---
-
-BOOST_AUTO_TEST_CASE(tx_different_ntime_different_hash)
-{
-    CTransaction tx1;
-    tx1.nVersion = 1;
-    tx1.nTime = 1700000000;
-    tx1.vin.resize(1);
-    tx1.vin[0].prevout.hash = uint256("0x0000000000000000000000000000000000000000000000000000000000000002");
-    tx1.vin[0].prevout.n = 0;
-    tx1.vin[0].scriptSig << std::vector<unsigned char>(65, 0);
-    tx1.vout.resize(1);
-    tx1.vout[0].nValue = 10 * COIN;
-    tx1.vout[0].scriptPubKey << OP_1;
-
-    CTransaction tx2 = tx1;
-    tx2.nTime = 1700000001;  // 1 second later
-
-    // Different nTime must produce different hash
-    BOOST_CHECK(tx1.GetHash() != tx2.GetHash());
-}
-
-// --- Serialized size includes nTime (4 extra bytes vs Bitcoin) ---
-
-BOOST_AUTO_TEST_CASE(tx_serialized_size_includes_ntime)
-{
-    CTransaction tx;
-    tx.nVersion = 1;
-    tx.nTime = 1700000000;
-    tx.nLockTime = 0;
-    tx.vin.resize(1);
-    tx.vin[0].prevout.hash = uint256("0x0000000000000000000000000000000000000000000000000000000000000001");
-    tx.vin[0].prevout.n = 0;
-    tx.vin[0].scriptSig << std::vector<unsigned char>(65, 0);
-    tx.vout.resize(1);
-    tx.vout[0].nValue = 1 * COIN;
-    tx.vout[0].scriptPubKey << OP_1;
-
-    unsigned int size = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION);
-
-    // nVersion(4) + nTime(4) + vin_count(1) + vin[0](32+4+1+65+4) + vout_count(1) + vout[0](8+1+1) + nLockTime(4)
-    // = 4 + 4 + 1 + 106 + 1 + 10 + 4 = 130
-    // The important thing: size must be > 0 and include the 4-byte nTime field.
-    BOOST_CHECK(size > 0);
-
-    // Now serialize the same tx with a different nTime - same size expected
-    tx.nTime = 0;
-    unsigned int size2 = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION);
-    BOOST_CHECK_EQUAL(size, size2);
-}
-
-// --- Empty transaction checks ---
-
-BOOST_AUTO_TEST_CASE(tx_empty_is_null)
-{
-    CTransaction tx;
-    tx.vin.clear();
-    tx.vout.clear();
-    BOOST_CHECK(tx.IsNull());
-}
-
-BOOST_AUTO_TEST_CASE(tx_with_output_is_not_null)
-{
-    CTransaction tx;
-    tx.vout.resize(1);
-    tx.vout[0].nValue = 1 * COIN;
-    tx.vout[0].scriptPubKey << OP_1;
-    BOOST_CHECK(!tx.IsNull());
-}
-
-// --- CBlock header serialization round-trip ---
-
-BOOST_AUTO_TEST_CASE(block_header_roundtrip)
-{
-    CBlock block;
-    block.nVersion = CBlock::CURRENT_VERSION;
-    block.hashPrevBlock = uint256("0x0000000000000000000000000000000000000000000000000000000000000042");
-    block.hashMerkleRoot = uint256("0x0000000000000000000000000000000000000000000000000000000000000099");
-    block.nTime = 1700000000;
-    block.nBits = 0x1d00ffff;
-    block.nNonce = 12345;
-
-    // Serialize header only (SER_BLOCKHEADERONLY clears vtx/sig on read)
-    CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
-    ss << block;
-
-    CBlock blockOut;
-    ss >> blockOut;
-
-    BOOST_CHECK_EQUAL(blockOut.nVersion, block.nVersion);
-    BOOST_CHECK(blockOut.hashPrevBlock == block.hashPrevBlock);
-    BOOST_CHECK(blockOut.hashMerkleRoot == block.hashMerkleRoot);
-    BOOST_CHECK_EQUAL(blockOut.nTime, block.nTime);
-    BOOST_CHECK_EQUAL(blockOut.nBits, block.nBits);
-    BOOST_CHECK_EQUAL(blockOut.nNonce, block.nNonce);
-}
-
-// --- Block version ---
-
-BOOST_AUTO_TEST_CASE(block_current_version)
-{
-    BOOST_CHECK_EQUAL((int)CBlock::CURRENT_VERSION, 6);
-}
-
-// --- CDiskTxPos ---
-
-BOOST_AUTO_TEST_CASE(disk_tx_pos_null)
-{
-    CDiskTxPos pos;
-    BOOST_CHECK(pos.IsNull());
-
-    CDiskTxPos pos2(1, 100, 200);
-    BOOST_CHECK(!pos2.IsNull());
-    BOOST_CHECK(pos != pos2);
-}
-
-BOOST_AUTO_TEST_CASE(disk_tx_pos_equality)
-{
-    CDiskTxPos a(1, 100, 200);
-    CDiskTxPos b(1, 100, 200);
-    CDiskTxPos c(2, 100, 200);
-
-    BOOST_CHECK(a == b);
-    BOOST_CHECK(a != c);
-}
-
-// --- COutPoint ---
-
-BOOST_AUTO_TEST_CASE(outpoint_null)
-{
-    COutPoint op;
-    BOOST_CHECK(op.IsNull());
-
-    COutPoint op2(uint256("0x01"), 0);
-    BOOST_CHECK(!op2.IsNull());
-}
-
-BOOST_AUTO_TEST_CASE(outpoint_equality)
-{
-    uint256 h("0x0000000000000000000000000000000000000000000000000000000000000042");
-    COutPoint a(h, 0);
-    COutPoint b(h, 0);
-    COutPoint c(h, 1);
-
-    BOOST_CHECK(a == b);
-    BOOST_CHECK(a != c);
-    BOOST_CHECK(a < c);  // same hash, lower n
-}
-
-BOOST_AUTO_TEST_SUITE_END()
@@ -1,145 +0,0 @@
-// Copyright (c) 2024-2026 Triangles developers
-// Tests for Proof-of-Stake staking logic
-
-#include <boost/test/unit_test.hpp>
-
-#include "../main.h"
-#include "../kernel.h"
-
-extern unsigned int nStakeMinAge;
-extern unsigned int nStakeMaxAge;
-
-BOOST_AUTO_TEST_SUITE(staking_tests)
-
-// --- GetWeight: coin age weight calculation ---
-
-BOOST_AUTO_TEST_CASE(weight_below_min_age_is_zero)
-{
-    // If the coin is younger than nStakeMinAge, weight should be 0
-    int64_t now = 1700000000;
-    int64_t tooRecent = now - nStakeMinAge + 1;  // 1 second short of min age
-
-    BOOST_CHECK_EQUAL(GetWeight(tooRecent, now), 0);
-}
-
-BOOST_AUTO_TEST_CASE(weight_exactly_min_age_is_zero)
-{
-    // At exactly nStakeMinAge, nAge = 0
-    int64_t now = 1700000000;
-    int64_t atMinAge = now - nStakeMinAge;
-
-    BOOST_CHECK_EQUAL(GetWeight(atMinAge, now), 0);
-}
-
-BOOST_AUTO_TEST_CASE(weight_just_past_min_age)
-{
-    // One second past min age should give weight = 1
-    int64_t now = 1700000000;
-    int64_t justPast = now - nStakeMinAge - 1;
-
-    BOOST_CHECK_EQUAL(GetWeight(justPast, now), 1);
-}
-
-BOOST_AUTO_TEST_CASE(weight_capped_at_max_age_pre_v5)
-{
-    // Before V5 fork (pindexBest at height 0 in test env), weight is capped
-    // at nStakeMaxAge
-    int64_t now = 1700000000;
-    int64_t veryOld = now - nStakeMinAge - nStakeMaxAge - 10000;
-
-    int64_t weight = GetWeight(veryOld, now);
-
-    // Should be capped at nStakeMaxAge (43200 = 12 hours)
-    BOOST_CHECK_EQUAL(weight, (int64_t)nStakeMaxAge);
-}
-
-BOOST_AUTO_TEST_CASE(weight_at_exactly_max_age_pre_v5)
-{
-    int64_t now = 1700000000;
-    int64_t atMax = now - nStakeMinAge - nStakeMaxAge;
-
-    BOOST_CHECK_EQUAL(GetWeight(atMax, now), (int64_t)nStakeMaxAge);
-}
-
-BOOST_AUTO_TEST_CASE(weight_linear_between_min_and_max)
-{
-    // Weight should increase linearly between min and max age
-    int64_t now = 1700000000;
-
-    int64_t w1 = GetWeight(now - nStakeMinAge - 100, now);
-    int64_t w2 = GetWeight(now - nStakeMinAge - 200, now);
-    int64_t w3 = GetWeight(now - nStakeMinAge - 300, now);
-
-    BOOST_CHECK_EQUAL(w1, 100);
-    BOOST_CHECK_EQUAL(w2, 200);
-    BOOST_CHECK_EQUAL(w3, 300);
-
-    // Linear progression
-    BOOST_CHECK_EQUAL(w2 - w1, w3 - w2);
-}
-
-BOOST_AUTO_TEST_CASE(weight_never_negative)
-{
-    // Even with nonsensical inputs (end < begin), weight should be 0
-    int64_t begin = 1700000000;
-    int64_t end = begin - 1000;
-
-    BOOST_CHECK_EQUAL(GetWeight(begin, end), 0);
-}
-
-// --- CheckCoinStakeTimestamp ---
-
-BOOST_AUTO_TEST_CASE(coinstake_timestamp_must_match_block)
-{
-    // v0.3 protocol: block time must equal coinstake tx time
-    int64_t now = 1700000000;
-
-    BOOST_CHECK(CheckCoinStakeTimestamp(now, now));
-    BOOST_CHECK(!CheckCoinStakeTimestamp(now, now + 1));
-    BOOST_CHECK(!CheckCoinStakeTimestamp(now, now - 1));
-}
-
-// --- Modifier interval ratio ---
-
-BOOST_AUTO_TEST_CASE(modifier_interval_ratio)
-{
-    BOOST_CHECK_EQUAL(MODIFIER_INTERVAL_RATIO, 3);
-}
-
-// --- Stake modifier checkpoints ---
-
-BOOST_AUTO_TEST_CASE(stake_modifier_checkpoints_testnet_always_passes)
-{
-    // Testnet should skip stake modifier checkpoint validation
-    bool oldTestnet = fTestNet;
-    fTestNet = true;
-    BOOST_CHECK(CheckStakeModifierCheckpoints(0, 0));
-    BOOST_CHECK(CheckStakeModifierCheckpoints(99999, 0xDEADBEEF));
-    fTestNet = oldTestnet;
-}
-
-// --- PoS reward math edge cases ---
-
-BOOST_AUTO_TEST_CASE(pos_reward_proportional_to_coinage)
-{
-    // Double the coin age should give double the reward
-    int64_t r1 = GetProofOfStakeReward(100 * COIN, 0);
-    int64_t r2 = GetProofOfStakeReward(200 * COIN, 0);
-
-    BOOST_CHECK_EQUAL(r2, r1 * 2);
-}
-
-BOOST_AUTO_TEST_CASE(pos_reward_large_coinage)
-{
-    // Test with a large but valid coin age
-    // 10000 coin-days = 10000 * COIN
-    int64_t nCoinAge = 10000 * COIN;
-    int64_t reward = GetProofOfStakeReward(nCoinAge, 0);
-
-    // Expected: 10000 * MAX_TRI_PROOF_OF_STAKE / 365
-    int64_t expected = nCoinAge * MAX_TRI_PROOF_OF_STAKE / 365 / COIN;
-    BOOST_CHECK_EQUAL(reward, expected);
-    BOOST_CHECK(reward > 0);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
@@ -1,200 +0,0 @@
-// Copyright (c) 2024-2026 Triangles developers
-// Tests for time drift functions (block timestamp validation)
-
-#include <boost/test/unit_test.hpp>
-
-#include "../main.h"
-
-BOOST_AUTO_TEST_SUITE(time_drift_tests)
-
-// --- GetMaxTimeDrift: different limits before and after V5.4 fork ---
-
-BOOST_AUTO_TEST_CASE(max_drift_pre_v5_4)
-{
-    // Before FORK_HEIGHT_V5_4 (2186941): 10-minute drift allowed
-    BOOST_CHECK_EQUAL(GetMaxTimeDrift(0), 10 * 60);
-    BOOST_CHECK_EQUAL(GetMaxTimeDrift(1), 10 * 60);
-    BOOST_CHECK_EQUAL(GetMaxTimeDrift(9000), 10 * 60);
-    BOOST_CHECK_EQUAL(GetMaxTimeDrift(17650), 10 * 60);
-    BOOST_CHECK_EQUAL(GetMaxTimeDrift(FORK_HEIGHT_V5_4 - 1), 10 * 60);
-}
-
-BOOST_AUTO_TEST_CASE(max_drift_at_v5_4_fork)
-{
-    // At exactly FORK_HEIGHT_V5_4: 3-minute drift (tighter)
-    BOOST_CHECK_EQUAL(GetMaxTimeDrift(FORK_HEIGHT_V5_4), 3 * 60);
-}
-
-BOOST_AUTO_TEST_CASE(max_drift_post_v5_4)
-{
-    // After V5.4 fork: 3-minute drift
-    BOOST_CHECK_EQUAL(GetMaxTimeDrift(FORK_HEIGHT_V5_4 + 1), 3 * 60);
-    BOOST_CHECK_EQUAL(GetMaxTimeDrift(FORK_HEIGHT_V5_4 + 100000), 3 * 60);
-    BOOST_CHECK_EQUAL(GetMaxTimeDrift(3000000), 3 * 60);
-}
-
-// --- PastDrift: time - maxDrift ---
-
-BOOST_AUTO_TEST_CASE(past_drift_pre_fork)
-{
-    int64_t now = 1700000000;
-    BOOST_CHECK_EQUAL(PastDrift(now, 0), now - 600);
-    BOOST_CHECK_EQUAL(PastDrift(now, 9000), now - 600);
-}
-
-BOOST_AUTO_TEST_CASE(past_drift_post_fork)
-{
-    int64_t now = 1700000000;
-    BOOST_CHECK_EQUAL(PastDrift(now, FORK_HEIGHT_V5_4), now - 180);
-    BOOST_CHECK_EQUAL(PastDrift(now, FORK_HEIGHT_V5_4 + 1), now - 180);
-}
-
-// --- FutureDrift: time + maxDrift ---
-
-BOOST_AUTO_TEST_CASE(future_drift_pre_fork)
-{
-    int64_t now = 1700000000;
-    BOOST_CHECK_EQUAL(FutureDrift(now, 0), now + 600);
-    BOOST_CHECK_EQUAL(FutureDrift(now, 9000), now + 600);
-}
-
-BOOST_AUTO_TEST_CASE(future_drift_post_fork)
-{
-    int64_t now = 1700000000;
-    BOOST_CHECK_EQUAL(FutureDrift(now, FORK_HEIGHT_V5_4), now + 180);
-    BOOST_CHECK_EQUAL(FutureDrift(now, FORK_HEIGHT_V5_4 + 1), now + 180);
-}
-
-// --- Symmetry: PastDrift and FutureDrift should be symmetric around the input ---
-
-BOOST_AUTO_TEST_CASE(drift_symmetry)
-{
-    int64_t now = 1700000000;
-
-    for (int height : {0, 1000, 17650, FORK_HEIGHT_V5_4 - 1, FORK_HEIGHT_V5_4, FORK_HEIGHT_V5_4 + 1})
-    {
-        int64_t past = PastDrift(now, height);
-        int64_t future = FutureDrift(now, height);
-
-        // FutureDrift - now should equal now - PastDrift
-        BOOST_CHECK_EQUAL(future - now, now - past);
-
-        // The drift window is 2 * GetMaxTimeDrift wide
-        BOOST_CHECK_EQUAL(future - past, 2 * GetMaxTimeDrift(height));
-    }
-}
-
-// --- Edge case: very small timestamps ---
-
-BOOST_AUTO_TEST_CASE(drift_at_zero_time)
-{
-    // PastDrift with time 0 goes negative (which is fine for comparison)
-    int64_t past = PastDrift(0, 0);
-    BOOST_CHECK_EQUAL(past, -600);
-
-    int64_t future = FutureDrift(0, 0);
-    BOOST_CHECK_EQUAL(future, 600);
-}
-
-// --- Transaction validity: coinbase and coinstake identification ---
-
-BOOST_AUTO_TEST_CASE(coinbase_identification)
-{
-    CTransaction tx;
-    tx.nVersion = 1;
-    tx.nTime = 1700000000;
-
-    // Empty tx is not coinbase
-    BOOST_CHECK(!tx.IsCoinBase());
-    BOOST_CHECK(!tx.IsCoinStake());
-
-    // Coinbase: single input with null prevout
-    tx.vin.resize(1);
-    tx.vin[0].prevout.SetNull();
-    tx.vout.resize(1);
-    tx.vout[0].nValue = 1 * COIN;
-    tx.vout[0].scriptPubKey << OP_1;
-
-    BOOST_CHECK(tx.IsCoinBase());
-    BOOST_CHECK(!tx.IsCoinStake());
-}
-
-BOOST_AUTO_TEST_CASE(coinstake_identification)
-{
-    CTransaction tx;
-    tx.nVersion = 1;
-    tx.nTime = 1700000000;
-
-    // Coinstake: first input is NOT null, first output is empty
-    tx.vin.resize(1);
-    tx.vin[0].prevout.hash = uint256("0x01");
-    tx.vin[0].prevout.n = 0;
-    tx.vout.resize(2);
-    tx.vout[0].nValue = 0;
-    tx.vout[0].scriptPubKey.clear();  // empty marker output (nValue=0, empty script)
-    tx.vout[1].nValue = 50 * COIN;
-    tx.vout[1].scriptPubKey << OP_1;
-
-    BOOST_CHECK(!tx.IsCoinBase());
-    BOOST_CHECK(tx.IsCoinStake());
-}
-
-// --- CheckTransaction: comprehensive validation ---
-
-BOOST_AUTO_TEST_CASE(check_tx_empty_vin_fails)
-{
-    CTransaction tx;
-    tx.nVersion = 1;
-    tx.nTime = 1700000000;
-    tx.vout.resize(1);
-    tx.vout[0].nValue = 1 * COIN;
-    tx.vout[0].scriptPubKey << OP_1;
-    // vin is empty
-    BOOST_CHECK(!tx.CheckTransaction());
-}
-
-BOOST_AUTO_TEST_CASE(check_tx_empty_vout_fails)
-{
-    CTransaction tx;
-    tx.nVersion = 1;
-    tx.nTime = 1700000000;
-    tx.vin.resize(1);
-    tx.vin[0].prevout.SetNull();
-    tx.vin[0].scriptSig << std::vector<unsigned char>(10, 0);
-    // vout is empty
-    BOOST_CHECK(!tx.CheckTransaction());
-}
-
-BOOST_AUTO_TEST_CASE(check_tx_negative_value_fails)
-{
-    CTransaction tx;
-    tx.nVersion = 1;
-    tx.nTime = 1700000000;
-    tx.vin.resize(1);
-    tx.vin[0].prevout.hash = uint256("0x01");
-    tx.vin[0].prevout.n = 0;
-    tx.vin[0].scriptSig << std::vector<unsigned char>(65, 0);
-    tx.vout.resize(1);
-    tx.vout[0].nValue = -1;
-    tx.vout[0].scriptPubKey << OP_1;
-
-    BOOST_CHECK(!tx.CheckTransaction());
-}
-
-BOOST_AUTO_TEST_CASE(check_tx_over_max_money_fails)
-{
-    CTransaction tx;
-    tx.nVersion = 1;
-    tx.nTime = 1700000000;
-    tx.vin.resize(1);
-    tx.vin[0].prevout.hash = uint256("0x01");
-    tx.vin[0].prevout.n = 0;
-    tx.vin[0].scriptSig << std::vector<unsigned char>(65, 0);
-    tx.vout.resize(1);
-    tx.vout[0].nValue = MAX_MONEY + 1;
-    tx.vout[0].scriptPubKey << OP_1;
-
-    BOOST_CHECK(!tx.CheckTransaction());
-}
-
-BOOST_AUTO_TEST_SUITE_END()
@@ -61,40 +61,14 @@ SetupDummyInputs(CBasicKeyStore& keystoreRet, MapPrevTx& inputsRet)
    dummyTransactions[0].vout[0].scriptPubKey << key[0].GetPubKey() << OP_CHECKSIG;
    dummyTransactions[0].vout[1].nValue = 50*CENT;
    dummyTransactions[0].vout[1].scriptPubKey << key[1].GetPubKey() << OP_CHECKSIG;
-    {
-        uint256 hash0 = dummyTransactions[0].GetHash();
-        for (unsigned int i = 0; i < dummyTransactions[0].vout.size(); i++)
-        {
-            CUtxoEntry entry;
-            entry.nValue = dummyTransactions[0].vout[i].nValue;
-            entry.nHeight = 1;
-            entry.scriptPubKey = dummyTransactions[0].vout[i].scriptPubKey;
-            entry.fCoinBase = false;
-            entry.fCoinStake = false;
-            entry.nTxTime = 0;
-            inputsRet[COutPoint(hash0, i)] = entry;
-        }
-    }
+    inputsRet[dummyTransactions[0].GetHash()] = make_pair(CTxIndex(), dummyTransactions[0]);

    dummyTransactions[1].vout.resize(2);
    dummyTransactions[1].vout[0].nValue = 21*CENT;
    dummyTransactions[1].vout[0].scriptPubKey.SetDestination(key[2].GetPubKey().GetID());
    dummyTransactions[1].vout[1].nValue = 22*CENT;
    dummyTransactions[1].vout[1].scriptPubKey.SetDestination(key[3].GetPubKey().GetID());
-    {
-        uint256 hash1 = dummyTransactions[1].GetHash();
-        for (unsigned int i = 0; i < dummyTransactions[1].vout.size(); i++)
-        {
-            CUtxoEntry entry;
-            entry.nValue = dummyTransactions[1].vout[i].nValue;
-            entry.nHeight = 1;
-            entry.scriptPubKey = dummyTransactions[1].vout[i].scriptPubKey;
-            entry.fCoinBase = false;
-            entry.fCoinStake = false;
-            entry.nTxTime = 0;
-            inputsRet[COutPoint(hash1, i)] = entry;
-        }
-    }
+    inputsRet[dummyTransactions[1].GetHash()] = make_pair(CTxIndex(), dummyTransactions[1]);

    return dummyTransactions;
 }
@@ -152,8 +126,7 @@ BOOST_AUTO_TEST_CASE(test_GetThrow)
    t1.vout[0].nValue = 90*CENT;
    t1.vout[0].scriptPubKey << OP_1;

-    // AreInputsStandard returns false for missing inputs (no longer throws)
-    BOOST_CHECK(!t1.AreInputsStandard(missingInputs));
+    BOOST_CHECK_THROW(t1.AreInputsStandard(missingInputs), runtime_error);
    BOOST_CHECK_THROW(t1.GetValueIn(missingInputs), runtime_error);
 }

@@ -165,13 +165,8 @@ bool CTorEmbedded::Start(int socks, int hsPort, bool enableHiddenService)
        }

        // Quick port check
-#ifdef WIN32
-        SOCKET sock = socket(AF_INET, SOCK_STREAM, 0);
-        if (sock != INVALID_SOCKET) {
-#else
        int sock = socket(AF_INET, SOCK_STREAM, 0);
        if (sock >= 0) {
-#endif
            struct sockaddr_in addr;
            memset(&addr, 0, sizeof(addr));
            addr.sin_family = AF_INET;
@@ -129,9 +129,9 @@ std::string CTorProcess::FindTorBinary()
    candidates.push_back("/usr/local/opt/tor/bin/tor");
 #endif

-    // Check each candidate (must be a regular file, not a directory)
+    // Check each candidate
    for (const std::string& path : candidates) {
-        if (fs::exists(path) && !fs::is_directory(path)) {
+        if (fs::exists(path)) {
            printf("Found Tor binary at: %s\n", path.c_str());
            return path;
        }
@@ -207,12 +207,8 @@ bool CTorProcess::WriteTorrc()
              << " 127.0.0.1:" << hiddenServicePort << "\n";
    }

-    // Only force client-only mode when we are NOT publishing a hidden service.
-    // When HiddenServicePort is configured, Tor needs to behave as a hidden
-    // service host, not just as a pure outbound client proxy.
-    if (!hiddenServiceEnabled) {
-        torrc << "ClientOnly 1\n";
-    }
+    // Reduce bandwidth/resource usage for wallet use
+    torrc << "ClientOnly 1\n";

    // Disable unused features
    torrc << "AvoidDiskWrites 1\n";
@@ -326,17 +322,6 @@ bool CTorProcess::Start(const std::string& dataDir, int socks, int hsPort, bool
        if (IsPortInUse(socksPort)) {
            printf("Tor SOCKS proxy ready on port %d (took %ds)\n", socksPort, i + 1);

-            // Defensive check: Tor must not directly occupy the node's hidden-service
-            // virtual port. If it does, node startup will fail with a bind collision.
-            if (hiddenServiceEnabled && IsPortInUse(hiddenServicePort)) {
-                printf("ERROR: Tor startup collision: hidden service port %d appears busy before node bind.\n",
-                       hiddenServicePort);
-                printf("       Refusing to treat Tor as healthy because this would block the node listener.\n");
-                Stop();
-                running = false;
-                return false;
-            }
-
            // Read and display the hidden service hostname if available
            if (hiddenServiceEnabled) {
                fs::path hsHostname = fs::path(torDataDir) / "hidden_service" / "hostname";
@@ -73,7 +73,7 @@ void RPCTypeCheck(const Array& params,
        if (!((v.type() == t) || (fAllowNull && (v.type() == null_type))))
        {
            string err = strprintf("Expected type %s, got %s",
-                                   ValueTypeName(t), ValueTypeName(v.type()));
+                                   Value_type_name[t], Value_type_name[v.type()]);
            throw JSONRPCError(RPC_TYPE_ERROR, err);
        }
        i++;
@@ -93,7 +93,7 @@ void RPCTypeCheck(const Object& o,
        if (!((v.type() == t.second) || (fAllowNull && (v.type() == null_type))))
        {
            string err = strprintf("Expected type %s for %s, got %s",
-                                   ValueTypeName(t.second), t.first.c_str(), ValueTypeName(v.type()));
+                                   Value_type_name[t.second], t.first.c_str(), Value_type_name[v.type()]);
            throw JSONRPCError(RPC_TYPE_ERROR, err);
        }
    }
@@ -297,8 +297,12 @@ static const CRPCCommand vRPCCommands[] =
    { "listaddressgroupings",   &listaddressgroupings,   false,  false },
    { "signmessage",            &signmessage,            false,  false },
    { "verifymessage",          &verifymessage,          false,  false },
+    { "getwork",                &getwork,                true,   false },
+    { "getworkex",              &getworkex,              true,   false },
    { "listaccounts",           &listaccounts,           false,  false },
    { "settxfee",               &settxfee,               false,  false },
+    { "getblocktemplate",       &getblocktemplate,       true,   false },
+    { "submitblock",            &submitblock,            false,  false },
    { "listsinceblock",         &listsinceblock,         false,  false },
    { "dumpprivkey",            &dumpprivkey,            false,  false },
    { "dumpwallet",             &dumpwallet,             true,   false },
@@ -991,7 +995,8 @@ void JSONRequest::parse(const Value& valRequest)
    if (valMethod.type() != str_type)
        throw JSONRPCError(RPC_INVALID_REQUEST, "Method must be a string");
    strMethod = valMethod.get_str();
-    printf("ThreadRPCServer method=%s\n", strMethod.c_str());
+    if (strMethod != "getwork" && strMethod != "getblocktemplate")
+        printf("ThreadRPCServer method=%s\n", strMethod.c_str());

    // Parse params
    Value valParams = find_value(request, "params");
@@ -1386,6 +1391,7 @@ Array RPCConvertValues(const std::string &strMethod, const std::vector<std::stri
    if (strMethod == "listaccounts"           && n > 0) ConvertTo<boost::int64_t>(params[0]);
    if (strMethod == "walletpassphrase"       && n > 1) ConvertTo<boost::int64_t>(params[1]);
    if (strMethod == "walletpassphrase"       && n > 2) ConvertTo<bool>(params[2]);
+    if (strMethod == "getblocktemplate"       && n > 0) ConvertTo<Object>(params[0]);
    if (strMethod == "listsinceblock"         && n > 1) ConvertTo<boost::int64_t>(params[1]);

    if (strMethod == "sendalert"              && n > 2) ConvertTo<boost::int64_t>(params[2]);
@@ -12,7 +12,9 @@

 class CBlockIndex;

-#include "json/json_compat.h"
+#include "json/json_spirit_reader_template.h"
+#include "json/json_spirit_writer_template.h"
+#include "json/json_spirit_utils.h"

 #include "util.h"
 #include "checkpoints.h"
@@ -159,6 +161,10 @@ extern json_spirit::Value sendalert(const json_spirit::Array& params, bool fHelp
 extern json_spirit::Value getsubsidy(const json_spirit::Array& params, bool fHelp);
 extern json_spirit::Value getmininginfo(const json_spirit::Array& params, bool fHelp);
 extern json_spirit::Value getstakinginfo(const json_spirit::Array& params, bool fHelp);
+extern json_spirit::Value getwork(const json_spirit::Array& params, bool fHelp);
+extern json_spirit::Value getworkex(const json_spirit::Array& params, bool fHelp);
+extern json_spirit::Value getblocktemplate(const json_spirit::Array& params, bool fHelp);
+extern json_spirit::Value submitblock(const json_spirit::Array& params, bool fHelp);

 extern json_spirit::Value getnewaddress(const json_spirit::Array& params, bool fHelp); // in rpcwallet.cpp
 extern json_spirit::Value getaccountaddress(const json_spirit::Array& params, bool fHelp);
@@ -29,8 +29,6 @@ namespace fs = boost::filesystem;

 leveldb::DB *txdb; // global pointer for LevelDB object instance

-bool CDiskBlockIndex::fSerializeChainTrust = false;
-
 static leveldb::Options GetOptions() {
    leveldb::Options options;
    int nCacheSizeMB = GetArg("-dbcache", 2048);
@@ -367,22 +365,9 @@ bool CTxDB::LoadBlockIndex()
        // from BDB.
        return true;
    }
-
-    // Check DB format version to determine serialization features.
-    int nDbFormat = 1;
-    ReadDbFormat(nDbFormat);
-    CDiskBlockIndex::fSerializeChainTrust = (nDbFormat >= 2);
-
-    if (CDiskBlockIndex::fSerializeChainTrust)
-        printf("LoadBlockIndex(): DB format v%d — nChainTrust persisted\n", nDbFormat);
-    else
-        printf("LoadBlockIndex(): DB format v%d — will recalculate nChainTrust (one-time upgrade)\n", nDbFormat);
-
    // The block index is an in-memory structure that maps hashes to on-disk
    // locations where the contents of the block can be found. Here, we scan it
    // out of the DB and into mapBlockIndex.
-    int64_t nPhaseStart = GetTimeMillis();
-    int64_t nTotalStart = nPhaseStart;
    leveldb::Iterator *iterator = pdb->NewIterator(leveldb::ReadOptions());
    // Seek to start key.
    CDataStream ssStartKey(SER_DISK, CLIENT_VERSION);
@@ -433,8 +418,6 @@ bool CTxDB::LoadBlockIndex()
        pindexNew->nTime          = diskindex.nTime;
        pindexNew->nBits          = diskindex.nBits;
        pindexNew->nNonce         = diskindex.nNonce;
-        // nChainTrust is populated from disk if fSerializeChainTrust, else stays 0
-        pindexNew->nChainTrust    = diskindex.nChainTrust;

        // Watch for genesis block
        if (pindexGenesisBlock == NULL && blockHash == (!fTestNet ? hashGenesisBlockOfficial : hashGenesisBlockTestNet))
@@ -445,138 +428,56 @@ bool CTxDB::LoadBlockIndex()
            return error("LoadBlockIndex() : CheckIndex failed at %d", pindexNew->nHeight);
        }

-        // setStakeSeen is populated below for recent blocks only (Change D)
+        // triangles: build setStakeSeen
+        if (pindexNew->IsProofOfStake())
+            setStakeSeen.insert(make_pair(pindexNew->prevoutStake, pindexNew->nStakeTime));

        iterator->Next();
    }
    delete iterator;
-    printf("STARTUP-PERF: block_index_deserialize %" PRId64 "ms blocks=%d\n", GetTimeMillis() - nPhaseStart, nBlocksLoaded);

    if (fRequestShutdown)
        return true;

-    // ---- nChainTrust: recalculate if not persisted, or verify stake modifiers ----
-    nPhaseStart = GetTimeMillis();
-    bool fNeedChainTrustRecalc = !CDiskBlockIndex::fSerializeChainTrust;
-
-    if (fNeedChainTrustRecalc)
+    // Calculate nChainTrust
+    vector<pair<int, CBlockIndex*> > vSortedByHeight;
+    vSortedByHeight.reserve(mapBlockIndex.size());
+    for (const auto& item : mapBlockIndex)
    {
-        uiInterface.InitMessage(_("Calculating chain trust (one-time upgrade)..."));
-
-        vector<pair<int, CBlockIndex*> > vSortedByHeight;
-        vSortedByHeight.reserve(mapBlockIndex.size());
-        for (const auto& item : mapBlockIndex)
-            vSortedByHeight.push_back(make_pair(item.second->nHeight, item.second));
-        sort(vSortedByHeight.begin(), vSortedByHeight.end());
-
-        int nLastCheckpointHeight = Checkpoints::GetTotalBlocksEstimate();
-        int nProgressInterval = std::max((int)vSortedByHeight.size() / 20, 1);
-        int nCount = 0;
-
-        for (const auto& item : vSortedByHeight)
-        {
-            CBlockIndex* pindex = item.second;
-            pindex->nChainTrust = (pindex->pprev ? pindex->pprev->nChainTrust : 0) + pindex->GetBlockTrust();
-
-            if (pindex->nHeight >= nLastCheckpointHeight)
-            {
-                pindex->nStakeModifierChecksum = GetStakeModifierChecksum(pindex);
-                if (!CheckStakeModifierCheckpoints(pindex->nHeight, pindex->nStakeModifierChecksum))
-                    return error("CTxDB::LoadBlockIndex() : Failed stake modifier checkpoint height=%d, modifier=0x%016"PRIx64, pindex->nHeight, pindex->nStakeModifier);
-            }
-
-            if (++nCount % nProgressInterval == 0)
-            {
-                std::string strMsg = strprintf(_("Calculating chain trust... (%d%%)"), nCount * 100 / vSortedByHeight.size());
-                uiInterface.InitMessage(strMsg);
-            }
-        }
-
-        // Upgrade: rewrite all block index entries with nChainTrust and bump format.
-        printf("LoadBlockIndex(): upgrading DB to format v3 (persisting nChainTrust + UTXO model)...\n");
-        uiInterface.InitMessage(_("Upgrading block index..."));
-        CDiskBlockIndex::fSerializeChainTrust = true;
-
-        leveldb::WriteBatch batch;
-        nCount = 0;
-        for (const auto& item : vSortedByHeight)
-        {
-            CBlockIndex* pindex = item.second;
-            CDiskBlockIndex diskindex(pindex);
-
-            CDataStream ssKey(SER_DISK, CLIENT_VERSION);
-            ssKey << make_pair(string("blockindex"), *pindex->phashBlock);
-            CDataStream ssValue(SER_DISK, CLIENT_VERSION);
-            ssValue << diskindex;
-            batch.Put(ssKey.str(), ssValue.str());
-
-            // Flush in chunks to limit memory usage
-            if (++nCount % 100000 == 0)
-            {
-                pdb->Write(leveldb::WriteOptions(), &batch);
-                batch.Clear();
-                printf("LoadBlockIndex(): upgraded %d / %d block index entries\n", nCount, (int)vSortedByHeight.size());
-            }
-        }
-        // Write remaining entries + format version
-        CDataStream ssFmtKey(SER_DISK, CLIENT_VERSION);
-        ssFmtKey << string("dbformat");
-        CDataStream ssFmtValue(SER_DISK, CLIENT_VERSION);
-        ssFmtValue << (int)3;
-        batch.Put(ssFmtKey.str(), ssFmtValue.str());
-
-        leveldb::Status status = pdb->Write(leveldb::WriteOptions(), &batch);
-        if (!status.ok())
-            return error("LoadBlockIndex(): failed to write upgraded block index: %s", status.ToString().c_str());
-
-        printf("LoadBlockIndex(): DB upgraded to format v3 (%d entries rewritten)\n", nCount);
+        CBlockIndex* pindex = item.second;
+        vSortedByHeight.push_back(make_pair(pindex->nHeight, pindex));
    }
-    else
+    sort(vSortedByHeight.begin(), vSortedByHeight.end());
+
+    int nLastCheckpointHeight = Checkpoints::GetTotalBlocksEstimate();
+    int nProgressInterval = std::max((int)vSortedByHeight.size() / 20, 1);
+    int nCount = 0;
+
+    for (const auto& item : vSortedByHeight)
    {
-        // nChainTrust was loaded from disk. Only need stake modifier checksums
-        // for blocks above the last checkpoint (typically very few or zero).
-        int nLastCheckpointHeight = Checkpoints::GetTotalBlocksEstimate();
-        bool fNeedModifierCheck = false;
-        for (const auto& item : mapBlockIndex)
+        CBlockIndex* pindex = item.second;
+        pindex->nChainTrust = (pindex->pprev ? pindex->pprev->nChainTrust : 0) + pindex->GetBlockTrust();
+
+        // Only compute the expensive SHA-256 stake modifier checksum for blocks
+        // at or beyond the last hardcoded checkpoint. Blocks well below the
+        // checkpoint have already been validated — recomputing 2M+ hashes on
+        // every startup was the main cause of multi-minute load times.
+        if (pindex->nHeight >= nLastCheckpointHeight)
        {
-            if (item.second->nHeight >= nLastCheckpointHeight)
-            {
-                fNeedModifierCheck = true;
-                break;
-            }
+            pindex->nStakeModifierChecksum = GetStakeModifierChecksum(pindex);
+            if (!CheckStakeModifierCheckpoints(pindex->nHeight, pindex->nStakeModifierChecksum))
+                return error("CTxDB::LoadBlockIndex() : Failed stake modifier checkpoint height=%d, modifier=0x%016"PRIx64, pindex->nHeight, pindex->nStakeModifier);
        }

-        if (fNeedModifierCheck)
+        // Report progress for UI responsiveness
+        if (++nCount % nProgressInterval == 0)
        {
-            vector<pair<int, CBlockIndex*> > vAboveCheckpoint;
-            for (const auto& item : mapBlockIndex)
-                if (item.second->nHeight >= nLastCheckpointHeight)
-                    vAboveCheckpoint.push_back(make_pair(item.second->nHeight, item.second));
-            sort(vAboveCheckpoint.begin(), vAboveCheckpoint.end());
-
-            for (const auto& item : vAboveCheckpoint)
-            {
-                CBlockIndex* pindex = item.second;
-                pindex->nStakeModifierChecksum = GetStakeModifierChecksum(pindex);
-                if (!CheckStakeModifierCheckpoints(pindex->nHeight, pindex->nStakeModifierChecksum))
-                    return error("CTxDB::LoadBlockIndex() : Failed stake modifier checkpoint height=%d, modifier=0x%016"PRIx64, pindex->nHeight, pindex->nStakeModifier);
-            }
+            std::string strMsg = strprintf(_("Loading block index... (%d%%)"), nCount * 100 / vSortedByHeight.size());
+            uiInterface.InitMessage(strMsg);
        }
    }

-    printf("STARTUP-PERF: chain_trust_and_modifiers %" PRId64 "ms\n", GetTimeMillis() - nPhaseStart);
-
-    // Bump dbformat to 3 if needed (databases that already had v2 nChainTrust upgrade).
-    // UTXO entries are written by ConnectBlock during normal sync. For databases upgrading
-    // from older versions, FetchInputs has a lazy fallback to the old CTxIndex path.
-    if (nDbFormat < 3)
-    {
-        WriteDbFormat(3);
-        printf("LoadBlockIndex(): bumped dbformat to v3 (UTXO model with lazy fallback)\n");
-    }
-
    // Load hashBestChain pointer to end of best chain
-    nPhaseStart = GetTimeMillis();
    if (!ReadHashBestChain(hashBestChain))
    {
        if (pindexGenesisBlock == NULL)
@@ -589,26 +490,6 @@ bool CTxDB::LoadBlockIndex()
    nBestHeight = pindexBest->nHeight;
    nBestChainTrust = pindexBest->nChainTrust;

-    printf("STARTUP-PERF: best_chain %" PRId64 "ms\n", GetTimeMillis() - nPhaseStart);
-
-    // ---- setStakeSeen: only populate for recent blocks (DoS protection) ----
-    nPhaseStart = GetTimeMillis();
-    {
-        int nStakeSeenDepth = 500;
-        CBlockIndex* pindex = pindexBest;
-        int nLoaded = 0;
-        while (pindex && nLoaded < nStakeSeenDepth)
-        {
-            if (pindex->IsProofOfStake())
-                setStakeSeen.insert(make_pair(pindex->prevoutStake, pindex->nStakeTime));
-            pindex = pindex->pprev;
-            nLoaded++;
-        }
-        printf("LoadBlockIndex(): populated setStakeSeen with %d entries (last %d blocks)\n",
-               (int)setStakeSeen.size(), nLoaded);
-    }
-    printf("STARTUP-PERF: stake_seen %" PRId64 "ms\n", GetTimeMillis() - nPhaseStart);
-
    printf("LoadBlockIndex(): hashBestChain=%s  height=%d  trust=%s  date=%s\n",
      hashBestChain.ToString().substr(0,20).c_str(), nBestHeight, CBigNum(nBestChainTrust).ToString().c_str(),
      DateTimeStrFormat("%x %H:%M:%S", pindexBest->GetBlockTime()).c_str());
@@ -631,7 +512,6 @@ bool CTxDB::LoadBlockIndex()
    nBestInvalidTrust = bnBestInvalidTrust.getuint256();

    // Verify blocks in the best chain
-    nPhaseStart = GetTimeMillis();
    int nCheckLevel = GetArg("-checklevel", 1);
    int nCheckDepth = GetArg( "-checkblocks", 50);
    if (nCheckDepth == 0)
@@ -683,20 +563,66 @@ bool CTxDB::LoadBlockIndex()
                                pindexFork = pindex->pprev;
                            }
                    }
-                    // check level 4: verify spent inputs were removed from UTXO set
-                    if (nCheckLevel>3 && !tx.IsCoinBase())
+                    // check level 4: check whether spent txouts were spent within the main chain
+                    unsigned int nOutput = 0;
+                    if (nCheckLevel>3)
                    {
-                        for (const CTxIn &txin : tx.vin)
+                        for (const CDiskTxPos &txpos : txindex.vSpent)
                        {
-                            if (HaveUtxo(txin.prevout.hash, txin.prevout.n))
+                            if (!txpos.IsNull())
                            {
-                                printf("LoadBlockIndex(): *** spent input still in UTXO set: %s:%i in %s\n",
-                                       txin.prevout.hash.ToString().c_str(), txin.prevout.n, hashTx.ToString().c_str());
-                                pindexFork = pindex->pprev;
+                                pair<unsigned int, unsigned int> posFind = make_pair(txpos.nFile, txpos.nBlockPos);
+                                if (!mapBlockPos.count(posFind))
+                                {
+                                    printf("LoadBlockIndex(): *** found bad spend at %d, hashBlock=%s, hashTx=%s\n", pindex->nHeight, pindex->GetBlockHash().ToString().c_str(), hashTx.ToString().c_str());
+                                    pindexFork = pindex->pprev;
+                                }
+                                // check level 6: check whether spent txouts were spent by a valid transaction that consume them
+                                if (nCheckLevel>5)
+                                {
+                                    CTransaction txSpend;
+                                    if (!txSpend.ReadFromDisk(txpos))
+                                    {
+                                        printf("LoadBlockIndex(): *** cannot read spending transaction of %s:%i from disk\n", hashTx.ToString().c_str(), nOutput);
+                                        pindexFork = pindex->pprev;
+                                    }
+                                    else if (!txSpend.CheckTransaction())
+                                    {
+                                        printf("LoadBlockIndex(): *** spending transaction of %s:%i is invalid\n", hashTx.ToString().c_str(), nOutput);
+                                        pindexFork = pindex->pprev;
+                                    }
+                                    else
+                                    {
+                                        bool fFound = false;
+                                        for (const CTxIn &txin : txSpend.vin)
+                                            if (txin.prevout.hash == hashTx && txin.prevout.n == nOutput)
+                                                fFound = true;
+                                        if (!fFound)
+                                        {
+                                            printf("LoadBlockIndex(): *** spending transaction of %s:%i does not spend it\n", hashTx.ToString().c_str(), nOutput);
+                                            pindexFork = pindex->pprev;
+                                        }
+                                    }
+                                }
                            }
+                            nOutput++;
                        }
                    }
                }
+                // check level 5: check whether all prevouts are marked spent
+                if (nCheckLevel>4)
+                {
+                     for (const CTxIn &txin : tx.vin)
+                     {
+                          CTxIndex txindex;
+                          if (ReadTxIndex(txin.prevout.hash, txindex))
+                              if (txindex.vSpent.size()-1 < txin.prevout.n || txindex.vSpent[txin.prevout.n].IsNull())
+                              {
+                                  printf("LoadBlockIndex(): *** found unspent prevout %s:%i in %s\n", txin.prevout.hash.ToString().c_str(), txin.prevout.n, hashTx.ToString().c_str());
+                                  pindexFork = pindex->pprev;
+                              }
+                     }
+                }
            }
        }
    }
@@ -710,8 +636,6 @@ bool CTxDB::LoadBlockIndex()
        CTxDB txdb;
        block.SetBestChain(txdb, pindexFork);
    }
-    printf("STARTUP-PERF: verify_blocks %" PRId64 "ms depth=%d level=%d\n", GetTimeMillis() - nPhaseStart, nCheckDepth, nCheckLevel);
-    printf("STARTUP-PERF: load_block_index_total %" PRId64 "ms\n", GetTimeMillis() - nTotalStart);

    return true;
 }
@@ -826,37 +750,3 @@ bool CTxDB::GetAddressTxIds(int nType, const uint160& hashBytes, int nStartHeigh
    return true;
 }

-// ---------- UTXO database methods ----------
-
-bool CTxDB::ReadUtxo(const uint256& hash, unsigned int n, CUtxoEntry& entry)
-{
-    entry.SetNull();
-    return Read(make_pair(string("u"), make_pair(hash, n)), entry);
-}
-
-bool CTxDB::WriteUtxo(const uint256& hash, unsigned int n, const CUtxoEntry& entry)
-{
-    return Write(make_pair(string("u"), make_pair(hash, n)), entry);
-}
-
-bool CTxDB::EraseUtxo(const uint256& hash, unsigned int n)
-{
-    return Erase(make_pair(string("u"), make_pair(hash, n)));
-}
-
-bool CTxDB::HaveUtxo(const uint256& hash, unsigned int n)
-{
-    if (Exists(make_pair(string("u"), make_pair(hash, n))))
-        return true;
-
-    // Lazy fallback: check old CTxIndex vSpent for databases upgrading from pre-UTXO format
-    CTxIndex txindex;
-    if (ReadTxIndex(hash, txindex))
-    {
-        if (n < txindex.vSpent.size() && txindex.vSpent[n].IsNull())
-            return true; // vSpent[n] is null = output NOT spent = UTXO exists
-    }
-
-    return false;
-}
-
@@ -183,17 +183,6 @@ public:
        return Write(std::string("version"), nVersion);
    }

-    bool ReadDbFormat(int& nDbFormat)
-    {
-        nDbFormat = 1;
-        return Read(std::string("dbformat"), nDbFormat);
-    }
-
-    bool WriteDbFormat(int nDbFormat)
-    {
-        return Write(std::string("dbformat"), nDbFormat);
-    }
-
    bool ReadTxIndex(uint256 hash, CTxIndex& txindex);
    bool UpdateTxIndex(uint256 hash, const CTxIndex& txindex);
    bool AddTxIndex(const CTransaction& tx, const CDiskTxPos& pos, int nHeight);
@@ -231,12 +220,6 @@ public:
    bool GetAddressUtxos(int nType, const uint160& hashBytes, std::vector<std::pair<COutPoint, std::pair<int64_t, int> > >& vUtxos);
    bool GetAddressTxIds(int nType, const uint160& hashBytes, int nStartHeight, int nEndHeight, std::vector<uint256>& vTxIds);

-    // UTXO database methods
-    bool ReadUtxo(const uint256& hash, unsigned int n, CUtxoEntry& entry);
-    bool WriteUtxo(const uint256& hash, unsigned int n, const CUtxoEntry& entry);
-    bool EraseUtxo(const uint256& hash, unsigned int n);
-    bool HaveUtxo(const uint256& hash, unsigned int n);
-
 private:
    bool LoadBlockIndexGuts();
 };
@@ -30,7 +30,7 @@ static const int DATABASE_VERSION = 70509;
 // network protocol versioning
 //

-static const int PROTOCOL_VERSION = 70205;
+static const int PROTOCOL_VERSION = 70206;

 // v5 hard fork: require new protocol version (disconnects old nodes)
 static const int MIN_PROTO_VERSION = 70205;
@@ -52,8 +52,8 @@ static const int BIP0031_VERSION = 60000;
 static const int MEMPOOL_GD_VERSION = 60002;

 #define DISPLAY_VERSION_MAJOR       5
-#define DISPLAY_VERSION_MINOR       7
-#define DISPLAY_VERSION_REVISION    6
+#define DISPLAY_VERSION_MINOR       3
+#define DISPLAY_VERSION_REVISION    8
 #define DISPLAY_VERSION_BUILD       0

 #endif
@@ -12,7 +12,6 @@
 #include "kernel.h"
 #include "coincontrol.h"
 #include "addressindex.h"
-#include <memory>
 #include <boost/algorithm/string/replace.hpp>
 #include <algorithm>
 #include <random>
@@ -263,13 +262,11 @@ bool CWallet::ChangeWalletPassphrase(const SecureString& strOldWalletPassphrase,
            {
                int64_t nStartTime = GetTimeMillis();
                crypter.SetKeyFromPassphrase(strNewWalletPassphrase, pMasterKey.second.vchSalt, pMasterKey.second.nDeriveIterations, pMasterKey.second.nDerivationMethod);
-                int64_t nElapsed = std::max((int64_t)1, GetTimeMillis() - nStartTime);
-                pMasterKey.second.nDeriveIterations = pMasterKey.second.nDeriveIterations * (100 / ((double)nElapsed));
+                pMasterKey.second.nDeriveIterations = pMasterKey.second.nDeriveIterations * (100 / ((double)(GetTimeMillis() - nStartTime)));

                nStartTime = GetTimeMillis();
                crypter.SetKeyFromPassphrase(strNewWalletPassphrase, pMasterKey.second.vchSalt, pMasterKey.second.nDeriveIterations, pMasterKey.second.nDerivationMethod);
-                nElapsed = std::max((int64_t)1, GetTimeMillis() - nStartTime);
-                pMasterKey.second.nDeriveIterations = (pMasterKey.second.nDeriveIterations + pMasterKey.second.nDeriveIterations * 100 / ((double)nElapsed)) / 2;
+                pMasterKey.second.nDeriveIterations = (pMasterKey.second.nDeriveIterations + pMasterKey.second.nDeriveIterations * 100 / ((double)(GetTimeMillis() - nStartTime))) / 2;

                if (pMasterKey.second.nDeriveIterations < 25000)
                    pMasterKey.second.nDeriveIterations = 25000;
@@ -373,13 +370,11 @@ bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
    CCrypter crypter;
    int64_t nStartTime = GetTimeMillis();
    crypter.SetKeyFromPassphrase(strWalletPassphrase, kMasterKey.vchSalt, 25000, kMasterKey.nDerivationMethod);
-    int64_t nElapsed = std::max((int64_t)1, GetTimeMillis() - nStartTime);
-    kMasterKey.nDeriveIterations = 2500000 / ((double)nElapsed);
+    kMasterKey.nDeriveIterations = 2500000 / ((double)(GetTimeMillis() - nStartTime));

    nStartTime = GetTimeMillis();
    crypter.SetKeyFromPassphrase(strWalletPassphrase, kMasterKey.vchSalt, kMasterKey.nDeriveIterations, kMasterKey.nDerivationMethod);
-    nElapsed = std::max((int64_t)1, GetTimeMillis() - nStartTime);
-    kMasterKey.nDeriveIterations = (kMasterKey.nDeriveIterations + kMasterKey.nDeriveIterations * 100 / ((double)nElapsed)) / 2;
+    kMasterKey.nDeriveIterations = (kMasterKey.nDeriveIterations + kMasterKey.nDeriveIterations * 100 / ((double)(GetTimeMillis() - nStartTime))) / 2;

    if (kMasterKey.nDeriveIterations < 25000)
        kMasterKey.nDeriveIterations = 25000;
@@ -492,10 +487,7 @@ void CWallet::WalletUpdateSpent(const CTransaction &tx, bool fBlock)
                    wtx.MarkSpent(txin.prevout.n);
                    wtx.WriteToDisk();
                    if (!IsInitialBlockDownload())
-                    {
-                        try { NotifyTransactionChanged(this, txin.prevout.hash, CT_UPDATED); }
-                        catch (...) { }
-                    }
+                        NotifyTransactionChanged(this, txin.prevout.hash, CT_UPDATED);
                }
            }
        }
@@ -513,10 +505,7 @@ void CWallet::WalletUpdateSpent(const CTransaction &tx, bool fBlock)
                    wtx.MarkUnspent(&txout - &tx.vout[0]);
                    wtx.WriteToDisk();
                    if (!IsInitialBlockDownload())
-                    {
-                        try { NotifyTransactionChanged(this, hash, CT_UPDATED); }
-                        catch (...) { }
-                    }
+                        NotifyTransactionChanged(this, hash, CT_UPDATED);
                }
            }
        }
@@ -649,13 +638,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn)

        // Notify UI of new or updated transaction (skip during IBD to avoid flooding the event loop)
        if (!IsInitialBlockDownload())
-        {
-            try {
-                NotifyTransactionChanged(this, hash, fInsertedNew ? CT_NEW : CT_UPDATED);
-            } catch (...) {
-                // Absorb boost::bad_weak_ptr or other signal exceptions from stale slots
-            }
-        }
+            NotifyTransactionChanged(this, hash, fInsertedNew ? CT_NEW : CT_UPDATED);

        // notify an external script when a wallet transaction comes in or is updated
        std::string strCmd = GetArg("-walletnotify", "");
@@ -1120,27 +1103,43 @@ bool CWallet::ScanForWalletTransactionsFromIndex(CBlockIndex* pindexStart, bool
            wtx = (*mi).second;
        }

-        // Check UTXO existence to update spent status.
-        // Spending transactions are discovered through block scanning.
-        if (!txdb.ContainsTx(hashTx))
+        CTxIndex txindex;
+        if (!txdb.ReadTxIndex(hashTx, txindex))
            continue;
-
-        for (unsigned int i = 0; i < wtx.vout.size(); i++)
+        if (txindex.vSpent.size() != wtx.vout.size())
        {
-            if (!IsMine(wtx.vout[i]))
+            printf("ERROR: ScanForWalletTransactionsFromIndex() : txindex.vSpent.size() %"PRIszu" != wtx.vout.size() %"PRIszu" for %s\n",
+                   txindex.vSpent.size(), wtx.vout.size(), hashTx.ToString().c_str());
+            continue;
+        }
+
+        for (unsigned int i = 0; i < txindex.vSpent.size(); i++)
+        {
+            if (txindex.vSpent[i].IsNull() || !IsMine(wtx.vout[i]))
                continue;
-            // If UTXO doesn't exist, the output was spent
-            if (!txdb.HaveUtxo(hashTx, i))
+
+            CTransaction txSpend;
+            CTxIndex txindexSpend;
+            int nSpendHeight = 0;
+            if (!ReadIndexedWalletTransaction(txdb, txindex.vSpent[i], txSpend, txindexSpend, nSpendHeight))
+                return false;
+
+            bool fSpendExists = false;
            {
                LOCK(cs_wallet);
-                if (!wtx.IsSpent(i))
-                {
-                    CWalletTx& wtxMutable = mapWallet[hashTx];
-                    wtxMutable.MarkSpent(i);
-                    wtxMutable.WriteToDisk();
-                    nFound++;
-                }
+                fSpendExists = mapWallet.count(txSpend.GetHash()) > 0;
            }
+            if (fSpendExists && !fUpdate)
+                continue;
+
+            CWalletTx wtxSpend(this, txSpend);
+            wtxSpend.SetMerkleBranch();
+            if (!AddToWallet(wtxSpend))
+                return false;
+            nFound++;
+
+            if (setQueuedTxs.insert(txSpend.GetHash()).second)
+                vWorkQueue.push_back(txSpend.GetHash());
        }
    }

@@ -1182,20 +1181,25 @@ void CWallet::ReacceptWalletTransactions()
                if ((wtx.IsCoinBase() && wtx.IsSpent(0)) || (wtx.IsCoinStake() && wtx.IsSpent(1)))
                    continue;

-                uint256 hashTx = wtx.GetHash();
+                CTxIndex txindex;
                bool fUpdated = false;
-                // Check UTXO database for spent status of our outputs
-                if (txdb.ContainsTx(hashTx))
+                if (txdb.ReadTxIndex(wtx.GetHash(), txindex))
                {
-                    for (unsigned int i = 0; i < wtx.vout.size(); i++)
+                    // Update fSpent if a tx got spent somewhere else by a copy of wallet.dat
+                    if (txindex.vSpent.size() != wtx.vout.size())
+                    {
+                        printf("ERROR: ReacceptWalletTransactions() : txindex.vSpent.size() %"PRIszu" != wtx.vout.size() %"PRIszu"\n", txindex.vSpent.size(), wtx.vout.size());
+                        continue;
+                    }
+                    for (unsigned int i = 0; i < txindex.vSpent.size(); i++)
                    {
                        if (wtx.IsSpent(i))
                            continue;
-                        // If the UTXO doesn't exist, the output was spent
-                        if (!txdb.HaveUtxo(hashTx, i) && IsMine(wtx.vout[i]))
+                        if (!txindex.vSpent[i].IsNull() && IsMine(wtx.vout[i]))
                        {
                            wtx.MarkSpent(i);
                            fUpdated = true;
+                            vMissingTx.push_back(txindex.vSpent[i]);
                        }
                    }
                    if (fUpdated)
@@ -1687,13 +1691,11 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64_t> >& vecSend,
    int64_t nValue = 0;
    for (const auto& s : vecSend)
    {
-        if (!MoneyRange(s.second))
+        if (nValue < 0)
            return false;
        nValue += s.second;
-        if (!MoneyRange(nValue))
-            return false;
    }
-    if (vecSend.empty() || nValue <= 0)
+    if (vecSend.empty() || nValue < 0)
        return false;

    wtxNew.BindWallet(this);
@@ -1874,37 +1876,18 @@ bool CWallet::GetStakeWeight(const CKeyStore& keystore, uint64_t& nMinWeight, ui
    if (setCoins.empty())
        return false;

-    // Collect coin hashes under lock, then read DB outside the per-coin lock
-    // to avoid acquiring/releasing LOCK2 thousands of times for large wallets
-    struct StakeCoin {
-        uint256 hash;
-        int64_t nValue;
-        unsigned int nTime;
-    };
-    vector<StakeCoin> vStakeCoins;
-    {
-        LOCK(cs_wallet);
-        vStakeCoins.reserve(setCoins.size());
-        for (auto& pcoin : setCoins)
-        {
-            StakeCoin sc;
-            sc.hash = pcoin.first->GetHash();
-            sc.nValue = pcoin.first->vout[pcoin.second].nValue;
-            sc.nTime = pcoin.first->nTime;
-            vStakeCoins.push_back(sc);
-        }
-    }
-
    CTxDB txdb("r");
-    int64_t nNow = GetTime();
-    for (auto& sc : vStakeCoins)
+    for (auto pcoin : setCoins)
    {
        CTxIndex txindex;
-        if (!txdb.ReadTxIndex(sc.hash, txindex))
-            continue;
+        {
+            LOCK2(cs_main, cs_wallet);
+            if (!txdb.ReadTxIndex(pcoin.first->GetHash(), txindex))
+                continue;
+        }

-        int64_t nTimeWeight = GetWeight((int64_t)sc.nTime, nNow);
-        CBigNum bnCoinDayWeight = CBigNum(sc.nValue) * nTimeWeight / COIN / (24 * 60 * 60);
+        int64_t nTimeWeight = GetWeight((int64_t)pcoin.first->nTime, (int64_t)GetTime());
+        CBigNum bnCoinDayWeight = CBigNum(pcoin.first->vout[pcoin.second].nValue) * nTimeWeight / COIN / (24 * 60 * 60);

        // Weight is greater than zero
        if (nTimeWeight > 0)
@@ -2177,8 +2160,7 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey)
                coin.BindWallet(this);
                coin.MarkSpent(txin.prevout.n);
                coin.WriteToDisk();
-                try { NotifyTransactionChanged(this, coin.GetHash(), CT_UPDATED); }
-                catch (...) { }
+                NotifyTransactionChanged(this, coin.GetHash(), CT_UPDATED);
            }

            if (fFileBacked)
@@ -2307,9 +2289,8 @@ bool CWallet::SetAddressBookName(const CTxDestination& address, const string& st
        const CTrianglesAddress& caddress = address;
        SecureMsgWalletKeyChanged(caddress.ToString(), strName, nMode);
    }
-    try { NotifyAddressBookChanged(this, address, strName, fOwned, nMode); }
-    catch (...) { }
-
+    NotifyAddressBookChanged(this, address, strName, fOwned, nMode);
+    
    if (!fFileBacked)
        return false;
    return CWalletDB(strWalletFile).WriteName(CTrianglesAddress(address).ToString(), strName);
@@ -2322,7 +2303,7 @@ bool CWallet::DelAddressBookName(const CTxDestination& address)

        mapAddressBook.erase(address);
    }
-
+    
    bool fOwned = ::IsMine(*this, address);
    string sName = "";
    if (fOwned)
@@ -2330,8 +2311,7 @@ bool CWallet::DelAddressBookName(const CTxDestination& address)
        const CTrianglesAddress& caddress = address;
        SecureMsgWalletKeyChanged(caddress.ToString(), sName, CT_DELETED);
    }
-    try { NotifyAddressBookChanged(this, address, "", fOwned, CT_DELETED); }
-    catch (...) { }
+    NotifyAddressBookChanged(this, address, "", fOwned, CT_DELETED);

    if (!fFileBacked)
        return false;
@@ -2593,8 +2573,6 @@ std::map<CTxDestination, int64_t> CWallet::GetAddressBalances()

 set< set<CTxDestination> > CWallet::GetAddressGroupings()
 {
-    LOCK(cs_wallet);
-
    set< set<CTxDestination> > groupings;
    set<CTxDestination> grouping;

@@ -2605,7 +2583,7 @@ set< set<CTxDestination> > CWallet::GetAddressGroupings()
        if (pcoin->vin.size() > 0 && IsMine(pcoin->vin[0]))
        {
            // group all input addresses with each other
-            for (const CTxIn& txin : pcoin->vin)
+            for (CTxIn txin : pcoin->vin)
            {
                CTxDestination address;
                if(!ExtractDestination(mapWallet[txin.prevout.hash].vout[txin.prevout.n].scriptPubKey, address))
@@ -2614,9 +2592,10 @@ set< set<CTxDestination> > CWallet::GetAddressGroupings()
            }

            // group change with input addresses
-            for (const CTxOut& txout : pcoin->vout)
+            for (CTxOut txout : pcoin->vout)
                if (IsChange(txout))
                {
+                    CWalletTx tx = mapWallet[pcoin->vin[0].prevout.hash];
                    CTxDestination txoutAddr;
                    if(!ExtractDestination(txout.scriptPubKey, txoutAddr))
                        continue;
@@ -2639,38 +2618,37 @@ set< set<CTxDestination> > CWallet::GetAddressGroupings()
            }
    }

-    typedef std::shared_ptr< set<CTxDestination> > GroupPtr;
-    set<GroupPtr> uniqueGroupings;
-    map<CTxDestination, GroupPtr> setmap;
-    for (const auto& grouping : groupings)
+    set< set<CTxDestination>* > uniqueGroupings; // a set of pointers to groups of addresses
+    map< CTxDestination, set<CTxDestination>* > setmap;  // map addresses to the unique group containing it
+    for (set<CTxDestination> grouping : groupings)
    {
        // make a set of all the groups hit by this new group
-        set<GroupPtr> hits;
-        for (const auto& address : grouping)
-        {
-            auto it = setmap.find(address);
-            if (it != setmap.end())
-                hits.insert(it->second);
-        }
+        set< set<CTxDestination>* > hits;
+        map< CTxDestination, set<CTxDestination>* >::iterator it;
+        for (CTxDestination address : grouping)
+            if ((it = setmap.find(address)) != setmap.end())
+                hits.insert((*it).second);

-        // merge all hit groups into a new single group
-        auto merged = std::make_shared< set<CTxDestination> >(grouping);
-        for (const auto& hit : hits)
+        // merge all hit groups into a new single group and delete old groups
+        set<CTxDestination>* merged = new set<CTxDestination>(grouping);
+        for (set<CTxDestination>* hit : hits)
        {
            merged->insert(hit->begin(), hit->end());
            uniqueGroupings.erase(hit);
+            delete hit;
        }
        uniqueGroupings.insert(merged);

        // update setmap
-        for (const auto& element : *merged)
+        for (CTxDestination element : *merged)
            setmap[element] = merged;
    }

    set< set<CTxDestination> > ret;
-    for (const auto& uniqueGrouping : uniqueGroupings)
+    for (set<CTxDestination>* uniqueGrouping : uniqueGroupings)
    {
        ret.insert(*uniqueGrouping);
+        delete uniqueGrouping;
    }

    return ret;
@@ -2692,17 +2670,16 @@ void CWallet::FixSpentCoins(int& nMismatchFound, int64_t& nBalanceInQuestion, bo
    CTxDB txdb("r");
    for (CWalletTx* pcoin : vCoins)
    {
-        uint256 hashTx = pcoin->GetHash();
-        if (!txdb.ContainsTx(hashTx))
+        // Find the corresponding transaction index
+        CTxIndex txindex;
+        if (!txdb.ReadTxIndex(pcoin->GetHash(), txindex))
            continue;
        for (unsigned int n=0; n < pcoin->vout.size(); n++)
        {
-            bool fUtxoExists = txdb.HaveUtxo(hashTx, n);
-            // Wallet says spent but UTXO exists (meaning it's NOT spent) — lost coin
-            if (IsMine(pcoin->vout[n]) && pcoin->IsSpent(n) && fUtxoExists)
+            if (IsMine(pcoin->vout[n]) && pcoin->IsSpent(n) && (txindex.vSpent.size() <= n || txindex.vSpent[n].IsNull()))
            {
                printf("FixSpentCoins found lost coin %s TRI %s[%d], %s\n",
-                    FormatMoney(pcoin->vout[n].nValue).c_str(), hashTx.ToString().c_str(), n, fCheckOnly? "repair not attempted" : "repairing");
+                    FormatMoney(pcoin->vout[n].nValue).c_str(), pcoin->GetHash().ToString().c_str(), n, fCheckOnly? "repair not attempted" : "repairing");
                nMismatchFound++;
                nBalanceInQuestion += pcoin->vout[n].nValue;
                if (!fCheckOnly)
@@ -2711,11 +2688,10 @@ void CWallet::FixSpentCoins(int& nMismatchFound, int64_t& nBalanceInQuestion, bo
                    pcoin->WriteToDisk();
                }
            }
-            // Wallet says unspent but UTXO doesn't exist (meaning it IS spent) — phantom coin
-            else if (IsMine(pcoin->vout[n]) && !pcoin->IsSpent(n) && !fUtxoExists)
+            else if (IsMine(pcoin->vout[n]) && !pcoin->IsSpent(n) && (txindex.vSpent.size() > n && !txindex.vSpent[n].IsNull()))
            {
                printf("FixSpentCoins found spent coin %s TRI %s[%d], %s\n",
-                    FormatMoney(pcoin->vout[n].nValue).c_str(), hashTx.ToString().c_str(), n, fCheckOnly? "repair not attempted" : "repairing");
+                    FormatMoney(pcoin->vout[n].nValue).c_str(), pcoin->GetHash().ToString().c_str(), n, fCheckOnly? "repair not attempted" : "repairing");
                nMismatchFound++;
                nBalanceInQuestion += pcoin->vout[n].nValue;
                if (!fCheckOnly)
@@ -2811,10 +2787,7 @@ void CWallet::UpdatedTransaction(const uint256 &hashTx)
        // Only notify UI if this transaction is in this wallet
        map<uint256, CWalletTx>::const_iterator mi = mapWallet.find(hashTx);
        if (mi != mapWallet.end() && !IsInitialBlockDownload())
-        {
-            try { NotifyTransactionChanged(this, hashTx, CT_UPDATED); }
-            catch (...) { }
-        }
+            NotifyTransactionChanged(this, hashTx, CT_UPDATED);
    }
 }

@@ -718,64 +718,3 @@ bool CWalletDB::Recover(CDBEnv& dbenv, std::string filename)
 {
    return CWalletDB::Recover(dbenv, filename, false);
 }
-
-bool CWalletDB::ZapWalletTx(const std::string& strWalletFile)
-{
-    // Open the wallet database directly and delete all "tx" entries,
-    // keeping keys and other metadata intact. This strips transaction
-    // history while preserving private keys. A rescan will rebuild
-    // the transaction list from the blockchain.
-    printf("ZapWalletTx: erasing transaction records from %s\n", strWalletFile.c_str());
-
-    CWalletDB walletdb(strWalletFile, "r+");
-    if (!walletdb.pdb)
-    {
-        printf("ZapWalletTx: failed to open wallet database\n");
-        return false;
-    }
-
-    Dbc* pcursor = walletdb.GetCursor();
-    if (!pcursor)
-    {
-        printf("ZapWalletTx: failed to get cursor\n");
-        return false;
-    }
-
-    // First pass: collect all tx hashes to erase
-    std::vector<uint256> vTxHash;
-    CDataStream ssKey(SER_DISK, CLIENT_VERSION);
-    CDataStream ssValue(SER_DISK, CLIENT_VERSION);
-    while (true)
-    {
-        int ret = walletdb.ReadAtCursor(pcursor, ssKey, ssValue, DB_NEXT);
-        if (ret == DB_NOTFOUND)
-            break;
-        if (ret != 0)
-        {
-            printf("ZapWalletTx: cursor read error %d\n", ret);
-            pcursor->close();
-            return false;
-        }
-
-        std::string strType;
-        ssKey >> strType;
-        if (strType == "tx")
-        {
-            uint256 hash;
-            ssKey >> hash;
-            vTxHash.push_back(hash);
-        }
-    }
-    pcursor->close();
-
-    // Second pass: erase all collected tx entries
-    int nErased = 0;
-    for (const uint256& hash : vTxHash)
-    {
-        if (walletdb.EraseTx(hash))
-            nErased++;
-    }
-
-    printf("ZapWalletTx: erased %d of %d transaction records\n", nErased, (int)vTxHash.size());
-    return true;
-}
@@ -223,7 +223,6 @@ public:
    DBErrors LoadWallet(CWallet* pwallet);
    static bool Recover(CDBEnv& dbenv, std::string filename, bool fOnlyKeys);
    static bool Recover(CDBEnv& dbenv, std::string filename);
-    static bool ZapWalletTx(const std::string& strWalletFile);
 };

 #endif // TRIANGLES_WALLETDB_H
@@ -0,0 +1,605 @@
+TEMPLATE = app
+TARGET = triangles-qt
+
+VERSION = 5.3.9.0
+INCLUDEPATH += src src/json src/qt src/qt/plugins/mrichtexteditor
+DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN BOOST_BIND_GLOBAL_PLACEHOLDERS __NO_SYSTEM_INCLUDES
+CONFIG += no_include_pwd
+CONFIG += thread
+CONFIG += c++17
+
+lessThan(QT_MAJOR_VERSION, 5) {
+    error(Triangles Qt requires Qt 5 or newer)
+}
+
+QT += widgets
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+# UNCOMMENT THIS SECTION TO BUILD ON WINDOWS
+# MSYS2 MinGW64 paths
+win32 {
+    BOOST_LIB_SUFFIX=-mt
+    BOOST_THREAD_LIB_SUFFIX=-mt
+    BOOST_INCLUDE_PATH=C:/msys64/mingw64/include
+    BOOST_LIB_PATH=C:/msys64/mingw64/lib
+    BDB_INCLUDE_PATH=C:/msys64/mingw64/include
+    BDB_LIB_PATH=C:/msys64/mingw64/lib
+    OPENSSL_INCLUDE_PATH=C:/msys64/mingw64/include
+    OPENSSL_LIB_PATH=C:/msys64/mingw64/lib
+    MINIUPNPC_INCLUDE_PATH=C:/msys64/mingw64/include
+    MINIUPNPC_LIB_PATH=C:/msys64/mingw64/lib
+    EVENT_INCLUDE_PATH=C:/msys64/mingw64/include
+    EVENT_LIB_PATH=C:/msys64/mingw64/lib
+}
+
+# for boost 1.37, add -mt to the boost libraries
+# use: qmake BOOST_LIB_SUFFIX=-mt
+# for boost thread win32 with _win32 sufix
+# use: BOOST_THREAD_LIB_SUFFIX=_win32-...
+# or when linking against a specific BerkelyDB version: BDB_LIB_SUFFIX=-4.8
+
+# Dependency library locations can be customized with:
+#    BOOST_INCLUDE_PATH, BOOST_LIB_PATH, BDB_INCLUDE_PATH,
+#    BDB_LIB_PATH, OPENSSL_INCLUDE_PATH and OPENSSL_LIB_PATH respectively
+
+OBJECTS_DIR = build
+MOC_DIR = build
+UI_DIR = build
+
+# use: qmake "RELEASE=1"
+contains(RELEASE, 1) {
+    # Mac: compile for compatibility (macOS 11+)
+    macx:QMAKE_CXXFLAGS += -mmacosx-version-min=11.0
+    macx:QMAKE_LFLAGS += -mmacosx-version-min=11.0
+
+    !windows:!macx {
+        # Linux: static link
+        LIBS += -Wl,-Bstatic
+    }
+}
+
+!win32 {
+# for extra security against potential buffer overflows: enable GCCs Stack Smashing Protection
+QMAKE_CXXFLAGS *= -fstack-protector-all --param ssp-buffer-size=1
+QMAKE_LFLAGS *= -fstack-protector-all --param ssp-buffer-size=1
+# We need to exclude this for Windows cross compile with MinGW 4.2.x, as it will result in a non-working executable!
+# This can be enabled for Windows, when we switch to MinGW >= 4.4.x.
+}
+# for extra security on Windows: enable ASLR and DEP via GCC linker flags
+win32:QMAKE_LFLAGS *= -static
+win32:QMAKE_LFLAGS += -static-libgcc -static-libstdc++
+lessThan(QT_MAJOR_VERSION, 5): win32: QMAKE_LFLAGS *= -static
+
+# use: qmake "USE_QRCODE=1"
+# libqrencode (http://fukuchi.org/works/qrencode/index.en.html) must be installed for support
+contains(USE_QRCODE, 1) {
+    message(Building with QRCode support)
+    DEFINES += USE_QRCODE
+    LIBS += -lqrencode
+}
+
+#triangles: use UPNP with TOR
+USE_UPNP=1
+# use: qmake "USE_UPNP=1" ( enabled by default; default)
+#  or: qmake "USE_UPNP=0" (disabled by default)
+#  or: qmake "USE_UPNP=-" (not supported)
+# miniupnpc (http://miniupnp.free.fr/files/) must be installed for support
+contains(USE_UPNP, -) {
+    message(Building without UPNP support)
+} else {
+    message(Building with UPNP support)
+    count(USE_UPNP, 0) {
+        USE_UPNP=1
+    }
+    DEFINES += USE_UPNP=$$USE_UPNP STATICLIB MINIUPNP_STATICLIB
+    INCLUDEPATH += $$MINIUPNPC_INCLUDE_PATH
+    LIBS += $$join(MINIUPNPC_LIB_PATH,,-L,) -lminiupnpc
+    win32:LIBS += -liphlpapi
+}
+
+# use: qmake "USE_DBUS=1" or qmake "USE_DBUS=0"
+linux:count(USE_DBUS, 0) {
+    USE_DBUS=1
+}
+contains(USE_DBUS, 1) {
+    message(Building with DBUS (Freedesktop notifications) support)
+    DEFINES += USE_DBUS
+    QT += dbus
+}
+
+# use: qmake "USE_IPV6=1" ( enabled by default; default)
+#  or: qmake "USE_IPV6=0" (disabled by default)
+#  or: qmake "USE_IPV6=-" (not supported)
+contains(USE_IPV6, -) {
+    message(Building without IPv6 support)
+} else {
+    count(USE_IPV6, 0) {
+        USE_IPV6=1
+    }
+    DEFINES += USE_IPV6=$$USE_IPV6
+}
+
+contains(TRIANGLES_NEED_QT_PLUGINS, 1) {
+    message(Building with Qt Plugins)
+    DEFINES += TRIANGLES_NEED_QT_PLUGINS
+    QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs qtaccessiblewidgets
+} else {
+    message(Building without Qt Plugins)
+}
+
+INCLUDEPATH += src/leveldb/include src/leveldb/helpers
+LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a
+SOURCES += src/txdb-leveldb.cpp \
+    src/blake.c \
+    src/groestl.c \
+    src/jh.c \
+    src/keccak.c \
+    src/skein.c \
+    src/aes_helper.c \
+    src/bmw.c \
+    src/cubehash.c \
+    src/echo.c \
+    src/fugue.c \
+    src/hamsi.c \
+    src/hamsi_helper.c \
+    src/luffa.c \
+    src/shavite.c \
+    src/simd.c
+
+!win32 {
+    # we use QMAKE_CXXFLAGS_RELEASE even without RELEASE=1 because we use RELEASE to indicate linking preferences not -O preferences
+    genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a
+} else {
+    # make an educated guess about what the ranlib command is called
+    isEmpty(QMAKE_RANLIB) {
+        QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib)
+    }
+    LIBS += -lshlwapi
+    genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a
+}
+genleveldb.target = $$PWD/src/leveldb/libleveldb.a
+genleveldb.depends = FORCE
+PRE_TARGETDEPS += $$PWD/src/leveldb/libleveldb.a
+QMAKE_EXTRA_TARGETS += genleveldb
+# Gross ugly hack that depends on qmake internals, unfortunately there is no other way to do it.
+QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb ; $(MAKE) clean
+
+# regenerate src/build.h
+!windows|contains(USE_BUILD_INFO, 1) {
+    genbuild.depends = FORCE
+    genbuild.commands = cd $$PWD; /bin/sh share/genbuild.sh $$OUT_PWD/build/build.h
+    genbuild.target = $$OUT_PWD/build/build.h
+    PRE_TARGETDEPS += $$OUT_PWD/build/build.h
+    QMAKE_EXTRA_TARGETS += genbuild
+    DEFINES += HAVE_BUILD_INFO
+}
+
+contains(USE_O3, 1) {
+    message(Building O3 optimization flag)
+    QMAKE_CXXFLAGS_RELEASE -= -O2
+    QMAKE_CFLAGS_RELEASE -= -O2
+    QMAKE_CXXFLAGS += -O3
+    QMAKE_CFLAGS += -O3
+}
+
+*-g++-32 {
+    message("32 platform, adding -msse2 flag")
+
+    QMAKE_CXXFLAGS += -msse2
+    QMAKE_CFLAGS += -msse2
+}
+
+QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter -Wstack-protector
+
+
+# Input
+DEPENDPATH += src src/json src/qt
+HEADERS += src/qt/trianglesgui.h \
+    src/qt/transactiontablemodel.h \
+    src/qt/addresstablemodel.h \
+    src/qt/optionsdialog.h \
+    src/qt/coincontroldialog.h \
+    src/qt/coincontroltreewidget.h \
+    src/qt/sendcoinsdialog.h \
+    src/qt/addressbookpage.h \
+    src/qt/aboutdialog.h \
+    src/qt/introdialog.h \
+    src/bootstrap.h \
+    src/qt/editaddressdialog.h \
+    src/qt/trianglesaddressvalidator.h \
+    src/alert.h \
+    src/addrman.h \
+    src/base58.h \
+    src/bignum.h \
+    src/checkpoints.h \
+    src/compat.h \
+    src/coincontrol.h \
+    src/sync.h \
+    src/util.h \
+    src/openssl_compat.h \
+    src/uint256.h \
+    src/kernel.h \
+    src/net_bootstrap.h \
+    src/tor/onion_v3.h \
+    src/tor/tor_process.h \
+    src/tor/tor_embedded.h \
+    src/tor/tor_crypto_compat.h \
+    src/scrypt.h \
+    src/pbkdf2.h \
+    src/serialize.h \
+    src/strlcpy.h \
+    src/smessage.h \
+    src/zmqpublishnotifier.h \
+    src/notificationqueue.h \
+    src/addressindex.h \
+    src/main.h \
+    src/miner.h \
+    src/net.h \
+    src/key.h \
+    src/db.h \
+    src/txdb.h \
+    src/walletdb.h \
+    src/script.h \
+    src/init.h \
+    src/irc.h \
+    src/mruset.h \
+    src/json/json_spirit_writer_template.h \
+    src/json/json_spirit_writer.h \
+    src/json/json_spirit_value.h \
+    src/json/json_spirit_utils.h \
+    src/json/json_spirit_stream_reader.h \
+    src/json/json_spirit_reader_template.h \
+    src/json/json_spirit_reader.h \
+    src/json/json_spirit_error_position.h \
+    src/json/json_spirit.h \
+    src/qt/clientmodel.h \
+    src/qt/guiutil.h \
+    src/qt/transactionrecord.h \
+    src/qt/guiconstants.h \
+    src/qt/optionsmodel.h \
+    src/qt/monitoreddatamapper.h \
+    src/qt/transactiondesc.h \
+    src/qt/transactiondescdialog.h \
+    src/qt/trianglesamountfield.h \
+    src/wallet.h \
+    src/keystore.h \
+    src/qt/transactionfilterproxy.h \
+    src/qt/transactionview.h \
+    src/qt/walletmodel.h \
+    src/tor_embed_hooks.h \
+    src/trianglesrpc.h \
+    src/rest.h \
+    src/qt/overviewpage.h \
+    src/qt/csvmodelwriter.h \
+    src/crypter.h \
+    src/qt/sendcoinsentry.h \
+    src/qt/qvalidatedlineedit.h \
+    src/qt/trianglesunits.h \
+    src/qt/qvaluecombobox.h \
+    src/qt/askpassphrasedialog.h \
+    src/protocol.h \
+    src/qt/notificator.h \
+    src/qt/qtipcserver.h \
+    src/allocators.h \
+    src/ui_interface.h \
+    src/qt/rpcconsole.h \
+    src/version.h \
+    src/netbase.h \
+    src/clientversion.h \
+    src/hashblock.h \
+    src/sph_blake.h \
+    src/sph_groestl.h \
+    src/sph_jh.h \
+    src/sph_keccak.h \
+    src/sph_skein.h \
+    src/sph_types.h \
+    src/qt/messagepage.h \
+    src/qt/dialog_move_handler.h \
+    src/qt/signmessagepage.h \
+    src/qt/verifymessagepage.h \
+    src/qt/messagemodel.h \
+    src/qt/sendmessagesdialog.h \
+    src/qt/sendmessagesentry.h \
+    src/qt/plugins/mrichtexteditor/mrichtextedit.h \
+    src/qt/qvalidatedtextedit.h \
+    src/txdb-leveldb.h \
+    src/onionseed.h \
+    src/sph_bmw.h \
+    src/sph_cubehash.h \
+    src/sph_echo.h \
+    src/sph_fugue.h \
+    src/sph_hamsi.h \
+    src/sph_luffa.h \
+    src/sph_shavite.h \
+    src/sph_simd.h
+
+SOURCES += src/qt/triangles.cpp src/qt/trianglesgui.cpp \
+    src/qt/transactiontablemodel.cpp \
+    src/qt/addresstablemodel.cpp \
+    src/qt/optionsdialog.cpp \
+    src/qt/sendcoinsdialog.cpp \
+    src/qt/coincontroldialog.cpp \
+    src/qt/coincontroltreewidget.cpp \
+    src/qt/addressbookpage.cpp \
+    src/qt/aboutdialog.cpp \
+    src/qt/introdialog.cpp \
+    src/bootstrap.cpp \
+    src/qt/editaddressdialog.cpp \
+    src/qt/trianglesaddressvalidator.cpp \
+    # Old embedded Tor v2 client removed - incompatible with OpenSSL 3.x
+    # Tor v3 onion services handled by onion_v3.cpp via external Tor/SOCKS5
+    src/tor_embed_hooks.cpp \
+    src/alert.cpp \
+    src/version.cpp \
+    src/sync.cpp \
+    src/smessage.cpp \
+    src/lz4/lz4.c \
+    src/util.cpp \
+    src/netbase.cpp \
+    src/key.cpp \
+    src/script.cpp \
+    src/main.cpp \
+    src/miner.cpp \
+    src/init.cpp \
+    src/net.cpp \
+    src/irc.cpp \
+    src/checkpoints.cpp \
+    src/addrman.cpp \
+    src/db.cpp \
+    src/walletdb.cpp \
+    src/qt/clientmodel.cpp \
+    src/qt/guiutil.cpp \
+    src/qt/transactionrecord.cpp \
+    src/qt/optionsmodel.cpp \
+    src/qt/monitoreddatamapper.cpp \
+    src/qt/transactiondesc.cpp \
+    src/qt/transactiondescdialog.cpp \
+    src/qt/trianglesstrings.cpp \
+    src/qt/trianglesamountfield.cpp \
+    src/wallet.cpp \
+    src/keystore.cpp \
+    src/qt/transactionfilterproxy.cpp \
+    src/qt/transactionview.cpp \
+    src/qt/walletmodel.cpp \
+    src/trianglesrpc.cpp \
+    src/rest.cpp \
+    src/rpcdump.cpp \
+    src/rpcnet.cpp \
+    src/rpcmining.cpp \
+    src/rpcwallet.cpp \
+    src/rpcblockchain.cpp \
+    src/rpcrawtransaction.cpp \
+    src/rpcsmessage.cpp \
+    src/zmqpublishnotifier.cpp \
+    src/qt/overviewpage.cpp \
+    src/qt/csvmodelwriter.cpp \
+    src/crypter.cpp \
+    src/qt/sendcoinsentry.cpp \
+    src/qt/qvalidatedlineedit.cpp \
+    src/qt/trianglesunits.cpp \
+    src/qt/qvaluecombobox.cpp \
+    src/qt/askpassphrasedialog.cpp \
+    src/protocol.cpp \
+    src/qt/notificator.cpp \
+    src/qt/qtipcserver.cpp \
+    src/qt/rpcconsole.cpp \
+    src/qt/messagepage.cpp \
+    src/qt/dialog_move_handler.cpp \
+    src/qt/signmessagepage.cpp \
+    src/qt/verifymessagepage.cpp \
+    src/qt/messagemodel.cpp \
+    src/qt/sendmessagesdialog.cpp \
+    src/qt/sendmessagesentry.cpp \
+    src/qt/qvalidatedtextedit.cpp \
+    src/qt/plugins/mrichtexteditor/mrichtextedit.cpp \
+    src/noui.cpp \
+    src/kernel.cpp \
+    src/net_bootstrap.cpp \
+    src/tor/onion_v3.cpp \
+    src/tor/tor_process.cpp \
+    src/tor/tor_embedded.cpp \
+    src/scrypt-arm.S \
+    src/scrypt-x86.S \
+    src/scrypt-x86_64.S \
+    src/scrypt.cpp \
+    src/pbkdf2.cpp
+
+RESOURCES += \
+    src/qt/triangles.qrc
+
+FORMS += \
+    src/qt/forms/coincontroldialog.ui \
+    src/qt/forms/sendcoinsdialog.ui \
+    src/qt/forms/addressbookpage.ui \
+    src/qt/forms/aboutdialog.ui \
+    src/qt/forms/editaddressdialog.ui \
+    src/qt/forms/transactiondescdialog.ui \
+    src/qt/forms/overviewpage.ui \
+    src/qt/forms/sendcoinsentry.ui \
+    src/qt/forms/askpassphrasedialog.ui \
+    src/qt/forms/rpcconsole.ui \
+    src/qt/forms/optionsdialog.ui \
+    src/qt/forms/messagepage.ui \
+    src/qt/forms/sendmessagesentry.ui \
+    src/qt/forms/sendmessagesdialog.ui \
+    src/qt/plugins/mrichtexteditor/mrichtextedit.ui \
+    src/qt/forms/mainwindow.ui \
+    src/qt/forms/signmessagepage.ui \
+    src/qt/forms/verifymessagepage.ui \
+    src/qt/forms/transactionspage.ui 
+
+
+contains(USE_QRCODE, 1) {
+HEADERS += src/qt/qrcodedialog.h
+SOURCES += src/qt/qrcodedialog.cpp
+FORMS += src/qt/forms/qrcodedialog.ui
+}
+
+CODECFORTR = UTF-8
+
+# for lrelease/lupdate
+# also add new translations to src/qt/triangles.qrc under translations/
+TRANSLATIONS = $$files(src/qt/locale/triangles_*.ts)
+
+isEmpty(QMAKE_LRELEASE) {
+    win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
+    else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
+}
+isEmpty(QM_DIR):QM_DIR = $$PWD/src/qt/locale
+# automatically build translations, so they can be included in resource file
+TSQM.name = lrelease ${QMAKE_FILE_IN}
+TSQM.input = TRANSLATIONS
+TSQM.output = $$QM_DIR/${QMAKE_FILE_BASE}.qm
+TSQM.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
+TSQM.CONFIG = no_link
+QMAKE_EXTRA_COMPILERS += TSQM
+
+# "Other files" to show in Qt Creator
+OTHER_FILES += \
+    doc/*.rst doc/*.txt doc/README README.md res/triangles-qt.rc
+
+# platform specific defaults, if not overridden on command line
+isEmpty(BOOST_LIB_SUFFIX) {
+    macx:BOOST_LIB_SUFFIX =
+    windows:BOOST_LIB_SUFFIX = -mt
+}
+
+isEmpty(BOOST_THREAD_LIB_SUFFIX) {
+    BOOST_THREAD_LIB_SUFFIX = $$BOOST_LIB_SUFFIX
+}
+
+isEmpty(BDB_LIB_PATH) {
+    macx:BDB_LIB_PATH = /opt/homebrew/opt/berkeley-db@5/lib
+}
+
+isEmpty(BDB_LIB_SUFFIX) {
+    macx:BDB_LIB_SUFFIX =
+}
+
+isEmpty(BDB_INCLUDE_PATH) {
+    macx:BDB_INCLUDE_PATH = /opt/homebrew/opt/berkeley-db@5/include
+}
+
+isEmpty(BOOST_LIB_PATH) {
+    macx:BOOST_LIB_PATH = /opt/homebrew/opt/boost/lib
+}
+
+isEmpty(BOOST_INCLUDE_PATH) {
+    macx:BOOST_INCLUDE_PATH = /opt/homebrew/opt/boost/include
+}
+
+windows:DEFINES += WIN32
+windows:RC_FILE = src/qt/res/triangles-qt.rc
+
+windows:!contains(MINGW_THREAD_BUGFIX, 0) {
+    # At least qmake's win32-g++-cross profile is missing the -lmingwthrd
+    # thread-safety flag. GCC has -mthreads to enable this, but it doesn't
+    # work with static linking. -lmingwthrd must come BEFORE -lmingw, so
+    # it is prepended to QMAKE_LIBS_QT_ENTRY.
+    # It can be turned off with MINGW_THREAD_BUGFIX=0, just in case it causes
+    # any problems on some untested qmake profile now or in the future.
+    DEFINES += _MT
+    QMAKE_LIBS_QT_ENTRY = -lmingwthrd $$QMAKE_LIBS_QT_ENTRY
+}
+
+!windows:!macx {
+    DEFINES += LINUX
+    LIBS += -lrt
+}
+
+macx:HEADERS += src/qt/macdockiconhandler.h \
+                src/qt/macnotificationhandler.h
+macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm \
+                          src/qt/macnotificationhandler.mm
+
+macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
+macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0
+macx:ICON = src/qt/res/icons/triangles.icns
+macx:TARGET = "Triangles-Qt"
+macx:QMAKE_CFLAGS_THREAD += -pthread
+macx:QMAKE_LFLAGS_THREAD += -pthread
+macx:QMAKE_CXXFLAGS_THREAD += -pthread
+macx:QMAKE_CXXFLAGS += -Wno-reserved-user-defined-literal -Wno-deprecated-declarations
+
+# Set libraries and includes at end, to use platform-defined defaults if not overridden
+#$$join(ADDITIONAL_LIBS_PATH,,-L,)
+INCLUDEPATH +=  $$BOOST_INCLUDE_PATH \
+                $$BDB_INCLUDE_PATH \
+                $$OPENSSL_INCLUDE_PATH \
+                #$$QRENCODE_INCLUDE_PATH \
+                $$EVENT_INCLUDE_PATH
+
+LIBS += $$join(BOOST_LIB_PATH,,-L,) \
+        $$join(BDB_LIB_PATH,,-L,) \
+        $$join(OPENSSL_LIB_PATH,,-L,) \
+        #$$join(QRENCODE_LIB_PATH,,-L,) \
+        $$join(EVENT_LIB_PATH,,-L,)
+
+LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX 
+LIBS += -levent -lz
+# -lgdi32 has to happen after -lcrypto (see  #681)
+windows:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32 -lcrypt32
+
+LIBS += -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX
+LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
+
+contains(RELEASE, 1) {
+    !windows:!macx {
+        # Linux: turn dynamic linking back on for c/c++ runtime libraries
+        LIBS += -Wl,-Bdynamic
+    }
+}
+
+# ZMQ support (optional)
+# Build with: qmake "USE_ZMQ=1"
+contains(USE_ZMQ, 1) {
+    message(Building with ZMQ support)
+    DEFINES += ENABLE_ZMQ
+    LIBS += -lzmq
+}
+
+# Embedded Tor support (optional)
+# Build with:
+#   qmake "USE_TOR_EMBEDDED=1" "TOR_SOURCE_ROOT=src/tor/tor-src"
+contains(USE_TOR_EMBEDDED, 1) {
+    message(Building with embedded Tor support)
+    DEFINES += ENABLE_TOR_EMBEDDED
+
+    isEmpty(TOR_SOURCE_ROOT) {
+        TOR_SOURCE_ROOT = src/tor/tor-src
+    }
+
+    isEmpty(TOR_INCLUDE_PATH) {
+        TOR_INCLUDE_PATH = $$TOR_SOURCE_ROOT/src/feature/api
+    }
+
+    isEmpty(TOR_LIB_PATH) {
+        TOR_LIB_PATH = $$TOR_SOURCE_ROOT
+    }
+
+    !isEmpty(TOR_INCLUDE_PATH) {
+        INCLUDEPATH += $$TOR_INCLUDE_PATH
+    }
+
+    for(path, TOR_LIB_PATH) {
+        LIBS += -L$$path
+    }
+
+    # Default static library set for the imported Tor 0.4.9.x tree.
+    # A full upstream build emits a top-level libtor.a aggregator.
+    # Override with TOR_EMBEDDED_LIBS from the qmake command line if needed.
+    isEmpty(TOR_EMBEDDED_LIBS) {
+        TOR_EMBEDDED_LIBS = -ltor
+    }
+
+    unix {
+        LIBS += -Wl,--start-group $$TOR_EMBEDDED_LIBS -Wl,--end-group
+    } else {
+        LIBS += $$TOR_EMBEDDED_LIBS
+    }
+
+    LIBS += -llzma -lzstd
+    windows:LIBS += -liphlpapi
+}
+
+system($$QMAKE_LRELEASE -silent $$_PRO_FILE_)
@@ -0,0 +1,588 @@
+TEMPLATE = app
+TARGET = triangles-qt
+
+VERSION = 4.2.1.0
+INCLUDEPATH += src src/json src/qt src/qt/plugins/mrichtexteditor
+DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN __NO_SYSTEM_INCLUDES
+CONFIG += no_include_pwd
+CONFIG += thread
+
+QMAKE_CXXFLAGS = -fpermissive
+
+greaterThan(QT_MAJOR_VERSION, 4) {
+    QT += widgets
+    DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+}
+
+#INCLUDEPATH += /usr/include/i386-linux-gnu
+INCLUDEPATH += /opt/mxe/usr/i686-pc-mingw32.static/include
+LIBS_PATH=/opt/mxe/usr/i686-pc-mingw32.static/lib
+LIBS += $$join(LIBS_PATH,,-L,)
+
+# for boost 1.37, add -mt to the boost libraries
+# use: qmake BOOST_LIB_SUFFIX=-mt
+# for boost thread win32 with _win32 sufix
+# use: BOOST_THREAD_LIB_SUFFIX=_win32-...
+# or when linking against a specific BerkelyDB version: BDB_LIB_SUFFIX=-4.8
+
+# Dependency library locations can be customized with:
+#    BOOST_INCLUDE_PATH, BOOST_LIB_PATH, BDB_INCLUDE_PATH,
+#    BDB_LIB_PATH, OPENSSL_INCLUDE_PATH and OPENSSL_LIB_PATH respectively
+
+OBJECTS_DIR = build
+MOC_DIR = build
+UI_DIR = build
+
+# use: qmake "RELEASE=1"
+contains(RELEASE, 1) {
+    # Mac: compile for maximum compatibility (10.5, 32-bit)
+    macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.5 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk
+
+    !windows:!macx {
+        # Linux: static link
+        LIBS += -Wl,-Bstatic
+    }
+}
+
+!win32 {
+# for extra security against potential buffer overflows: enable GCCs Stack Smashing Protection
+QMAKE_CXXFLAGS *= -fstack-protector-all --param ssp-buffer-size=1
+QMAKE_LFLAGS *= -fstack-protector-all --param ssp-buffer-size=1
+# We need to exclude this for Windows cross compile with MinGW 4.2.x, as it will result in a non-working executable!
+# This can be enabled for Windows, when we switch to MinGW >= 4.4.x.
+}
+# for extra security on Windows: enable ASLR and DEP via GCC linker flags
+win32:QMAKE_LFLAGS *= -Wl,--large-address-aware -static
+win32:QMAKE_LFLAGS += -static-libgcc -static-libstdc++
+lessThan(QT_MAJOR_VERSION, 5): win32: QMAKE_LFLAGS *= -static
+
+# use: qmake "USE_QRCODE=1"
+# libqrencode (http://fukuchi.org/works/qrencode/index.en.html) must be installed for support
+contains(USE_QRCODE, 1) {
+    message(Building with QRCode support)
+    DEFINES += USE_QRCODE
+    LIBS += -lqrencode
+}
+
+#triangles: use UPNP with TOR
+USE_UPNP=1
+# use: qmake "USE_UPNP=1" ( enabled by default; default)
+#  or: qmake "USE_UPNP=0" (disabled by default)
+#  or: qmake "USE_UPNP=-" (not supported)
+# miniupnpc (http://miniupnp.free.fr/files/) must be installed for support
+contains(USE_UPNP, -) {
+    message(Building without UPNP support)
+} else {
+    message(Building with UPNP support)
+    count(USE_UPNP, 0) {
+        USE_UPNP=1
+    }
+    DEFINES += USE_UPNP=$$USE_UPNP STATICLIB
+    INCLUDEPATH += $$MINIUPNPC_INCLUDE_PATH
+    LIBS += $$join(MINIUPNPC_LIB_PATH,,-L,) -lminiupnpc
+    win32:LIBS += -liphlpapi
+}
+
+
+# use: qmake "USE_DBUS=1"
+contains(USE_DBUS, 1) {
+    message(Building with DBUS (Freedesktop notifications) support)
+    DEFINES += USE_DBUS
+    QT += dbus
+}
+
+# use: qmake "USE_IPV6=1" ( enabled by default; default)
+#  or: qmake "USE_IPV6=0" (disabled by default)
+#  or: qmake "USE_IPV6=-" (not supported)
+contains(USE_IPV6, -) {
+    message(Building without IPv6 support)
+} else {
+    count(USE_IPV6, 0) {
+        USE_IPV6=1
+    }
+    DEFINES += USE_IPV6=$$USE_IPV6
+}
+
+contains(TRIANGLES_NEED_QT_PLUGINS, 1) {
+    message(Building with Qt Plugins)
+    DEFINES += TRIANGLES_NEED_QT_PLUGINS
+    QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs qtaccessiblewidgets
+} else {
+    message(Building without Qt Plugins)
+}
+
+INCLUDEPATH += src/leveldb/include src/leveldb/helpers
+LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a
+SOURCES += src/txdb-leveldb.cpp \
+    src/blake.c \
+    src/groestl.c \
+    src/jh.c \
+    src/keccak.c \
+    src/skein.c \
+    src/aes_helper.c \
+    src/bmw.c \
+    src/cubehash.c \
+    src/echo.c \
+    src/fugue.c \
+    src/hamsi.c \
+    src/hamsi_helper.c \
+    src/luffa.c \
+    src/shavite.c \
+    src/simd.c
+
+!win32 {
+    # we use QMAKE_CXXFLAGS_RELEASE even without RELEASE=1 because we use RELEASE to indicate linking preferences not -O preferences
+    genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a
+} else {
+    # make an educated guess about what the ranlib command is called
+    isEmpty(QMAKE_RANLIB) {
+        QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib)
+    }
+    LIBS += -lshlwapi
+    genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a
+}
+genleveldb.target = $$PWD/src/leveldb/libleveldb.a
+genleveldb.depends = FORCE
+PRE_TARGETDEPS += $$PWD/src/leveldb/libleveldb.a
+QMAKE_EXTRA_TARGETS += genleveldb
+# Gross ugly hack that depends on qmake internals, unfortunately there is no other way to do it.
+QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb ; $(MAKE) clean
+
+# regenerate src/build.h
+!windows|contains(USE_BUILD_INFO, 1) {
+    genbuild.depends = FORCE
+    genbuild.commands = cd $$PWD; /bin/sh share/genbuild.sh $$OUT_PWD/build/build.h
+    genbuild.target = $$OUT_PWD/build/build.h
+    PRE_TARGETDEPS += $$OUT_PWD/build/build.h
+    QMAKE_EXTRA_TARGETS += genbuild
+    DEFINES += HAVE_BUILD_INFO
+}
+
+contains(USE_O3, 1) {
+    message(Building O3 optimization flag)
+    QMAKE_CXXFLAGS_RELEASE -= -O2
+    QMAKE_CFLAGS_RELEASE -= -O2
+    QMAKE_CXXFLAGS += -O3
+    QMAKE_CFLAGS += -O3
+}
+
+win32-g++ {
+    message("32 platform, adding -msse2 flag")
+
+    QMAKE_CXXFLAGS += -msse2
+    QMAKE_CFLAGS += -msse2
+}
+
+QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter -Wstack-protector
+
+
+# Input
+DEPENDPATH += src src/json src/qt
+HEADERS += src/qt/trianglesgui.h \
+    src/qt/transactiontablemodel.h \
+    src/qt/addresstablemodel.h \
+    src/qt/optionsdialog.h \
+    src/qt/coincontroldialog.h \
+    src/qt/coincontroltreewidget.h \
+    src/qt/sendcoinsdialog.h \
+    src/qt/addressbookpage.h \
+    src/qt/aboutdialog.h \
+    src/qt/editaddressdialog.h \
+    src/qt/trianglesaddressvalidator.h \
+    src/alert.h \
+    src/addrman.h \
+    src/base58.h \
+    src/bignum.h \
+    src/checkpoints.h \
+    src/compat.h \
+    src/coincontrol.h \
+    src/sync.h \
+    src/util.h \
+    src/uint256.h \
+    src/kernel.h \
+    src/scrypt.h \
+    src/pbkdf2.h \
+    src/serialize.h \
+    src/strlcpy.h \
+    src/smessage.h \
+    src/main.h \
+    src/miner.h \
+    src/net.h \
+    src/key.h \
+    src/db.h \
+    src/txdb.h \
+    src/walletdb.h \
+    src/script.h \
+    src/init.h \
+    src/irc.h \
+    src/mruset.h \
+    src/json/json_spirit_writer_template.h \
+    src/json/json_spirit_writer.h \
+    src/json/json_spirit_value.h \
+    src/json/json_spirit_utils.h \
+    src/json/json_spirit_stream_reader.h \
+    src/json/json_spirit_reader_template.h \
+    src/json/json_spirit_reader.h \
+    src/json/json_spirit_error_position.h \
+    src/json/json_spirit.h \
+    src/qt/clientmodel.h \
+    src/qt/guiutil.h \
+    src/qt/transactionrecord.h \
+    src/qt/guiconstants.h \
+    src/qt/optionsmodel.h \
+    src/qt/monitoreddatamapper.h \
+    src/qt/transactiondesc.h \
+    src/qt/transactiondescdialog.h \
+    src/qt/trianglesamountfield.h \
+    src/wallet.h \
+    src/keystore.h \
+    src/qt/transactionfilterproxy.h \
+    src/qt/transactionview.h \
+    src/qt/walletmodel.h \
+    src/trianglesrpc.h \
+    src/qt/overviewpage.h \
+    src/qt/csvmodelwriter.h \
+    src/crypter.h \
+    src/qt/sendcoinsentry.h \
+    src/qt/qvalidatedlineedit.h \
+    src/qt/trianglesunits.h \
+    src/qt/qvaluecombobox.h \
+    src/qt/askpassphrasedialog.h \
+    src/protocol.h \
+    src/qt/notificator.h \
+    src/qt/qtipcserver.h \
+    src/allocators.h \
+    src/ui_interface.h \
+    src/qt/rpcconsole.h \
+    src/version.h \
+    src/netbase.h \
+    src/clientversion.h \
+    src/hashblock.h \
+    src/sph_blake.h \
+    src/sph_groestl.h \
+    src/sph_jh.h \
+    src/sph_keccak.h \
+    src/sph_skein.h \
+    src/sph_types.h \
+    src/qt/messagepage.h \
+    src/qt/dialog_move_handler.h \
+    src/qt/signmessagepage.h \
+    src/qt/verifymessagepage.h \
+    src/qt/messagemodel.h \
+    src/qt/sendmessagesdialog.h \
+    src/qt/sendmessagesentry.h \
+    src/qt/plugins/mrichtexteditor/mrichtextedit.h \
+    src/qt/qvalidatedtextedit.h \
+    src/txdb-leveldb.h \
+    src/onionseed.h \
+    src/sph_bmw.h \
+    src/sph_cubehash.h \
+    src/sph_echo.h \
+    src/sph_fugue.h \
+    src/sph_hamsi.h \
+    src/sph_luffa.h \
+    src/sph_shavite.h \
+    src/sph_simd.h
+
+SOURCES += src/qt/triangles.cpp src/qt/trianglesgui.cpp \
+    src/qt/transactiontablemodel.cpp \
+    src/qt/addresstablemodel.cpp \
+    src/qt/optionsdialog.cpp \
+    src/qt/sendcoinsdialog.cpp \
+    src/qt/coincontroldialog.cpp \
+    src/qt/coincontroltreewidget.cpp \
+    src/qt/addressbookpage.cpp \
+    src/qt/aboutdialog.cpp \
+    src/qt/editaddressdialog.cpp \
+    src/qt/trianglesaddressvalidator.cpp \
+    src/tor/address.c \
+    src/tor/addressmap.c \
+    src/tor/aes.c \
+    src/tor/backtrace.c \
+    src/tor/buffers.c \
+    src/tor/channel.c \
+    src/tor/channeltls.c \
+    src/tor/circpathbias.c \
+    src/tor/circuitbuild.c \
+    src/tor/circuitlist.c \
+    src/tor/circuitmux.c \
+    src/tor/circuitmux_ewma.c \
+    src/tor/circuitstats.c \
+    src/tor/circuituse.c \
+    src/tor/command.c \
+    src/tor/compat.c \
+    src/tor/compat_libevent.c \
+    src/tor/config.c \
+    src/tor/config_codedigest.c \
+    src/tor/confparse.c \
+    src/tor/connection.c \
+    src/tor/connection_edge.c \
+    src/tor/connection_or.c \
+    src/tor/container.c \
+    src/tor/control.c \
+    src/tor/cpuworker.c \
+    src/tor/crypto.c \
+    src/tor/crypto_curve25519.c \
+    src/tor/crypto_format.c \
+    src/tor/curve25519-donna.c \
+    src/tor/di_ops.c \
+    src/tor/directory.c \
+    src/tor/dirserv.c \
+    src/tor/dirvote.c \
+    src/tor/dns.c \
+    src/tor/dnsserv.c \
+    src/tor/entrynodes.c \
+    src/tor/ext_orport.c \
+    src/tor/fp_pair.c \
+    src/tor/geoip.c \
+    src/tor/hibernate.c \
+    src/tor/log.c \
+    src/tor/memarea.c \
+    src/tor/mempool.c \
+    src/tor/microdesc.c \
+    src/tor/networkstatus.c \
+    src/tor/nodelist.c \
+    src/tor/onion.c \
+    src/tor/onion_fast.c \
+    src/tor/onion_main.c \
+    src/tor/onion_ntor.c \
+    src/tor/onion_tap.c \
+    src/tor/policies.c \
+    src/tor/anonymize.cpp \
+    src/tor/procmon.c \
+    src/tor/reasons.c \
+    src/tor/relay.c \
+    src/tor/rendclient.c \
+    src/tor/rendcommon.c \
+    src/tor/rendmid.c \
+    src/tor/rendservice.c \
+    src/tor/rephist.c \
+    src/tor/replaycache.c \
+    src/tor/router.c \
+    src/tor/routerlist.c \
+    src/tor/routerparse.c \
+    src/tor/routerset.c \
+    src/tor/sandbox.c \
+    src/tor/statefile.c \
+    src/tor/status.c \
+    src/tor/strlcat.c \
+    src/tor/strlcpy.c \
+    src/tor/tor_util.c \
+    src/tor/torgzip.c \
+    src/tor/tortls.c \
+    src/tor/transports.c \
+    src/tor/util_codedigest.c \
+    src/alert.cpp \
+    src/version.cpp \
+    src/sync.cpp \
+    src/smessage.cpp \
+    src/util.cpp \
+    src/netbase.cpp \
+    src/key.cpp \
+    src/script.cpp \
+    src/main.cpp \
+    src/miner.cpp \
+    src/init.cpp \
+    src/net.cpp \
+    src/irc.cpp \
+    src/checkpoints.cpp \
+    src/addrman.cpp \
+    src/db.cpp \
+    src/walletdb.cpp \
+    src/qt/clientmodel.cpp \
+    src/qt/guiutil.cpp \
+    src/qt/transactionrecord.cpp \
+    src/qt/optionsmodel.cpp \
+    src/qt/monitoreddatamapper.cpp \
+    src/qt/transactiondesc.cpp \
+    src/qt/transactiondescdialog.cpp \
+    src/qt/trianglesstrings.cpp \
+    src/qt/trianglesamountfield.cpp \
+    src/wallet.cpp \
+    src/keystore.cpp \
+    src/qt/transactionfilterproxy.cpp \
+    src/qt/transactionview.cpp \
+    src/qt/walletmodel.cpp \
+    src/trianglesrpc.cpp \
+    src/rpcdump.cpp \
+    src/rpcnet.cpp \
+    src/rpcmining.cpp \
+    src/rpcwallet.cpp \
+    src/rpcblockchain.cpp \
+    src/rpcrawtransaction.cpp \
+    src/rpcsmessage.cpp \
+    src/qt/overviewpage.cpp \
+    src/qt/csvmodelwriter.cpp \
+    src/crypter.cpp \
+    src/qt/sendcoinsentry.cpp \
+    src/qt/qvalidatedlineedit.cpp \
+    src/qt/trianglesunits.cpp \
+    src/qt/qvaluecombobox.cpp \
+    src/qt/askpassphrasedialog.cpp \
+    src/protocol.cpp \
+    src/qt/notificator.cpp \
+    src/qt/qtipcserver.cpp \
+    src/qt/rpcconsole.cpp \
+    src/qt/messagepage.cpp \
+    src/qt/dialog_move_handler.cpp \
+    src/qt/signmessagepage.cpp \
+    src/qt/verifymessagepage.cpp \
+    src/qt/messagemodel.cpp \
+    src/qt/sendmessagesdialog.cpp \
+    src/qt/sendmessagesentry.cpp \
+    src/qt/qvalidatedtextedit.cpp \
+    src/qt/plugins/mrichtexteditor/mrichtextedit.cpp \
+    src/noui.cpp \
+    src/kernel.cpp \
+    src/scrypt-arm.S \
+    src/scrypt-x86.S \
+    src/scrypt-x86_64.S \
+    src/scrypt.cpp \
+    src/pbkdf2.cpp
+
+RESOURCES += \
+    src/qt/triangles.qrc
+
+FORMS += \
+    src/qt/forms/coincontroldialog.ui \
+    src/qt/forms/sendcoinsdialog.ui \
+    src/qt/forms/addressbookpage.ui \
+    src/qt/forms/aboutdialog.ui \
+    src/qt/forms/editaddressdialog.ui \
+    src/qt/forms/transactiondescdialog.ui \
+    src/qt/forms/overviewpage.ui \
+    src/qt/forms/sendcoinsentry.ui \
+    src/qt/forms/askpassphrasedialog.ui \
+    src/qt/forms/rpcconsole.ui \
+    src/qt/forms/optionsdialog.ui \
+    src/qt/forms/messagepage.ui \
+    src/qt/forms/sendmessagesentry.ui \
+    src/qt/forms/sendmessagesdialog.ui \
+    src/qt/plugins/mrichtexteditor/mrichtextedit.ui \
+    src/qt/forms/mainwindow.ui \
+    src/qt/forms/signmessagepage.ui \
+    src/qt/forms/verifymessagepage.ui \
+    src/qt/forms/transactionspage.ui 
+
+
+contains(USE_QRCODE, 1) {
+HEADERS += src/qt/qrcodedialog.h
+SOURCES += src/qt/qrcodedialog.cpp
+FORMS += src/qt/forms/qrcodedialog.ui
+}
+
+CODECFORTR = UTF-8
+
+# for lrelease/lupdate
+# also add new translations to src/qt/triangles.qrc under translations/
+TRANSLATIONS = $$files(src/qt/locale/triangles_*.ts)
+
+isEmpty(QMAKE_LRELEASE) {
+    win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
+    else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
+}
+isEmpty(QM_DIR):QM_DIR = $$PWD/src/qt/locale
+# automatically build translations, so they can be included in resource file
+TSQM.name = lrelease ${QMAKE_FILE_IN}
+TSQM.input = TRANSLATIONS
+TSQM.output = $$QM_DIR/${QMAKE_FILE_BASE}.qm
+TSQM.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
+TSQM.CONFIG = no_link
+QMAKE_EXTRA_COMPILERS += TSQM
+
+# "Other files" to show in Qt Creator
+OTHER_FILES += \
+    doc/*.rst doc/*.txt doc/README README.md res/triangles-qt.rc
+
+# platform specific defaults, if not overridden on command line
+isEmpty(BOOST_LIB_SUFFIX) {
+    macx:BOOST_LIB_SUFFIX = -mt
+    windows:BOOST_LIB_SUFFIX = -mt
+}
+
+isEmpty(BOOST_THREAD_LIB_SUFFIX) {
+    win32:BOOST_THREAD_LIB_SUFFIX = _win32$$BOOST_LIB_SUFFIX
+    else:BOOST_THREAD_LIB_SUFFIX = $$BOOST_LIB_SUFFIX
+}
+
+isEmpty(BDB_LIB_PATH) {
+    macx:BDB_LIB_PATH = /opt/local/lib/db48
+}
+
+isEmpty(BDB_LIB_SUFFIX) {
+    macx:BDB_LIB_SUFFIX = -4.8
+}
+
+isEmpty(BDB_INCLUDE_PATH) {
+    macx:BDB_INCLUDE_PATH = /opt/local/include/db48
+}
+
+isEmpty(BOOST_LIB_PATH) {
+    macx:BOOST_LIB_PATH = /opt/local/lib
+}
+
+isEmpty(BOOST_INCLUDE_PATH) {
+    macx:BOOST_INCLUDE_PATH = /opt/local/include
+}
+
+windows:DEFINES += WIN32
+windows:RC_FILE = src/qt/res/triangles-qt.rc
+
+windows:!contains(MINGW_THREAD_BUGFIX, 0) {
+    # At least qmake's win32-g++-cross profile is missing the -lmingwthrd
+    # thread-safety flag. GCC has -mthreads to enable this, but it doesn't
+    # work with static linking. -lmingwthrd must come BEFORE -lmingw, so
+    # it is prepended to QMAKE_LIBS_QT_ENTRY.
+    # It can be turned off with MINGW_THREAD_BUGFIX=0, just in case it causes
+    # any problems on some untested qmake profile now or in the future.
+    DEFINES += _MT
+    QMAKE_LIBS_QT_ENTRY = -lmingwthrd $$QMAKE_LIBS_QT_ENTRY
+}
+
+!windows:!macx {
+    DEFINES += LINUX
+    LIBS += -lrt
+}
+
+macx:HEADERS += src/qt/macdockiconhandler.h \
+                src/qt/macnotificationhandler.h
+macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm \
+                          src/qt/macnotificationhandler.mm
+macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
+macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0
+macx:ICON = src/qt/res/icons/triangles.icns
+macx:TARGET = "Triangles-Qt"
+macx:QMAKE_CFLAGS_THREAD += -pthread
+macx:QMAKE_LFLAGS_THREAD += -pthread
+macx:QMAKE_CXXFLAGS_THREAD += -pthread
+
+# Set libraries and includes at end, to use platform-defined defaults if not overridden
+#$$join(ADDITIONAL_LIBS_PATH,,-L,)
+INCLUDEPATH +=  $$BOOST_INCLUDE_PATH \
+                $$BDB_INCLUDE_PATH \
+                $$OPENSSL_INCLUDE_PATH \
+                #$$QRENCODE_INCLUDE_PATH \
+                $$EVENT_INCLUDE_PATH
+
+LIBS += $$join(BOOST_LIB_PATH,,-L,) \
+        $$join(BDB_LIB_PATH,,-L,) \
+        $$join(OPENSSL_LIB_PATH,,-L,) \
+        #$$join(QRENCODE_LIB_PATH,,-L,) \
+        $$join(EVENT_LIB_PATH,,-L,)
+
+LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX 
+LIBS += -levent -lz
+# -lgdi32 has to happen after -lcrypto (see  #681)
+windows:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32
+
+LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX
+windows:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
+
+contains(RELEASE, 1) {
+    !windows:!macx {
+        # Linux: turn dynamic linking back on for c/c++ runtime libraries
+        LIBS += -Wl,-Bdynamic
+    }
+}
+
+system($$QMAKE_LRELEASE -silent $$_PRO_FILE_)