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 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1b34ed2ed6 - Show all commits

4
eth/catalyst/api.go
View File

@ -641,9 +641,9 @@ func (api *ConsensusAPI) heartbeat() {
} }
} else { } else {
if lastTransitionUpdate.IsZero() { if lastTransitionUpdate.IsZero() {
message = "Merge is configured, but no beacon client seen. Please ensure you have one available before the transision arrives!" message = "Merge is configured, but no beacon client seen. Please ensure you have one available before the transition arrives!"
} else { } else {
message = "Merge is configured, but previously seen beacon client is offline. Please ensure it is operational before the transision arrives!" message = "Merge is configured, but previously seen beacon client is offline. Please ensure it is operational before the transition arrives!"
} }
} }
if eta == 0 { if eta == 0 {