FEAT: Update libsecp256k1 to v0.5.0 (#169)

* FEAT: Update libsecp256k1 to v0.5.0 * (fix) used wrong zip SHA * (fix) ruff check * (fix) still need to update github flow, tempted to remove it * (fix) remove COINCURVE_UPSTREAM_REF from workflow * (fix) remove COINCURVE_UPSTREAM_REF from workflow * (fix) remove COINCURVE_UPSTREAM_REF from workflow - shared flow
ofek · Jun 29, 2024 · 36acb70 · 36acb70
1 parent 1e47583
commit 36acb70
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,12 +15,10 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  COINCURVE_UPSTREAM_REF: 1ad5185cd42c0636104129fcc9f6a4bf9c67cc40
   COINCURVE_IGNORE_SYSTEM_LIB: 'ON'
   COINCURVE_SECP256K1_STATIC: 'ON'
   COINCURVE_CROSS_HOST: ''
   CIBW_ENVIRONMENT_PASS_LINUX: >
-    COINCURVE_UPSTREAM_REF
     COINCURVE_IGNORE_SYSTEM_LIB
     COINCURVE_SECP256K1_STATIC
     COINCURVE_CROSS_HOST

diff --git a/.github/workflows/verify_shared_build.yml b/.github/workflows/verify_shared_build.yml
@@ -15,12 +15,10 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  COINCURVE_UPSTREAM_REF: 1ad5185cd42c0636104129fcc9f6a4bf9c67cc40
   COINCURVE_IGNORE_SYSTEM_LIB: '1'
   # Only 'SHARED' is recognized, any other string means 'not SHARED'
   COINCURVE_SECP256K1_BUILD: 'SHARED'
   CIBW_ENVIRONMENT_PASS_LINUX: >
-    COINCURVE_UPSTREAM_REF
     COINCURVE_IGNORE_SYSTEM_LIB
     COINCURVE_SECP256K1_BUILD
   CIBW_PROJECT_REQUIRES_PYTHON: '>=3.8'

diff --git a/cm_vendored_library/CMakeLists.txt b/cm_vendored_library/CMakeLists.txt
@@ -12,10 +12,12 @@ if (PROJECT_IGNORE_SYSTEM_LIB OR NOT VENDORED_AS_SYSTEM_LIB_FOUND)
     endif()
 
     if (NOT VENDORED_UPSTREAM_REF)
-        set(VENDORED_UPSTREAM_REF "1ad5185cd42c0636104129fcc9f6a4bf9c67cc40")
+       message(STATUS "VENDORED_UPSTREAM_REF not set, using default value.")
+       set(VENDORED_UPSTREAM_REF "1ad5185cd42c0636104129fcc9f6a4bf9c67cc40")
     endif()
 
     if (NOT VENDORED_UPSTREAM_SHA)
+        message(STATUS "VENDORED_UPSTREAM_SHA not set, using default value.")
         set(VENDORED_UPSTREAM_SHA "ba34be4319f505c5766aa80b99cfa696cbb2993bfecf7d7eb8696106c493cb8c")
     endif()
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -76,10 +76,10 @@ PROJECT_CROSS_COMPILE_TARGET = { env = "COINCURVE_CROSS_HOST", default = "" }
 # Vendored library: SECP256K1
 VENDORED_LIBRARY_CMAKE_TARGET = "secp256k1"
 VENDORED_LIBRARY_PKG_CONFIG = "libsecp256k1"
-VENDORED_LIBRARY_PKG_CONFIG_VERSION = "0.4.1"
+VENDORED_LIBRARY_PKG_CONFIG_VERSION = "0.5.0"
 VENDORED_UPSTREAM_URL = "https://github.com/bitcoin-core/secp256k1/archive/"
-VENDORED_UPSTREAM_REF = { env = "COINCURVE_UPSTREAM_REF", default = "1ad5185cd42c0636104129fcc9f6a4bf9c67cc40" }
-VENDORED_UPSTREAM_SHA = { env = "COINCURVE_UPSTREAM_SHA", default = "ba34be4319f505c5766aa80b99cfa696cbb2993bfecf7d7eb8696106c493cb8c" }
+VENDORED_UPSTREAM_REF = { env = "COINCURVE_UPSTREAM_REF", default = "e3a885d42a7800c1ccebad94ad1e2b82c4df5c65" }
+VENDORED_UPSTREAM_SHA = { env = "COINCURVE_UPSTREAM_SHA", default = "183b9f0417beea4d9c826ca324b5a464faca7446ef39a13a6abbe602df8d934b" }
 # SECP256K1 library specific build options
 # `VENDORED_OPTION` is reserved prefix for vendored library build options
 VENDORED_LIBRARY_OPTION_PREFIX = "SECP256K1"

diff --git a/tox.ini b/tox.ini
@@ -38,7 +38,7 @@ deps =
     black>=21.12b0
     ruff
 commands =
-    ruff .
+    ruff check .
     black --check --diff .
 
 [testenv:fmt]
@@ -47,7 +47,7 @@ skip_install = true
 deps = {[testenv:lint]deps}
 commands =
     black .
-    ruff --fix .
+    ruff check --fix .
     {[testenv:lint]commands}
 
 [testenv:typing]