diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-13 23:08:30 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-13 23:08:30 +0800 |
| commit | 5c251b69282b3992512d0c17ed0063f294a0e663 (patch) | |
| tree | 7842c1a6ac8394e8bebfd4f27c9222b497aaf0f6 /cmd/mist/main.go | |
| parent | 75d164037fb9bbf75def7c5501727fd634ef124f (diff) | |
| parent | bde3ff16ad98cb4ab0befc899f7f0584d21ff9a4 (diff) | |
| download | go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar.gz go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar.bz2 go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar.lz go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar.xz go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar.zst go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.zip | |
Merge branch 'fjl-poc8-net-integration' into develop
Diffstat (limited to 'cmd/mist/main.go')
| -rw-r--r-- | cmd/mist/main.go | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/cmd/mist/main.go b/cmd/mist/main.go index 66872a241..52b5e4e94 100644 --- a/cmd/mist/main.go +++ b/cmd/mist/main.go @@ -52,19 +52,18 @@ func run() error { config := utils.InitConfig(VmType, ConfigFile, Datadir, "ETH") ethereum, err := eth.New(ð.Config{ - Name: ClientIdentifier, - Version: Version, - KeyStore: KeyStore, - DataDir: Datadir, - LogFile: LogFile, - LogLevel: LogLevel, - Identifier: Identifier, - MaxPeers: MaxPeer, - Port: OutboundPort, - NATType: PMPGateway, - PMPGateway: PMPGateway, - KeyRing: KeyRing, - Dial: true, + Name: p2p.MakeName(ClientIdentifier, Version), + KeyStore: KeyStore, + DataDir: Datadir, + LogFile: LogFile, + LogLevel: LogLevel, + MaxPeers: MaxPeer, + Port: OutboundPort, + NAT: NAT, + BootNodes: BootNodes, + NodeKey: NodeKey, + KeyRing: KeyRing, + Dial: true, }) if err != nil { mainlogger.Fatalln(err) @@ -79,12 +78,12 @@ func run() error { utils.StartWebSockets(ethereum, WsPort) } - gui := NewWindow(ethereum, config, ethereum.ClientIdentity().(*p2p.SimpleClientIdentity), KeyRing, LogLevel) + gui := NewWindow(ethereum, config, KeyRing, LogLevel) utils.RegisterInterrupt(func(os.Signal) { gui.Stop() }) - go utils.StartEthereum(ethereum, SeedNode) + go utils.StartEthereum(ethereum) fmt.Println("ETH stack took", time.Since(tstart)) |