Skip to content

G
Geth-Modification
Commit 03cc5df9 authored by zelig's avatar zelig
Browse files
Options

eth: fix protocol version/network id copied from config to Ethereum field

parent dbb2af60
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 9 deletions
eth/backend.go
View file @ 03cc5df9
...@@ -177,15 +177,16 @@ func New(config *Config) (*Ethereum, error) { ...@@ -177,15 +177,16 @@ func New(config *Config) (*Ethereum, error) {
servlogger.Infof("Protocol Version: %v, Network Id: %v", config.ProtocolVersion, config.NetworkId) servlogger.Infof("Protocol Version: %v, Network Id: %v", config.ProtocolVersion, config.NetworkId)
eth := &Ethereum{ eth := &Ethereum{
shutdownChan: make(chan bool), shutdownChan: make(chan bool),
blockDb: blockDb, blockDb: blockDb,
stateDb: stateDb, stateDb: stateDb,
extraDb: extraDb, extraDb: extraDb,
eventMux: &event.TypeMux{}, eventMux: &event.TypeMux{},
// logger: servlogsystem, accountManager: config.AccountManager,
accountManager: config.AccountManager, DataDir: config.DataDir,
DataDir: config.DataDir, version: config.Name, // TODO should separate from Name
version: config.Name, // TODO should separate from Name ProtocolVersion: config.ProtocolVersion,
NetworkId: config.NetworkId,
} }
eth.chainManager = core.NewChainManager(blockDb, stateDb, eth.EventMux()) eth.chainManager = core.NewChainManager(blockDb, stateDb, eth.EventMux())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment