mirror of
https://github.com/serai-dex/serai.git
synced 2025-12-08 12:19: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:
@@ -6,7 +6,7 @@ use zeroize::Zeroizing;
|
||||
|
||||
use ciphersuite::{
|
||||
group::{ff::PrimeField, GroupEncoding},
|
||||
Ciphersuite,
|
||||
WrappedGroup,
|
||||
};
|
||||
use ciphersuite_kp256::Secp256k1;
|
||||
use dalek_ff_group::{Ed25519, Ristretto};
|
||||
@@ -40,7 +40,7 @@ pub fn processor_instance(
|
||||
name: &str,
|
||||
network: ExternalNetworkId,
|
||||
port: u32,
|
||||
message_queue_key: <Ristretto as Ciphersuite>::F,
|
||||
message_queue_key: <Ristretto as WrappedGroup>::F,
|
||||
) -> (Vec<TestBodySpecification>, EvrfPublicKeys) {
|
||||
let substrate_evrf_key =
|
||||
insecure_arbitrary_key_from_name::<<Ristretto as EvrfCurve>::EmbeddedCurve>(name);
|
||||
@@ -113,7 +113,7 @@ pub fn processor_instance(
|
||||
}
|
||||
|
||||
pub struct ProcessorKeys {
|
||||
coordinator: <Ristretto as Ciphersuite>::F,
|
||||
coordinator: <Ristretto as WrappedGroup>::F,
|
||||
evrf: EvrfPublicKeys,
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
use zeroize::Zeroizing;
|
||||
use rand_core::{RngCore, OsRng};
|
||||
|
||||
use ciphersuite::{WrappedGroup, GroupIo};
|
||||
|
||||
use scale::Encode;
|
||||
|
||||
use serai_client::{
|
||||
@@ -90,7 +92,7 @@ pub enum Wallet {
|
||||
},
|
||||
Ethereum {
|
||||
rpc_url: String,
|
||||
key: <ciphersuite::Secp256k1 as Ciphersuite>::F,
|
||||
key: <ciphersuite::Secp256k1 as WrappedGroup>::F,
|
||||
nonce: u64,
|
||||
},
|
||||
Monero {
|
||||
@@ -158,9 +160,9 @@ impl Wallet {
|
||||
network::Ethereum,
|
||||
};
|
||||
|
||||
let key = <Secp256k1 as Ciphersuite>::F::random(&mut OsRng);
|
||||
let key = <Secp256k1 as WrappedGroup>::F::random(&mut OsRng);
|
||||
let address =
|
||||
ethereum_serai::crypto::address(&(<Secp256k1 as Ciphersuite>::generator() * key));
|
||||
ethereum_serai::crypto::address(&(<Secp256k1 as WrappedGroup>::generator() * key));
|
||||
|
||||
let provider = RootProvider::<_, Ethereum>::new(
|
||||
ClientBuilder::default().transport(SimpleRequest::new(rpc_url.clone()), true),
|
||||
@@ -321,7 +323,7 @@ impl Wallet {
|
||||
));
|
||||
|
||||
let to_as_key = PublicKey::new(
|
||||
<ciphersuite::Secp256k1 as Ciphersuite>::read_G(&mut to.as_slice()).unwrap(),
|
||||
<ciphersuite::Secp256k1 as GroupIo>::read_G(&mut to.as_slice()).unwrap(),
|
||||
)
|
||||
.unwrap();
|
||||
let router_addr = {
|
||||
|
||||
Reference in New Issue
Block a user