diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-06 00:57:03 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-06 00:59:18 +0800 |
| commit | 9c55576c7b415954773c062d404a736741fb9794 (patch) | |
| tree | 5c79551e6ad55d88c02fbe3374ebc9738b863f8d /core | |
| parent | 3040296beb3a8ca991b738a83df0af7bddde2ac6 (diff) | |
| download | dexon-9c55576c7b415954773c062d404a736741fb9794.tar.gz dexon-9c55576c7b415954773c062d404a736741fb9794.tar.zst dexon-9c55576c7b415954773c062d404a736741fb9794.zip | |
Block header changed & console miner control
* miner control moved to `admin.miner`
* miner option to set extra data
* block extra now bytes
Diffstat (limited to 'core')
| -rw-r--r-- | core/chain_makers.go | 2 | ||||
| -rw-r--r-- | core/chain_manager.go | 2 | ||||
| -rw-r--r-- | core/genesis.go | 2 | ||||
| -rw-r--r-- | core/types/block.go | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/core/chain_makers.go b/core/chain_makers.go index 6597cc315..bbf1b1439 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -55,7 +55,7 @@ func NewCanonical(n int, db common.Database) (*BlockProcessor, error) { // block time is fixed at 10 seconds func newBlockFromParent(addr common.Address, parent *types.Block) *types.Block { - block := types.NewBlock(parent.Hash(), addr, parent.Root(), common.BigPow(2, 32), 0, "") + block := types.NewBlock(parent.Hash(), addr, parent.Root(), common.BigPow(2, 32), 0, nil) block.SetUncles(nil) block.SetTransactions(nil) block.SetReceipts(nil) diff --git a/core/chain_manager.go b/core/chain_manager.go index 0c2eb0fe1..c2e241e90 100644 --- a/core/chain_manager.go +++ b/core/chain_manager.go @@ -228,7 +228,7 @@ func (bc *ChainManager) NewBlock(coinbase common.Address) *types.Block { root, common.BigPow(2, 32), 0, - "") + nil) block.SetUncles(nil) block.SetTransactions(nil) block.SetReceipts(nil) diff --git a/core/genesis.go b/core/genesis.go index 13656c40c..8ef1e140f 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -20,7 +20,7 @@ var ZeroHash160 = make([]byte, 20) var ZeroHash512 = make([]byte, 64) func GenesisBlock(db common.Database) *types.Block { - genesis := types.NewBlock(common.Hash{}, common.Address{}, common.Hash{}, params.GenesisDifficulty, 42, "") + genesis := types.NewBlock(common.Hash{}, common.Address{}, common.Hash{}, params.GenesisDifficulty, 42, nil) genesis.Header().Number = common.Big0 genesis.Header().GasLimit = params.GenesisGasLimit genesis.Header().GasUsed = common.Big0 diff --git a/core/types/block.go b/core/types/block.go index d5cd8a21e..116acbf79 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -39,7 +39,7 @@ type Header struct { // Creation time Time uint64 // Extra data - Extra string + Extra []byte // Mix digest for quick checking to prevent DOS MixDigest common.Hash // Nonce @@ -121,7 +121,7 @@ type storageblock struct { TD *big.Int } -func NewBlock(parentHash common.Hash, coinbase common.Address, root common.Hash, difficulty *big.Int, nonce uint64, extra string) *Block { +func NewBlock(parentHash common.Hash, coinbase common.Address, root common.Hash, difficulty *big.Int, nonce uint64, extra []byte) *Block { header := &Header{ Root: root, ParentHash: parentHash, @@ -371,7 +371,7 @@ func (self *Header) String() string { GasLimit: %v GasUsed: %v Time: %v - Extra: %v + Extra: %s MixDigest: %x Nonce: %x`, self.ParentHash, self.UncleHash, self.Coinbase, self.Root, self.TxHash, self.ReceiptHash, self.Bloom, self.Difficulty, self.Number, self.GasLimit, self.GasUsed, self.Time, self.Extra, self.MixDigest, self.Nonce) |