Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump dependencies and release new version #75

Merged
merged 2 commits into from
Jan 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "secp256k1-zkp"
version = "0.9.2"
version = "0.10.0"
authors = [ "Dawid Ciężarkiewicz <[email protected]>",
"Andrew Poelstra <[email protected]>",
"Lucas Soriano <[email protected]>",
Expand All @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion contrib/test.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions secp256k1-zkp-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "secp256k1-zkp-sys"
version = "0.8.1"
version = "0.9.0"
authors = [ "Dawid Ciężarkiewicz <[email protected]>",
"Andrew Poelstra <[email protected]>",
"Steven Roose <[email protected]>",
Expand All @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion secp256k1-zkp-sys/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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**.
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
8 changes: 4 additions & 4 deletions src/zkp/rangeproof.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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() {
Expand All @@ -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;
Expand Down Expand Up @@ -309,7 +309,7 @@ mod tests {
)
.unwrap();

#[cfg(feature = "bitcoin_hashes")]
#[cfg(feature = "hashes")]
{
use std::str::FromStr;
use std::string::ToString;
Expand Down
8 changes: 4 additions & 4 deletions src/zkp/surjection_proof.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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() {
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Loading