From 125d737afd4ed178bc72f899439d6df95deb8693 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Wed, 16 Apr 2025 20:11:08 +0000 Subject: [PATCH 1/3] Raise MSRV to 1.63 --- CHANGELOG.md | 2 ++ Cargo.toml | 2 +- README.md | 2 +- rust-toolchain.toml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f3dae72..06f475c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to Rust's notion of [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Changed +- MSRV is now 1.63.0. ## [0.23.0] - 2022-12-06 ### Changed diff --git a/Cargo.toml b/Cargo.toml index 2fad51f2..66f46192 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "pairing" version = "0.23.0" authors = ["Sean Bowe ", "Jack Grigg "] edition = "2021" -rust-version = "1.56" +rust-version = "1.63" readme = "README.md" license = "MIT/Apache-2.0" diff --git a/README.md b/README.md index 3a0e84eb..10531baa 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ access patterns, or resistance to side-channel attacks. ## Minimum Supported Rust Version -Requires Rust **1.56** or higher. +Requires Rust **1.63** or higher. Minimum supported Rust version can be changed in the future, but it will be done with a minor version bump. diff --git a/rust-toolchain.toml b/rust-toolchain.toml index de43b230..3eebdfe1 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.56.0" +channel = "1.63.0" components = [ "clippy", "rustfmt" ] From 3c001b379f9874a91dcea45b89dffc08f3841092 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Wed, 16 Apr 2025 20:18:52 +0000 Subject: [PATCH 2/3] Migrate to `group 0.14` release branch with `rand 0.9` --- CHANGELOG.md | 1 + Cargo.lock | 10 ++++------ Cargo.toml | 4 ++++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06f475c2..e8af0d39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to Rust's notion of ## [Unreleased] ### Changed - MSRV is now 1.63.0. +- Bumped dependencies to `group 0.14`. ## [0.23.0] - 2022-12-06 ### Changed diff --git a/Cargo.lock b/Cargo.lock index 440bfc99..fc0b2e4d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5,8 +5,7 @@ version = 3 [[package]] name = "ff" version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" +source = "git+https://github.com/zkcrypto/ff.git?rev=241caff9bcedafbe279b5a4d875461f66b3f9701#241caff9bcedafbe279b5a4d875461f66b3f9701" dependencies = [ "rand_core", "subtle", @@ -15,8 +14,7 @@ dependencies = [ [[package]] name = "group" version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +source = "git+https://github.com/zkcrypto/group.git?rev=94b7e7420b410d301162a8aa4d7a0a6d88564e69#94b7e7420b410d301162a8aa4d7a0a6d88564e69" dependencies = [ "ff", "rand_core", @@ -32,9 +30,9 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.4" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" [[package]] name = "subtle" diff --git a/Cargo.toml b/Cargo.toml index 66f46192..113d9c16 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,3 +17,7 @@ group = { version = "0.13", default-features = false } [badges] maintenance = { status = "actively-developed" } + +[patch.crates-io] +ff = { git = "https://github.com/zkcrypto/ff.git", rev = "241caff9bcedafbe279b5a4d875461f66b3f9701" } +group = { git = "https://github.com/zkcrypto/group.git", rev = "94b7e7420b410d301162a8aa4d7a0a6d88564e69" } From 36b60181b61f1f2062822e831dba33b8f0ac1b31 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 17 Apr 2025 17:54:30 +0000 Subject: [PATCH 3/3] Preview 0.24.0-pre.0 --- Cargo.lock | 12 +++++++----- Cargo.toml | 8 ++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fc0b2e4d..d158f05c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,8 +4,9 @@ version = 3 [[package]] name = "ff" -version = "0.13.1" -source = "git+https://github.com/zkcrypto/ff.git?rev=241caff9bcedafbe279b5a4d875461f66b3f9701#241caff9bcedafbe279b5a4d875461f66b3f9701" +version = "0.14.0-pre.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d42dd26f5790eda47c1a2158ea4120e32c35ddc9a7743c98a292accc01b54ef3" dependencies = [ "rand_core", "subtle", @@ -13,8 +14,9 @@ dependencies = [ [[package]] name = "group" -version = "0.13.0" -source = "git+https://github.com/zkcrypto/group.git?rev=94b7e7420b410d301162a8aa4d7a0a6d88564e69#94b7e7420b410d301162a8aa4d7a0a6d88564e69" +version = "0.14.0-pre.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ff6a0b2dd4b981b1ae9e3e6830ab146771f3660d31d57bafd9018805a91b0f1" dependencies = [ "ff", "rand_core", @@ -23,7 +25,7 @@ dependencies = [ [[package]] name = "pairing" -version = "0.23.0" +version = "0.24.0-pre.0" dependencies = [ "group", ] diff --git a/Cargo.toml b/Cargo.toml index 113d9c16..50c2d6a7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pairing" -version = "0.23.0" +version = "0.24.0-pre.0" authors = ["Sean Bowe ", "Jack Grigg "] edition = "2021" rust-version = "1.63" @@ -13,11 +13,7 @@ homepage = "https://github.com/zkcrypto/pairing" repository = "https://github.com/zkcrypto/pairing" [dependencies] -group = { version = "0.13", default-features = false } +group = { version = "=0.14.0-pre.0", default-features = false } [badges] maintenance = { status = "actively-developed" } - -[patch.crates-io] -ff = { git = "https://github.com/zkcrypto/ff.git", rev = "241caff9bcedafbe279b5a4d875461f66b3f9701" } -group = { git = "https://github.com/zkcrypto/group.git", rev = "94b7e7420b410d301162a8aa4d7a0a6d88564e69" }