eth/catalyst: fix params in failure log (#30131)

arajasek · web-flow · commit 37590b2c5579 · 2024-07-09T15:19:55.000+03:00
diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go
@@ -335,7 +335,7 @@ func (api *ConsensusAPI) forkchoiceUpdated(update engine.ForkchoiceStateV1, payl
 			log.Warn("Final block not available in database", "hash", update.FinalizedBlockHash)
 			return engine.STATUS_INVALID, engine.InvalidForkChoiceState.With(errors.New("final block not available in database"))
 		} else if rawdb.ReadCanonicalHash(api.eth.ChainDb(), finalBlock.NumberU64()) != update.FinalizedBlockHash {
-			log.Warn("Final block not in canonical chain", "number", block.NumberU64(), "hash", update.HeadBlockHash)
+			log.Warn("Final block not in canonical chain", "number", finalBlock.NumberU64(), "hash", update.FinalizedBlockHash)
 			return engine.STATUS_INVALID, engine.InvalidForkChoiceState.With(errors.New("final block not in canonical chain"))
 		}
 		// Set the finalized block

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ func (api *ConsensusAPI) forkchoiceUpdated(update engine.ForkchoiceStateV1, payl`
`335`	`335`	`log.Warn("Final block not available in database", "hash", update.FinalizedBlockHash)`
`336`	`336`	`return engine.STATUS_INVALID, engine.InvalidForkChoiceState.With(errors.New("final block not available in database"))`
`337`	`337`	`} else if rawdb.ReadCanonicalHash(api.eth.ChainDb(), finalBlock.NumberU64()) != update.FinalizedBlockHash {`
`338`		`- log.Warn("Final block not in canonical chain", "number", block.NumberU64(), "hash", update.HeadBlockHash)`
	`338`	`+ log.Warn("Final block not in canonical chain", "number", finalBlock.NumberU64(), "hash", update.FinalizedBlockHash)`
`339`	`339`	`return engine.STATUS_INVALID, engine.InvalidForkChoiceState.With(errors.New("final block not in canonical chain"))`
`340`	`340`	`}`
`341`	`341`	`// Set the finalized block`