Guess changes required for Windows

Requires actual testing on Windows

Author: MatthewLM

coinlib/bin/build_windows.dart

@@ -1,31 +1,15 @@
 import 'dart:io';
 import 'util.dart';
 
-/// Follows bitcoin-core/secp256k1's "Building on Windows" instructions.
+/// Follows peercoin/secp256k1-coinlib's "Building on Windows" instructions.
 ///
 /// Runnable in "Developer Command Prompt for VS 2022".
-
 void main() async {
 
-  // Make temporary directory.
   final workDir = Directory.current.path;
-  final tmpDir = createTmpDir();
-
-  // Clone bitcoin-core/secp256k1.
-  await execWithStdioWin("git", [
-    "clone",
-    "https://github.com/bitcoin-core/secp256k1",
-    "$tmpDir/secp256k1",
-  ]);
-  Directory.current = Directory("$tmpDir/secp256k1");
-  await execWithStdioWin(
-    "git",
-    // Use version 0.5.0
-    ["checkout", "e3a885d42a7800c1ccebad94ad1e2b82c4df5c65"],
-  );
 
-  // Build in tmpDir/secp256k1/build.
-  Directory("build").createSync();
+  // Clone into tmp directory
+  final tmpDir = await cloneForWindowsInTmpDir();
 
   // Configure cmake.
   await execWithStdioWin("cmake", [
@@ -38,6 +22,13 @@ void main() async {
     "-B",
     "build",
     "--debug-output",
+    "-DSECP256K1_ENABLE_MODULE_RECOVERY=ON",
+    "-DSECP256K1_BUILD_TESTS=OFF",
+    "-DSECP256K1_BUILD_EXHAUSTIVE_TESTS=OFF",
+    "-DSECP256K1_BUILD_BENCHMARK=OFF",
+    "-DSECP256K1_BUILD_EXAMPLES=OFF",
+    "-DSECP256K1_BUILD_CTIME_TESTS=OFF",
+    "-DCMAKE_BUILD_TYPE=Release",
   ]);
 
   // Build.
@@ -53,11 +44,11 @@ void main() async {
   Directory("$workDir${Platform.pathSeparator}build").createSync();
   final dll = File(
     "$tmpDir"
-    "${Platform.pathSeparator}secp256k1"
+    "${Platform.pathSeparator}secp256k1-coinlib"
     "${Platform.pathSeparator}build"
     "${Platform.pathSeparator}src"
     "${Platform.pathSeparator}RelWithDebInfo"
-    "${Platform.pathSeparator}libsecp256k1-2.dll",
+    "${Platform.pathSeparator}libsecp256k1-6.dll",
   );
 
   print("File exists: ${dll.existsSync()}");

coinlib/bin/build_windows_crosscompile.dart

@@ -4,28 +4,34 @@ import 'docker_util.dart';
 /// Build a Windows DLL for secp256k1 using a Dockerfile string.
 
 String dockerfile = r"""
-FROM debian:bullseye
+FROM debian:bookworm
 
 # Install dependenices.
-RUN apt-get update -y \
-  && apt-get install -y autoconf libtool build-essential git cmake gcc-mingw-w64
+RUN apt-get update -y && apt-get install -y git cmake gcc-mingw-w64
 
-# Clone libsecp256k1 0.5.0 release.
-RUN git clone https://github.com/bitcoin-core/secp256k1 \
-  && cd secp256k1 \
-  && git checkout e3a885d42a7800c1ccebad94ad1e2b82c4df5c65 \
-  && mkdir build
+# Clone libsecp256k1-coinlib v0.7.0
+RUN git clone https://github.com/peercoin/secp256k1-coinlib \
+  && cd secp256k1-coinlib \
+  && git checkout 69018e5b939d8d540ca6b237945100f4ecb5681e
 
-WORKDIR /secp256k1/build
+WORKDIR /secp256k1-coinlib
 
 # Build shared library for Windows.
-RUN cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/x86_64-w64-mingw32.toolchain.cmake
-RUN make
+RUN cmake -B build \
+      -DCMAKE_TOOLCHAIN_FILE=cmake/x86_64-w64-mingw32.toolchain.cmake \
+      -DSECP256K1_ENABLE_MODULE_RECOVERY=ON \
+      -DSECP256K1_BUILD_TESTS=OFF \
+      -DSECP256K1_BUILD_EXHAUSTIVE_TESTS=OFF \
+      -DSECP256K1_BUILD_BENCHMARK=OFF \
+      -DSECP256K1_BUILD_EXAMPLES=OFF \
+      -DSECP256K1_BUILD_CTIME_TESTS=OFF \
+      -DCMAKE_BUILD_TYPE=Release
+RUN cmake --build build
 
 # Build DLL and copy into output.
-RUN make install
+RUN cmake --install build
 RUN mkdir output
-RUN cp src/libsecp256k1-2.dll output/secp256k1.dll
+RUN cp build/bin/libsecp256k1-6.dll output/secp256k1.dll
 """;
 
 void main() async {

coinlib/bin/build_wsl.dart

@@ -1,47 +1,37 @@
 import 'dart:io';
-
 import 'util.dart';
 
-/// Follows bitcoin-core/secp256k1's "Cross compiling" instructions.
+/// Follows peercoin/secp256k1-coinlib's "Cross compiling" instructions.
 ///
 /// Runnable in WSL.  Install the dependencies listed in the README:
 /// ```
 /// apt-get install -y autoconf libtool build-essential git cmake mingw-w64
 /// ```
-
 void main() async {
-  // Make temporary directory.
+
   final workDir = Directory.current.path;
-  final tmpDir = createTmpDir();
-
-  // Clone bitcoin-core/secp256k1.
-  await execWithStdio(
-    "git",
-    ["clone", "https://github.com/bitcoin-core/secp256k1", "$tmpDir/secp256k1"],
-  );
-  Directory.current = Directory("$tmpDir/secp256k1");
-  await execWithStdio(
-    "git",
-    // Use version 0.5.0
-    ["checkout", "e3a885d42a7800c1ccebad94ad1e2b82c4df5c65"],
-  );
-
-  // Build in tmpDir/secp256k1/lib.
-  Directory("lib").createSync();
-  Directory.current = Directory("lib");
+
+  // Clone into tmp directory
+  await cloneForWindowsInTmpDir();
 
   // Run cmake with the provided toolchain file.
   await execWithStdio("cmake", [
-    "..",
+    "-B", "build",
     "-DCMAKE_TOOLCHAIN_FILE=../cmake/x86_64-w64-mingw32.toolchain.cmake",
+    "-DSECP256K1_ENABLE_MODULE_RECOVERY=ON",
+    "-DSECP256K1_BUILD_TESTS=OFF",
+    "-DSECP256K1_BUILD_EXHAUSTIVE_TESTS=OFF",
+    "-DSECP256K1_BUILD_BENCHMARK=OFF",
+    "-DSECP256K1_BUILD_EXAMPLES=OFF",
+    "-DSECP256K1_BUILD_CTIME_TESTS=OFF",
+    "-DCMAKE_BUILD_TYPE=Release",
   ]);
 
-  // Build the project using "make".
-  await execWithStdio("make", []);
+  await execWithStdio("cmake", ["--build", "build"]);
 
   // Copy the DLL to build/libsecp256k1.dll.
   Directory("$workDir/build").createSync();
-  File("src/libsecp256k1.dll").copySync("$workDir/build/secp256k1.dll");
+  File("build/bin/libsecp256k1-6.dll").copySync("$workDir/build/secp256k1.dll");
 
   print("Output libsecp256k1.dll successfully");
 

coinlib/bin/util.dart

@@ -61,3 +61,27 @@ void exitOnCode(int exitCode, String exitMsg) {
 
 String createTmpDir() =>
     Directory.systemTemp.createTempSync("coinlibBuild").path;
+
+Future<String> cloneForWindowsInTmpDir() async {
+
+  final tmpDir = createTmpDir();
+
+  // Clone bitcoin-core/secp256k1.
+  await execWithStdioWin("git", [
+    "clone",
+    "https://github.com/peercoin/secp256k1-coinlib",
+    "$tmpDir/secp256k1-coinlib",
+  ]);
+  Directory.current = Directory("$tmpDir/secp256k1-coinlib");
+  await execWithStdioWin(
+    "git",
+    // Use version 0.7.0
+    ["checkout", "69018e5b939d8d540ca6b237945100f4ecb5681e"],
+  );
+
+  // Build in tmpDir/secp256k1-coinlib/build.
+  Directory("build").createSync();
+
+  return tmpDir;
+
+}