diff options
| author | obscuren <geffobscura@gmail.com> | 2014-07-04 21:32:25 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-07-04 21:32:25 +0800 |
| commit | 3ebcd36667a32cb79c1686e3b74f6196d6ed16b1 (patch) | |
| tree | d88bfa53ee9d3572437aa276a3b5e8014e38632d /ethereal/main.go | |
| parent | 0076fa583ce16c45f904b6cd0a6e5ab3cc1ab197 (diff) | |
| parent | 9e38ca555dccd6b9a4a3fa0eb9eb749d2dc3c82c (diff) | |
| download | go-tangerine-3ebcd36667a32cb79c1686e3b74f6196d6ed16b1.tar go-tangerine-3ebcd36667a32cb79c1686e3b74f6196d6ed16b1.tar.gz go-tangerine-3ebcd36667a32cb79c1686e3b74f6196d6ed16b1.tar.bz2 go-tangerine-3ebcd36667a32cb79c1686e3b74f6196d6ed16b1.tar.lz go-tangerine-3ebcd36667a32cb79c1686e3b74f6196d6ed16b1.tar.xz go-tangerine-3ebcd36667a32cb79c1686e3b74f6196d6ed16b1.tar.zst go-tangerine-3ebcd36667a32cb79c1686e3b74f6196d6ed16b1.zip | |
Merge branch 'develop'
Diffstat (limited to 'ethereal/main.go')
| -rw-r--r-- | ethereal/main.go | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/ethereal/main.go b/ethereal/main.go index f3f1d3140..645e8f2ce 100644 --- a/ethereal/main.go +++ b/ethereal/main.go @@ -8,6 +8,11 @@ import ( "runtime" ) +const ( + ClientIdentifier = "Ethereal" + Version = "0.5.16" +) + func main() { // Leave QT on top at ALL times. Qt Needs to be initialized from the main thread qml.Init(nil) @@ -23,7 +28,8 @@ func main() { // precedence: code-internal flag default < config file < environment variables < command line Init() // parsing command line - utils.InitConfig(ConfigFile, Datadir, Identifier, "ETH") + + config := utils.InitConfig(ConfigFile, Datadir, "ETH") utils.InitDataDir(Datadir) @@ -36,7 +42,9 @@ func main() { // create, import, export keys utils.KeyTasks(keyManager, KeyRing, GenAddr, SecretFile, ExportDir, NonInteractive) - ethereum := utils.NewEthereum(db, keyManager, UseUPnP, OutboundPort, MaxPeer) + clientIdentity := utils.NewClientIdentity(ClientIdentifier, Version, Identifier) + + ethereum := utils.NewEthereum(db, clientIdentity, keyManager, UseUPnP, OutboundPort, MaxPeer) if ShowGenesis { utils.ShowGenesis(ethereum) @@ -46,7 +54,7 @@ func main() { utils.StartRpc(ethereum, RpcPort) } - gui := NewWindow(ethereum, KeyRing, LogLevel) + gui := NewWindow(ethereum, config, clientIdentity, KeyRing, LogLevel) utils.RegisterInterrupt(func(os.Signal) { gui.Stop() |