Rebase onto develop

This was a messy as hell, blunt forced rebase, but it's done.

Cargo.toml

@@ -30,9 +30,6 @@ members = [
   "processor/messages",
   "processor",
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
   "coordinator/tributary/tendermint",
   "coordinator/tributary",
   "coordinator",
@@ -45,31 +42,13 @@ members = [
   "substrate/in-instructions/primitives",
   "substrate/in-instructions/pallet",
 
-  "substrate/validator-sets/primitives",
-  "substrate/validator-sets/pallet",
-
-  "substrate/runtime",
-=======
-  "substrate/tendermint",
-=======
-=======
   "substrate/staking/primitives",
   "substrate/staking/pallet",
 
->>>>>>> 820618dd (Implement a basic staking pallet)
-  "substrate/tendermint/machine",
-  "substrate/tendermint/primitives",
-  "substrate/tendermint/client",
-  "substrate/tendermint/pallet",
->>>>>>> 66f7663c (Redo Tendermint folder structure)
+  "substrate/validator-sets/primitives",
+  "substrate/validator-sets/pallet",
 
   "substrate/runtime",
-<<<<<<< HEAD
-
-  "substrate/consensus",
->>>>>>> 49ab2620 (Add pallet sessions to runtime, create pallet-tendermint)
-=======
->>>>>>> 66f7663c (Redo Tendermint folder structure)
   "substrate/node",
 
   "substrate/client",

common/env/Cargo.toml

@@ -1,11 +1,7 @@
 [package]
 name = "serai-env"
 version = "0.1.0"
-<<<<<<< HEAD:common/env/Cargo.toml
 description = "A common library for Serai apps to access environment variables"
-=======
-description = "Tendermint primitives for Substrate"
->>>>>>> 91ae2b71 (Move serai_runtime specific code from tendermint/client to node):substrate/tendermint/primitives/Cargo.toml
 license = "AGPL-3.0-only"
 repository = "https://github.com/serai-dex/serai/tree/develop/common/env"
 authors = ["Luke Parker <[email protected]>"]
@@ -15,12 +11,3 @@ edition = "2021"
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
-
-[dependencies]
-sp-core = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-std = { git = "https://github.com/serai-dex/substrate", default-features = false }
-sp-api = { git = "https://github.com/serai-dex/substrate", default-features = false }
-
-[features]
-std = ["sp-core/std", "sp-std/std", "sp-api/std"]
-default = ["std"]

coordinator/tributary/tendermint/src/block.rs

@@ -1,27 +1,19 @@
-<<<<<<< HEAD:coordinator/tributary/tendermint/src/block.rs
 use std::{
   sync::Arc,
   collections::{HashSet, HashMap},
 };
-=======
-use std::collections::{HashSet, HashMap};
->>>>>>> b7b57ee6 (Move BlockData to a new file):substrate/tendermint/machine/src/block.rs
 
 use crate::{
   time::CanonicalInstant,
   ext::{RoundNumber, BlockNumber, Block, Network},
   round::RoundData,
   message_log::MessageLog,
-<<<<<<< HEAD:coordinator/tributary/tendermint/src/block.rs
   Step, Data, DataFor, Message, MessageFor,
-=======
->>>>>>> b7b57ee6 (Move BlockData to a new file):substrate/tendermint/machine/src/block.rs
 };
 
 pub(crate) struct BlockData<N: Network> {
   pub(crate) number: BlockNumber,
   pub(crate) validator_id: Option<N::ValidatorId>,
-<<<<<<< HEAD:coordinator/tributary/tendermint/src/block.rs
   pub(crate) proposal: Option<N::Block>,
 
   pub(crate) log: MessageLog<N>,
@@ -33,24 +25,10 @@ pub(crate) struct BlockData<N: Network> {
   pub(crate) end_time: HashMap<RoundNumber, CanonicalInstant>,
 
   pub(crate) round: Option<RoundData<N>>,
-=======
-  pub(crate) proposal: N::Block,
-
-  pub(crate) log: MessageLog<N>,
-  pub(crate) slashes: HashSet<N::ValidatorId>,
-  // We track the end times of each round for two reasons:
-  // 1) Knowing the start time of the next round
-  // 2) Validating precommits, which include the end time of the round which produced it
-  // This HashMap contains the end time of the round we're currently in and every round prior
-  pub(crate) end_time: HashMap<RoundNumber, CanonicalInstant>,
-
-  pub(crate) round: RoundData<N>,
->>>>>>> b7b57ee6 (Move BlockData to a new file):substrate/tendermint/machine/src/block.rs
 
   pub(crate) locked: Option<(RoundNumber, <N::Block as Block>::Id)>,
   pub(crate) valid: Option<(RoundNumber, N::Block)>,
 }
-<<<<<<< HEAD:coordinator/tributary/tendermint/src/block.rs
 
 impl<N: Network> BlockData<N> {
   pub(crate) fn new(
@@ -88,16 +66,8 @@ impl<N: Network> BlockData<N> {
   // This is generally used when moving to the next round, where this will only populate one time,
   // yet is also used when jumping rounds (when 33% of the validators are on a round ahead of us)
   pub(crate) fn populate_end_time(&mut self, round: RoundNumber) {
-<<<<<<< HEAD:coordinator/tributary/tendermint/src/block.rs
-<<<<<<< HEAD:coordinator/tributary/tendermint/src/block.rs
-    // Starts from the current round since we only start the current round once we have have all
-    // the prior time data
-=======
->>>>>>> 14fc181d (Correct pupulate_end_time):substrate/tendermint/machine/src/block.rs
-=======
     // Starts from the current round since we only start the current round once we have have all
     // the prior time data
->>>>>>> 3d20afd2 (Improve documentation):substrate/tendermint/machine/src/block.rs
     for r in (self.round().number.0 + 1) ..= round.0 {
       self.end_time.insert(
         RoundNumber(r),
@@ -167,5 +137,3 @@ impl<N: Network> BlockData<N> {
     })
   }
 }
-=======
->>>>>>> b7b57ee6 (Move BlockData to a new file):substrate/tendermint/machine/src/block.rs

coordinator/tributary/tendermint/src/ext.rs

@@ -1,11 +1,5 @@
 use core::{hash::Hash, fmt::Debug};
 use std::{sync::Arc, collections::HashSet};
-<<<<<<< HEAD:coordinator/tributary/tendermint/src/ext.rs
-
-use async_trait::async_trait;
-use thiserror::Error;
-=======
->>>>>>> b042a2a3 (Prevent a commit from including the same signature multiple times):substrate/tendermint/machine/src/ext.rs
 
 use async_trait::async_trait;
 use thiserror::Error;
@@ -38,37 +32,6 @@ pub struct BlockNumber(pub u64);
 /// A struct containing a round number, wrapped to have a distinct type.
 #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug, Encode, Decode)]
 pub struct RoundNumber(pub u32);
-<<<<<<< HEAD:coordinator/tributary/tendermint/src/ext.rs
-
-/// A signer for a validator.
-#[async_trait]
-pub trait Signer: Send + Sync {
-  // Type used to identify validators.
-  type ValidatorId: ValidatorId;
-  /// Signature type.
-  type Signature: Signature;
-
-  /// Returns the validator's current ID. Returns None if they aren't a current validator.
-  async fn validator_id(&self) -> Option<Self::ValidatorId>;
-  /// Sign a signature with the current validator's private key.
-  async fn sign(&self, msg: &[u8]) -> Self::Signature;
-}
-
-#[async_trait]
-impl<S: Signer> Signer for Arc<S> {
-  type ValidatorId = S::ValidatorId;
-  type Signature = S::Signature;
-
-  async fn validator_id(&self) -> Option<Self::ValidatorId> {
-    self.as_ref().validator_id().await
-  }
-
-  async fn sign(&self, msg: &[u8]) -> Self::Signature {
-    self.as_ref().sign(msg).await
-  }
-}
-=======
->>>>>>> 2f3bb887 (Rename Round to RoundNumber):substrate/tendermint/machine/src/ext.rs
 
 /// A signer for a validator.
 #[async_trait]
@@ -110,20 +73,9 @@ pub trait SignatureScheme: Send + Sync {
   /// It could even be a threshold signature scheme, though that's currently unexpected.
   type AggregateSignature: Signature;
 
-<<<<<<< HEAD:coordinator/tributary/tendermint/src/ext.rs
-<<<<<<< HEAD:coordinator/tributary/tendermint/src/ext.rs
-  /// Type representing a signer of this scheme.
-  type Signer: Signer<ValidatorId = Self::ValidatorId, Signature = Self::Signature>;
-
-=======
-  /// Sign a signature with the current validator's private key.
-  async fn sign(&self, msg: &[u8]) -> Self::Signature;
->>>>>>> 2947ef08 (Make sign asynchronous):substrate/tendermint/machine/src/ext.rs
-=======
   /// Type representing a signer of this scheme.
   type Signer: Signer<ValidatorId = Self::ValidatorId, Signature = Self::Signature>;
 
->>>>>>> f3e17710 (Reduce Arcs in TendermintMachine, split Signer from SignatureScheme):substrate/tendermint/machine/src/ext.rs
   /// Verify a signature from the validator in question.
   #[must_use]
   fn verify(&self, validator: Self::ValidatorId, msg: &[u8], sig: &Self::Signature) -> bool;
@@ -165,26 +117,12 @@ impl<S: SignatureScheme> SignatureScheme for Arc<S> {
   }
 }
 
-<<<<<<< HEAD:coordinator/tributary/tendermint/src/ext.rs
 /// A commit for a specific block.
 ///
 /// The list of validators have weight exceeding the threshold for a valid commit.
 #[derive(PartialEq, Debug, Encode, Decode)]
-=======
-/// A commit for a specific block. The list of validators have weight exceeding the threshold for
-/// a valid commit.
-#[derive(Clone, PartialEq, Debug, Encode, Decode)]
->>>>>>> f3e17710 (Reduce Arcs in TendermintMachine, split Signer from SignatureScheme):substrate/tendermint/machine/src/ext.rs
 pub struct Commit<S: SignatureScheme> {
-<<<<<<< HEAD:coordinator/tributary/tendermint/src/ext.rs
-<<<<<<< HEAD:coordinator/tributary/tendermint/src/ext.rs
   /// End time of the round which created this commit, used as the start time of the next block.
-=======
-  /// End time of the round, used as the start time of next round.
->>>>>>> a7f48047 (Move Commit from including the round to including the round's end_time):substrate/tendermint/src/ext.rs
-=======
-  /// End time of the round which created this commit, used as the start time of the next block.
->>>>>>> b53759c6 (Have the machine respond to advances made by an external sync loop):substrate/tendermint/machine/src/ext.rs
   pub end_time: u64,
   /// Validators participating in the signature.
   pub validators: Vec<S::ValidatorId>,
@@ -220,33 +158,9 @@ pub trait Weights: Send + Sync {
   }
 
   /// Weighted round robin function.
-<<<<<<< HEAD:coordinator/tributary/tendermint/src/ext.rs
-<<<<<<< HEAD:coordinator/tributary/tendermint/src/ext.rs
   fn proposer(&self, block: BlockNumber, round: RoundNumber) -> Self::ValidatorId;
 }
 
-impl<W: Weights> Weights for Arc<W> {
-  type ValidatorId = W::ValidatorId;
-
-  fn total_weight(&self) -> u64 {
-    self.as_ref().total_weight()
-  }
-
-  fn weight(&self, validator: Self::ValidatorId) -> u64 {
-    self.as_ref().weight(validator)
-  }
-
-  fn proposer(&self, block: BlockNumber, round: RoundNumber) -> Self::ValidatorId {
-    self.as_ref().proposer(block, round)
-  }
-=======
-  fn proposer(&self, number: BlockNumber, round: RoundNumber) -> Self::ValidatorId;
->>>>>>> 2f3bb887 (Rename Round to RoundNumber):substrate/tendermint/machine/src/ext.rs
-=======
-  fn proposer(&self, block: BlockNumber, round: RoundNumber) -> Self::ValidatorId;
->>>>>>> 9dfa22de (Misc lints):substrate/tendermint/machine/src/ext.rs
-}
-
 impl<W: Weights> Weights for Arc<W> {
   type ValidatorId = W::ValidatorId;
 
@@ -301,23 +215,12 @@ pub trait Network: Send + Sync {
   const BLOCK_PROCESSING_TIME: u32;
   /// Network latency time in seconds.
   const LATENCY_TIME: u32;
-<<<<<<< HEAD:coordinator/tributary/tendermint/src/ext.rs
-=======
-
-  /// The block time is defined as the processing time plus three times the latency.
-  fn block_time() -> u32 {
-    Self::BLOCK_PROCESSING_TIME + (3 * Self::LATENCY_TIME)
-  }
->>>>>>> fffb7a69 (Separate the block processing time from the latency):substrate/tendermint/machine/src/ext.rs
 
-<<<<<<< HEAD:coordinator/tributary/tendermint/src/ext.rs
   /// The block time is defined as the processing time plus three times the latency.
   fn block_time() -> u32 {
     Self::BLOCK_PROCESSING_TIME + (3 * Self::LATENCY_TIME)
   }
 
-=======
->>>>>>> f3e17710 (Reduce Arcs in TendermintMachine, split Signer from SignatureScheme):substrate/tendermint/machine/src/ext.rs
   /// Return a handle on the signer in use, usable for the entire lifetime of the machine.
   fn signer(&self) -> <Self::SignatureScheme as SignatureScheme>::Signer;
   /// Return a handle on the signing scheme in use, usable for the entire lifetime of the machine.
@@ -349,33 +252,22 @@ pub trait Network: Send + Sync {
     commit.validators.iter().map(|v| weights.weight(*v)).sum::<u64>() >= weights.threshold()
   }
 
-<<<<<<< HEAD:coordinator/tributary/tendermint/src/ext.rs
   /// Broadcast a message to the other validators.
   ///
   /// If authenticated channels have already been established, this will double-authenticate.
   /// Switching to unauthenticated channels in a system already providing authenticated channels is
   /// not recommended as this is a minor, temporal inefficiency, while downgrading channels may
   /// have wider implications.
-=======
-  /// Broadcast a message to the other validators. If authenticated channels have already been
-  /// established, this will double-authenticate. Switching to unauthenticated channels in a system
-  /// already providing authenticated channels is not recommended as this is a minor, temporal
-  /// inefficiency while downgrading channels may have wider implications.
->>>>>>> c13e0c75 (Move more code into block.rs):substrate/tendermint/machine/src/ext.rs
   async fn broadcast(&mut self, msg: SignedMessageFor<Self>);
 
   /// Trigger a slash for the validator in question who was definitively malicious.
   ///
   /// The exact process of triggering a slash is undefined and left to the network as a whole.
-<<<<<<< HEAD:coordinator/tributary/tendermint/src/ext.rs
   // TODO: We need to provide some evidence for this.
-=======
->>>>>>> dbcddb2f (Don't spam slash):substrate/tendermint/machine/src/ext.rs
   async fn slash(&mut self, validator: Self::ValidatorId);
 
   /// Validate a block.
   async fn validate(&mut self, block: &Self::Block) -> Result<(), BlockError>;
-<<<<<<< HEAD:coordinator/tributary/tendermint/src/ext.rs
 
   /// Add a block, returning the proposal for the next one.
   ///
@@ -385,13 +277,6 @@ pub trait Network: Send + Sync {
   /// This deviates from the paper which will have a local node refuse to decide on a block it
   /// considers invalid. This library acknowledges the network did decide on it, leaving handling
   /// of it to the network, and outside of this scope.
-=======
-  /// Add a block, returning the proposal for the next one. It's possible a block, which was never
-  /// validated or even failed validation, may be passed here if a supermajority of validators did
-  /// consider it valid and created a commit for it. This deviates from the paper which will have a
-  /// local node refuse to decide on a block it considers invalid. This library acknowledges the
-  /// network did decide on it, leaving handling of it to the network, and outside of this scope.
->>>>>>> 193281e3 (Get the result of block importing):substrate/tendermint/src/ext.rs
   async fn add_block(
     &mut self,
     block: Self::Block,