diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-08-07 20:00:36 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-08-07 20:00:36 +0800 |
| commit | d7580f21f65beaf896bfc004cf13d28ed87f2ae3 (patch) | |
| tree | eeb9391f0b828099319612445337ef2a9069819a /eth | |
| parent | b1fac4270d639d0a80871784edd80cf16c9f8540 (diff) | |
| parent | 132df860d90c163a8be55260bdd219892f9e1bef (diff) | |
| download | dexon-d7580f21f65beaf896bfc004cf13d28ed87f2ae3.tar dexon-d7580f21f65beaf896bfc004cf13d28ed87f2ae3.tar.gz dexon-d7580f21f65beaf896bfc004cf13d28ed87f2ae3.tar.bz2 dexon-d7580f21f65beaf896bfc004cf13d28ed87f2ae3.tar.lz dexon-d7580f21f65beaf896bfc004cf13d28ed87f2ae3.tar.xz dexon-d7580f21f65beaf896bfc004cf13d28ed87f2ae3.tar.zst dexon-d7580f21f65beaf896bfc004cf13d28ed87f2ae3.zip | |
Merge pull request #1595 from obscuren/extra-data
cmd/geth, eth: added canonical extra data
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/backend.go | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/eth/backend.go b/eth/backend.go index 4795000e0..ed46a4ab3 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -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() |