aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/mist/main.go
diff options
context:
space:
mode:
Diffstat (limited to 'cmd/mist/main.go')
-rw-r--r--cmd/mist/main.go11
1 files changed, 7 insertions, 4 deletions
diff --git a/cmd/mist/main.go b/cmd/mist/main.go
index eb0a80add..66872a241 100644
--- a/cmd/mist/main.go
+++ b/cmd/mist/main.go
@@ -30,18 +30,21 @@ import (
"github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/p2p"
- "gopkg.in/qml.v1"
+ "github.com/ethereum/go-ethereum/ui/qt/webengine"
+ "github.com/obscuren/qml"
)
const (
ClientIdentifier = "Mist"
- Version = "0.8.1"
+ Version = "0.8.2"
)
var ethereum *eth.Ethereum
var mainlogger = logger.NewLogger("MAIN")
func run() error {
+ webengine.Initialize()
+
// precedence: code-internal flag default < config file < environment variables < command line
Init() // parsing command line
@@ -73,7 +76,7 @@ func run() error {
}
if StartWebSockets {
- utils.StartWebSockets(ethereum)
+ utils.StartWebSockets(ethereum, WsPort)
}
gui := NewWindow(ethereum, config, ethereum.ClientIdentity().(*p2p.SimpleClientIdentity), KeyRing, LogLevel)
@@ -81,7 +84,7 @@ func run() error {
utils.RegisterInterrupt(func(os.Signal) {
gui.Stop()
})
- go utils.StartEthereum(ethereum, UseSeed)
+ go utils.StartEthereum(ethereum, SeedNode)
fmt.Println("ETH stack took", time.Since(tstart))