From 809fb0eb62e0822077a4cada6666b8e779fbd26d Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Wed, 15 May 2024 13:44:21 -0400 Subject: [PATCH 1/2] upgrade to libsecp256k1 0.5.0 --- libraries/libfc/secp256k1/CMakeLists.txt | 4 +++- libraries/libfc/secp256k1/secp256k1 | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/libfc/secp256k1/CMakeLists.txt b/libraries/libfc/secp256k1/CMakeLists.txt index 0218592a5a..51e86945ff 100644 --- a/libraries/libfc/secp256k1/CMakeLists.txt +++ b/libraries/libfc/secp256k1/CMakeLists.txt @@ -5,7 +5,9 @@ add_library(secp256k1-internal INTERFACE) target_include_directories(secp256k1-internal INTERFACE secp256k1/src) target_compile_definitions(secp256k1-internal INTERFACE ENABLE_MODULE_RECOVERY=1 - ECMULT_GEN_PREC_BITS=4 + ENABLE_MODULE_EXTRAKEYS=1 + COMB_BLOCKS=11 + COMB_TEETH=6 ECMULT_WINDOW_SIZE=15 SECP256K1_STATIC=1) if(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL amd64) diff --git a/libraries/libfc/secp256k1/secp256k1 b/libraries/libfc/secp256k1/secp256k1 index 1ad5185cd4..e3a885d42a 160000 --- a/libraries/libfc/secp256k1/secp256k1 +++ b/libraries/libfc/secp256k1/secp256k1 @@ -1 +1 @@ -Subproject commit 1ad5185cd42c0636104129fcc9f6a4bf9c67cc40 +Subproject commit e3a885d42a7800c1ccebad94ad1e2b82c4df5c65 From 17b50d774e8cbe1d6d912e4ad13fd15d2fbc8911 Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Wed, 15 May 2024 13:45:13 -0400 Subject: [PATCH 2/2] there is no arm64 asm --- libraries/libfc/secp256k1/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/libfc/secp256k1/CMakeLists.txt b/libraries/libfc/secp256k1/CMakeLists.txt index 51e86945ff..bc12852ad6 100644 --- a/libraries/libfc/secp256k1/CMakeLists.txt +++ b/libraries/libfc/secp256k1/CMakeLists.txt @@ -10,7 +10,7 @@ target_compile_definitions(secp256k1-internal INTERFACE ENABLE_MODULE_RECOVERY=1 COMB_TEETH=6 ECMULT_WINDOW_SIZE=15 SECP256K1_STATIC=1) -if(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL amd64) +if(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64) target_compile_definitions(secp256k1-internal INTERFACE USE_ASM_X86_64=1) endif()