Merge branch 'develop' into next

This resolves the conflicts and gets the workspace `Cargo.toml`s to not be
invalid. It doesn't actually get clippy to pass again yet.

Does move `crypto/dkg/src/evrf` into a new `crypto/dkg/evrf` crate (which does
not yet compile).

substrate/client/Cargo.toml

@@ -7,7 +7,7 @@ repository = "https://github.com/serai-dex/serai/tree/develop/substrate/client"
 authors = ["Luke Parker <lukeparker5132@gmail.com>"]
 keywords = ["serai"]
 edition = "2021"
-rust-version = "1.80"
+rust-version = "1.82"
 
 [package.metadata.docs.rs]
 all-features = true
@@ -41,8 +41,9 @@ simple-request = { path = "../../common/request", version = "0.1", optional = tr
 
 bitcoin = { version = "0.32", optional = true }
 
+dalek-ff-group = { path = "../../crypto/dalek-ff-group", optional = true }
 ciphersuite = { path = "../../crypto/ciphersuite", version = "0.4", optional = true }
-monero-address = { path = "../../networks/monero/wallet/address", version = "0.1.0", default-features = false, features = ["std"], optional = true }
+monero-address = { git = "https://github.com/kayabaNerve/monero-oxide", rev = "b6dd1a9ff7ac6b96eb7cb488a4501fd1f6f2dd1e", version = "0.1.0", default-features = false, features = ["std"], optional = true }
 
 [dev-dependencies]
 rand_core = "0.6"
@@ -50,7 +51,9 @@ hex = "0.4"
 
 blake2 = "0.10"
 
-ciphersuite = { path = "../../crypto/ciphersuite", features = ["ristretto", "secp256k1"] }
+dalek-ff-group = { path = "../../crypto/dalek-ff-group" }
+ciphersuite = { path = "../../crypto/ciphersuite" }
+dkg-musig = { path = "../../crypto/dkg/musig" }
 frost = { package = "modular-frost", path = "../../crypto/frost", features = ["tests"] }
 schnorrkel = { path = "../../crypto/schnorrkel", package = "frost-schnorrkel" }
 
@@ -66,7 +69,7 @@ borsh = ["serai-abi/borsh"]
 networks = []
 bitcoin = ["networks", "dep:bitcoin"]
 ethereum = ["networks"]
-monero = ["networks", "ciphersuite/ed25519", "monero-address"]
+monero = ["networks", "dalek-ff-group", "ciphersuite", "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,6 +1,9 @@
 use core::{str::FromStr, fmt};
 
-use ciphersuite::{Ciphersuite, Ed25519};
+use scale::{Encode, Decode};
+
+use dalek_ff_group::Ed25519;
+use ciphersuite::Ciphersuite;
 
 use monero_address::{Network, AddressType as MoneroAddressType, MoneroAddress};
 

substrate/client/tests/common/genesis_liquidity.rs

@@ -3,8 +3,9 @@ use std::collections::HashMap;
 use rand_core::{RngCore, OsRng};
 use zeroize::Zeroizing;
 
-use ciphersuite::{Ciphersuite, Ristretto};
-use frost::dkg::musig::musig;
+use dalek_ff_group::Ristretto;
+use ciphersuite::Ciphersuite;
+use dkg_musig::musig;
 use schnorrkel::Schnorrkel;
 
 use sp_core::{sr25519::Signature, Pair as PairTrait};
@@ -103,7 +104,7 @@ async fn set_values(serai: &Serai, values: &Values) {
 
   assert_eq!(Ristretto::generator() * secret_key, public_key);
   let threshold_keys =
-    musig::<Ristretto>(&musig_context(set), &Zeroizing::new(secret_key), &[public_key]).unwrap();
+    musig::<Ristretto>(musig_context(set), Zeroizing::new(secret_key), &[public_key]).unwrap();
 
   let sig = frost::tests::sign_without_caching(
     &mut OsRng,

substrate/client/tests/common/mod.rs

@@ -49,17 +49,24 @@ macro_rules! serai_test {
         test.provide_container(composition);
         test.run_async(|ops| async move {
           // Sleep until the Substrate RPC starts
-          let serai_rpc = ops.handle(handle).host_port(9944).unwrap();
-          let serai_rpc = format!("http://{}:{}", serai_rpc.0, serai_rpc.1);
-          // Bound execution to 60 seconds
-          for _ in 0 .. 60 {
+          let mut ticks = 0;
+          let serai_rpc = loop {
+            // Bound execution to 60 seconds
+            if ticks > 60 {
+              panic!("Serai node didn't start within 60 seconds");
+            }
             tokio::time::sleep(core::time::Duration::from_secs(1)).await;
+            ticks += 1;
+
+            let Some(serai_rpc) = ops.handle(handle).host_port(9944) else { continue };
+            let serai_rpc = format!("http://{}:{}", serai_rpc.0, serai_rpc.1);
+
             let Ok(client) = Serai::new(serai_rpc.clone()).await else { continue };
             if client.latest_finalized_block_hash().await.is_err() {
               continue;
             }
-            break;
-          }
+            break serai_rpc;
+          };
           #[allow(clippy::redundant_closure_call)]
           $test(Serai::new(serai_rpc).await.unwrap()).await;
         }).await;

substrate/client/tests/common/validator_sets.rs

@@ -11,8 +11,9 @@ use sp_core::{
   Pair as PairTrait,
 };
 
-use ciphersuite::{Ciphersuite, Ristretto};
-use frost::dkg::musig::musig;
+use dalek_ff_group::Ristretto;
+use ciphersuite::Ciphersuite;
+use dkg_musig::musig;
 use schnorrkel::Schnorrkel;
 
 use serai_client::{
@@ -49,8 +50,7 @@ pub async fn set_keys(
     assert_eq!(Ristretto::generator() * secret_key, pub_keys[i]);
 
     threshold_keys.push(
-      musig::<Ristretto>(&musig_context(set.into()), &Zeroizing::new(secret_key), &pub_keys)
-        .unwrap(),
+      musig::<Ristretto>(musig_context(set.into()), Zeroizing::new(secret_key), &pub_keys).unwrap(),
     );
   }