Finish merging in the develop branch

2025-12-09 04:39:24 +00:00 · 2025-01-30 03:14:24 -05:00
parent 258c02ff39
commit a275023cfc
62 changed files with 452 additions and 508 deletions
--- a/substrate/client/tests/common/validator_sets.rs
+++ b/substrate/client/tests/common/validator_sets.rs
@@ -16,12 +16,12 @@ use frost::dkg::musig::musig;
 use schnorrkel::Schnorrkel;

 use serai_client::{
-  primitives::EmbeddedEllipticCurve,
+  primitives::{EmbeddedEllipticCurve, Amount},
  validator_sets::{
    primitives::{MAX_KEY_LEN, ExternalValidatorSet, KeyPair, musig_context, set_keys_message},
    ValidatorSetsEvent,
  },
-  Amount, Serai, SeraiValidatorSets,
+  SeraiValidatorSets, Serai,
 };

 use crate::common::tx::publish_tx;