Ecosystem/serai
Ecosystem/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-04-02 12:29:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Don't spam slash

Browse source 
Also adds a slash condition of failing to propose.
This commit is contained in:
Luke Parker 2022-11-11 05:53:20 -05:00
parent 354bcefeb0
commit dbcddb2fb0
No known key found for this signature in database
GPG key ID: F9F1386DB1E119B6
2 changed files with 14 additions and 3 deletions
substrate/tendermint/machine/src
ext.rslib.rs

1
substrate/tendermint/machine/src/ext.rs
View file

@ -260,7 +260,6 @@ pub trait Network: Send + Sync {
/// 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.
// TODO: This is spammed right now.
async fn slash(&mut self, validator: Self::ValidatorId);
/// Validate a block.

16
substrate/tendermint/machine/src/lib.rs
View file

@ -3,7 +3,7 @@ use core::fmt::Debug;
use std::{
sync::Arc,
time::{UNIX_EPOCH, SystemTime, Instant, Duration},
collections::{VecDeque, HashMap},
collections::{VecDeque, HashSet, HashMap},
};
use parity_scale_codec::{Encode, Decode};
@ -121,6 +121,7 @@ pub struct TendermintMachine<N: Network> {
>,
log: MessageLog<N>,
slashes: HashSet<N::ValidatorId>,
round: Round,
end_time: HashMap<Round, Instant>,
step: Step,
@ -239,6 +240,7 @@ impl<N: Network + 'static> TendermintMachine<N> {
self.queue = self.queue.drain(..).filter(|msg| msg.number == self.number).collect();
self.log = MessageLog::new(self.weights.clone());
self.slashes = HashSet::new();
self.end_time = HashMap::new();
self.locked = None;
@ -247,6 +249,13 @@ impl<N: Network + 'static> TendermintMachine<N> {
self.round(Round(0));
}
async fn slash(&mut self, validator: N::ValidatorId) {
if !self.slashes.contains(&validator) {
self.slashes.insert(validator);
self.network.slash(validator).await;
}
}
/// Create a new Tendermint machine, from the specified point, with the specified block as the
/// one to propose next. This will return a channel to send messages from the gossip layer and
/// the machine itself. The machine should have `run` called from an asynchronous task.
@ -308,6 +317,7 @@ impl<N: Network + 'static> TendermintMachine<N> {
msg_recv,
log: MessageLog::new(weights),
slashes: HashSet::new(),
round: Round(0),
end_time: HashMap::new(),
step: Step::Propose,
@ -364,6 +374,8 @@ impl<N: Network + 'static> TendermintMachine<N> {
// never attempt to add a timeout after this timeout has expired
self.timeouts.remove(&Step::Propose);
if self.step == Step::Propose {
// Slash the validator for not proposing when they should've
self.slash(self.weights.proposer(self.number, self.round)).await;
self.broadcast(Data::Prevote(None));
}
None
@ -425,7 +437,7 @@ impl<N: Network + 'static> TendermintMachine<N> {
self.reset(msg.round, proposal).await;
}
Err(TendermintError::Malicious(validator)) => {
self.network.slash(validator).await;
self.slash(validator).await;
}
Err(TendermintError::Temporal) => (),
}