aarifullin/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

core: check headers at the proper state on state reset

Browse source 
And fix the comment along the way.
This commit is contained in:
Anna Shaleva 2022-11-21 15:50:44 +03:00
parent b27a9bcf95
commit f3ef2890f0
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkg/core/blockchain.go
View file

@ -672,17 +672,19 @@ func (bc *Blockchain) Reset(height uint32) error {
} }
func (bc *Blockchain) resetStateInternal(height uint32, stage stateChangeStage) error { func (bc *Blockchain) resetStateInternal(height uint32, stage stateChangeStage) error {
// Cache isn't yet initialized, so retrieve header height right from DAO. // Cache isn't yet initialized, so retrieve block height right from DAO.
currHeight, err := bc.dao.GetCurrentBlockHeight() currHeight, err := bc.dao.GetCurrentBlockHeight()
if err != nil { if err != nil {
return fmt.Errorf("failed to retrieve current block height: %w", err) return fmt.Errorf("failed to retrieve current block height: %w", err)
} }
// Headers are already initialized by this moment, thus may use chain's API.
hHeight := bc.HeaderHeight()
// State reset may already be started by this moment, so perform these checks only if it wasn't. // State reset may already be started by this moment, so perform these checks only if it wasn't.
if stage == none { if stage == none {
if height > currHeight { if height > currHeight {
return fmt.Errorf("current block height is %d, can't reset state to height %d", currHeight, height) return fmt.Errorf("current block height is %d, can't reset state to height %d", currHeight, height)
} }
if height == currHeight { if height == currHeight && hHeight == currHeight {
bc.log.Info("chain is at the proper state", zap.Uint32("height", height)) bc.log.Info("chain is at the proper state", zap.Uint32("height", height))
return nil return nil
} }
@ -695,7 +697,6 @@ func (bc *Blockchain) resetStateInternal(height uint32, stage stateChangeStage)
} }
// Retrieve necessary state before the DB modification. // Retrieve necessary state before the DB modification.
hHeight := bc.HeaderHeight()
b, err := bc.GetBlock(bc.headerHashes[height]) b, err := bc.GetBlock(bc.headerHashes[height])
if err != nil { if err != nil {
return fmt.Errorf("failed to retrieve block %d: %w", height, err) return fmt.Errorf("failed to retrieve block %d: %w", height, err)