diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-10-19 18:52:38 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-04-09 21:32:50 +0800 |
| commit | 00e8f2d99b3c6b27d8047712baf5bbb6150dc273 (patch) | |
| tree | b36879b60e89210e664a7007d08fcd5a990e613d /core | |
| parent | b52b1b2106f075260674660638aa60fe5ec81f87 (diff) | |
| download | dexon-00e8f2d99b3c6b27d8047712baf5bbb6150dc273.tar dexon-00e8f2d99b3c6b27d8047712baf5bbb6150dc273.tar.gz dexon-00e8f2d99b3c6b27d8047712baf5bbb6150dc273.tar.bz2 dexon-00e8f2d99b3c6b27d8047712baf5bbb6150dc273.tar.lz dexon-00e8f2d99b3c6b27d8047712baf5bbb6150dc273.tar.xz dexon-00e8f2d99b3c6b27d8047712baf5bbb6150dc273.tar.zst dexon-00e8f2d99b3c6b27d8047712baf5bbb6150dc273.zip | |
consensus: dexcon: fetch config from state
Diffstat (limited to 'core')
| -rw-r--r-- | core/types/block.go | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/core/types/block.go b/core/types/block.go index a28ce8ee0..b814bd975 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -26,6 +26,8 @@ import ( "time" "unsafe" + coreTypes "github.com/dexon-foundation/dexon-consensus-core/core/types" + "github.com/dexon-foundation/dexon/common" "github.com/dexon-foundation/dexon/common/hexutil" "github.com/dexon-foundation/dexon/rlp" @@ -68,25 +70,26 @@ func (n *BlockNonce) UnmarshalText(input []byte) error { // Header represents a block header in the Ethereum blockchain. type Header struct { - ParentHash common.Hash `json:"parentHash" gencodec:"required"` - UncleHash common.Hash `json:"sha3Uncles" gencodec:"required"` - Coinbase common.Address `json:"miner" gencodec:"required"` - Root common.Hash `json:"stateRoot" gencodec:"required"` - TxHash common.Hash `json:"transactionsRoot" gencodec:"required"` - ReceiptHash common.Hash `json:"receiptsRoot" gencodec:"required"` - Bloom Bloom `json:"logsBloom" gencodec:"required"` - Difficulty *big.Int `json:"difficulty" gencodec:"required"` - Number *big.Int `json:"number" gencodec:"required"` - GasLimit uint64 `json:"gasLimit" gencodec:"required"` - GasUsed uint64 `json:"gasUsed" gencodec:"required"` - Time uint64 `json:"timestamp" gencodec:"required"` - Extra []byte `json:"extraData" gencodec:"required"` - MixDigest common.Hash `json:"mixHash"` - Nonce BlockNonce `json:"nonce"` - Randomness []byte `json:"randomness" gencodec:"required"` - WitnessHeight uint64 `json:"witnessHeight" gencodec:"required"` - WitnessRoot common.Hash `json:"WitnessRoot" gencodec:"required"` - WitnessReceiptHash common.Hash `json:"WitnessReceiptHash" gencodec:"required"` + ParentHash common.Hash `json:"parentHash" gencodec:"required"` + UncleHash common.Hash `json:"sha3Uncles" gencodec:"required"` + Coinbase common.Address `json:"miner" gencodec:"required"` + Root common.Hash `json:"stateRoot" gencodec:"required"` + TxHash common.Hash `json:"transactionsRoot" gencodec:"required"` + ReceiptHash common.Hash `json:"receiptsRoot" gencodec:"required"` + Bloom Bloom `json:"logsBloom" gencodec:"required"` + Difficulty *big.Int `json:"difficulty" gencodec:"required"` + Number *big.Int `json:"number" gencodec:"required"` + GasLimit uint64 `json:"gasLimit" gencodec:"required"` + GasUsed uint64 `json:"gasUsed" gencodec:"required"` + Time uint64 `json:"timestamp" gencodec:"required"` + Extra []byte `json:"extraData" gencodec:"required"` + MixDigest common.Hash `json:"mixHash"` + Nonce BlockNonce `json:"nonce"` + Randomness []byte `json:"randomness" gencodec:"required"` + Position coreTypes.Position `json:"position" gencodec:"required"` + WitnessHeight uint64 `json:"witnessHeight" gencodec:"required"` + WitnessRoot common.Hash `json:"WitnessRoot" gencodec:"required"` + WitnessReceiptHash common.Hash `json:"WitnessReceiptHash" gencodec:"required"` } // field type overrides for gencodec |