diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-13 22:37:47 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-13 22:37:47 +0800 |
| commit | 1adfc272a856d466e3d513522ee2fa83853b08ab (patch) | |
| tree | 1618746391e6302d65401581e9804b7900cfbd45 /ethereal/ethereum.go | |
| parent | 721d3a9a57fbc7478255d52271531f001375b863 (diff) | |
| parent | 9caf53f8c63cb30a174d2b33ef85176c8f6f8204 (diff) | |
| download | go-tangerine-poc5-rc4.tar go-tangerine-poc5-rc4.tar.gz go-tangerine-poc5-rc4.tar.bz2 go-tangerine-poc5-rc4.tar.lz go-tangerine-poc5-rc4.tar.xz go-tangerine-poc5-rc4.tar.zst go-tangerine-poc5-rc4.zip | |
Merge branch 'release/poc5-rc4'poc5-rc4
Diffstat (limited to 'ethereal/ethereum.go')
| -rw-r--r-- | ethereal/ethereum.go | 14 |
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() } |