aboutsummaryrefslogtreecommitdiffstats
path: root/ethereum
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2014-06-30 01:37:22 +0800
committerzelig <viktor.tron@gmail.com>2014-06-30 01:37:22 +0800
commit27e1352c85e9b73fdccc83b559a104c68cc00975 (patch)
treed3bb3049726d5b6ff7c591e752ebfc44a01a625d /ethereum
parent0ea9595d41c59d763237f7a3dd415f23dad34c6f (diff)
downloadgo-tangerine-27e1352c85e9b73fdccc83b559a104c68cc00975.tar.gz
go-tangerine-27e1352c85e9b73fdccc83b559a104c68cc00975.tar.zst
go-tangerine-27e1352c85e9b73fdccc83b559a104c68cc00975.zip
main loop uses new flags and common methods in util: db, keymanager set up
Diffstat (limited to 'ethereum')
-rw-r--r--ethereum/main.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/ethereum/main.go b/ethereum/main.go
index 6b1995eec..1531871cb 100644
--- a/ethereum/main.go
+++ b/ethereum/main.go
@@ -21,10 +21,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)