Feat/update v0.4.1

.github/workflows/build.yml

@@ -15,7 +15,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  COINCURVE_UPSTREAM_REF: acf5c55ae6a94e5ca847e07def40427547876101
+  COINCURVE_UPSTREAM_REF: 1ad5185cd42c0636104129fcc9f6a4bf9c67cc40
   COINCURVE_IGNORE_SYSTEM_LIB: '1'
   CIBW_BEFORE_ALL_MACOS: ./.github/scripts/install-macos-build-deps.sh
   CIBW_ENVIRONMENT_PASS_LINUX: >
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      PYTHON_VERSION: '3.10'
+      PYTHON_VERSION: '3.12'
 
     steps:
     - uses: actions/checkout@v3
@@ -75,7 +75,7 @@ jobs:
     name: Build Linux wheels
     needs:
     - test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v3
@@ -99,7 +99,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Build wheels
-      uses: pypa/cibuildwheel@v2.11.2
+      uses: pypa/cibuildwheel@v2.16.2
       env:
         CIBW_ARCHS_MACOS: x86_64
 
@@ -119,7 +119,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Build wheels
-      uses: pypa/cibuildwheel@v2.11.2
+      uses: pypa/cibuildwheel@v2.16.2
       env:
         CIBW_ARCHS_MACOS: arm64
         COINCURVE_CROSS_HOST: aarch64-apple-darwin
@@ -174,7 +174,7 @@ jobs:
         platforms: arm64
 
     - name: Build wheels
-      uses: pypa/cibuildwheel@v2.11.2
+      uses: pypa/cibuildwheel@v2.16.2
       env:
         CIBW_ARCHS_LINUX: aarch64
 

MANIFEST.in

@@ -1,4 +1,5 @@
 include coincurve/py.typed
 include setup_support.py
 recursive-include _cffi_build *.py *.h
+prune /*
 graft libsecp256k1

_cffi_build/build.py

@@ -29,6 +29,8 @@ def _mk_ffi(sources, name='_libsecp256k1', **kwargs):
     Source('secp256k1_extrakeys.h', '#include <secp256k1_extrakeys.h>'),
     Source('secp256k1_recovery.h', '#include <secp256k1_recovery.h>'),
     Source('secp256k1_schnorrsig.h', '#include <secp256k1_schnorrsig.h>'),
+    Source('secp256k1_ellswift.h', '#include <secp256k1_ellswift.h>'),
+    Source('secp256k1_preallocated.h', '#include <secp256k1_preallocated.h>'),
 ]
 
 ffi = _mk_ffi(modules, libraries=['secp256k1'])

_cffi_build/build_shared.py

@@ -0,0 +1,84 @@
+import argparse
+import logging
+import os
+from collections import namedtuple
+from typing import List
+
+from cffi import FFI
+
+logging.basicConfig(level=logging.INFO)
+
+here = os.path.dirname(os.path.abspath(__file__))
+
+Source = namedtuple('Source', ('h', 'include'))
+
+
+def gather_sources_from_directory(directory: str) -> List[Source]:
+    """
+    Gather source files from a given directory.
+
+    :param directory: The directory where source files are located.
+    :return: A list of Source namedtuples.
+    """
+    sources = []
+    for filename in os.listdir(directory):
+        if filename.endswith('.h'):
+            include_line = f'#include <{filename}>'
+            sources.append(Source(filename, include_line))
+    return sorted(sources)
+
+
+define_static_lib = """
+#if defined(_WIN32)
+#   define SECP256K1_STATIC 1
+#   define SECP256K1_API extern __declspec(dllexport)
+#endif
+"""
+
+define_shared_lib = """
+#if defined(_WIN32)
+#   define SECP256K1_API extern __declspec(dllimport)
+#endif
+"""
+
+
+def mk_ffi(sources: List[Source],
+           static_lib: str = '0',
+           name: str = '_libsecp256k1') -> FFI:
+    """
+    Create an FFI object.
+
+    :param sources: A list of Source namedtuples.
+    :param libraries: A list of libraries to link against.
+    :param static_lib: Whether to generate a static lib in Windows.
+    :param name: The name of the FFI object.
+    :return: An FFI object.
+    """
+    _ffi = FFI()
+    code = [define_static_lib] if static_lib == '1' else [define_shared_lib]
+
+    for source in sources:
+        with open(os.path.join(here, source.h)) as h:
+            logging.info(f'   Including {source.h}...')
+            c_header = h.read().replace('SECP256K1_API', '')
+            _ffi.cdef(c_header)
+
+        code.append(source.include)
+
+    code.append('#define PY_USE_BUNDLED')
+    _ffi.set_source(name, '\n'.join(code))
+
+    return _ffi
+
+
+if __name__ == '__main__':
+    logging.info('Starting CFFI build process...')
+    parser = argparse.ArgumentParser(description='Generate C code using CFFI.')
+    parser.add_argument('c_file', help='Generated C code filename.')
+    parser.add_argument('static_lib', help='Generate static lib in Windows.', default=False)
+    args = parser.parse_args()
+
+    modules = gather_sources_from_directory(here)
+    ffi = mk_ffi(modules, args.static_lib)
+    ffi.emit_c_code(args.c_file)
+    logging.info(f'   Generated C code: {args.c_file}')