interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #21425 from holiman/leslock 

les: update checktime even if check fails
This commit is contained in:
Péter Szilágyi 2020-08-07 12:32:01 +03:00 committed by GitHub
parent 68754f3931 983cb25a07
commit 3bb8a4ed3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
les/checkpointoracle/oracle.go
View File

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