From 076692def0fc56e9bf80946b4081f783056f5238 Mon Sep 17 00:00:00 2001 From: Darioush Jalali Date: Thu, 16 Mar 2023 14:40:45 -0700 Subject: [PATCH 1/2] internal/ethapi: nit: int->uint64 in GetTxReceipt --- internal/ethapi/api.go | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 93a2d1264d3..c240960969c 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -1626,7 +1626,7 @@ func (s *TransactionAPI) GetTransactionReceipt(ctx context.Context, hash common. if err != nil { return nil, err } - if len(receipts) <= int(index) { + if uint64(len(receipts)) <= index { return nil, nil } receipt := receipts[index] @@ -1923,19 +1923,12 @@ func NewDebugAPI(b Backend) *DebugAPI { // GetRawHeader retrieves the RLP encoding for a single header. func (api *DebugAPI) GetRawHeader(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash) (hexutil.Bytes, error) { - var hash common.Hash - if h, ok := blockNrOrHash.Hash(); ok { - hash = h - } else { - block, err := api.b.BlockByNumberOrHash(ctx, blockNrOrHash) - if err != nil { - return nil, err - } - hash = block.Hash() + header, err := api.b.HeaderByNumberOrHash(ctx, blockNrOrHash) + if err != nil { + return nil, err } - header, _ := api.b.HeaderByHash(ctx, hash) if header == nil { - return nil, fmt.Errorf("header #%d not found", hash) + return nil, fmt.Errorf("header #%v not found", blockNrOrHash) } return rlp.EncodeToBytes(header) } From 1289bfa0418b648b0a75ae5a07c43dd5ab0c2f84 Mon Sep 17 00:00:00 2001 From: Darioush Jalali Date: Thu, 16 Mar 2023 14:41:45 -0700 Subject: [PATCH 2/2] sync master --- internal/ethapi/api.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index c240960969c..0cf29e5fe64 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -1923,12 +1923,19 @@ func NewDebugAPI(b Backend) *DebugAPI { // GetRawHeader retrieves the RLP encoding for a single header. func (api *DebugAPI) GetRawHeader(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash) (hexutil.Bytes, error) { - header, err := api.b.HeaderByNumberOrHash(ctx, blockNrOrHash) - if err != nil { - return nil, err + var hash common.Hash + if h, ok := blockNrOrHash.Hash(); ok { + hash = h + } else { + block, err := api.b.BlockByNumberOrHash(ctx, blockNrOrHash) + if err != nil { + return nil, err + } + hash = block.Hash() } + header, _ := api.b.HeaderByHash(ctx, hash) if header == nil { - return nil, fmt.Errorf("header #%v not found", blockNrOrHash) + return nil, fmt.Errorf("header #%d not found", hash) } return rlp.EncodeToBytes(header) }