Merge branch 'next' into next-polkadot-sdk

substrate/client/Cargo.toml

@@ -41,9 +41,9 @@ simple-request = { path = "../../common/request", version = "0.1", optional = tr
 
 bitcoin = { version = "0.32", optional = true }
 
+ciphersuite = { path = "../../crypto/ciphersuite", optional = true }
 dalek-ff-group = { path = "../../crypto/dalek-ff-group", optional = true }
-ciphersuite = { path = "../../crypto/ciphersuite", version = "0.4", optional = true }
-monero-address = { git = "https://github.com/monero-oxide/monero-oxide", rev = "6966575e05fe09b77674c46984b21686ed9304ff", version = "0.1.0", default-features = false, features = ["std"], optional = true }
+monero-address = { git = "https://github.com/monero-oxide/monero-oxide", rev = "7f37cc8f770858aa1739e0f56dbe447db86f4ba6", version = "0.1.0", default-features = false, features = ["std"], optional = true }
 
 [dev-dependencies]
 rand_core = "0.6"
@@ -69,7 +69,7 @@ serai = ["thiserror/std", "scale", "serde", "serde_json", "multiaddr", "sp-core"
 networks = []
 bitcoin = ["networks", "dep:bitcoin"]
 ethereum = ["networks"]
-monero = ["networks", "dalek-ff-group", "ciphersuite", "monero-address"]
+monero = ["networks", "ciphersuite", "dalek-ff-group", "monero-address"]
 
 # Assumes the default usage is to use Serai as a DEX, which doesn't actually
 # require connecting to a Serai node

substrate/client/src/networks/monero.rs

@@ -1,7 +1,7 @@
 use core::{str::FromStr, fmt};
 
-use dalek_ff_group::Ed25519;
-use ciphersuite::Ciphersuite;
+use dalek_ff_group::{EdwardsPoint, Ed25519};
+use ciphersuite::GroupIo;
 
 use monero_address::{Network, AddressType as MoneroAddressType, MoneroAddress};
 
@@ -18,8 +18,8 @@ enum AddressType {
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
 pub struct Address {
   kind: AddressType,
-  spend: <Ed25519 as Ciphersuite>::G,
-  view: <Ed25519 as Ciphersuite>::G,
+  spend: EdwardsPoint,
+  view: EdwardsPoint,
 }
 
 fn byte_for_kind(kind: AddressType) -> u8 {

substrate/client/tests/common/genesis_liquidity.rs

@@ -3,8 +3,8 @@ use std::collections::HashMap;
 use rand_core::{RngCore, OsRng};
 use zeroize::Zeroizing;
 
-use dalek_ff_group::Ristretto;
-use ciphersuite::Ciphersuite;
+use frost::curve::Ristretto;
+use ciphersuite::{WrappedGroup, GroupIo};
 use dkg_musig::musig;
 use schnorrkel::Schnorrkel;
 
@@ -96,11 +96,10 @@ async fn set_values(serai: &Serai, values: &Values) {
   // we publish the tx in set 1
   let set = ValidatorSet { session: Session(1), network: NetworkId::Serai };
 
-  let public_key = <Ristretto as Ciphersuite>::read_G::<&[u8]>(&mut public.0.as_ref()).unwrap();
-  let secret_key = <Ristretto as Ciphersuite>::read_F::<&[u8]>(
-    &mut pair.as_ref().secret.to_bytes()[.. 32].as_ref(),
-  )
-  .unwrap();
+  let public_key = <Ristretto as GroupIo>::read_G::<&[u8]>(&mut public.0.as_ref()).unwrap();
+  let secret_key =
+    <Ristretto as GroupIo>::read_F::<&[u8]>(&mut pair.as_ref().secret.to_bytes()[.. 32].as_ref())
+      .unwrap();
 
   assert_eq!(Ristretto::generator() * secret_key, public_key);
   let threshold_keys =

substrate/client/tests/common/validator_sets.rs

@@ -1,9 +1,13 @@
 use std::collections::HashMap;
 
-use serai_abi::primitives::NetworkId;
 use zeroize::Zeroizing;
 use rand_core::OsRng;
 
+use frost::curve::Ristretto;
+use ciphersuite::{WrappedGroup, GroupIo};
+use dkg_musig::musig;
+use schnorrkel::Schnorrkel;
+
 use sp_core::{
   ConstU32,
   bounded::BoundedVec,
@@ -11,10 +15,7 @@ use sp_core::{
   Pair as PairTrait,
 };
 
-use dalek_ff_group::Ristretto;
-use ciphersuite::Ciphersuite;
-use dkg_musig::musig;
-use schnorrkel::Schnorrkel;
+use serai_abi::primitives::NetworkId;
 
 use serai_client::{
   primitives::{EmbeddedEllipticCurve, Amount},
@@ -37,13 +38,13 @@ pub async fn set_keys(
   let mut pub_keys = vec![];
   for pair in pairs {
     let public_key =
-      <Ristretto as Ciphersuite>::read_G::<&[u8]>(&mut pair.public().0.as_ref()).unwrap();
+      <Ristretto as GroupIo>::read_G::<&[u8]>(&mut pair.public().0.as_ref()).unwrap();
     pub_keys.push(public_key);
   }
 
   let mut threshold_keys = vec![];
   for i in 0 .. pairs.len() {
-    let secret_key = <Ristretto as Ciphersuite>::read_F::<&[u8]>(
+    let secret_key = <Ristretto as GroupIo>::read_F::<&[u8]>(
       &mut pairs[i].as_ref().secret.to_bytes()[.. 32].as_ref(),
     )
     .unwrap();

substrate/node/Cargo.toml

@@ -82,7 +82,7 @@ serai-env = { path = "../../common/env" }
 
 curve25519-dalek = { version = "4", default-features = false, features = ["alloc", "zeroize"] }
 bitcoin-serai = { path = "../../networks/bitcoin", default-features = false, features = ["std", "hazmat"] }
-monero-address = { git = "https://github.com/monero-oxide/monero-oxide", rev = "6966575e05fe09b77674c46984b21686ed9304ff", default-features = false, features = ["std"] }
+monero-address = { git = "https://github.com/monero-oxide/monero-oxide", rev = "7f37cc8f770858aa1739e0f56dbe447db86f4ba6", default-features = false, features = ["std"] }
 
 [build-dependencies]
 substrate-build-script-utils = { git = "https://github.com/serai-dex/patch-polkadot-sdk", rev = "ece373ca1e8aaee67844eebcca28b5e016136dba" }

substrate/node/src/rpc.rs

@@ -50,7 +50,7 @@ where
 {
   use substrate_frame_rpc_system::{System, SystemApiServer};
   use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};
-  use ciphersuite::Ciphersuite;
+  use ciphersuite::{GroupIo, WithPreferredHash};
   use ciphersuite_kp256::{k256::elliptic_curve::point::AffineCoordinates, Secp256k1};
   use dalek_ff_group::Ed25519;
   use bitcoin_serai::bitcoin;
@@ -126,7 +126,7 @@ where
 
       match network {
         ExternalNetworkId::Bitcoin => {
-          let key = <Secp256k1 as Ciphersuite>::read_G::<&[u8]>(&mut external_key.as_slice())
+          let key = <Secp256k1 as GroupIo>::read_G::<&[u8]>(&mut external_key.as_slice())
             .map_err(|_| Error::Custom("invalid key stored in db".to_string()))?;
 
           let addr = bitcoin::Address::p2tr_tweaked(
@@ -144,14 +144,11 @@ where
         ExternalNetworkId::Ethereum => Ok(String::new()),
         ExternalNetworkId::Monero => {
           // TODO: Serai view-key crate
-          let view_private = zeroize::Zeroizing::new(
-            <Ed25519 as Ciphersuite>::hash_to_F(
-              &["Monero".as_bytes(), &0u64.to_le_bytes()].concat(),
-            )
-            .0,
-          );
+          let view_private = zeroize::Zeroizing::new(<Ed25519 as WithPreferredHash>::hash_to_F(
+            &["Monero".as_bytes(), &0u64.to_le_bytes()].concat(),
+          ));
 
-          let spend = <Ed25519 as Ciphersuite>::read_G::<&[u8]>(&mut external_key.as_slice())
+          let spend = <Ed25519 as GroupIo>::read_G::<&[u8]>(&mut external_key.as_slice())
             .map_err(|_| Error::Custom("invalid key stored in db".to_string()))?;
 
           let addr = monero_address::MoneroAddress::new(

substrate/validator-sets/src/tests.rs

@@ -2,10 +2,9 @@ use crate::{mock::*, primitives::*};
 
 use std::collections::HashMap;
 
-use ciphersuite::Ciphersuite;
-use dalek_ff_group::Ristretto;
+use ciphersuite::{WrappedGroup, GroupIo};
 use dkg_musig::musig;
-use schnorrkel::Schnorrkel;
+use schnorrkel::{frost::curve::Ristretto, Schnorrkel};
 
 use zeroize::Zeroizing;
 use rand_core::OsRng;
@@ -75,13 +74,13 @@ fn set_keys_signature(set: &ExternalValidatorSet, key_pair: &KeyPair, pairs: &[P
   let mut pub_keys = vec![];
   for pair in pairs {
     let public_key =
-      <Ristretto as Ciphersuite>::read_G::<&[u8]>(&mut pair.public().0.as_ref()).unwrap();
+      <Ristretto as GroupIo>::read_G::<&[u8]>(&mut pair.public().0.as_ref()).unwrap();
     pub_keys.push(public_key);
   }
 
   let mut threshold_keys = vec![];
   for i in 0 .. pairs.len() {
-    let secret_key = <Ristretto as Ciphersuite>::read_F::<&[u8]>(
+    let secret_key = <Ristretto as GroupIo>::read_F::<&[u8]>(
       &mut pairs[i].as_ref().secret.to_bytes()[.. 32].as_ref(),
     )
     .unwrap();