eth/catalyst: fix trigger transition

MariusVanDerWijden · MariusVanDerWijden · commit 6561c6d0974f · 2021-11-23T12:59:30.000+01:00
diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go
@@ -504,6 +504,11 @@ func (api *ConsensusAPI) setHead(newHead common.Hash) error {
 	}
 	headBlock := api.eth.BlockChain().CurrentBlock()
 	if headBlock.Hash() == newHead {
+		// Trigger the transition if it's the first `NewHead` event.
+		merger := api.merger()
+		if !merger.PoSFinalized() {
+			merger.FinalizePoS()
+		}
 		return nil
 	}
 	newHeadBlock := api.eth.BlockChain().GetBlockByHash(newHead)

Original file line number	Diff line number	Diff line change
`@@ -504,6 +504,11 @@ func (api *ConsensusAPI) setHead(newHead common.Hash) error {`
`504`	`504`	`}`
`505`	`505`	`headBlock := api.eth.BlockChain().CurrentBlock()`
`506`	`506`	`if headBlock.Hash() == newHead {`
	`507`	+ // Trigger the transition if it's the first `NewHead` event.
	`508`	`+ merger := api.merger()`
	`509`	`+ if !merger.PoSFinalized() {`
	`510`	`+ merger.FinalizePoS()`
	`511`	`+ }`
`507`	`512`	`return nil`
`508`	`513`	`}`
`509`	`514`	`newHeadBlock := api.eth.BlockChain().GetBlockByHash(newHead)`