From f2563d39cbd560379411ad2393c127171a926789 Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Fri, 15 Aug 2025 20:37:03 -0400 Subject: [PATCH] Correct crypto MSRVs --- Cargo.lock | 6 +++--- common/zalloc/Cargo.toml | 2 +- crypto/dalek-ff-group/Cargo.toml | 2 +- crypto/dalek-ff-group/src/lib.rs | 16 ++++++++++++---- crypto/dkg/Cargo.toml | 2 +- crypto/dleq/Cargo.toml | 2 +- crypto/ed448/Cargo.toml | 2 +- 7 files changed, 20 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 799988d5..95a91959 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2222,7 +2222,7 @@ dependencies = [ "rand_core", "schnorr-signatures", "std-shims", - "thiserror 1.0.64", + "thiserror 2.0.14", "zeroize", ] @@ -2241,7 +2241,7 @@ dependencies = [ "multiexp", "rand_core", "rustversion", - "thiserror 1.0.64", + "thiserror 2.0.14", "zeroize", ] @@ -4838,7 +4838,7 @@ dependencies = [ "schnorr-signatures", "serde_json", "subtle", - "thiserror 1.0.64", + "thiserror 2.0.14", "zeroize", ] diff --git a/common/zalloc/Cargo.toml b/common/zalloc/Cargo.toml index af4e7c1c..88e59ec0 100644 --- a/common/zalloc/Cargo.toml +++ b/common/zalloc/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/serai-dex/serai/tree/develop/common/zalloc" authors = ["Luke Parker "] keywords = [] edition = "2021" -rust-version = "1.77.0" +rust-version = "1.77" [package.metadata.docs.rs] all-features = true diff --git a/crypto/dalek-ff-group/Cargo.toml b/crypto/dalek-ff-group/Cargo.toml index b41e1f4e..e5793c98 100644 --- a/crypto/dalek-ff-group/Cargo.toml +++ b/crypto/dalek-ff-group/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/serai-dex/serai/tree/develop/crypto/dalek-ff-gr authors = ["Luke Parker "] keywords = ["curve25519", "ed25519", "ristretto", "dalek", "group"] edition = "2021" -rust-version = "1.71" +rust-version = "1.65" [package.metadata.docs.rs] all-features = true diff --git a/crypto/dalek-ff-group/src/lib.rs b/crypto/dalek-ff-group/src/lib.rs index e6aad5b2..0e96bfa6 100644 --- a/crypto/dalek-ff-group/src/lib.rs +++ b/crypto/dalek-ff-group/src/lib.rs @@ -40,11 +40,19 @@ pub use field::FieldElement; // Use black_box when possible #[rustversion::since(1.66)] -use core::hint::black_box; -#[rustversion::before(1.66)] -fn black_box(val: T) -> T { - val +mod black_box { + pub(crate) fn black_box(val: T) -> T { + #[allow(clippy::incompatible_msrv)] + core::hint::black_box(val) + } } +#[rustversion::before(1.66)] +mod black_box { + pub(crate) fn black_box(val: T) -> T { + val + } +} +use black_box::black_box; fn u8_from_bool(bit_ref: &mut bool) -> u8 { let bit_ref = black_box(bit_ref); diff --git a/crypto/dkg/Cargo.toml b/crypto/dkg/Cargo.toml index db54f218..b144cb26 100644 --- a/crypto/dkg/Cargo.toml +++ b/crypto/dkg/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/serai-dex/serai/tree/develop/crypto/dkg" authors = ["Luke Parker "] keywords = ["dkg", "multisig", "threshold", "ff", "group"] edition = "2021" -rust-version = "1.81" +rust-version = "1.80" [package.metadata.docs.rs] all-features = true diff --git a/crypto/dleq/Cargo.toml b/crypto/dleq/Cargo.toml index a2b8ad9e..61e9a362 100644 --- a/crypto/dleq/Cargo.toml +++ b/crypto/dleq/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT" repository = "https://github.com/serai-dex/serai/tree/develop/crypto/dleq" authors = ["Luke Parker "] edition = "2021" -rust-version = "1.81" +rust-version = "1.79" [package.metadata.docs.rs] all-features = true diff --git a/crypto/ed448/Cargo.toml b/crypto/ed448/Cargo.toml index 64c1b243..2302d7b3 100644 --- a/crypto/ed448/Cargo.toml +++ b/crypto/ed448/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/serai-dex/serai/tree/develop/crypto/ed448" authors = ["Luke Parker "] keywords = ["ed448", "ff", "group"] edition = "2021" -rust-version = "1.71" +rust-version = "1.65" [package.metadata.docs.rs] all-features = true