mirror of
https://github.com/serai-dex/serai.git
synced 2025-12-09 04:39:24 +00:00
Smash the singular Ciphersuite trait into multiple
This helps identify where the various functionalities are used, or rather, not used. The `Ciphersuite` trait present in `patches/ciphersuite`, facilitating the entire FCMP++ tree, only requires the markers _and_ canonical point decoding. I've opened a PR to upstream such a trait into `group` (https://github.com/zkcrypto/group/pull/68). `WrappedGroup` is still justified for as long as `Group::generator` exists. Moving `::generator()` to its own trait, on an independent structure (upstream) would be massively appreciated. @tarcieri also wanted to update from `fn generator()` to `const GENERATOR`, which would encourage further discussion on https://github.com/zkcrypto/group/issues/32 and https://github.com/zkcrypto/group/issues/45, which have been stagnant. The `Id` trait is occasionally used yet really should be first off the chopping block. Finally, `WithPreferredHash` is only actually used around a third of the time, which more than justifies it being a separate trait. --- Updates `dalek_ff_group::Scalar` to directly re-export `curve25519_dalek::Scalar`, as without issue. `dalek_ff_group::RistrettoPoint` also could be replaced with an export of `curve25519_dalek::RistrettoPoint`, yet the coordinator relies on how we implemented `Hash` on it for the hell of it so it isn't worth it at this time. `dalek_ff_group::EdwardsPoint` can't be replaced for an re-export of `curve25519_dalek::SubgroupPoint` as it doesn't implement `zeroize`, `subtle` traits within a released, non-yanked version. Relevance to https://github.com/serai-dex/serai/issues/201 and https://github.com/dalek-cryptography/curve25519-dalek/issues/811#issuecomment-3247732746. Also updates the `Ristretto` ciphersuite to prefer `Blake2b-512` over `SHA2-512`. In order to maintain compliance with FROST's IETF standard, `modular-frost` defines its own ciphersuite for Ristretto which still uses `SHA2-512`.
This commit is contained in:
@@ -24,10 +24,9 @@ transcript = { package = "flexible-transcript", path = "../transcript", version
|
||||
|
||||
group = "0.13"
|
||||
|
||||
dalek-ff-group = { path = "../dalek-ff-group" }
|
||||
ciphersuite = { path = "../ciphersuite", version = "^0.4.1", features = ["std"] }
|
||||
schnorr = { package = "schnorr-signatures", path = "../schnorr", version = "^0.5.1" }
|
||||
frost = { path = "../frost", package = "modular-frost", version = "^0.10.0", features = ["ristretto"] }
|
||||
frost = { path = "../frost", package = "modular-frost", version = "0.11.0", features = ["ristretto"] }
|
||||
|
||||
schnorrkel = { version = "0.11" }
|
||||
|
||||
|
||||
@@ -9,16 +9,16 @@ use zeroize::Zeroizing;
|
||||
|
||||
use transcript::{Transcript, MerlinTranscript};
|
||||
|
||||
use dalek_ff_group::Ristretto;
|
||||
use ciphersuite::{
|
||||
group::{ff::PrimeField, GroupEncoding},
|
||||
Ciphersuite,
|
||||
WrappedGroup,
|
||||
};
|
||||
use schnorr::SchnorrSignature;
|
||||
|
||||
use ::frost::{
|
||||
Participant, ThresholdKeys, ThresholdView, FrostError,
|
||||
algorithm::{Hram, Algorithm, Schnorr},
|
||||
curve::Ristretto,
|
||||
};
|
||||
|
||||
/// The [modular-frost](https://docs.rs/modular-frost) library.
|
||||
@@ -28,8 +28,8 @@ pub mod frost {
|
||||
|
||||
use schnorrkel::{PublicKey, Signature, context::SigningTranscript, signing_context};
|
||||
|
||||
type RistrettoPoint = <Ristretto as Ciphersuite>::G;
|
||||
type Scalar = <Ristretto as Ciphersuite>::F;
|
||||
type RistrettoPoint = <Ristretto as WrappedGroup>::G;
|
||||
type Scalar = <Ristretto as WrappedGroup>::F;
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests;
|
||||
@@ -83,7 +83,7 @@ impl Algorithm<Ristretto> for Schnorrkel {
|
||||
self.schnorr.transcript()
|
||||
}
|
||||
|
||||
fn nonces(&self) -> Vec<Vec<<Ristretto as Ciphersuite>::G>> {
|
||||
fn nonces(&self) -> Vec<Vec<<Ristretto as WrappedGroup>::G>> {
|
||||
self.schnorr.nonces()
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user