mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-05-31 03:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

blocksync: fixed merge induced error

Browse Source
This commit is contained in:
Jasmina Malicevic
2022-05-11 13:07:41 +02:00
parent 3a476331f1
commit 3395affe75
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/blocksync/reactor.go
View File

@@ -553,9 +553,8 @@ func (r *Reactor) poolRoutine(ctx context.Context, stateSynced bool, blockSyncCh
// // first.Hash() doesn't verify the tx contents, so MakePartSet() is
// // currently necessary.
// err = state.Validators.VerifyCommitLight(chainID, firstID, first.Height, second.LastCommit)
r.lastTrustedBlock = &BlockResponse{block: newBlock, commit: verifyBlock.LastCommit}
r.lastTrustedBlock.block = newBlock
r.lastTrustedBlock.commit = verifyBlock.LastCommit
} else {
// we need to load the last block we trusted
if r.initialState.LastBlockHeight != 0 {
@@ -581,8 +580,7 @@ func (r *Reactor) poolRoutine(ctx context.Context, stateSynced bool, blockSyncCh
continue // was return previously
}
r.lastTrustedBlock.block = newBlock
// r.lastTrustedBlock.commit
r.lastTrustedBlock = &BlockResponse{block: newBlock, commit: verifyBlock.LastCommit}
}
var err error
// validate the block before we persist it