coordinator/tributary tests

clippy.toml

@@ -5,6 +5,10 @@ path = "Option::map_or"
 [[disallowed-methods]]
 path = "Option::map_or_else"
 
+[[disallowed-methods]]
+path = "borsh::from_reader"
+reason = "`borsh::from_reader` errors if there's any bytes following the read item, which isn't documented behavior"
+
 # TODO: https://github.com/rust-lang/rust-clippy/pull/12194
 [[disallowed-methods]]
 path = "<ruint::Uint as core::ops::Add>::add"

coordinator/Cargo.toml

@@ -21,7 +21,6 @@ zeroize = { version = "^1.5", default-features = false, features = ["std"] }
 bitvec = { version = "1", default-features = false, features = ["std"] }
 rand_core = { version = "0.6", default-features = false, features = ["std"] }
 
-blake2 = { version = "0.11.0-rc.5", default-features = false, features = ["alloc"] }
 schnorrkel = { version = "0.11", default-features = false, features = ["std"] }
 
 dalek-ff-group = { path = "../crypto/dalek-ff-group", default-features = false, features = ["std"] }

coordinator/cosign/src/tests/evaluator.rs

@@ -131,7 +131,7 @@ fn signed_cosign(
       block_hash: random_block_hash(&mut OsRng),
       cosigner,
     },
-    signature: random_bytes_64(&mut OsRng),
+    signature: random_bytes(&mut OsRng),
   }
 }
 

coordinator/cosign/types/src/tests/mod.rs

@@ -21,7 +21,7 @@ pub fn random_external_network_id(rng: &mut (impl RngCore + CryptoRng)) -> Exter
 
 /// Generate a random global session ID (`[u8; 32]`).
 pub fn random_global_session<R: RngCore + CryptoRng>(rng: &mut R) -> [u8; 32] {
-  serai_primitives::test_helpers::random_bytes_32(rng)
+  serai_primitives::test_helpers::random_bytes(rng)
 }
 
 /// Generate a random [`Cosign`] for testing.

coordinator/src/dkg_confirmation.rs

@@ -108,9 +108,9 @@ fn handle_frost_error<T>(result: Result<T, FrostError>) -> Result<T, Participant
 
 #[rustfmt::skip]
 enum Signer {
-  Preprocess { attempt: u32, seed: CachedPreprocess, preprocess: [u8; 64] },
+  Preprocess { attempt: u64, seed: CachedPreprocess, preprocess: [u8; 64] },
   Share {
-    attempt: u32,
+    attempt: u64,
     musig_validators: Vec<SeraiAddress>,
     share: [u8; 32],
     machine: Box<AlgorithmSignatureMachine<Ristretto, Schnorrkel>>,
@@ -151,7 +151,7 @@ impl<CD: DbTrait, TD: DbTrait> ConfirmDkgTask<CD, TD> {
   fn preprocess(
     db: &mut CD,
     set: ExternalValidatorSet,
-    attempt: u32,
+    attempt: u64,
     key: Zeroizing<<Ristretto as WrappedGroup>::F>,
     signer: &mut Option<Signer>,
   ) {

coordinator/src/tributary.rs

@@ -3,7 +3,6 @@ use std::sync::Arc;
 
 use zeroize::Zeroizing;
 use rand_core::OsRng;
-use blake2::{digest::typenum::U32, Digest as _, Blake2s};
 use ciphersuite::*;
 use dalek_ff_group::Ristretto;
 
@@ -482,8 +481,7 @@ pub(crate) async fn spawn_tributary<P: P2p>(
     return;
   }
 
-  let genesis =
-    <[u8; 32]>::from(Blake2s::<U32>::digest(borsh::to_vec(&(set.serai_block, set.set)).unwrap()));
+  let genesis = set.tributary_genesis();
 
   // Since the Serai block will be finalized, then cosigned, before we handle this, this time will
   // be a couple of minutes stale. While the Tributary will still function with a start time in the

coordinator/substrate/Cargo.toml

@@ -19,6 +19,7 @@ workspace = true
 [dependencies]
 borsh = { version = "1", default-features = false, features = ["std", "derive", "de_strict_order"] }
 
+blake2 = { version = "0.11.0-rc.5", default-features = false, features = ["alloc"] }
 dkg = { path = "../../crypto/dkg", default-features = false, features = ["std"] }
 
 serai-client-serai = { path = "../../substrate/client/serai", default-features = false }

coordinator/substrate/src/lib.rs

@@ -7,6 +7,10 @@ use std::collections::HashMap;
 
 use borsh::{BorshSerialize, BorshDeserialize};
 
+use blake2::{
+  digest::{typenum::U32, Digest as _},
+  Blake2b,
+};
 use dkg::Participant;
 
 use serai_client_serai::abi::{
@@ -80,6 +84,37 @@ impl NewSetInformation {
       self.participant_indexes.insert(*validator, these_is);
     }
   }
+
+  /// Create a new [`NewSetInformation`].
+  pub fn new(
+    set: ExternalValidatorSet,
+    serai_block: [u8; 32],
+    declaration_time: u64,
+    threshold: u16,
+    validators: Vec<(SeraiAddress, u16)>,
+    evrf_public_keys: Vec<([u8; 32], Vec<u8>)>,
+  ) -> Self {
+    let mut result = Self {
+      set,
+      serai_block,
+      declaration_time,
+      threshold,
+      validators,
+      evrf_public_keys,
+      participant_indexes: Default::default(),
+      participant_indexes_reverse_lookup: Default::default(),
+    };
+    result.init_participant_indexes();
+    result
+  }
+}
+
+impl NewSetInformation {
+  /// The hash to use for the genesis of the corresponding Tributary.
+  pub fn tributary_genesis(&self) -> [u8; 32] {
+    // This MUST only hash data completely deterministic to the Substrate blockchain.
+    Blake2b::<U32>::digest(borsh::to_vec(self).unwrap()).into()
+  }
 }
 
 mod _public_db {

coordinator/tributary/Cargo.toml

@@ -28,7 +28,7 @@ dalek-ff-group = { path = "../../crypto/dalek-ff-group", default-features = fals
 dkg = { path = "../../crypto/dkg", default-features = false, features = ["std"] }
 schnorr = { package = "schnorr-signatures", path = "../../crypto/schnorr", default-features = false, features = ["std"] }
 
-serai-primitives = { path = "../../substrate/primitives", default-features = false, features = ["std"] }
+serai-primitives = { path = "../../substrate/primitives", default-features = false, features = ["std", "test-helpers"] }
 
 serai-db = { path = "../../common/db" }
 serai-task = { path = "../../common/task", version = "0.1" }
@@ -40,7 +40,19 @@ serai-coordinator-substrate = { path = "../substrate" }
 
 messages = { package = "serai-processor-messages", path = "../../processor/messages" }
 
-log = { version = "0.4", default-features = false, features = ["std"] }
+serai-env = { path = "../../common/env", version = "0.1.0" }
+
+[dev-dependencies]
+rand = { version = "0.8", default-features = false, features = ["std"] }
+rand_chacha = { version = "0.3", default-features = false, features = ["std"] }
+
+tendermint = { package = "tendermint-machine", path = "../tributary-sdk/tendermint" }
+tributary-sdk = { path = "../tributary-sdk", features = ["tests"] }
+
+tokio = { version = "1", default-features = false, features = ["rt", "time", "macros", "rt-multi-thread"] }
+
+serai-task = { path = "../../common/task", features = ["test-helpers"] }
+serai-substrate-tests = { path = "../../tests/substrate" }
 
 [features]
 longer-reattempts = []