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

internal/cli: use correct RPCMarshalBlock function

Browse source
This commit is contained in:
Manav Darji 2025-02-18 19:06:11 +05:30
parent 866434899d
commit 4a60a3e16d
No known key found for this signature in database
GPG key ID: A426F0124435F36E
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
internal/ethapi/api.go
View file

@ -975,7 +975,7 @@ func (api *BlockChainAPI) GetHeaderByHash(ctx context.Context, hash common.Hash)
func (api *BlockChainAPI) GetBlockByNumber(ctx context.Context, number rpc.BlockNumber, fullTx bool) (map[string]interface{}, error) { func (api *BlockChainAPI) GetBlockByNumber(ctx context.Context, number rpc.BlockNumber, fullTx bool) (map[string]interface{}, error) {
block, err := api.b.BlockByNumber(ctx, number) block, err := api.b.BlockByNumber(ctx, number)
if block != nil && err == nil { if block != nil && err == nil {
response := RPCMarshalBlock(block, true, fullTx, api.b.ChainConfig()) response := RPCMarshalBlock(block, true, fullTx, api.b.ChainConfig(), api.b.ChainDb())
if number == rpc.PendingBlockNumber { if number == rpc.PendingBlockNumber {
// Pending blocks need to nil out a few fields // Pending blocks need to nil out a few fields
for _, field := range []string{"hash", "nonce", "miner"} { for _, field := range []string{"hash", "nonce", "miner"} {
@ -998,14 +998,15 @@ func (api *BlockChainAPI) GetBlockByNumber(ctx context.Context, number rpc.Block
// detail, otherwise only the transaction hash is returned. // detail, otherwise only the transaction hash is returned.
func (api *BlockChainAPI) GetBlockByHash(ctx context.Context, hash common.Hash, fullTx bool) (map[string]interface{}, error) { func (api *BlockChainAPI) GetBlockByHash(ctx context.Context, hash common.Hash, fullTx bool) (map[string]interface{}, error) {
block, err := api.b.BlockByHash(ctx, hash) block, err := api.b.BlockByHash(ctx, hash)
if block != nil { if block != nil && err == nil {
response, err := api.rpcMarshalBlock(ctx, block, true, fullTx) response := RPCMarshalBlock(block, true, fullTx, api.b.ChainConfig(), api.b.ChainDb())
// append marshalled bor transaction // append marshalled bor transaction
if err == nil && response != nil { if response != nil {
return api.appendRPCMarshalBorTransaction(ctx, block, response, fullTx), err return api.appendRPCMarshalBorTransaction(ctx, block, response, fullTx), err
} }
return response, err return response, nil
} }
return nil, err return nil, err
@ -1022,7 +1023,7 @@ func (api *BlockChainAPI) GetUncleByBlockNumberAndIndex(ctx context.Context, blo
} }
block = types.NewBlockWithHeader(uncles[index]) block = types.NewBlockWithHeader(uncles[index])
return RPCMarshalBlock(block, false, false, api.b.ChainConfig()), nil return RPCMarshalBlock(block, false, false, api.b.ChainConfig(), api.b.ChainDb()), nil
} }
return nil, err return nil, err
@ -1039,7 +1040,7 @@ func (api *BlockChainAPI) GetUncleByBlockHashAndIndex(ctx context.Context, block
} }
block = types.NewBlockWithHeader(uncles[index]) block = types.NewBlockWithHeader(uncles[index])
return RPCMarshalBlock(block, false, false, api.b.ChainConfig()), nil return RPCMarshalBlock(block, false, false, api.b.ChainConfig(), api.b.ChainDb()), nil
} }
return nil, err return nil, err