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

Merge pull request #1742 from fjl/rpc-receipt-root

Browse Source 
rpc: add receiptRoot to getBlock* responses
This commit is contained in:
Felix Lange 2015-08-31 14:50:21 +02:00
commit 9dc23ce284
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpc/api/parsing.go
View File

@ -169,6 +169,7 @@ type BlockRes struct {
LogsBloom *hexdata `json:"logsBloom"` LogsBloom *hexdata `json:"logsBloom"`
TransactionRoot *hexdata `json:"transactionsRoot"` TransactionRoot *hexdata `json:"transactionsRoot"`
StateRoot *hexdata `json:"stateRoot"` StateRoot *hexdata `json:"stateRoot"`
ReceiptRoot *hexdata `json:"receiptRoot"`
Miner *hexdata `json:"miner"` Miner *hexdata `json:"miner"`
Difficulty *hexnum `json:"difficulty"` Difficulty *hexnum `json:"difficulty"`
TotalDifficulty *hexnum `json:"totalDifficulty"` TotalDifficulty *hexnum `json:"totalDifficulty"`
@ -192,6 +193,7 @@ func (b *BlockRes) MarshalJSON() ([]byte, error) {
LogsBloom *hexdata `json:"logsBloom"` LogsBloom *hexdata `json:"logsBloom"`
TransactionRoot *hexdata `json:"transactionsRoot"` TransactionRoot *hexdata `json:"transactionsRoot"`
StateRoot *hexdata `json:"stateRoot"` StateRoot *hexdata `json:"stateRoot"`
ReceiptRoot *hexdata `json:"receiptRoot"`
Miner *hexdata `json:"miner"` Miner *hexdata `json:"miner"`
Difficulty *hexnum `json:"difficulty"` Difficulty *hexnum `json:"difficulty"`
TotalDifficulty *hexnum `json:"totalDifficulty"` TotalDifficulty *hexnum `json:"totalDifficulty"`
@ -212,6 +214,7 @@ func (b *BlockRes) MarshalJSON() ([]byte, error) {
ext.LogsBloom = b.LogsBloom ext.LogsBloom = b.LogsBloom
ext.TransactionRoot = b.TransactionRoot ext.TransactionRoot = b.TransactionRoot
ext.StateRoot = b.StateRoot ext.StateRoot = b.StateRoot
ext.ReceiptRoot = b.ReceiptRoot
ext.Miner = b.Miner ext.Miner = b.Miner
ext.Difficulty = b.Difficulty ext.Difficulty = b.Difficulty
ext.TotalDifficulty = b.TotalDifficulty ext.TotalDifficulty = b.TotalDifficulty
@ -236,6 +239,7 @@ func (b *BlockRes) MarshalJSON() ([]byte, error) {
LogsBloom *hexdata `json:"logsBloom"` LogsBloom *hexdata `json:"logsBloom"`
TransactionRoot *hexdata `json:"transactionsRoot"` TransactionRoot *hexdata `json:"transactionsRoot"`
StateRoot *hexdata `json:"stateRoot"` StateRoot *hexdata `json:"stateRoot"`
ReceiptRoot *hexdata `json:"receiptRoot"`
Miner *hexdata `json:"miner"` Miner *hexdata `json:"miner"`
Difficulty *hexnum `json:"difficulty"` Difficulty *hexnum `json:"difficulty"`
TotalDifficulty *hexnum `json:"totalDifficulty"` TotalDifficulty *hexnum `json:"totalDifficulty"`
@ -256,6 +260,7 @@ func (b *BlockRes) MarshalJSON() ([]byte, error) {
ext.LogsBloom = b.LogsBloom ext.LogsBloom = b.LogsBloom
ext.TransactionRoot = b.TransactionRoot ext.TransactionRoot = b.TransactionRoot
ext.StateRoot = b.StateRoot ext.StateRoot = b.StateRoot
ext.ReceiptRoot = b.ReceiptRoot
ext.Miner = b.Miner ext.Miner = b.Miner
ext.Difficulty = b.Difficulty ext.Difficulty = b.Difficulty
ext.TotalDifficulty = b.TotalDifficulty ext.TotalDifficulty = b.TotalDifficulty
@ -291,6 +296,7 @@ func NewBlockRes(block *types.Block, fullTx bool) *BlockRes {
res.LogsBloom = newHexData(block.Bloom()) res.LogsBloom = newHexData(block.Bloom())
res.TransactionRoot = newHexData(block.TxHash()) res.TransactionRoot = newHexData(block.TxHash())
res.StateRoot = newHexData(block.Root()) res.StateRoot = newHexData(block.Root())
res.ReceiptRoot = newHexData(block.ReceiptHash())
res.Miner = newHexData(block.Coinbase()) res.Miner = newHexData(block.Coinbase())
res.Difficulty = newHexNum(block.Difficulty()) res.Difficulty = newHexNum(block.Difficulty())
res.TotalDifficulty = newHexNum(block.Td) res.TotalDifficulty = newHexNum(block.Td)