Merge branch 'master' of https://github.com/SamiAhmed7777/triangles_v5

# Conflicts:
#	src/tor/build-libtor.sh

.github/workflows/build-all.yml

@@ -22,7 +22,15 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y build-essential cmake ninja-build \
             libboost-all-dev libssl-dev libdb++-dev libleveldb-dev \
-            librocksdb-dev libevent-dev libminiupnpc-dev zlib1g-dev
+            libevent-dev libminiupnpc-dev zlib1g-dev \
+            libsnappy-dev liblz4-dev libzstd-dev
+
+      - name: Build RocksDB from source
+        # Ubuntu 22.04's librocksdb-dev is 6.11.4 which CMakeLists.txt now
+        # refuses to configure against (need >= 7.4 for XXH3 per-block
+        # checksum). Build 8.9.1 from source — same version DNS2 ships —
+        # into /usr/local so CMake's find_library picks it up first.
+        run: sudo bash scripts/ci/build-rocksdb.sh
 
       - name: Configure
         run: |
@@ -104,7 +112,11 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y build-essential cmake ninja-build \
             libboost-all-dev libssl-dev libdb++-dev libleveldb-dev \
-            librocksdb-dev libevent-dev libminiupnpc-dev zlib1g-dev
+            libevent-dev libminiupnpc-dev zlib1g-dev \
+            libsnappy-dev liblz4-dev libzstd-dev
+
+      - name: Build RocksDB from source
+        run: sudo bash scripts/ci/build-rocksdb.sh
 
       - name: Configure with sanitizers
         run: |
@@ -389,7 +401,11 @@ jobs:
           sudo apt-get install -y build-essential cmake ninja-build \
             qtbase5-dev qttools5-dev-tools \
             libboost-all-dev libssl-dev libdb++-dev \
-            libleveldb-dev librocksdb-dev libevent-dev libminiupnpc-dev zlib1g-dev
+            libleveldb-dev libevent-dev libminiupnpc-dev zlib1g-dev \
+            libsnappy-dev liblz4-dev libzstd-dev
+
+      - name: Build RocksDB from source
+        run: sudo bash scripts/ci/build-rocksdb.sh
 
       - name: Configure
         run: |
@@ -516,7 +532,11 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y build-essential cmake ninja-build \
             libboost-all-dev libssl-dev libdb++-dev libleveldb-dev \
-            librocksdb-dev libevent-dev libminiupnpc-dev zlib1g-dev
+            libevent-dev libminiupnpc-dev zlib1g-dev \
+            libsnappy-dev liblz4-dev libzstd-dev
+
+      - name: Build RocksDB from source
+        run: sudo bash scripts/ci/build-rocksdb.sh
 
       - name: Configure
         run: |
@@ -576,9 +596,14 @@ jobs:
 
       - name: Install dependencies
         run: |
-          brew install cmake ninja qt@5 openssl@3 boost berkeley-db@5 leveldb rocksdb libevent miniupnpc
+          brew install cmake ninja qt@5 openssl@3 boost berkeley-db@5 leveldb rocksdb libevent miniupnpc zstd
 
       - name: Configure
+        # Add -L/opt/homebrew/lib to the link line so rocksdb's
+        # transitive -lzstd resolves. /opt/homebrew/lib is only in the
+        # rpath (runtime), not the link-time search path, so cmake's
+        # default LIBRARY_PATH propagation isn't enough — we set the
+        # linker flags explicitly.
         run: |
           export PATH="/opt/homebrew/opt/qt@5/bin:$PATH"
           cmake -B build -G Ninja \
@@ -595,7 +620,22 @@ jobs:
             -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
+            -DQt5_DIR=/opt/homebrew/opt/qt@5/lib/cmake/Qt5 \
+            -DCMAKE_LIBRARY_PATH=/opt/homebrew/lib \
+            -DCMAKE_EXE_LINKER_FLAGS="-L/opt/homebrew/lib" \
+            -DCMAKE_SHARED_LINKER_FLAGS="-L/opt/homebrew/lib"
+
+      - name: Build libtor (embedded Tor static lib)
+        # macOS Qt GUI also transitively links -ltor via triangles_common.
+        # macOS Qt is built with @rpath embedded, so libtor needs to be
+        # at the configured TOR_SOURCE_ROOT location.
+        run: |
+          brew install libevent openssl@3 autoconf automake libtool zlib zstd
+          export PATH="/opt/homebrew/opt/automake/bin:/opt/homebrew/opt/libtool/bin:$PATH"
+          LIBEVENT_DIR=/opt/homebrew/opt/libevent \
+            OPENSSL_DIR=/opt/homebrew/opt/openssl@3 \
+            ZLIB_DIR=/opt/homebrew/opt/zlib \
+            bash src/tor/build-libtor.sh
 
       - name: Build libtor (embedded Tor static lib)
         # macOS Qt GUI also transitively links -ltor via triangles_common.

.github/workflows/lint.yml

@@ -56,9 +56,17 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y build-essential cmake ninja-build clang-tidy-15 \
             libboost-all-dev libssl-dev libdb++-dev libleveldb-dev \
-            librocksdb-dev libevent-dev libminiupnpc-dev zlib1g-dev
+            libevent-dev libminiupnpc-dev zlib1g-dev \
+            libsnappy-dev liblz4-dev libzstd-dev
           sudo ln -sf /usr/bin/clang-tidy-15 /usr/local/bin/clang-tidy
 
+      - name: Build RocksDB from source
+        # Ubuntu 22.04's librocksdb-dev is 6.11.4 which CMakeLists.txt now
+        # refuses to configure against (need >= 7.4 for XXH3 per-block
+        # checksum). Build 8.9.1 from source — same version DNS2 ships —
+        # into /usr/local so CMake's find_library picks it up first.
+        run: sudo bash scripts/ci/build-rocksdb.sh
+
       - name: Configure (export compile_commands.json)
         run: |
           cmake -B build -G Ninja \