Remove the RemoveParticipant protocol for having new DKGs specify the participants which were removed

Obvious code cleanup is obvious.

substrate/client/src/serai/validator_sets.rs

@@ -126,36 +126,22 @@ impl<'a> SeraiValidatorSets<'a> {
       .await
   }
 
-  pub async fn musig_key(&self, set: ValidatorSet) -> Result<Option<[u8; 32]>, SeraiError> {
-    self.0.storage(PALLET, "MuSigKeys", (sp_core::hashing::twox_64(&set.encode()), set)).await
-  }
-
   // TODO: Store these separately since we almost never need both at once?
   pub async fn keys(&self, set: ValidatorSet) -> Result<Option<KeyPair>, SeraiError> {
     self.0.storage(PALLET, "Keys", (sp_core::hashing::twox_64(&set.encode()), set)).await
   }
 
-  pub fn set_keys(network: NetworkId, key_pair: KeyPair, signature: Signature) -> Transaction {
+  pub fn set_keys(
+    network: NetworkId,
+    removed_participants: Vec<SeraiAddress>,
+    key_pair: KeyPair,
+    signature: Signature,
+  ) -> Transaction {
     Serai::unsigned(serai_abi::Call::ValidatorSets(serai_abi::validator_sets::Call::set_keys {
       network,
+      removed_participants,
       key_pair,
       signature,
     }))
   }
-
-  pub fn remove_participant(
-    network: NetworkId,
-    to_remove: SeraiAddress,
-    signers: Vec<SeraiAddress>,
-    signature: Signature,
-  ) -> Transaction {
-    Serai::unsigned(serai_abi::Call::ValidatorSets(
-      serai_abi::validator_sets::Call::remove_participant {
-        network,
-        to_remove,
-        signers,
-        signature,
-      },
-    ))
-  }
 }

substrate/client/tests/common/validator_sets.rs

@@ -5,14 +5,14 @@ use rand_core::OsRng;
 
 use sp_core::{Pair, sr25519::Signature};
 
-use ciphersuite::{group::GroupEncoding, Ciphersuite, Ristretto};
+use ciphersuite::{Ciphersuite, Ristretto};
 use frost::dkg::musig::musig;
 use schnorrkel::Schnorrkel;
 
 use serai_client::{
   primitives::insecure_pair_from_name,
   validator_sets::{
-    primitives::{ValidatorSet, KeyPair, musig_context, musig_key, set_keys_message},
+    primitives::{ValidatorSet, KeyPair, musig_context, set_keys_message},
     ValidatorSetsEvent,
   },
   SeraiValidatorSets, Serai,
@@ -26,19 +26,6 @@ pub async fn set_keys(serai: &Serai, set: ValidatorSet, key_pair: KeyPair) -> [u
   let public = pair.public();
 
   let public_key = <Ristretto as Ciphersuite>::read_G::<&[u8]>(&mut public.0.as_ref()).unwrap();
-  assert_eq!(
-    serai
-      .as_of_latest_finalized_block()
-      .await
-      .unwrap()
-      .validator_sets()
-      .musig_key(set)
-      .await
-      .unwrap()
-      .unwrap(),
-    musig_key(set, &[public]).0
-  );
-
   let secret_key = <Ristretto as Ciphersuite>::read_F::<&[u8]>(
     &mut pair.as_ref().secret.to_bytes()[.. 32].as_ref(),
   )
@@ -46,18 +33,6 @@ pub async fn set_keys(serai: &Serai, set: ValidatorSet, key_pair: KeyPair) -> [u
   assert_eq!(Ristretto::generator() * secret_key, public_key);
   let threshold_keys =
     musig::<Ristretto>(&musig_context(set), &Zeroizing::new(secret_key), &[public_key]).unwrap();
-  assert_eq!(
-    serai
-      .as_of_latest_finalized_block()
-      .await
-      .unwrap()
-      .validator_sets()
-      .musig_key(set)
-      .await
-      .unwrap()
-      .unwrap(),
-    threshold_keys.group_key().to_bytes()
-  );
 
   let sig = frost::tests::sign_without_caching(
     &mut OsRng,
@@ -66,13 +41,13 @@ pub async fn set_keys(serai: &Serai, set: ValidatorSet, key_pair: KeyPair) -> [u
       Schnorrkel::new(b"substrate"),
       &HashMap::from([(threshold_keys.params().i(), threshold_keys.into())]),
     ),
-    &set_keys_message(&set, &key_pair),
+    &set_keys_message(&set, &[], &key_pair),
   );
 
   // Set the key pair
   let block = publish_tx(
     serai,
-    &SeraiValidatorSets::set_keys(set.network, key_pair.clone(), Signature(sig.to_bytes())),
+    &SeraiValidatorSets::set_keys(set.network, vec![], key_pair.clone(), Signature(sig.to_bytes())),
   )
   .await;
 

substrate/client/tests/validator_sets.rs

@@ -5,7 +5,7 @@ use sp_core::{sr25519::Public, Pair};
 use serai_client::{
   primitives::{NETWORKS, NetworkId, insecure_pair_from_name},
   validator_sets::{
-    primitives::{Session, ValidatorSet, KeyPair, musig_key},
+    primitives::{Session, ValidatorSet, KeyPair},
     ValidatorSetsEvent,
   },
   Serai,
@@ -58,7 +58,6 @@ serai_test!(
         .collect::<Vec<_>>();
       let participants_ref: &[_] = participants.as_ref();
       assert_eq!(participants_ref, [public].as_ref());
-      assert_eq!(vs_serai.musig_key(set).await.unwrap().unwrap(), musig_key(set, &[public]).0);
     }
 
     let block = set_keys(&serai, set, key_pair.clone()).await;