Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

internal/ethapi: return error when requesting invalid trie key #25762

Merged
merged 5 commits into from
Sep 16, 2022
Merged

internal/ethapi: return error when requesting invalid trie key #25762

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c020bf7
internal/ethapi: return error when requesting invalid trie key
lightclient Sep 15, 2022
9e9077f
internal/ethapi: add helper function
fjl Sep 15, 2022
5acb004
Update api.go
fjl Sep 15, 2022
7039933
internal/ethapi: allow keys without 0x prefix
lightclient Sep 16, 2022
0b422b2
Update api.go
fjl Sep 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions internal/ethapi/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,8 +708,10 @@ func (s *BlockChainAPI) GetProof(ctx context.Context, address common.Address, st
}, state.Error()
}

// decodeHash parses a hex-encoded 32-byte hash. The input may optionally
// be prefixed by 0x and can have an byte length up to 32.
func decodeHash(s string) (common.Hash, error) {
if has0xPrefix(s) {
if strings.HasPrefix(s, "0x") || strings.HasPrefix(s, "0X") {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

s = s[2:]
}
b, err := hex.DecodeString(s)
Expand All @@ -722,10 +724,6 @@ func decodeHash(s string) (common.Hash, error) {
return common.BytesToHash(b), nil
}

func has0xPrefix(input string) bool {
return len(input) >= 2 && input[0] == '0' && (input[1] == 'x' || input[1] == 'X')
}

// GetHeaderByNumber returns the requested canonical block header.
// * When blockNr is -1 the chain head is returned.
// * When blockNr is -2 the pending chain head is returned.
Expand Down