aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-03-24 01:00:54 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-03-24 01:00:54 +0800
commit60020add74c40225e81122071d20c30f24832007 (patch)
tree000b1d26bdf2ba2681bb7c0fb1dba6f690085299
parent1cf6ca8f10ab7dd5de29caf0d255c93cdec96994 (diff)
parent03cc5df9b7ea7d9bf5569b5b4e320c7c7d0e0930 (diff)
downloaddexon-60020add74c40225e81122071d20c30f24832007.tar.gz
dexon-60020add74c40225e81122071d20c30f24832007.tar.zst
dexon-60020add74c40225e81122071d20c30f24832007.zip
Merge pull request #551 from ethersphere/frontier/eth-version-exports
eth: fix protocol version/network id copied from config to Ethereum field
-rw-r--r--eth/backend.go19
1 files changed, 10 insertions, 9 deletions
diff --git a/eth/backend.go b/eth/backend.go
index 11ef9660f..ded3f0021 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -177,15 +177,16 @@ func New(config *Config) (*Ethereum, error) {
servlogger.Infof("Protocol Version: %v, Network Id: %v", config.ProtocolVersion, config.NetworkId)
eth := &Ethereum{
- shutdownChan: make(chan bool),
- blockDb: blockDb,
- stateDb: stateDb,
- extraDb: extraDb,
- eventMux: &event.TypeMux{},
- // logger: servlogsystem,
- accountManager: config.AccountManager,
- DataDir: config.DataDir,
- version: config.Name, // TODO should separate from Name
+ shutdownChan: make(chan bool),
+ blockDb: blockDb,
+ stateDb: stateDb,
+ extraDb: extraDb,
+ eventMux: &event.TypeMux{},
+ accountManager: config.AccountManager,
+ DataDir: config.DataDir,
+ version: config.Name, // TODO should separate from Name
+ ProtocolVersion: config.ProtocolVersion,
+ NetworkId: config.NetworkId,
}
eth.chainManager = core.NewChainManager(blockDb, stateDb, eth.EventMux())