Skip to content

G
Geth-Modification
Commit c88e4357 authored by Felix Lange's avatar Felix Lange Committed by GitHub
Browse files
Options

Merge pull request #3088 from bas-vk/rpc-block-output 

core/types: renamed receiptRoot to receiptsRoot
parents eeb2a1a6 71e8ae01
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
core/types/block.go
View file @ c88e4357
......@@ -104,7 +104,7 @@ type jsonHeader struct {
Coinbase *common.Address `json:"miner"`
Root *common.Hash `json:"stateRoot"`
TxHash *common.Hash `json:"transactionsRoot"`
ReceiptHash *common.Hash `json:"receiptRoot"`
ReceiptHash *common.Hash `json:"receiptsRoot"`
Bloom *Bloom `json:"logsBloom"`
Difficulty *hexBig `json:"difficulty"`
Number *hexBig `json:"number"`
......
core/types/json_test.go
View file @ c88e4357
This diff is collapsed.
internal/ethapi/api.go
View file @ c88e4357
......@@ -597,7 +597,7 @@ func (s *PublicBlockChainAPI) rpcOutputBlock(b *types.Block, inclTx bool, fullTx
"gasUsed": rpc.NewHexNumber(head.GasUsed),
"timestamp": rpc.NewHexNumber(head.Time),
"transactionsRoot": head.TxHash,
"receiptRoot": head.ReceiptHash,
"receiptsRoot": head.ReceiptHash,
}
if inclTx {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment