cerc-io/plugeth
17
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23677 from karalabe/canon-rlp-fetcher

Browse Source 
internal/ethapi: make header/block rlp retrieval canonical
This commit is contained in:
Péter Szilágyi 2021-10-03 17:45:12 +03:00 committed by GitHub
commit 01fdca53e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
internal/ethapi/api.go
View File

@ -1916,29 +1916,21 @@ func NewPublicDebugAPI(b Backend) *PublicDebugAPI {
} }
// GetHeaderRlp retrieves the RLP encoded for of a single header. // GetHeaderRlp retrieves the RLP encoded for of a single header.
func (api *PublicDebugAPI) GetHeaderRlp(ctx context.Context, number uint64) (string, error) { func (api *PublicDebugAPI) GetHeaderRlp(ctx context.Context, number uint64) (hexutil.Bytes, error) {
header, _ := api.b.HeaderByNumber(ctx, rpc.BlockNumber(number)) header, _ := api.b.HeaderByNumber(ctx, rpc.BlockNumber(number))
if header == nil { if header == nil {
return "", fmt.Errorf("header #%d not found", number) return nil, fmt.Errorf("header #%d not found", number)
} }
encoded, err := rlp.EncodeToBytes(header) return rlp.EncodeToBytes(header)
if err != nil {
return "", err
}
return fmt.Sprintf("%x", encoded), nil
} }
// GetBlockRlp retrieves the RLP encoded for of a single block. // GetBlockRlp retrieves the RLP encoded for of a single block.
func (api *PublicDebugAPI) GetBlockRlp(ctx context.Context, number uint64) (string, error) { func (api *PublicDebugAPI) GetBlockRlp(ctx context.Context, number uint64) (hexutil.Bytes, error) {
block, _ := api.b.BlockByNumber(ctx, rpc.BlockNumber(number)) block, _ := api.b.BlockByNumber(ctx, rpc.BlockNumber(number))
if block == nil { if block == nil {
return "", fmt.Errorf("block #%d not found", number) return nil, fmt.Errorf("block #%d not found", number)
} }
encoded, err := rlp.EncodeToBytes(block) return rlp.EncodeToBytes(block)
if err != nil {
return "", err
}
return fmt.Sprintf("%x", encoded), nil
} }
// TestSignCliqueBlock fetches the given block number, and attempts to sign it as a clique header with the // TestSignCliqueBlock fetches the given block number, and attempts to sign it as a clique header with the