eth/catalyst: prevent division by zero (#25654)

MariusVanDerWijden · web-flow · commit 95a2c221d4c7 · 2022-08-31T21:29:39.000+03:00
eth/catalyst: prevent diff by zero
diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go
@@ -656,7 +656,7 @@ func (api *ConsensusAPI) heartbeat() {
 				if deltaTime > 0 {
 					growth := deltaDiff / deltaTime
 					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!"

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