cmd/geth, eth: added canonical extra data

Implemented canonical extra data according to
https://github.com/ethereum/wiki/wiki/Extra-Data
This commit is contained in:
Jeffrey Wilcke
2015-08-06 11:20:15 +02:00
parent ac10c9352e
commit 785b3e7a57
2 changed files with 32 additions and 9 deletions

View File

@ -45,7 +45,6 @@ import (
"github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/p2p/discover"
"github.com/ethereum/go-ethereum/p2p/nat"
"github.com/ethereum/go-ethereum/params"
"github.com/ethereum/go-ethereum/whisper"
)
@ -92,6 +91,7 @@ type Config struct {
NatSpec bool
AutoDAG bool
PowTest bool
ExtraData []byte
MaxPeers int
MaxPendingPeers int
@ -378,12 +378,7 @@ func New(config *Config) (*Ethereum, error) {
eth.miner = miner.New(eth, eth.EventMux(), eth.pow)
eth.miner.SetGasPrice(config.GasPrice)
extra := config.Name
if uint64(len(extra)) > params.MaximumExtraDataSize.Uint64() {
extra = extra[:params.MaximumExtraDataSize.Uint64()]
}
eth.miner.SetExtra([]byte(extra))
eth.miner.SetExtra(config.ExtraData)
if config.Shh {
eth.whisper = whisper.New()