diff options
| author | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-07-01 22:15:59 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-07-01 22:15:59 +0800 |
| commit | 5e02d2b5866e9aeb4bc0ad0ec4479f2104131f51 (patch) | |
| tree | 6d50a032f70e1b3709f47403fcc793e52ac9b4c9 /ethereal/main.go | |
| parent | 4fc60f340f6ef5ffe68e684ed44e5974fa08e8c8 (diff) | |
| parent | ce88a73aa6e695a0b672da2d01baf14f03d514b0 (diff) | |
| download | dexon-5e02d2b5866e9aeb4bc0ad0ec4479f2104131f51.tar dexon-5e02d2b5866e9aeb4bc0ad0ec4479f2104131f51.tar.gz dexon-5e02d2b5866e9aeb4bc0ad0ec4479f2104131f51.tar.bz2 dexon-5e02d2b5866e9aeb4bc0ad0ec4479f2104131f51.tar.lz dexon-5e02d2b5866e9aeb4bc0ad0ec4479f2104131f51.tar.xz dexon-5e02d2b5866e9aeb4bc0ad0ec4479f2104131f51.tar.zst dexon-5e02d2b5866e9aeb4bc0ad0ec4479f2104131f51.zip | |
Merge pull request #96 from ethersphere/feature/keys
Feature/keys
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() |