diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2019-04-08 21:16:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 21:16:05 +0800 |
| commit | 4e13a09c5033b4cf073db6aeaaa7d159dcf07f30 (patch) | |
| tree | 0f64daac335200ce6fd45d6ee9f62dabc0fb1887 /light | |
| parent | c942700427557e3ff6de3aaf6b916e2f056c1ec2 (diff) | |
| parent | 009d2fe2d650b1a92e28f0decbf5f7fa628779e9 (diff) | |
| download | go-tangerine-4e13a09c5033b4cf073db6aeaaa7d159dcf07f30.tar.gz go-tangerine-4e13a09c5033b4cf073db6aeaaa7d159dcf07f30.tar.zst go-tangerine-4e13a09c5033b4cf073db6aeaaa7d159dcf07f30.zip | |
Merge pull request #19370 from karalabe/geth-1.8.24v1.8.24
Backport PR for the v1.8.24 maintenance release
Diffstat (limited to 'light')
| -rw-r--r-- | light/lightchain.go | 4 | ||||
| -rw-r--r-- | light/postprocess.go | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/light/lightchain.go b/light/lightchain.go index 8e2734c2d..977f497a7 100644 --- a/light/lightchain.go +++ b/light/lightchain.go @@ -157,7 +157,7 @@ func (self *LightChain) loadLastState() error { // Issue a status log and return header := self.hc.CurrentHeader() headerTd := self.GetTd(header.Hash(), header.Number.Uint64()) - log.Info("Loaded most recent local header", "number", header.Number, "hash", header.Hash(), "td", headerTd, "age", common.PrettyAge(time.Unix(header.Time.Int64(), 0))) + log.Info("Loaded most recent local header", "number", header.Number, "hash", header.Hash(), "td", headerTd, "age", common.PrettyAge(time.Unix(int64(header.Time), 0))) return nil } @@ -488,7 +488,7 @@ func (self *LightChain) SyncCht(ctx context.Context) bool { // Ensure the chain didn't move past the latest block while retrieving it if self.hc.CurrentHeader().Number.Uint64() < header.Number.Uint64() { - log.Info("Updated latest header based on CHT", "number", header.Number, "hash", header.Hash(), "age", common.PrettyAge(time.Unix(header.Time.Int64(), 0))) + log.Info("Updated latest header based on CHT", "number", header.Number, "hash", header.Hash(), "age", common.PrettyAge(time.Unix(int64(header.Time), 0))) self.hc.SetCurrentHeader(header) } return true diff --git a/light/postprocess.go b/light/postprocess.go index dd1b74a7b..24fe47bc7 100644 --- a/light/postprocess.go +++ b/light/postprocess.go @@ -109,6 +109,7 @@ var trustedCheckpoints = map[common.Hash]*params.TrustedCheckpoint{ params.MainnetGenesisHash: params.MainnetTrustedCheckpoint, params.TestnetGenesisHash: params.TestnetTrustedCheckpoint, params.RinkebyGenesisHash: params.RinkebyTrustedCheckpoint, + params.GoerliGenesisHash: params.GoerliTrustedCheckpoint, } var ( |