Skip to content

Commit 36acb70

Browse files
authored
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
1 parent 1e47583 commit 36acb70

File tree

5 files changed

+8
-10
lines changed

5 files changed

+8
-10
lines changed

.github/workflows/build.yml

-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@ concurrency:
1515
cancel-in-progress: true
1616

1717
env:
18-
COINCURVE_UPSTREAM_REF: 1ad5185cd42c0636104129fcc9f6a4bf9c67cc40
1918
COINCURVE_IGNORE_SYSTEM_LIB: 'ON'
2019
COINCURVE_SECP256K1_STATIC: 'ON'
2120
COINCURVE_CROSS_HOST: ''
2221
CIBW_ENVIRONMENT_PASS_LINUX: >
23-
COINCURVE_UPSTREAM_REF
2422
COINCURVE_IGNORE_SYSTEM_LIB
2523
COINCURVE_SECP256K1_STATIC
2624
COINCURVE_CROSS_HOST

.github/workflows/verify_shared_build.yml

-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@ concurrency:
1515
cancel-in-progress: true
1616

1717
env:
18-
COINCURVE_UPSTREAM_REF: 1ad5185cd42c0636104129fcc9f6a4bf9c67cc40
1918
COINCURVE_IGNORE_SYSTEM_LIB: '1'
2019
# Only 'SHARED' is recognized, any other string means 'not SHARED'
2120
COINCURVE_SECP256K1_BUILD: 'SHARED'
2221
CIBW_ENVIRONMENT_PASS_LINUX: >
23-
COINCURVE_UPSTREAM_REF
2422
COINCURVE_IGNORE_SYSTEM_LIB
2523
COINCURVE_SECP256K1_BUILD
2624
CIBW_PROJECT_REQUIRES_PYTHON: '>=3.8'

cm_vendored_library/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@ if (PROJECT_IGNORE_SYSTEM_LIB OR NOT VENDORED_AS_SYSTEM_LIB_FOUND)
1212
endif()
1313

1414
if (NOT VENDORED_UPSTREAM_REF)
15-
set(VENDORED_UPSTREAM_REF "1ad5185cd42c0636104129fcc9f6a4bf9c67cc40")
15+
message(STATUS "VENDORED_UPSTREAM_REF not set, using default value.")
16+
set(VENDORED_UPSTREAM_REF "1ad5185cd42c0636104129fcc9f6a4bf9c67cc40")
1617
endif()
1718

1819
if (NOT VENDORED_UPSTREAM_SHA)
20+
message(STATUS "VENDORED_UPSTREAM_SHA not set, using default value.")
1921
set(VENDORED_UPSTREAM_SHA "ba34be4319f505c5766aa80b99cfa696cbb2993bfecf7d7eb8696106c493cb8c")
2022
endif()
2123

pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ PROJECT_CROSS_COMPILE_TARGET = { env = "COINCURVE_CROSS_HOST", default = "" }
7676
# Vendored library: SECP256K1
7777
VENDORED_LIBRARY_CMAKE_TARGET = "secp256k1"
7878
VENDORED_LIBRARY_PKG_CONFIG = "libsecp256k1"
79-
VENDORED_LIBRARY_PKG_CONFIG_VERSION = "0.4.1"
79+
VENDORED_LIBRARY_PKG_CONFIG_VERSION = "0.5.0"
8080
VENDORED_UPSTREAM_URL = "https://github.com/bitcoin-core/secp256k1/archive/"
81-
VENDORED_UPSTREAM_REF = { env = "COINCURVE_UPSTREAM_REF", default = "1ad5185cd42c0636104129fcc9f6a4bf9c67cc40" }
82-
VENDORED_UPSTREAM_SHA = { env = "COINCURVE_UPSTREAM_SHA", default = "ba34be4319f505c5766aa80b99cfa696cbb2993bfecf7d7eb8696106c493cb8c" }
81+
VENDORED_UPSTREAM_REF = { env = "COINCURVE_UPSTREAM_REF", default = "e3a885d42a7800c1ccebad94ad1e2b82c4df5c65" }
82+
VENDORED_UPSTREAM_SHA = { env = "COINCURVE_UPSTREAM_SHA", default = "183b9f0417beea4d9c826ca324b5a464faca7446ef39a13a6abbe602df8d934b" }
8383
# SECP256K1 library specific build options
8484
# `VENDORED_OPTION` is reserved prefix for vendored library build options
8585
VENDORED_LIBRARY_OPTION_PREFIX = "SECP256K1"

tox.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ deps =
3838
black>=21.12b0
3939
ruff
4040
commands =
41-
ruff .
41+
ruff check .
4242
black --check --diff .
4343

4444
[testenv:fmt]
@@ -47,7 +47,7 @@ skip_install = true
4747
deps = {[testenv:lint]deps}
4848
commands =
4949
black .
50-
ruff --fix .
50+
ruff check --fix .
5151
{[testenv:lint]commands}
5252

5353
[testenv:typing]

0 commit comments

Comments
 (0)