From 7cf09399bb834373002d06af83bb5190e7db06f2 Mon Sep 17 00:00:00 2001 From: Adolfo Olivera Date: Thu, 16 Jun 2022 15:36:58 -0300 Subject: [PATCH 1/2] Fix typo in Using Tendermint section (#8780) Modify using-tendermint.md to replace unsafe_reset_all to unsafe-reset-all . Closes #8779 . --- docs/tendermint-core/using-tendermint.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tendermint-core/using-tendermint.md b/docs/tendermint-core/using-tendermint.md index 9501c5e66..b249d2619 100644 --- a/docs/tendermint-core/using-tendermint.md +++ b/docs/tendermint-core/using-tendermint.md @@ -254,7 +254,7 @@ afford to lose all blockchain data! To reset a blockchain, stop the node and run: ```sh -tendermint unsafe_reset_all +tendermint unsafe-reset-all ``` This command will remove the data directory and reset private validator and From a4f29bfd4483d928aa9571affcf9149820d8a051 Mon Sep 17 00:00:00 2001 From: Sergio Mena Date: Thu, 16 Jun 2022 21:31:17 +0200 Subject: [PATCH 2/2] Don't check PBTS-timeliness when in replay mode (#8774) Closes #8781 Temporary fix to this issue, so that e2e tests don't fail and potentially leave other problems uncovered. --- internal/consensus/state.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/consensus/state.go b/internal/consensus/state.go index 3af775bb6..a7a0b8fed 100644 --- a/internal/consensus/state.go +++ b/internal/consensus/state.go @@ -1530,7 +1530,8 @@ func (cs *State) defaultDoPrevote(ctx context.Context, height int64, round int32 } sp := cs.state.ConsensusParams.Synchrony.SynchronyParamsOrDefaults() - if cs.Proposal.POLRound == -1 && cs.LockedRound == -1 && !cs.proposalIsTimely() { + //TODO: Remove this temporary fix when the complete solution is ready. See #8739 + if !cs.replayMode && cs.Proposal.POLRound == -1 && cs.LockedRound == -1 && !cs.proposalIsTimely() { logger.Debug("prevote step: Proposal is not timely; prevoting nil", "proposed", tmtime.Canonical(cs.Proposal.Timestamp).Format(time.RFC3339Nano),