eth: fix crash on querying finalized block (ethereum#27162)

s1na · web-flow · commit b1113aa07ee5 · 2023-04-25T09:15:43.000-04:00
eth: fix crash on querying nil finalized block
diff --git a/eth/api_backend.go b/eth/api_backend.go
@@ -134,13 +134,19 @@ func (b *EthAPIBackend) BlockByNumber(ctx context.Context, number rpc.BlockNumbe
 			return nil, errors.New("'finalized' tag not supported on pre-merge network")
 		}
 		header := b.eth.blockchain.CurrentFinalBlock()
+		if header == nil {
+			return nil, errors.New("finalized block not found")
+		}
 		return b.eth.blockchain.GetBlock(header.Hash(), header.Number.Uint64()), nil
 	}
 	if number == rpc.SafeBlockNumber {
 		if !b.eth.Merger().TDDReached() {
 			return nil, errors.New("'safe' tag not supported on pre-merge network")
 		}
 		header := b.eth.blockchain.CurrentSafeBlock()
+		if header == nil {
+			return nil, errors.New("safe block not found")
+		}
 		return b.eth.blockchain.GetBlock(header.Hash(), header.Number.Uint64()), nil
 	}
 	return b.eth.blockchain.GetBlockByNumber(uint64(number)), nil

Original file line number	Diff line number	Diff line change
`@@ -134,13 +134,19 @@ func (b *EthAPIBackend) BlockByNumber(ctx context.Context, number rpc.BlockNumbe`
`134`	`134`	`return nil, errors.New("'finalized' tag not supported on pre-merge network")`
`135`	`135`	`}`
`136`	`136`	`header := b.eth.blockchain.CurrentFinalBlock()`
	`137`	`+ if header == nil {`
	`138`	`+ return nil, errors.New("finalized block not found")`
	`139`	`+ }`
`137`	`140`	`return b.eth.blockchain.GetBlock(header.Hash(), header.Number.Uint64()), nil`
`138`	`141`	`}`
`139`	`142`	`if number == rpc.SafeBlockNumber {`
`140`	`143`	`if !b.eth.Merger().TDDReached() {`
`141`	`144`	`return nil, errors.New("'safe' tag not supported on pre-merge network")`
`142`	`145`	`}`
`143`	`146`	`header := b.eth.blockchain.CurrentSafeBlock()`
	`147`	`+ if header == nil {`
	`148`	`+ return nil, errors.New("safe block not found")`
	`149`	`+ }`
`144`	`150`	`return b.eth.blockchain.GetBlock(header.Hash(), header.Number.Uint64()), nil`
`145`	`151`	`}`
`146`	`152`	`return b.eth.blockchain.GetBlockByNumber(uint64(number)), nil`