From bc4948d0b4b2111e7f6e4b7eecad1c6f4445bb30 Mon Sep 17 00:00:00 2001
From: Marius van der Wijden <m.vanderwijden@live.de>
Date: Mon, 24 Feb 2025 14:43:26 +0100
Subject: [PATCH] crypto/secp256k1: fix build

---
 crypto/secp256k1/ext.h      |  4 ++--
 crypto/secp256k1/secp256.go | 18 +++++-------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/crypto/secp256k1/ext.h b/crypto/secp256k1/ext.h
index e422fe4b49..1c485e2603 100644
--- a/crypto/secp256k1/ext.h
+++ b/crypto/secp256k1/ext.h
@@ -109,8 +109,8 @@ int secp256k1_ext_scalar_mul(const secp256k1_context* ctx, unsigned char *point,
 	ARG_CHECK(scalar != NULL);
 	(void)ctx;
 
-	secp256k1_fe_set_b32(&feX, point);
-	secp256k1_fe_set_b32(&feY, point+32);
+	secp256k1_fe_set_b32_limit(&feX, point);
+	secp256k1_fe_set_b32_limit(&feY, point+32);
 	secp256k1_ge_set_xy(&ge, &feX, &feY);
 	secp256k1_scalar_set_b32(&s, scalar, &overflow);
 	if (overflow || secp256k1_scalar_is_zero(&s)) {
diff --git a/crypto/secp256k1/secp256.go b/crypto/secp256k1/secp256.go
index 61abc1eaf0..c8c0df8224 100644
--- a/crypto/secp256k1/secp256.go
+++ b/crypto/secp256k1/secp256.go
@@ -12,25 +12,17 @@ package secp256k1
 #cgo CFLAGS: -I./libsecp256k1
 #cgo CFLAGS: -I./libsecp256k1/src/
 
-#ifdef __SIZEOF_INT128__
-#  define HAVE___INT128
-#  define USE_FIELD_5X52
-#  define USE_SCALAR_4X64
-#else
-#  define USE_FIELD_10X26
-#  define USE_SCALAR_8X32
-#endif
-
 #ifndef NDEBUG
 #  define NDEBUG
 #endif
 
-#define USE_ENDOMORPHISM
-#define USE_NUM_NONE
-#define USE_FIELD_INV_BUILTIN
-#define USE_SCALAR_INV_BUILTIN
+#define ECMULTWINDOW 15
+#define ECMULTGENKB 22
+#define WIDEMUL auto
 #include "./libsecp256k1/src/secp256k1.c"
 #include "./libsecp256k1/src/modules/recovery/main_impl.h"
+#include "./libsecp256k1/src/precomputed_ecmult.c"
+#include "./libsecp256k1/src/precomputed_ecmult_gen.c"
 #include "ext.h"
 
 typedef void (*callbackFunc) (const char* msg, void* data);