diff options
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/backend.go | 22 | ||||
| -rw-r--r-- | eth/config.go | 5 |
2 files changed, 14 insertions, 13 deletions
diff --git a/eth/backend.go b/eth/backend.go index 02a23cc..6d052e2 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -153,7 +153,7 @@ func New(ctx *node.ServiceContext, config *Config, return nil, err } } - chainConfig, genesisHash, genesisErr := core.SetupGenesisBlock(chainDb, config.Genesis) + chainConfig, genesisHash, genesisErr := core.SetupGenesisBlockWithOverride(chainDb, config.Genesis, config.OverrideIstanbul) if _, ok := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !ok { return nil, genesisErr } @@ -524,12 +524,10 @@ func (s *Ethereum) Start(srvr *p2p.Server) error { maxPeers -= s.config.LightPeers } // Start the networking layer and the light server if requested - if s.protocolManager != nil { - s.protocolManager.Start(maxPeers) - } - if s.lesServer != nil { - s.lesServer.Start(srvr) - } + //s.protocolManager.Start(maxPeers) + //if s.lesServer != nil { + // s.lesServer.Start(srvr) + //} return nil } @@ -539,12 +537,10 @@ func (s *Ethereum) Stop() error { s.bloomIndexer.Close() s.blockchain.Stop() s.engine.Close() - if s.protocolManager != nil { - s.protocolManager.Stop() - } - if s.lesServer != nil { - s.lesServer.Stop() - } + //s.protocolManager.Stop() + //if s.lesServer != nil { + // s.lesServer.Stop() + //} s.txPool.Stop() s.miner.Stop() s.eventMux.Stop() diff --git a/eth/config.go b/eth/config.go index 0313783..85abe7c 100644 --- a/eth/config.go +++ b/eth/config.go @@ -156,6 +156,11 @@ type Config struct { // CheckpointOracle is the configuration for checkpoint oracle. CheckpointOracle *params.CheckpointOracleConfig `toml:",omitempty"` + + // Istanbul block override (TODO: remove after the fork) + OverrideIstanbul *big.Int + + // Manually select and grow the canonical chain ManualCanonical bool } |