diff options
| author | obscuren <geffobscura@gmail.com> | 2014-10-07 17:20:52 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-10-07 17:20:52 +0800 |
| commit | d1a6084bf71d0cfff02e35062a0bbd7b20f304b7 (patch) | |
| tree | 1b855fe929a0fafb2e6108b34b16b20b3798b02e /ethereum/main.go | |
| parent | bd95fd770be8e6a969513a8eaddd05f3ae47c9a3 (diff) | |
| parent | a9b857769dfd843b70563c5abd5727285ebc9608 (diff) | |
| download | dexon-d1a6084bf71d0cfff02e35062a0bbd7b20f304b7.tar dexon-d1a6084bf71d0cfff02e35062a0bbd7b20f304b7.tar.gz dexon-d1a6084bf71d0cfff02e35062a0bbd7b20f304b7.tar.bz2 dexon-d1a6084bf71d0cfff02e35062a0bbd7b20f304b7.tar.lz dexon-d1a6084bf71d0cfff02e35062a0bbd7b20f304b7.tar.xz dexon-d1a6084bf71d0cfff02e35062a0bbd7b20f304b7.tar.zst dexon-d1a6084bf71d0cfff02e35062a0bbd7b20f304b7.zip | |
Merge branch 'release/0.6.8'
Diffstat (limited to 'ethereum/main.go')
| -rw-r--r-- | ethereum/main.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ethereum/main.go b/ethereum/main.go index 6521188ff..0f0df20bb 100644 --- a/ethereum/main.go +++ b/ethereum/main.go @@ -103,6 +103,10 @@ func main() { utils.StartRpc(ethereum, RpcPort) } + if StartWebSockets { + utils.StartWebSockets(ethereum) + } + utils.StartEthereum(ethereum, UseSeed) // this blocks the thread |