Merge #75: bump dependencies and release new version

44b3826 bump dependencies and release new version (Andrew Poelstra)
7bde8df bump MSRV to 1.56.1 (Andrew Poelstra)

Pull request description:

ACKs for top commit:
  jamesdorfman:
    ACK 44b3826.
  jonasnick:
    ACK 44b3826

Tree-SHA512: f1ee388fee5ddae168402cd799ce3bff882665db2ae6886d5c54291699f7ab40e9a1e922d235b940e801c293faae4b2c16e656c80c18fa58d4ea7a14c46cb828

Author: jonasnick

.github/workflows/rust.yml

@@ -32,12 +32,12 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.48.0
+          - 1.56.1
           - beta
           - stable
         os: [ ubuntu-latest, macos-latest ]
         exclude:
-          - rust: 1.48.0
+          - rust: 1.56.1
             os: macos-latest
     runs-on: ${{ matrix.os }}
     steps:
@@ -89,12 +89,12 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.48.0
+          - 1.56.1
           - beta
           - stable
         os: [ ubuntu-latest, macos-latest ]
         exclude:
-          - rust: 1.48.0
+          - rust: 1.56.1
             os: macos-latest
     runs-on: ${{ matrix.os }}
     steps:

CHANGELOG.md

@@ -1,4 +1,10 @@
-# Unreleased
+# 0.10.0 - 2024-01-02
+
+- update `secp256k1` to 0.28.0
+- update `secp256k1-sys` to 0.9.0
+- update `hashes` to 0.13.0
+- rename `bitcoin_hashes` feature to `hashes`
+- bump MSRV to 1.56.1
 
 # 0.9.2 - 2023-07-18
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "secp256k1-zkp"
-version = "0.9.2"
+version = "0.10.0"
 authors = [ "Dawid Ciężarkiewicz <dpc@ucore.info>",
             "Andrew Poelstra <apoelstra@wpsoftware.net>",
             "Lucas Soriano <lucas@comit.network>",
@@ -26,15 +26,15 @@ rand-std = ["actual-rand/std", "secp256k1/rand-std"]
 recovery = ["secp256k1-zkp-sys/recovery", "secp256k1/recovery"]
 lowmemory = ["secp256k1-zkp-sys/lowmemory", "secp256k1/lowmemory"]
 global-context = ["std", "rand-std", "secp256k1/global-context"]
-bitcoin_hashes = ["secp256k1/bitcoin_hashes"]
+hashes = ["secp256k1/hashes"]
 serde = ["actual-serde", "secp256k1/serde"]
 rand = ["actual-rand", "secp256k1/rand"]
 
 [dependencies]
 actual-serde = { package = "serde", version = "1.0", default-features = false, optional = true }
 actual-rand = { package = "rand", version = "0.8", default-features = false, optional = true }
-secp256k1 = "0.27.0"
-secp256k1-zkp-sys = { version = "0.8.1", default-features = false, path = "./secp256k1-zkp-sys" }
+secp256k1 = "0.28.0"
+secp256k1-zkp-sys = { version = "0.9.0", default-features = false, path = "./secp256k1-zkp-sys" }
 internals = { package = "bitcoin-private", version = "0.1.0" }
 
 [dev-dependencies]

contrib/test.sh

@@ -1,6 +1,6 @@
 #!/bin/sh -ex
 
-FEATURES="bitcoin_hashes global-context lowmemory rand rand-std recovery serde"
+FEATURES="hashes global-context lowmemory rand rand-std recovery serde"
 
 cargo --version
 rustc --version

secp256k1-zkp-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "secp256k1-zkp-sys"
-version = "0.8.1"
+version = "0.9.0"
 authors = [ "Dawid Ciężarkiewicz <dpc@ucore.info>",
             "Andrew Poelstra <apoelstra@wpsoftware.net>",
             "Steven Roose <steven@stevenroose.org>",
@@ -23,7 +23,7 @@ features = [ "recovery", "lowmemory" ]
 cc = "1.0.28"
 
 [dependencies]
-secp256k1-sys = "0.8.0"
+secp256k1-sys = "0.9.0"
 
 [features]
 default = ["std"]

secp256k1-zkp-sys/README.md

@@ -33,4 +33,4 @@ against those existing symbols is left as an exercise to the reader.
 
 ## Minimum Supported Rust Version
 
-This library should always compile with any combination of features on **Rust 1.48.0**.
+This library should always compile with any combination of features on **Rust 1.56.1**.

src/lib.rs

@@ -40,7 +40,7 @@ pub use secp256k1_zkp_sys as ffi;
 
 extern crate secp256k1;
 
-#[cfg(feature = "bitcoin_hashes")]
+#[cfg(feature = "hashes")]
 pub use secp256k1::hashes;
 /// Re-export of the `rand` crate
 #[cfg(feature = "actual-rand")]

src/zkp/rangeproof.rs

@@ -203,7 +203,7 @@ impl RangeProof {
     }
 }
 
-#[cfg(feature = "bitcoin_hashes")]
+#[cfg(feature = "hashes")]
 impl ::core::fmt::Display for RangeProof {
     fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
         use internals::hex::display::DisplayHex;
@@ -223,7 +223,7 @@ impl str::FromStr for RangeProof {
     }
 }
 
-#[cfg(all(feature = "serde", feature = "bitcoin_hashes"))]
+#[cfg(all(feature = "serde", feature = "hashes"))]
 impl ::serde::Serialize for RangeProof {
     fn serialize<S: ::serde::Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
         if s.is_human_readable() {
@@ -234,7 +234,7 @@ impl ::serde::Serialize for RangeProof {
     }
 }
 
-#[cfg(all(feature = "serde", feature = "bitcoin_hashes"))]
+#[cfg(all(feature = "serde", feature = "hashes"))]
 impl<'de> ::serde::Deserialize<'de> for RangeProof {
     fn deserialize<D: ::serde::Deserializer<'de>>(d: D) -> Result<RangeProof, D::Error> {
         use crate::serde_util;
@@ -309,7 +309,7 @@ mod tests {
             )
             .unwrap();
 
-        #[cfg(feature = "bitcoin_hashes")]
+        #[cfg(feature = "hashes")]
         {
             use std::str::FromStr;
             use std::string::ToString;

src/zkp/surjection_proof.rs

@@ -190,7 +190,7 @@ impl SurjectionProof {
     }
 }
 
-#[cfg(feature = "bitcoin_hashes")]
+#[cfg(feature = "hashes")]
 impl ::core::fmt::Display for SurjectionProof {
     fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
         use internals::hex::display::DisplayHex;
@@ -210,7 +210,7 @@ impl str::FromStr for SurjectionProof {
     }
 }
 
-#[cfg(all(feature = "serde", feature = "bitcoin_hashes"))]
+#[cfg(all(feature = "serde", feature = "hashes"))]
 impl ::serde::Serialize for SurjectionProof {
     fn serialize<S: ::serde::Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
         if s.is_human_readable() {
@@ -221,7 +221,7 @@ impl ::serde::Serialize for SurjectionProof {
     }
 }
 
-#[cfg(all(feature = "serde", feature = "bitcoin_hashes"))]
+#[cfg(all(feature = "serde", feature = "hashes"))]
 impl<'de> ::serde::Deserialize<'de> for SurjectionProof {
     fn deserialize<D: ::serde::Deserializer<'de>>(d: D) -> Result<SurjectionProof, D::Error> {
         use crate::serde_util;
@@ -300,7 +300,7 @@ mod tests {
 
         assert_eq!(parsed, proof);
 
-        #[cfg(feature = "bitcoin_hashes")]
+        #[cfg(feature = "hashes")]
         {
             use std::str::FromStr;
             use std::string::ToString;