Merge pull request #21425 from holiman/leslock

les: update checktime even if check fails
pull/21428/head
Péter Szilágyi 4 years ago committed by GitHub
commit 3bb8a4ed3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      les/checkpointoracle/oracle.go

@ -93,8 +93,11 @@ func (oracle *CheckpointOracle) StableCheckpoint() (*params.TrustedCheckpoint, u
// Look it up properly
// Retrieve the latest checkpoint from the contract, abort if empty
latest, hash, height, err := oracle.contract.Contract().GetLatestCheckpoint(nil)
oracle.lastCheckTime = time.Now()
if err != nil || (latest == 0 && hash == [32]byte{}) {
return nil, 0
oracle.lastCheckPointHeight = 0
oracle.lastCheckPoint = nil
return oracle.lastCheckPoint, oracle.lastCheckPointHeight
}
local := oracle.getLocal(latest)
@ -106,10 +109,9 @@ func (oracle *CheckpointOracle) StableCheckpoint() (*params.TrustedCheckpoint, u
//
// In both cases, no stable checkpoint will be returned.
if local.HashEqual(hash) {
oracle.lastCheckTime = time.Now()
oracle.lastCheckPointHeight = height.Uint64()
oracle.lastCheckPoint = &local
return &local, height.Uint64()
return oracle.lastCheckPoint, oracle.lastCheckPointHeight
}
return nil, 0
}

Loading…
Cancel
Save