forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 23:26:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix panic on getting safe block

Browse source 
Since bor doesn't have "safe" block, the api should always return null when requested safe block.
This commit is contained in:
Jerry 2024-10-08 11:51:33 -07:00
parent 2a7c58a616
commit a7578a3cea
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
eth/api_backend.go
View file

@ -157,7 +157,11 @@ func (b *EthAPIBackend) BlockByNumber(ctx context.Context, number rpc.BlockNumbe
if number == rpc.SafeBlockNumber { if number == rpc.SafeBlockNumber {
header := b.eth.blockchain.CurrentSafeBlock() header := b.eth.blockchain.CurrentSafeBlock()
return b.eth.blockchain.GetBlock(header.Hash(), header.Number.Uint64()), nil if header == nil {
return nil, errors.New("safe block not found")
} else {
return b.eth.blockchain.GetBlock(header.Hash(), header.Number.Uint64()), nil
}
} }
return b.eth.blockchain.GetBlockByNumber(uint64(number)), nil return b.eth.blockchain.GetBlockByNumber(uint64(number)), nil

5
internal/ethapi/api_test.go
View file

@ -1818,6 +1818,11 @@ func TestRPCGetBlockOrHeader(t *testing.T) {
fullTx: true, fullTx: true,
file: "hash-pending-fullTx", file: "hash-pending-fullTx",
}, },
// 26. safe block
{
blockNumber: rpc.SafeBlockNumber,
file: "tag-safe",
},
} }
for i, tt := range testSuite { for i, tt := range testSuite {

1
internal/ethapi/testdata/eth_getBlockByNumber-tag-safe.json vendored Normal file
View file

@ -0,0 +1 @@
null