diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-04-01 19:42:19 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-04-01 19:42:19 +0800 |
| commit | c58079461bafe508bea9233e2b81852df5188f57 (patch) | |
| tree | 33d4c6a96eed3bf1ce9f69bbef3cbc1561f2b114 /eth/handler.go | |
| parent | 10d3466c934bd425a8c941270749a652a588527d (diff) | |
| parent | 1f3596c25af077a3303c554ee6b49404b20f7117 (diff) | |
| download | dexon-c58079461bafe508bea9233e2b81852df5188f57.tar dexon-c58079461bafe508bea9233e2b81852df5188f57.tar.gz dexon-c58079461bafe508bea9233e2b81852df5188f57.tar.bz2 dexon-c58079461bafe508bea9233e2b81852df5188f57.tar.lz dexon-c58079461bafe508bea9233e2b81852df5188f57.tar.xz dexon-c58079461bafe508bea9233e2b81852df5188f57.tar.zst dexon-c58079461bafe508bea9233e2b81852df5188f57.zip | |
Merge pull request #2281 from obscuren/configurable-genesis
core: homestead chain configuration & artificial gas floor target mining flag
Diffstat (limited to 'eth/handler.go')
| -rw-r--r-- | eth/handler.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eth/handler.go b/eth/handler.go index 2c5cae479..135de3749 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -86,7 +86,7 @@ type ProtocolManager struct { // NewProtocolManager returns a new ethereum sub protocol manager. The Ethereum sub protocol manages peers capable // with the ethereum network. -func NewProtocolManager(fastSync bool, networkId int, mux *event.TypeMux, txpool txPool, pow pow.PoW, blockchain *core.BlockChain, chaindb ethdb.Database) (*ProtocolManager, error) { +func NewProtocolManager(config *core.ChainConfig, fastSync bool, networkId int, mux *event.TypeMux, txpool txPool, pow pow.PoW, blockchain *core.BlockChain, chaindb ethdb.Database) (*ProtocolManager, error) { // Figure out whether to allow fast sync or not if fastSync && blockchain.CurrentBlock().NumberU64() > 0 { glog.V(logger.Info).Infof("blockchain not empty, fast sync disabled") @@ -144,7 +144,7 @@ func NewProtocolManager(fastSync bool, networkId int, mux *event.TypeMux, txpool manager.removePeer) validator := func(block *types.Block, parent *types.Block) error { - return core.ValidateHeader(pow, block.Header(), parent.Header(), true, false) + return core.ValidateHeader(config, pow, block.Header(), parent.Header(), true, false) } heighter := func() uint64 { return blockchain.CurrentBlock().NumberU64() |