From b4610fb5b0ca0d79f51f2f4257d407ef0b9a414c Mon Sep 17 00:00:00 2001
From: sneurlax <sneurlax@gmail.com>
Date: Tue, 22 Oct 2024 18:31:18 -0500
Subject: [PATCH 1/2] move 'rem's from native windows secp256k1 build script

and adjust path
---
 scripts/windows/build_secp256k1.bat | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/windows/build_secp256k1.bat b/scripts/windows/build_secp256k1.bat
index 9e7433032..bcabe1c7f 100644
--- a/scripts/windows/build_secp256k1.bat
+++ b/scripts/windows/build_secp256k1.bat
@@ -1,10 +1,10 @@
 if not exist "build" mkdir "build"
 cd build
-rem git clone https://github.com/bitcoin-core/secp256k1
+git clone https://github.com/bitcoin-core/secp256k1
 cd secp256k1
-rem cmake -G "Visual Studio 17 2022" -A x64 -S . -B build
+cmake -G "Visual Studio 17 2022" -A x64 -S . -B build
 cd build
-rem cmake --build .
+cmake --build .
 if not exist "..\..\..\..\build\" mkdir "..\..\..\..\build\"
-xcopy src\Debug\libsecp256k1-2.dll "..\..\..\..\build\secp256k1.dll" /Y
-cd ..\..\..\
+xcopy bin\Debug\libsecp256k1-2.dll "..\..\..\..\build\secp256k1.dll" /Y
+cd ..\..\..\
\ No newline at end of file

From e2f3a1ad797dacb6bfb9e7c1f024f142ff38f526 Mon Sep 17 00:00:00 2001
From: sneurlax <sneurlax@gmail.com>
Date: Tue, 22 Oct 2024 18:59:02 -0500
Subject: [PATCH 2/2] track secp256k1 changes in build scripts and pin to
 latest commit

---
 scripts/linux/build_secp256k1.sh       | 8 ++++++--
 scripts/windows/build_secp256k1.bat    | 4 +++-
 scripts/windows/build_secp256k1_wsl.sh | 8 ++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/scripts/linux/build_secp256k1.sh b/scripts/linux/build_secp256k1.sh
index 6fdd9f58c..f00b6b82b 100755
--- a/scripts/linux/build_secp256k1.sh
+++ b/scripts/linux/build_secp256k1.sh
@@ -1,10 +1,14 @@
 mkdir -p build
 cd build
-git clone https://github.com/bitcoin-core/secp256k1
+if [ ! -d "secp256k1" ]; then
+    git clone https://github.com/bitcoin-core/secp256k1
+fi
 cd secp256k1
+git checkout 68b55209f1ba3e6c0417789598f5f75649e9c14c
+git reset --hard
 mkdir -p build && cd build
 cmake ..
 cmake --build .
 mkdir -p ../../../../../build
-cp src/libsecp256k1.so.2.2.1 "../../../../../build/libsecp256k1.so"
+cp lib/libsecp256k1.so.2.2.2 "../../../../../build/libsecp256k1.so"
 cd ../../../
diff --git a/scripts/windows/build_secp256k1.bat b/scripts/windows/build_secp256k1.bat
index bcabe1c7f..f5777b974 100644
--- a/scripts/windows/build_secp256k1.bat
+++ b/scripts/windows/build_secp256k1.bat
@@ -2,9 +2,11 @@ if not exist "build" mkdir "build"
 cd build
 git clone https://github.com/bitcoin-core/secp256k1
 cd secp256k1
+git checkout 68b55209f1ba3e6c0417789598f5f75649e9c14c
+git reset --hard
 cmake -G "Visual Studio 17 2022" -A x64 -S . -B build
 cd build
 cmake --build .
 if not exist "..\..\..\..\build\" mkdir "..\..\..\..\build\"
 xcopy bin\Debug\libsecp256k1-2.dll "..\..\..\..\build\secp256k1.dll" /Y
-cd ..\..\..\
\ No newline at end of file
+cd ..\..\..\
diff --git a/scripts/windows/build_secp256k1_wsl.sh b/scripts/windows/build_secp256k1_wsl.sh
index b5d2e281f..a39cd3bee 100644
--- a/scripts/windows/build_secp256k1_wsl.sh
+++ b/scripts/windows/build_secp256k1_wsl.sh
@@ -1,10 +1,14 @@
 mkdir -p build
 cd build
-git clone https://github.com/bitcoin-core/secp256k1
+if [ ! -d "secp256k1" ]; then
+    git clone https://github.com/bitcoin-core/secp256k1
+fi
 cd secp256k1
+git checkout 68b55209f1ba3e6c0417789598f5f75649e9c14c
+git reset --hard
 mkdir -p build && cd build
 cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/x86_64-w64-mingw32.toolchain.cmake
 cmake --build .
 mkdir -p ../../../../../build
-cp src/libsecp256k1-2.dll "../../../../../build/secp256k1.dll"
+cp bin/libsecp256k1-2.dll "../../../../../build/secp256k1.dll"
 cd ../../../