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

rpc: reject block parameter with neither number nor hash (#35271)

Browse source
This commit is contained in:
Stavros Vlachakis 2026-07-03 09:31:53 +03:00 committed by GitHub
parent 3d50e3eb0e
commit d617f4fcdb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
rpc/types.go
View file

@ -158,6 +158,9 @@ func (bnh *BlockNumberOrHash) UnmarshalJSON(data []byte) error {
if e.BlockNumber != nil && e.BlockHash != nil { if e.BlockNumber != nil && e.BlockHash != nil {
return errors.New("cannot specify both BlockHash and BlockNumber, choose one or the other") return errors.New("cannot specify both BlockHash and BlockNumber, choose one or the other")
} }
if e.BlockNumber == nil && e.BlockHash == nil {
return errors.New("must specify either BlockHash or BlockNumber")
}
bnh.BlockNumber = e.BlockNumber bnh.BlockNumber = e.BlockNumber
bnh.BlockHash = e.BlockHash bnh.BlockHash = e.BlockHash
bnh.RequireCanonical = e.RequireCanonical bnh.RequireCanonical = e.RequireCanonical

2
rpc/types_test.go
View file

@ -109,6 +109,8 @@ func TestBlockNumberOrHash_UnmarshalJSON(t *testing.T) {
27: {`{"blockNumber":"safe"}`, false, BlockNumberOrHashWithNumber(SafeBlockNumber)}, 27: {`{"blockNumber":"safe"}`, false, BlockNumberOrHashWithNumber(SafeBlockNumber)},
28: {`{"blockNumber":"finalized"}`, false, BlockNumberOrHashWithNumber(FinalizedBlockNumber)}, 28: {`{"blockNumber":"finalized"}`, false, BlockNumberOrHashWithNumber(FinalizedBlockNumber)},
29: {`{"blockNumber":"0x1", "blockHash":"0x0000000000000000000000000000000000000000000000000000000000000000"}`, true, BlockNumberOrHash{}}, 29: {`{"blockNumber":"0x1", "blockHash":"0x0000000000000000000000000000000000000000000000000000000000000000"}`, true, BlockNumberOrHash{}},
30: {`{}`, true, BlockNumberOrHash{}},
31: {`{"requireCanonical":true}`, true, BlockNumberOrHash{}},
} }
for i, test := range tests { for i, test := range tests {