schnorr module integrated into signature_scheme

Author: curiecrypt

Cargo.lock

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.6.2 (11-27-2025)
+
+### Changed
+
+- Stm library re-organized for SNARK-friendliness.
+
 ## 0.6.1 (11-27-2025)
 
 ### Added

mithril-stm/CHANGELOG.md

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-stm"
-version = "0.6.1"
+version = "0.6.2"
 edition = { workspace = true }
 authors = { workspace = true }
 homepage = { workspace = true }

mithril-stm/Cargo.toml

@@ -112,9 +112,6 @@
 //! ```
 
 mod membership_commitment;
-#[cfg(feature = "future_snark")]
-mod schnorr_signature;
-
 mod proof_system;
 mod protocol;
 mod signature_scheme;
@@ -128,7 +125,7 @@ pub use signature_scheme::{
 };
 
 #[cfg(feature = "future_snark")]
-pub use schnorr_signature::{SchnorrSignature, SchnorrSigningKey, SchnorrVerificationKey};
+pub use signature_scheme::{SchnorrSignature, SchnorrSigningKey, SchnorrVerificationKey};
 
 /// The quantity of stake held by a party, represented as a `u64`.
 pub type Stake = u64;

mithril-stm/src/lib.rs

@@ -1,4 +1,8 @@
 mod bls_multi_signature;
+#[cfg(feature = "future_snark")]
 mod schnorr_signature;
 
 pub use bls_multi_signature::*;
+
+#[cfg(feature = "future_snark")]
+pub use schnorr_signature::*;

mithril-stm/src/schnorr_signature/mod.rs

@@ -1 +1,16 @@
+mod error;
+mod signature;
+mod signing_key;
+mod utils;
+mod verification_key;
 
+pub use error::*;
+pub use signature::*;
+pub use signing_key::*;
+pub(crate) use utils::*;
+pub use verification_key::*;
+
+use dusk_jubjub::Fq as JubjubBase;
+
+/// A DST (Domain Separation Tag) to distinguish between use of Poseidon hash
+const DST_SIGNATURE: JubjubBase = JubjubBase::from_raw([0u64, 0, 0, 0]);

mithril-stm/src/signature_scheme/mod.rs

@@ -8,9 +8,9 @@ use group::{Group, GroupEncoding};
 
 use crate::{
     StmResult,
-    schnorr_signature::{
-        DST_SIGNATURE, SchnorrSignatureError, SchnorrVerificationKey,
-        get_coordinates_several_points, is_on_curve,
+    signature_scheme::{
+        SchnorrSignatureError, SchnorrVerificationKey, get_coordinates_several_points, is_on_curve,
+        schnorr_signature::DST_SIGNATURE,
     },
 };
 
@@ -211,7 +211,7 @@ mod tests {
         use rand_chacha::ChaCha20Rng;
         use rand_core::SeedableRng;
 
-        use crate::schnorr_signature::{SchnorrSignature, SchnorrSigningKey};
+        use crate::{SchnorrSignature, SchnorrSigningKey};
 
         const GOLDEN_BYTES: &[u8; 96] = &[
             143, 53, 198, 62, 178, 1, 88, 253, 21, 92, 100, 13, 72, 180, 198, 127, 39, 175, 102,

mithril-stm/src/schnorr_signature/error.rs renamed to mithril-stm/src/signature_scheme/schnorr_signature/error.rs

@@ -9,9 +9,9 @@ use rand_core::{CryptoRng, RngCore};
 
 use crate::{
     StmResult,
-    schnorr_signature::{
-        DST_SIGNATURE, SchnorrSignature, SchnorrSignatureError, SchnorrVerificationKey,
-        generate_non_zero_scalar, get_coordinates_several_points,
+    signature_scheme::{
+        SchnorrSignature, SchnorrSignatureError, SchnorrVerificationKey, generate_non_zero_scalar,
+        get_coordinates_several_points, schnorr_signature::DST_SIGNATURE,
     },
 };
 
@@ -193,7 +193,7 @@ mod tests {
         use rand_chacha::ChaCha20Rng;
         use rand_core::SeedableRng;
 
-        use crate::schnorr_signature::SchnorrSigningKey;
+        use crate::SchnorrSigningKey;
 
         const GOLDEN_BYTES: &[u8; 32] = &[
             126, 191, 239, 197, 88, 151, 248, 254, 187, 143, 86, 35, 29, 62, 90, 13, 196, 71, 234,