|
|
|
@ -807,7 +807,7 @@ func decodeHash(s string) (h common.Hash, inputLength int, err error) { |
|
|
|
func (api *BlockChainAPI) GetHeaderByNumber(ctx context.Context, number rpc.BlockNumber) (map[string]interface{}, error) { |
|
|
|
func (api *BlockChainAPI) GetHeaderByNumber(ctx context.Context, number rpc.BlockNumber) (map[string]interface{}, error) { |
|
|
|
header, err := api.b.HeaderByNumber(ctx, number) |
|
|
|
header, err := api.b.HeaderByNumber(ctx, number) |
|
|
|
if header != nil && err == nil { |
|
|
|
if header != nil && err == nil { |
|
|
|
response := api.rpcMarshalHeader(ctx, header) |
|
|
|
response := RPCMarshalHeader(header) |
|
|
|
if number == rpc.PendingBlockNumber { |
|
|
|
if number == rpc.PendingBlockNumber { |
|
|
|
// Pending header need to nil out a few fields
|
|
|
|
// Pending header need to nil out a few fields
|
|
|
|
for _, field := range []string{"hash", "nonce", "miner"} { |
|
|
|
for _, field := range []string{"hash", "nonce", "miner"} { |
|
|
|
@ -823,7 +823,7 @@ func (api *BlockChainAPI) GetHeaderByNumber(ctx context.Context, number rpc.Bloc |
|
|
|
func (api *BlockChainAPI) GetHeaderByHash(ctx context.Context, hash common.Hash) map[string]interface{} { |
|
|
|
func (api *BlockChainAPI) GetHeaderByHash(ctx context.Context, hash common.Hash) map[string]interface{} { |
|
|
|
header, _ := api.b.HeaderByHash(ctx, hash) |
|
|
|
header, _ := api.b.HeaderByHash(ctx, hash) |
|
|
|
if header != nil { |
|
|
|
if header != nil { |
|
|
|
return api.rpcMarshalHeader(ctx, header) |
|
|
|
return RPCMarshalHeader(header) |
|
|
|
} |
|
|
|
} |
|
|
|
return nil |
|
|
|
return nil |
|
|
|
} |
|
|
|
} |
|
|
|
@ -838,14 +838,14 @@ 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, err := api.rpcMarshalBlock(ctx, block, true, fullTx) |
|
|
|
response := RPCMarshalBlock(block, true, fullTx, api.b.ChainConfig()) |
|
|
|
if err == nil && 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"} { |
|
|
|
response[field] = nil |
|
|
|
response[field] = nil |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return response, err |
|
|
|
return response, nil |
|
|
|
} |
|
|
|
} |
|
|
|
return nil, err |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
} |
|
|
|
@ -855,7 +855,7 @@ func (api *BlockChainAPI) GetBlockByNumber(ctx context.Context, number rpc.Block |
|
|
|
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 { |
|
|
|
return api.rpcMarshalBlock(ctx, block, true, fullTx) |
|
|
|
return RPCMarshalBlock(block, true, fullTx, api.b.ChainConfig()), nil |
|
|
|
} |
|
|
|
} |
|
|
|
return nil, err |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
} |
|
|
|
@ -870,7 +870,7 @@ func (api *BlockChainAPI) GetUncleByBlockNumberAndIndex(ctx context.Context, blo |
|
|
|
return nil, nil |
|
|
|
return nil, nil |
|
|
|
} |
|
|
|
} |
|
|
|
block = types.NewBlockWithHeader(uncles[index]) |
|
|
|
block = types.NewBlockWithHeader(uncles[index]) |
|
|
|
return api.rpcMarshalBlock(ctx, block, false, false) |
|
|
|
return RPCMarshalBlock(block, false, false, api.b.ChainConfig()), nil |
|
|
|
} |
|
|
|
} |
|
|
|
return nil, err |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
} |
|
|
|
@ -885,7 +885,7 @@ func (api *BlockChainAPI) GetUncleByBlockHashAndIndex(ctx context.Context, block |
|
|
|
return nil, nil |
|
|
|
return nil, nil |
|
|
|
} |
|
|
|
} |
|
|
|
block = types.NewBlockWithHeader(uncles[index]) |
|
|
|
block = types.NewBlockWithHeader(uncles[index]) |
|
|
|
return api.rpcMarshalBlock(ctx, block, false, false) |
|
|
|
return RPCMarshalBlock(block, false, false, api.b.ChainConfig()), nil |
|
|
|
} |
|
|
|
} |
|
|
|
return nil, err |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
} |
|
|
|
@ -1442,24 +1442,6 @@ func RPCMarshalBlock(block *types.Block, inclTx bool, fullTx bool, config *param |
|
|
|
return fields |
|
|
|
return fields |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// rpcMarshalHeader uses the generalized output filler, then adds the total difficulty field, which requires
|
|
|
|
|
|
|
|
// a `BlockchainAPI`.
|
|
|
|
|
|
|
|
func (api *BlockChainAPI) rpcMarshalHeader(ctx context.Context, header *types.Header) map[string]interface{} { |
|
|
|
|
|
|
|
fields := RPCMarshalHeader(header) |
|
|
|
|
|
|
|
fields["totalDifficulty"] = (*hexutil.Big)(api.b.GetTd(ctx, header.Hash())) |
|
|
|
|
|
|
|
return fields |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// rpcMarshalBlock uses the generalized output filler, then adds the total difficulty field, which requires
|
|
|
|
|
|
|
|
// a `BlockchainAPI`.
|
|
|
|
|
|
|
|
func (api *BlockChainAPI) rpcMarshalBlock(ctx context.Context, b *types.Block, inclTx bool, fullTx bool) (map[string]interface{}, error) { |
|
|
|
|
|
|
|
fields := RPCMarshalBlock(b, inclTx, fullTx, api.b.ChainConfig()) |
|
|
|
|
|
|
|
if inclTx { |
|
|
|
|
|
|
|
fields["totalDifficulty"] = (*hexutil.Big)(api.b.GetTd(ctx, b.Hash())) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return fields, nil |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// RPCTransaction represents a transaction that will serialize to the RPC representation of a transaction
|
|
|
|
// RPCTransaction represents a transaction that will serialize to the RPC representation of a transaction
|
|
|
|
type RPCTransaction struct { |
|
|
|
type RPCTransaction struct { |
|
|
|
BlockHash *common.Hash `json:"blockHash"` |
|
|
|
BlockHash *common.Hash `json:"blockHash"` |
|
|
|
|
Sina M
2 months ago
committed by
GitHub