From 6492c6008eb117a30939719ac45f05975fdc294b Mon Sep 17 00:00:00 2001
From: SChernykh <15806605+SChernykh@users.noreply.github.com>
Date: Thu, 13 Feb 2025 10:58:41 +0100
Subject: [PATCH] CI: use clang-20

---
 .github/workflows/clang-tidy.yml | 10 +++++-----
 external/src/cppzmq              |  2 +-
 src/crypto.cpp                   |  3 +--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
index 80916a2..054ca8e 100644
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -18,9 +18,9 @@ jobs:
       run: |
         wget https://apt.llvm.org/llvm.sh
         chmod +x llvm.sh
-        sudo ./llvm.sh 19
-        sudo apt-get install -y clang-tidy-19
-        clang-tidy-19 --verify-config
+        sudo ./llvm.sh 20
+        sudo apt-get install -y clang-tidy-20
+        clang-tidy-20 --verify-config
 
     - name: Checkout repository
       uses: actions/checkout@v4
@@ -31,9 +31,9 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang-19 -DCMAKE_CXX_COMPILER=clang++-19 -DDEV_CLANG_TIDY=ON -DSTATIC_LIBS=ON
+        cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang-20 -DCMAKE_CXX_COMPILER=clang++-20 -DDEV_CLANG_TIDY=ON -DSTATIC_LIBS=ON
 
     - name: Run clang-tidy
       run: |
         cd src
-        clang-tidy-19 *.cpp -p ../build -checks=-clang-diagnostic-undefined-internal,-clang-analyzer-optin.performance.Padding,-clang-diagnostic-nan-infinity-disabled -warnings-as-errors=* -header-filter=^[^\.]
+        clang-tidy-20 *.cpp -p ../build -checks=-clang-diagnostic-undefined-internal,-clang-analyzer-optin.performance.Padding,-clang-diagnostic-nan-infinity-disabled -warnings-as-errors=* -header-filter=^[^\.]
diff --git a/external/src/cppzmq b/external/src/cppzmq
index 6164cf7..a371495 160000
--- a/external/src/cppzmq
+++ b/external/src/cppzmq
@@ -1 +1 @@
-Subproject commit 6164cf7dbc1df6d1bd8e4c6c5f8e52d7dea63aa7
+Subproject commit a371495a91a1fa7645f9383e9001ac10148be8a7
diff --git a/src/crypto.cpp b/src/crypto.cpp
index cbd7d08..62ca231 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -151,8 +151,7 @@ static FORCEINLINE void derivation_to_scalar(const hash& derivation, size_t outp
 	uint8_t* p = buf.output_index;
 	writeVarint(output_index, [&p](uint8_t b) { *(p++) = b; });
 
-	const uint8_t* data = buf.derivation;
-	hash_to_scalar(data, static_cast<int>(p - data), res);
+	hash_to_scalar(buf.derivation, static_cast<int>(sizeof(buf.derivation) + (p - buf.output_index)), res);
 }
 
 class Cache : public nocopy_nomove