diff options
Diffstat (limited to 'ethereal/main.go')
| -rw-r--r-- | ethereal/main.go | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ethereal/main.go b/ethereal/main.go index 1674b59d9..82427f088 100644 --- a/ethereal/main.go +++ b/ethereal/main.go @@ -10,7 +10,7 @@ import ( ) func main() { - // Leave QT on top at ALL times. + // Leave QT on top at ALL times. Qt Needs to be initialized from the main thread qml.Init(nil) runtime.GOMAXPROCS(runtime.NumCPU()) @@ -30,10 +30,14 @@ func main() { utils.InitLogging(Datadir, LogFile, LogLevel, DebugFile) - ethereum := utils.NewEthereum(UseUPnP, OutboundPort, MaxPeer) + db := utils.NewDatabase() + + keyManager := utils.NewKeyManager(KeyStore, Datadir, db) // create, import, export keys - utils.KeyTasks(GenAddr, ImportKey, ExportKey, NonInteractive) + utils.KeyTasks(keyManager, KeyRing, GenAddr, SecretFile, ExportDir, NonInteractive) + + ethereum := utils.NewEthereum(db, keyManager, UseUPnP, OutboundPort, MaxPeer) if ShowGenesis { utils.ShowGenesis(ethereum) @@ -43,7 +47,7 @@ func main() { utils.StartRpc(ethereum, RpcPort) } - gui := ethui.New(ethereum, LogLevel) + gui := ethui.New(ethereum, KeyRing, LogLevel) utils.RegisterInterrupt(func(os.Signal) { gui.Stop() |