diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-13 22:05:56 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-13 22:05:56 +0800 |
| commit | a5ea21cd85530eee6eb1bb83c37c20d009f11f74 (patch) | |
| tree | e5be5bd595139ff7dfbe6261e1e659d8e7dd6f9c /cmd/mist/main.go | |
| parent | db24fb792cf0dab91bc85e79aecf6758349002a4 (diff) | |
| parent | 38faf2c51a1e4a86cda5dfa1b4f7fdae4fd7f58d (diff) | |
| download | go-tangerine-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar go-tangerine-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar.gz go-tangerine-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar.bz2 go-tangerine-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar.lz go-tangerine-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar.xz go-tangerine-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.tar.zst go-tangerine-a5ea21cd85530eee6eb1bb83c37c20d009f11f74.zip | |
merge
Diffstat (limited to 'cmd/mist/main.go')
| -rw-r--r-- | cmd/mist/main.go | 11 |
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)) |