Skip to content

Commit

Permalink
rename 'maker' to 'miner' for json
Browse files Browse the repository at this point in the history
  • Loading branch information
iceming123 committed Aug 19, 2021
1 parent 5355ec0 commit 170eb8e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion core/types/block.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ type Header struct {
TxHash common.Hash `json:"transactionsRoot" gencodec:"required"`
ReceiptHash common.Hash `json:"receiptsRoot" gencodec:"required"`
CommitteeHash common.Hash `json:"committeeRoot" gencodec:"required"`
Proposer common.Address `json:"maker" gencodec:"required"`
Proposer common.Address `json:"miner" gencodec:"required"`
Bloom Bloom `json:"logsBloom" gencodec:"required"`
SnailHash common.Hash `json:"snailHash" gencodec:"required"`
SnailNumber *big.Int `json:"snailNumber" gencodec:"required"`
Expand Down
6 changes: 3 additions & 3 deletions core/types/gen_header_json.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/trueapi/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -1058,7 +1058,7 @@ func RPCMarshalBlock(b *types.Block, inclTx bool, fullTx bool) (map[string]inter
"hash": b.Hash(),
"parentHash": head.ParentHash,
"committeeRoot": head.CommitteeHash,
"maker": head.Proposer,
"miner": head.Proposer,
"logsBloom": head.Bloom,
"stateRoot": head.Root,
"snailHash": head.SnailHash,
Expand Down

0 comments on commit 170eb8e

Please sign in to comment.