catalyst: check if block exists in assemble-block call with unknown p…

…arent-hash (ethereum#22770)
holiman · Apr 29, 2021 · c7d0729 · c7d0729
1 parent 871f50b
commit c7d0729
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go
@@ -109,6 +109,11 @@ func (api *consensusAPI) AssembleBlock(params assembleBlockParams) (*executableD
 
 	bc := api.eth.BlockChain()
 	parent := bc.GetBlockByHash(params.ParentHash)
+	if parent == nil {
+		log.Warn("Cannot assemble block with parent hash to unknown block", "parentHash", params.ParentHash)
+		return nil, fmt.Errorf("cannot assemble block with unknown parent %s", params.ParentHash)
+	}
+
 	pool := api.eth.TxPool()
 
 	if parent.Time() >= params.Timestamp {