Refactor the reset snapshots

consensus/parlia/parlia.go

@@ -801,7 +801,7 @@ func (p *Parlia) snapshot(chain consensus.ChainHeaderReader, number uint64, hash
  headers[i], headers[len(headers)-1-i] = headers[len(headers)-1-i], headers[i]
  }
 
- snap, err := snap.apply(headers, chain, parents, p.chainConfig, p.recentSnaps)
+ snap, err := snap.apply(headers, chain, parents, p.chainConfig, p.recentSnaps, verify)
  if err != nil {
  return nil, err
  }
@@ -1631,53 +1631,34 @@ func (p *Parlia) ResetSnapshot(chain consensus.ChainHeaderReader, header *types.
  )
  hash := header.Hash()
  number := header.Number.Uint64()
+ headers = append(headers, header)
 
- for snap == nil {
- if s, ok := p.recentSnaps.Get(hash); ok {
- snap = s
- break
- }
+ if s, ok := p.recentSnaps.Get(header.ParentHash); ok {
+ snap = s
+ }
 
- // If an on-disk checkpoint snapshot can be found, use that
- if number%CheckpointInterval == 0 {
- if s, err := loadSnapshot(p.config, p.signatures, p.db, number, hash); err == nil {
- log.Trace("Loaded snapshot from disk", "number", number, "hash", hash)
- snap = s
- break
- }
+ // If we're at the genesis, snapshot the initial state.
+ if number == 0 {
+ // Headers included into the snapshots have to be trusted as checkpoints get validators from headers
+ validators, voteAddrs, err := parseValidators(header, p.chainConfig, p.config)
+ if err != nil {
+ return err
  }
-
- // If we're at the genesis, snapshot the initial state.
- if number == 0 {
- // Headers included into the snapshots have to be trusted as checkpoints get validators from headers
- validators, voteAddrs, err := parseValidators(header, p.chainConfig, p.config)
- if err != nil {
- return err
- }
- // new snapshot
- snap = newSnapshot(p.config, p.signatures, number, hash, validators, voteAddrs)
- p.recentSnaps.Add(hash, snap)
- if err := snap.store(p.db); err != nil {
- return err
- }
- p.logger.Info("Stored checkpoint snapshot to disk", "number", number, "hash", hash)
- break
+ // new snapshot
+ snap = newSnapshot(p.config, p.signatures, number, hash, validators, voteAddrs)
+ p.recentSnaps.Add(hash, snap)
+ if err := snap.store(p.db); err != nil {
+ return err
  }
- headers = append(headers, header)
- number, hash = number-1, header.ParentHash
- header = chain.GetHeader(hash, number)
+ p.logger.Info("Stored checkpoint snapshot to disk", "number", number, "hash", hash)
  }
 
  // check if snapshot is nil
  if snap == nil {
  return fmt.Errorf("unknown error while retrieving snapshot at block number %v", number)
  }
 
- // Previous snapshot found, apply any pending headers on top of it
- for i := 0; i < len(headers)/2; i++ {
- headers[i], headers[len(headers)-1-i] = headers[len(headers)-1-i], headers[i]
- }
- snap, err := snap.apply(headers, chain, nil, p.chainConfig, p.recentSnaps)
+ snap, err := snap.apply(headers, chain, nil, p.chainConfig, p.recentSnaps, true)
  if err != nil {
  return err
  }

consensus/parlia/snapshot.go

@@ -261,7 +261,7 @@ func (s *Snapshot) updateAttestation(header *types.Header, chainConfig *chain.Co
  }
 }
 
-func (s *Snapshot) apply(headers []*types.Header, chain consensus.ChainHeaderReader, parents []*types.Header, chainConfig *chain.Config, recentSnaps *lru.ARCCache[libcommon.Hash, *Snapshot]) (*Snapshot, error) {
+func (s *Snapshot) apply(headers []*types.Header, chain consensus.ChainHeaderReader, parents []*types.Header, chainConfig *chain.Config, recentSnaps *lru.ARCCache[libcommon.Hash, *Snapshot], verify bool) (*Snapshot, error) {
  // Allow passing in no headers for cleaner code
  if len(headers) == 0 {
  return s, nil
@@ -297,9 +297,13 @@ func (s *Snapshot) apply(headers []*types.Header, chain consensus.ChainHeaderRea
  delete(snap.RecentForkHashes, number-limit)
  }
  // Resolve the authorization key and check against signers
- validator, err := ecrecover(header, s.sigCache, chainConfig.ChainID)
- if err != nil {
- return nil, err
+ validator := header.Coinbase
+ if !verify {
+ v, err := ecrecover(header, s.sigCache, chainConfig.ChainID)
+ if err != nil {
+ return nil, err
+ }
+ validator = v
  }
  // Disabling this validation due to issues with BEP-131 looks like is breaks the property that used to allow Erigon to sync Parlia without knowning the contract state
  // Further investigation is required