diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-29 01:22:53 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-29 01:22:53 +0800 |
| commit | 45e15f62f594d6f5191e60a54aead33602838e98 (patch) | |
| tree | 5b82273df6a23c219d1e97dbb86b4bdcb620374a /eth/backend.go | |
| parent | fb7c03ff4dc759f7dd2fc5cee65b46111cbb7375 (diff) | |
| parent | 7f638f0b2d8d989be25e660178d79df3278e4c84 (diff) | |
| download | dexon-45e15f62f594d6f5191e60a54aead33602838e98.tar.gz dexon-45e15f62f594d6f5191e60a54aead33602838e98.tar.zst dexon-45e15f62f594d6f5191e60a54aead33602838e98.zip | |
merge jsonrpc
Diffstat (limited to 'eth/backend.go')
| -rw-r--r-- | eth/backend.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/eth/backend.go b/eth/backend.go index c3c7d1287..b7b5c5f85 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -66,7 +66,8 @@ type Ethereum struct { txSub event.Subscription blockSub event.Subscription - RpcServer *rpc.JsonRpcServer + RpcServer rpc.RpcServer + WsServer rpc.RpcServer keyManager *crypto.KeyManager clientIdentity p2p.ClientIdentity @@ -218,6 +219,10 @@ func (s *Ethereum) MaxPeers() int { return s.net.MaxPeers } +func (s *Ethereum) Coinbase() []byte { + return nil // TODO +} + // Start the ethereum func (s *Ethereum) Start(seed bool) error { err := s.net.Start() @@ -276,6 +281,9 @@ func (s *Ethereum) Stop() { if s.RpcServer != nil { s.RpcServer.Stop() } + if s.WsServer != nil { + s.WsServer.Stop() + } s.txPool.Stop() s.eventMux.Stop() s.blockPool.Stop() |