Set stable toolchain & MSRV 1.85, update msgpacker

.github/workflows/dusk_ci.yml

@@ -72,6 +72,6 @@ jobs:
         with:
           token: ${{secrets.CODECOV_TOKEN}}
 
-  test_nightly_std:
-    name: Nightly tests std
+  test_stable_std:
+    name: Stable tests std
     uses: dusk-network/.github/.github/workflows/run-tests.yml@main

CHANGELOG.md

@@ -7,8 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Added MSRV, set to rust version `1.85` [#860]
+
 ### Changed
 
+- Update rust edition to 2024 [#861]
+- Update rust toolchain to stable [#859]
+- Change dependency `msgpacker`to `0.4.8`
 - Update rust toolchain to nightly 2024-10-17 (1.84.0)
 
 ## [0.21.0] - 2025-02-06
@@ -618,6 +625,9 @@ is necessary since `rkyv/validation` was required as a bound.
 - Proof system module.
 
 <!-- ISSUES -->
+[#861]: https://github.com/dusk-network/plonk/issues/861
+[#860]: https://github.com/dusk-network/plonk/issues/860
+[#859]: https://github.com/dusk-network/plonk/issues/859
 [#842]: https://github.com/dusk-network/plonk/issues/842
 [#834]: https://github.com/dusk-network/plonk/issues/834
 [#831]: https://github.com/dusk-network/plonk/issues/831

Cargo.toml

@@ -2,7 +2,8 @@
 name = "dusk-plonk"
 version = "0.21.0"
 categories =["algorithms", "cryptography", "science", "mathematics"]
-edition = "2021"
+edition = "2024"
+rust-version = "1.85"
 keywords = ["cryptography", "plonk", "zk-snarks", "zero-knowledge", "crypto"]
 license = "MPL-2.0"
 repository = "https://github.com/dusk-network/plonk"
@@ -15,6 +16,7 @@ exclude = [
 ]
 
 [dependencies]
+blake2b_simd = { version = "=1.0.3", default-features = false }
 merlin = {version = "3.0", default-features = false}
 rand_core = {version="0.6", default-features=false}
 dusk-bytes = "0.1"
@@ -23,7 +25,7 @@ dusk-jubjub = {version = "0.15", default-features = false}
 ff = {version = "0.13", default-features = false}
 itertools = {version = "0.9", default-features = false}
 hashbrown = {version = "0.9", default-features=false, features = ["ahash"]}
-msgpacker = {version = "=0.4.3", default-features=false, features = ["alloc", "derive"], optional=true}
+msgpacker = {version = "=0.4.8", default-features=false, features = ["alloc", "derive"], optional=true}
 miniz_oxide = {version = "0.7", default-features=false, features = ["with-alloc"], optional = true}
 rayon = {version = "1.3", optional = true}
 sha2 = {version = "0.10", default-features = false, optional = true}

benches/plonk.rs

@@ -6,7 +6,7 @@
 
 #![allow(clippy::many_single_char_names)]
 
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use dusk_plonk::prelude::*;
 
 #[derive(Debug, Clone, Copy)]

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2024-10-17"
+channel = "stable"
 components = ["rustfmt", "cargo", "clippy"]

rustfmt.toml

@@ -1,2 +1 @@
 max_width = 80
-wrap_comments = true

src/commitment_scheme/kzg10/commitment.rs

@@ -12,8 +12,8 @@ use dusk_bytes::{DeserializableSlice, Serializable};
 use bytecheck::CheckBytes;
 #[cfg(feature = "rkyv-impl")]
 use rkyv::{
-    ser::{ScratchSpace, Serializer},
     Archive, Deserialize, Serialize,
+    ser::{ScratchSpace, Serializer},
 };
 
 /// Holds a commitment to a polynomial in a form of a [`G1Affine`]-bls12_381

src/commitment_scheme/kzg10/key.rs

@@ -7,14 +7,14 @@
 //! Key module contains the utilities and data structures
 //! that support the generation and usage of Commit and
 //! Opening keys.
-use super::{proof::Proof, Commitment};
+use super::{Commitment, proof::Proof};
 use crate::{
     error::Error, fft::Polynomial, transcript::TranscriptProtocol, util,
 };
 use alloc::vec::Vec;
 use dusk_bls12_381::{
-    multiscalar_mul::msm_variable_base, BlsScalar, G1Affine, G1Projective,
-    G2Affine, G2Prepared,
+    BlsScalar, G1Affine, G1Projective, G2Affine, G2Prepared,
+    multiscalar_mul::msm_variable_base,
 };
 use dusk_bytes::{DeserializableSlice, Serializable};
 use merlin::Transcript;
@@ -23,8 +23,8 @@ use merlin::Transcript;
 use bytecheck::CheckBytes;
 #[cfg(feature = "rkyv-impl")]
 use rkyv::{
-    ser::{ScratchSpace, Serializer},
     Archive, Deserialize, Serialize,
+    ser::{ScratchSpace, Serializer},
 };
 
 /// CommitKey is used to commit to a polynomial which is bounded by the
@@ -84,17 +84,19 @@ impl CommitKey {
     /// happen, the inputed bytes must match the ones that were generated by
     /// the encoding functions of this lib.
     pub unsafe fn from_slice_unchecked(bytes: &[u8]) -> Self {
-        let mut len = [0u8; u64::SIZE];
-        len.copy_from_slice(&bytes[..u64::SIZE]);
-        let len = u64::from_le_bytes(len);
-
-        let powers_of_g = bytes[u64::SIZE..]
-            .chunks_exact(G1Affine::RAW_SIZE)
-            .zip(0..len)
-            .map(|(c, _)| G1Affine::from_slice_unchecked(c))
-            .collect();
-
-        Self { powers_of_g }
+        unsafe {
+            let mut len = [0u8; u64::SIZE];
+            len.copy_from_slice(&bytes[..u64::SIZE]);
+            let len = u64::from_le_bytes(len);
+
+            let powers_of_g = bytes[u64::SIZE..]
+                .chunks_exact(G1Affine::RAW_SIZE)
+                .zip(0..len)
+                .map(|(c, _)| G1Affine::from_slice_unchecked(c))
+                .collect();
+
+            Self { powers_of_g }
+        }
     }
 
     /// Serializes the [`CommitKey`] into a byte slice.

src/commitment_scheme/kzg10/srs.rs

@@ -18,8 +18,8 @@ use rand_core::{CryptoRng, RngCore};
 use bytecheck::CheckBytes;
 #[cfg(feature = "rkyv-impl")]
 use rkyv::{
-    ser::{ScratchSpace, Serializer},
     Archive, Deserialize, Serialize,
+    ser::{ScratchSpace, Serializer},
 };
 
 /// The Public Parameters can also be referred to as the Structured Reference
@@ -128,16 +128,18 @@ impl PublicParameters {
     /// happen, the inputed bytes must match the ones that were generated by
     /// the encoding functions of this lib.
     pub unsafe fn from_slice_unchecked(bytes: &[u8]) -> Self {
-        let opening_key = &bytes[..OpeningKey::SIZE];
-        let opening_key = OpeningKey::from_slice(opening_key)
-            .expect("Error at OpeningKey deserialization");
-
-        let commit_key = &bytes[OpeningKey::SIZE..];
-        let commit_key = CommitKey::from_slice_unchecked(commit_key);
-
-        Self {
-            commit_key,
-            opening_key,
+        unsafe {
+            let opening_key = &bytes[..OpeningKey::SIZE];
+            let opening_key = OpeningKey::from_slice(opening_key)
+                .expect("Error at OpeningKey deserialization");
+
+            let commit_key = &bytes[OpeningKey::SIZE..];
+            let commit_key = CommitKey::from_slice_unchecked(commit_key);
+
+            Self {
+                commit_key,
+                opening_key,
+            }
         }
     }
 

src/compiler.rs

@@ -10,7 +10,7 @@ use crate::commitment_scheme::{CommitKey, OpeningKey, PublicParameters};
 use crate::error::Error;
 use crate::fft::{EvaluationDomain, Evaluations, Polynomial};
 use crate::proof_system::preprocess::Polynomials;
-use crate::proof_system::{widget, ProverKey};
+use crate::proof_system::{ProverKey, widget};
 
 use crate::prelude::{Circuit, Composer};
 
@@ -161,8 +161,12 @@ impl Compiler {
             Polynomial::from_coefficients_vec(q_variable_group_add_poly);
 
         // 2. compute the sigma polynomials
-        let [s_sigma_1_poly, s_sigma_2_poly, s_sigma_3_poly, s_sigma_4_poly] =
-            perm.compute_sigma_polynomials(size, &domain);
+        let [
+            s_sigma_1_poly,
+            s_sigma_2_poly,
+            s_sigma_3_poly,
+            s_sigma_4_poly,
+        ] = perm.compute_sigma_polynomials(size, &domain);
 
         let q_m_comm = commit_key.commit(&q_m_poly).unwrap_or_default();
         let q_l_comm = commit_key.commit(&q_l_poly).unwrap_or_default();

src/compiler/prover.rs

@@ -18,7 +18,7 @@ use crate::compiler::prover::linearization_poly::ProofEvaluations;
 use crate::error::Error;
 use crate::fft::{EvaluationDomain, Polynomial};
 use crate::proof_system::{
-    linearization_poly, proof::Proof, quotient_poly, ProverKey, VerifierKey,
+    ProverKey, VerifierKey, linearization_poly, proof::Proof, quotient_poly,
 };
 use crate::transcript::TranscriptProtocol;
 

src/composer/permutation.rs

@@ -993,8 +993,12 @@ mod test {
         assert_ne!(gamma, beta);
 
         // 1. Compute the permutation polynomial using both methods
-        let [s_sigma_1_poly, s_sigma_2_poly, s_sigma_3_poly, s_sigma_4_poly] =
-            perm.compute_sigma_polynomials(n, domain);
+        let [
+            s_sigma_1_poly,
+            s_sigma_2_poly,
+            s_sigma_3_poly,
+            s_sigma_4_poly,
+        ] = perm.compute_sigma_polynomials(n, domain);
         let (z_vec, numerator_components, denominator_components) =
             compute_slow_permutation_poly(
                 domain,

src/error.rs

@@ -129,7 +129,10 @@ impl std::fmt::Display for Error {
                 write!(f, "circuit has already been preprocessed")
             }
             Self::InvalidCircuitSize(description_size, circuit_size) => {
-                write!(f, "circuit description has a different amount of gates than the circuit for the proof creation: description size = {description_size}, circuit size = {circuit_size}")
+                write!(
+                    f,
+                    "circuit description has a different amount of gates than the circuit for the proof creation: description size = {description_size}, circuit size = {circuit_size}"
+                )
             }
             Self::DegreeIsZero => {
                 write!(f, "cannot create PublicParameters with max degree 0")
@@ -152,19 +155,27 @@ impl std::fmt::Display for Error {
             Self::NotEnoughBytes => write!(f, "not enough bytes left to read"),
             Self::PointMalformed => write!(f, "BLS point bytes malformed"),
             Self::BlsScalarMalformed => write!(f, "BLS scalar bytes malformed"),
-            Self::JubJubScalarMalformed => write!(f, "JubJub scalar bytes malformed"),
+            Self::JubJubScalarMalformed => {
+                write!(f, "JubJub scalar bytes malformed")
+            }
             Self::BytesError(err) => write!(f, "{:?}", err),
             Self::UnsupportedWNAF2k => write!(
                 f,
                 "WNAF2k cannot hold values not contained in `[-1..1]`"
             ),
-            Self::PublicInputNotFound {
+            Self::PublicInputNotFound { index } => write!(
+                f,
+                "The public input of index {} is defined in the circuit description, but wasn't declared in the prove instance",
                 index
-            } => write!(f, "The public input of index {} is defined in the circuit description, but wasn't declared in the prove instance", index),
-            Self::InconsistentPublicInputsLen {
-                expected, provided,
-            } => write!(f, "The provided public inputs set of length {} doesn't match the processed verifier: {}", provided, expected),
-            Self::InvalidCompressedCircuit => write!(f, "invalid compressed circuit"),
+            ),
+            Self::InconsistentPublicInputsLen { expected, provided } => write!(
+                f,
+                "The provided public inputs set of length {} doesn't match the processed verifier: {}",
+                provided, expected
+            ),
+            Self::InvalidCompressedCircuit => {
+                write!(f, "invalid compressed circuit")
+            }
         }
     }
 }

src/fft/domain.rs

@@ -19,8 +19,8 @@ use dusk_bytes::{DeserializableSlice, Serializable};
 use bytecheck::CheckBytes;
 #[cfg(feature = "rkyv-impl")]
 use rkyv::{
-    ser::{ScratchSpace, Serializer},
     Archive, Deserialize, Serialize,
+    ser::{ScratchSpace, Serializer},
 };
 
 /// Defines a domain over which finite field (I)FFTs can be performed. Works

src/fft/evaluations.rs

@@ -20,8 +20,8 @@ use dusk_bytes::{DeserializableSlice, Serializable};
 use bytecheck::CheckBytes;
 #[cfg(feature = "rkyv-impl")]
 use rkyv::{
-    ser::{ScratchSpace, Serializer},
     Archive, Deserialize, Serialize,
+    ser::{ScratchSpace, Serializer},
 };
 
 /// Stores a polynomial in evaluation form.
@@ -90,7 +90,7 @@ impl Index<usize> for Evaluations {
     }
 }
 
-impl<'a, 'b> Mul<&'a Evaluations> for &'b Evaluations {
+impl<'a> Mul<&'a Evaluations> for &Evaluations {
     type Output = Evaluations;
 
     #[inline]
@@ -112,7 +112,7 @@ impl<'a> MulAssign<&'a Evaluations> for Evaluations {
     }
 }
 
-impl<'a, 'b> Add<&'a Evaluations> for &'b Evaluations {
+impl<'a> Add<&'a Evaluations> for &Evaluations {
     type Output = Evaluations;
 
     #[inline]
@@ -134,7 +134,7 @@ impl<'a> AddAssign<&'a Evaluations> for Evaluations {
     }
 }
 
-impl<'a, 'b> Sub<&'a Evaluations> for &'b Evaluations {
+impl<'a> Sub<&'a Evaluations> for &Evaluations {
     type Output = Evaluations;
 
     #[inline]