Merge #764: Update the secp256k1-sys codebase to version v0.6.

06ab8d0 Update codebase to version 0.6 (jlest01)

Pull request description:

  This PR updates the `secp256k1-sys` codebase to version v0.6.
  I'm not sure if there are more steps involved, but these commits work fine in #716.

ACKs for top commit:
  apoelstra:
    ACK 06ab8d0; successfully ran local tests; thanks for iterating!

Tree-SHA512: 9b17a977d000821b7044f3f1f1b7d1e3209197be270b1e6a577c9245e30f09c6d6c532c85ffae5df503bc2ce80ea0c79983bbe7f838d77efac79f022132409c2

Cargo-minimal.lock

@@ -289,7 +289,7 @@ dependencies = [
 
 [[package]]
 name = "secp256k1-sys"
-version = "0.10.0"
+version = "0.11.0"
 dependencies = [
  "cc",
  "libc",

Cargo-recent.lock

@@ -210,7 +210,7 @@ dependencies = [
 
 [[package]]
 name = "secp256k1-sys"
-version = "0.10.0"
+version = "0.11.0"
 dependencies = [
  "cc",
  "libc",

Cargo.toml

@@ -34,7 +34,7 @@ global-context = ["std"]
 global-context-less-secure = ["global-context"]
 
 [dependencies]
-secp256k1-sys = { version = "0.10.0", default-features = false, path = "./secp256k1-sys" }
+secp256k1-sys = { version = "0.11.0", default-features = false, path = "./secp256k1-sys" }
 
 hashes = { package = "bitcoin_hashes", version = "0.14", default-features = false, optional = true }
 rand = { version = "0.8", default-features = false, optional = true }

secp256k1-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "secp256k1-sys"
-version = "0.10.0"
+version = "0.11.0"
 authors = [ "Dawid Ciężarkiewicz <[email protected]>",
             "Andrew Poelstra <[email protected]>",
             "Steven Roose <[email protected]>" ]
@@ -12,7 +12,7 @@ description = "FFI for Pieter Wuille's `libsecp256k1` library."
 keywords = [ "secp256k1", "libsecp256k1", "ffi" ]
 readme = "README.md"
 build = "build.rs"
-links = "rustsecp256k1_v0_10_0"
+links = "rustsecp256k1_v0_11"
 edition = "2021"
 rust-version = "1.63.0"
 

secp256k1-sys/depend/scratch.h.patch

@@ -0,0 +1,5 @@
+26,29d25
+< static secp256k1_scratch* secp256k1_scratch_create(const secp256k1_callback* error_callback, size_t max_size);
+< 
+< static void secp256k1_scratch_destroy(const secp256k1_callback* error_callback, secp256k1_scratch* scratch);
+< 

secp256k1-sys/depend/secp256k1-HEAD-revision.txt

@@ -1,2 +1,2 @@
 # This file was automatically created by vendor-libsecp.sh
-1ad5185cd42c0636104129fcc9f6a4bf9c67cc40
+0cdc758a56360bf58a851fe91085a327ec97685a

secp256k1-sys/depend/secp256k1.c.patch

@@ -37,14 +37,14 @@
 <     free(ctx);
 < }
 < 
-220,229d183
+223,232d185
 < }
 < 
-< secp256k1_scratch_space* secp256k1_scratch_space_create(const secp256k1_context* ctx, size_t max_size) {
+< static secp256k1_scratch_space* secp256k1_scratch_space_create(const secp256k1_context* ctx, size_t max_size) {
 <     VERIFY_CHECK(ctx != NULL);
 <     return secp256k1_scratch_create(&ctx->error_callback, max_size);
 < }
 < 
-< void secp256k1_scratch_space_destroy(const secp256k1_context *ctx, secp256k1_scratch_space* scratch) {
+< static void secp256k1_scratch_space_destroy(const secp256k1_context *ctx, secp256k1_scratch_space* scratch) {
 <     VERIFY_CHECK(ctx != NULL);
 <     secp256k1_scratch_destroy(&ctx->error_callback, scratch);

secp256k1-sys/depend/secp256k1.h.patch

@@ -18,18 +18,6 @@
 <     secp256k1_context *ctx
 < ) SECP256K1_ARG_NONNULL(1);
 < 
-402,406d386
-< SECP256K1_API SECP256K1_WARN_UNUSED_RESULT secp256k1_scratch_space *secp256k1_scratch_space_create(
-<     const secp256k1_context *ctx,
-<     size_t size
-< ) SECP256K1_ARG_NONNULL(1);
-< 
-413,417d392
-< SECP256K1_API void secp256k1_scratch_space_destroy(
-<     const secp256k1_context *ctx,
-<     secp256k1_scratch_space *scratch
-< ) SECP256K1_ARG_NONNULL(1);
-< 
 636d610
 < SECP256K1_API const secp256k1_nonce_function secp256k1_nonce_function_rfc6979;
 639d612

secp256k1-sys/depend/secp256k1/.cirrus.yml

@@ -10,8 +10,8 @@ env:
   MAKEFLAGS: -j4
   BUILD: check
   ### secp256k1 config
-  ECMULTWINDOW: auto
-  ECMULTGENPRECISION: auto
+  ECMULTWINDOW: 15
+  ECMULTGENKB: 22
   ASM: no
   WIDEMUL: auto
   WITH_VALGRIND: yes
@@ -20,10 +20,12 @@ env:
   EXPERIMENTAL: no
   ECDH: no
   RECOVERY: no
+  EXTRAKEYS: no
   SCHNORRSIG: no
+  MUSIG: no
   ELLSWIFT: no
   ### test options
-  SECP256K1_TEST_ITERS:
+  SECP256K1_TEST_ITERS: 64
   BENCH: yes
   SECP256K1_BENCH_ITERS: 2
   CTIMETESTS: yes
@@ -66,7 +68,9 @@ task:
   env:
     ECDH: yes
     RECOVERY: yes
+    EXTRAKEYS: yes
     SCHNORRSIG: yes
+    MUSIG: yes
     ELLSWIFT: yes
   matrix:
      # Currently only gcc-snapshot, the other compilers are tested on GHA with QEMU
@@ -82,7 +86,9 @@ task:
   env:
     ECDH: yes
     RECOVERY: yes
+    EXTRAKEYS: yes
     SCHNORRSIG: yes
+    MUSIG: yes
     ELLSWIFT: yes
     WRAPPER_CMD: 'valgrind --error-exitcode=42'
     SECP256K1_TEST_ITERS: 2

secp256k1-sys/depend/secp256k1/.github/actions/install-homebrew-valgrind/action.yml

@@ -16,7 +16,7 @@ runs:
         cat valgrind_fingerprint
       shell: bash
 
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       id: cache
       with:
         path: ${{ env.CI_HOMEBREW_CELLAR_VALGRIND }}

secp256k1-sys/depend/secp256k1/.github/actions/run-in-docker-action/action.yml

@@ -36,6 +36,11 @@ runs:
         load: true
         cache-from: type=gha
 
+    - # Workaround for https://github.com/google/sanitizers/issues/1614 .
+      # The underlying issue has been fixed in clang 18.1.3.
+      run: sudo sysctl -w vm.mmap_rnd_bits=28
+      shell: bash
+
     - # Tell Docker to pass environment variables in `env` into the container.
       run: >
         docker run \