aboutsummaryrefslogtreecommitdiffstats
path: root/ethereal/ethereum.go
diff options
context:
space:
mode:
Diffstat (limited to 'ethereal/ethereum.go')
-rw-r--r--ethereal/ethereum.go14
1 files changed, 12 insertions, 2 deletions
diff --git a/ethereal/ethereum.go b/ethereal/ethereum.go
index 8b8889e37..15a454bdf 100644
--- a/ethereal/ethereum.go
+++ b/ethereal/ethereum.go
@@ -100,8 +100,12 @@ func main() {
}
if StartRpc {
- ethereum.RpcServer = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum.StateManager(), ethereum.BlockChain(), ethereum.TxPool()))
- go ethereum.RpcServer.Start()
+ ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum), RpcPort)
+ if err != nil {
+ log.Println("Could not start RPC interface:", err)
+ } else {
+ go ethereum.RpcServer.Start()
+ }
}
log.Printf("Starting Ethereum GUI v%s\n", ethutil.Config.Ver)
@@ -110,5 +114,11 @@ func main() {
ethereum.MaxPeers = MaxPeer
gui := ethui.New(ethereum)
+
+ ethereum.Start(UseSeed)
+
gui.Start(AssetPath)
+
+ // Wait for shutdown
+ ethereum.WaitForShutdown()
}