mirror of
https://github.com/serai-dex/serai.git
synced 2025-01-03 17:40:34 +00:00
Correct log targets in tendermint-machine
This commit is contained in:
parent
bba7d2a356
commit
ac9e356af4
2 changed files with 34 additions and 9 deletions
|
@ -313,11 +313,16 @@ impl<N: Network + 'static> TendermintMachine<N> {
|
||||||
let time_until_round_end = round_end.instant().saturating_duration_since(Instant::now());
|
let time_until_round_end = round_end.instant().saturating_duration_since(Instant::now());
|
||||||
if time_until_round_end == Duration::ZERO {
|
if time_until_round_end == Duration::ZERO {
|
||||||
log::trace!(
|
log::trace!(
|
||||||
|
target: "tendermint",
|
||||||
"resetting when prior round ended {}ms ago",
|
"resetting when prior round ended {}ms ago",
|
||||||
Instant::now().saturating_duration_since(round_end.instant()).as_millis(),
|
Instant::now().saturating_duration_since(round_end.instant()).as_millis(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
log::trace!("sleeping until round ends in {}ms", time_until_round_end.as_millis());
|
log::trace!(
|
||||||
|
target: "tendermint",
|
||||||
|
"sleeping until round ends in {}ms",
|
||||||
|
time_until_round_end.as_millis(),
|
||||||
|
);
|
||||||
sleep(time_until_round_end).await;
|
sleep(time_until_round_end).await;
|
||||||
|
|
||||||
// Clear our outbound message queue
|
// Clear our outbound message queue
|
||||||
|
@ -598,7 +603,11 @@ impl<N: Network + 'static> TendermintMachine<N> {
|
||||||
);
|
);
|
||||||
let id = block.id();
|
let id = block.id();
|
||||||
let proposal = self.network.add_block(block, commit).await;
|
let proposal = self.network.add_block(block, commit).await;
|
||||||
log::trace!("added block {} (produced by machine)", hex::encode(id.as_ref()));
|
log::trace!(
|
||||||
|
target: "tendermint",
|
||||||
|
"added block {} (produced by machine)",
|
||||||
|
hex::encode(id.as_ref()),
|
||||||
|
);
|
||||||
self.reset(msg.round, proposal).await;
|
self.reset(msg.round, proposal).await;
|
||||||
}
|
}
|
||||||
Err(TendermintError::Malicious(sender, evidence)) => {
|
Err(TendermintError::Malicious(sender, evidence)) => {
|
||||||
|
@ -692,7 +701,12 @@ impl<N: Network + 'static> TendermintMachine<N> {
|
||||||
(msg.round == self.block.round().number) &&
|
(msg.round == self.block.round().number) &&
|
||||||
(msg.data.step() == Step::Propose)
|
(msg.data.step() == Step::Propose)
|
||||||
{
|
{
|
||||||
log::trace!("received Propose for block {}, round {}", msg.block.0, msg.round.0);
|
log::trace!(
|
||||||
|
target: "tendermint",
|
||||||
|
"received Propose for block {}, round {}",
|
||||||
|
msg.block.0,
|
||||||
|
msg.round.0,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// If this is a precommit, verify its signature
|
// If this is a precommit, verify its signature
|
||||||
|
@ -763,7 +777,12 @@ impl<N: Network + 'static> TendermintMachine<N> {
|
||||||
// 55-56
|
// 55-56
|
||||||
// Jump, enabling processing by the below code
|
// Jump, enabling processing by the below code
|
||||||
if self.block.log.round_participation(msg.round) > self.weights.fault_threshold() {
|
if self.block.log.round_participation(msg.round) > self.weights.fault_threshold() {
|
||||||
log::debug!("jumping from round {} to round {}", self.block.round().number.0, msg.round.0);
|
log::debug!(
|
||||||
|
target: "tendermint",
|
||||||
|
"jumping from round {} to round {}",
|
||||||
|
self.block.round().number.0,
|
||||||
|
msg.round.0,
|
||||||
|
);
|
||||||
|
|
||||||
// Jump to the new round.
|
// Jump to the new round.
|
||||||
let proposer = self.round(msg.round, None);
|
let proposer = self.round(msg.round, None);
|
||||||
|
@ -827,14 +846,18 @@ impl<N: Network + 'static> TendermintMachine<N> {
|
||||||
((threshold_weight - participation) > (threshold_weight / 10))
|
((threshold_weight - participation) > (threshold_weight / 10))
|
||||||
{
|
{
|
||||||
log::trace!(
|
log::trace!(
|
||||||
|
target: "tendermint",
|
||||||
"close to setting prevote timeout, participation: {}, needed: {}",
|
"close to setting prevote timeout, participation: {}, needed: {}",
|
||||||
participation,
|
participation,
|
||||||
threshold_weight
|
threshold_weight,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
// 34-35
|
// 34-35
|
||||||
if participation >= threshold_weight {
|
if participation >= threshold_weight {
|
||||||
log::trace!("setting timeout for prevote due to sufficient participation");
|
log::trace!(
|
||||||
|
target: "tendermint",
|
||||||
|
"setting timeout for prevote due to sufficient participation",
|
||||||
|
);
|
||||||
self.block.round_mut().set_timeout(Step::Prevote);
|
self.block.round_mut().set_timeout(Step::Prevote);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -849,7 +872,10 @@ impl<N: Network + 'static> TendermintMachine<N> {
|
||||||
if matches!(msg.data, Data::Precommit(_)) &&
|
if matches!(msg.data, Data::Precommit(_)) &&
|
||||||
self.block.log.has_participation(self.block.round().number, Step::Precommit)
|
self.block.log.has_participation(self.block.round().number, Step::Precommit)
|
||||||
{
|
{
|
||||||
log::trace!("setting timeout for precommit due to sufficient participation");
|
log::trace!(
|
||||||
|
target: "tendermint",
|
||||||
|
"setting timeout for precommit due to sufficient participation",
|
||||||
|
);
|
||||||
self.block.round_mut().set_timeout(Step::Precommit);
|
self.block.round_mut().set_timeout(Step::Precommit);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
use std::{sync::Arc, collections::HashMap};
|
use std::{sync::Arc, collections::HashMap};
|
||||||
|
|
||||||
use log::debug;
|
|
||||||
use parity_scale_codec::Encode;
|
use parity_scale_codec::Encode;
|
||||||
|
|
||||||
use crate::{ext::*, RoundNumber, Step, DataFor, TendermintError, SignedMessageFor, Evidence};
|
use crate::{ext::*, RoundNumber, Step, DataFor, TendermintError, SignedMessageFor, Evidence};
|
||||||
|
@ -27,7 +26,7 @@ impl<N: Network> MessageLog<N> {
|
||||||
let step = msg.data.step();
|
let step = msg.data.step();
|
||||||
if let Some(existing) = msgs.get(&step) {
|
if let Some(existing) = msgs.get(&step) {
|
||||||
if existing.msg.data != msg.data {
|
if existing.msg.data != msg.data {
|
||||||
debug!(
|
log::debug!(
|
||||||
target: "tendermint",
|
target: "tendermint",
|
||||||
"Validator sent multiple messages for the same block + round + step"
|
"Validator sent multiple messages for the same block + round + step"
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in a new issue