cerc-io/go-ethereum
18
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

Patch for concurrent iterator & others (onto v1.11.6) #386

Closed
roysc wants to merge 1565 commits from v1.11.6-statediff-v5 into master
pull from: v1.11.6-statediff-v5
merge into: cerc-io:master
Conversation 0 Commits 1565 Files Changed 1471 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 95a2c221d4 - Show all commits

2
eth/catalyst/api.go
View File

@ -656,7 +656,7 @@ func (api *ConsensusAPI) heartbeat() {
if deltaTime > 0 { if deltaTime > 0 {
growth := deltaDiff / deltaTime growth := deltaDiff / deltaTime
left := new(big.Int).Sub(ttd, htd) left := new(big.Int).Sub(ttd, htd)
eta = time.Duration(new(big.Int).Div(left, new(big.Int).SetUint64(growth)).Uint64()) * time.Second eta = time.Duration(new(big.Int).Div(left, new(big.Int).SetUint64(growth+1)).Uint64()) * time.Second
} }
} }
message := "Merge is configured, but previously seen beacon client is offline. Please ensure it is operational before the transition arrives!" message := "Merge is configured, but previously seen beacon client is offline. Please ensure it is operational before the transition arrives!"