Merge branch 'next' into next-polkadot-sdk

orchestration/src/coordinator.rs

@@ -3,7 +3,7 @@ use std::path::Path;
 use zeroize::Zeroizing;
 
 use dalek_ff_group::Ristretto;
-use ciphersuite::{group::ff::PrimeField, Ciphersuite};
+use ciphersuite::{group::ff::PrimeField, WrappedGroup};
 
 use crate::{Network, Os, mimalloc, os, build_serai_service, write_dockerfile};
 
@@ -11,8 +11,8 @@ use crate::{Network, Os, mimalloc, os, build_serai_service, write_dockerfile};
 pub fn coordinator(
   orchestration_path: &Path,
   network: Network,
-  coordinator_key: Zeroizing<<Ristretto as Ciphersuite>::F>,
-  serai_key: &Zeroizing<<Ristretto as Ciphersuite>::F>,
+  coordinator_key: Zeroizing<<Ristretto as WrappedGroup>::F>,
+  serai_key: &Zeroizing<<Ristretto as WrappedGroup>::F>,
 ) {
   let db = network.db();
   let longer_reattempts = if network == Network::Dev { "longer-reattempts" } else { "" };

orchestration/src/main.rs

@@ -24,7 +24,7 @@ use ciphersuite::{
     ff::{Field, PrimeField},
     GroupEncoding,
   },
-  Ciphersuite,
+  WrappedGroup,
 };
 use embedwards25519::Embedwards25519;
 use secq256k1::Secq256k1;
@@ -222,8 +222,10 @@ fn orchestration_path(network: Network) -> PathBuf {
   orchestration_path
 }
 
-type InfrastructureKeys =
-  HashMap<&'static str, (Zeroizing<<Ristretto as Ciphersuite>::F>, <Ristretto as Ciphersuite>::G)>;
+type InfrastructureKeys = HashMap<
+  &'static str,
+  (Zeroizing<<Ristretto as WrappedGroup>::F>, <Ristretto as WrappedGroup>::G),
+>;
 fn infrastructure_keys(network: Network) -> InfrastructureKeys {
   // Generate entropy for the infrastructure keys
 
@@ -258,7 +260,7 @@ fn infrastructure_keys(network: Network) -> InfrastructureKeys {
   let mut rng = ChaCha20Rng::from_seed(transcript.rng_seed(b"infrastructure_keys"));
 
   let mut key_pair = || {
-    let key = Zeroizing::new(<Ristretto as Ciphersuite>::F::random(&mut rng));
+    let key = Zeroizing::new(<Ristretto as WrappedGroup>::F::random(&mut rng));
     let public = Ristretto::generator() * key.deref();
     (key, public)
   };
@@ -308,12 +310,12 @@ fn embedded_curve_keys(network: Network) -> EmbeddedCurveKeys {
 
   EmbeddedCurveKeys {
     embedwards25519: {
-      let key = Zeroizing::new(<Embedwards25519 as Ciphersuite>::F::random(&mut rng));
+      let key = Zeroizing::new(<Embedwards25519 as WrappedGroup>::F::random(&mut rng));
       let pub_key = Embedwards25519::generator() * key.deref();
       (Zeroizing::new(key.to_repr().as_ref().to_vec()), pub_key.to_bytes().to_vec())
     },
     secq256k1: {
-      let key = Zeroizing::new(<Secq256k1 as Ciphersuite>::F::random(&mut rng));
+      let key = Zeroizing::new(<Secq256k1 as WrappedGroup>::F::random(&mut rng));
       let pub_key = Secq256k1::generator() * key.deref();
       (Zeroizing::new(key.to_repr().as_ref().to_vec()), pub_key.to_bytes().to_vec())
     },
@@ -382,9 +384,9 @@ fn dockerfiles(network: Network) {
         .expect("couldn't read key for this network"),
     );
     let mut serai_key_repr =
-      Zeroizing::new(<<Ristretto as Ciphersuite>::F as PrimeField>::Repr::default());
+      Zeroizing::new(<<Ristretto as WrappedGroup>::F as PrimeField>::Repr::default());
     serai_key_repr.as_mut().copy_from_slice(serai_key.as_ref());
-    Zeroizing::new(<Ristretto as Ciphersuite>::F::from_repr(*serai_key_repr).unwrap())
+    Zeroizing::new(<Ristretto as WrappedGroup>::F::from_repr(*serai_key_repr).unwrap())
   };
 
   coordinator(&orchestration_path, network, coordinator_key.0, &serai_key);
@@ -400,7 +402,7 @@ fn key_gen(network: Network) {
     return;
   }
 
-  let key = <Ristretto as Ciphersuite>::F::random(&mut OsRng);
+  let key = <Ristretto as WrappedGroup>::F::random(&mut OsRng);
 
   let _ = fs::create_dir_all(&serai_dir);
   fs::write(key_file, key.to_repr()).expect("couldn't write key");
@@ -408,7 +410,7 @@ fn key_gen(network: Network) {
   // TODO: Move embedded curve key gen here, and print them
   println!(
     "Public Key: {}",
-    hex::encode((<Ristretto as Ciphersuite>::generator() * key).to_bytes())
+    hex::encode((<Ristretto as WrappedGroup>::generator() * key).to_bytes())
   );
 }
 

orchestration/src/message_queue.rs

@@ -1,17 +1,17 @@
 use std::path::Path;
 
 use dalek_ff_group::Ristretto;
-use ciphersuite::{group::GroupEncoding, Ciphersuite};
+use ciphersuite::{group::GroupEncoding, WrappedGroup};
 
 use crate::{Network, Os, mimalloc, os, build_serai_service, write_dockerfile};
 
 pub fn message_queue(
   orchestration_path: &Path,
   network: Network,
-  coordinator_key: <Ristretto as Ciphersuite>::G,
-  bitcoin_key: <Ristretto as Ciphersuite>::G,
-  ethereum_key: <Ristretto as Ciphersuite>::G,
-  monero_key: <Ristretto as Ciphersuite>::G,
+  coordinator_key: <Ristretto as WrappedGroup>::G,
+  bitcoin_key: <Ristretto as WrappedGroup>::G,
+  ethereum_key: <Ristretto as WrappedGroup>::G,
+  monero_key: <Ristretto as WrappedGroup>::G,
 ) {
   let setup = mimalloc(Os::Debian).to_string() +
     &build_serai_service("", network.release(), network.db(), "serai-message-queue");

orchestration/src/processor.rs

@@ -3,7 +3,7 @@ use std::path::Path;
 use zeroize::Zeroizing;
 
 use dalek_ff_group::Ristretto;
-use ciphersuite::{group::ff::PrimeField, Ciphersuite};
+use ciphersuite::{group::ff::PrimeField, WrappedGroup};
 
 use crate::{Network, Os, mimalloc, os, build_serai_service, write_dockerfile};
 
@@ -12,8 +12,8 @@ pub fn processor(
   orchestration_path: &Path,
   network: Network,
   coin: &'static str,
-  _coordinator_key: <Ristretto as Ciphersuite>::G,
-  processor_key: Zeroizing<<Ristretto as Ciphersuite>::F>,
+  _coordinator_key: <Ristretto as WrappedGroup>::G,
+  processor_key: Zeroizing<<Ristretto as WrappedGroup>::F>,
   substrate_evrf_key: Zeroizing<Vec<u8>>,
   network_evrf_key: Zeroizing<Vec<u8>>,
 ) {

orchestration/src/serai.rs

@@ -2,14 +2,14 @@ use std::path::Path;
 
 use zeroize::Zeroizing;
 use dalek_ff_group::Ristretto;
-use ciphersuite::{group::ff::PrimeField, Ciphersuite};
+use ciphersuite::{group::ff::PrimeField, WrappedGroup};
 
 use crate::{Network, Os, mimalloc, os, build_serai_service, write_dockerfile};
 
 pub fn serai(
   orchestration_path: &Path,
   network: Network,
-  serai_key: &Zeroizing<<Ristretto as Ciphersuite>::F>,
+  serai_key: &Zeroizing<<Ristretto as WrappedGroup>::F>,
 ) {
   // Always builds in release for performance reasons
   let setup = mimalloc(Os::Debian).to_string() + &build_serai_service("", true, "", "serai-node");