diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-10 07:51:56 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-10 07:51:56 +0800 |
| commit | e3da85faedf21a3ddb73a0fa29decf65364e6c39 (patch) | |
| tree | 516faf70a5346bec9016bbdd308b6bcc23d5bccb /cmd/mist | |
| parent | 491c23a728e4f5cdedfa040aded6a6b136f6bee0 (diff) | |
| download | dexon-e3da85faedf21a3ddb73a0fa29decf65364e6c39.tar.gz dexon-e3da85faedf21a3ddb73a0fa29decf65364e6c39.tar.zst dexon-e3da85faedf21a3ddb73a0fa29decf65364e6c39.zip | |
Implemented filter for ws + fixes
* proper 0xhex
* filters fixed
* start of filter manager
* accounts for ws. Closes #246
Diffstat (limited to 'cmd/mist')
| -rw-r--r-- | cmd/mist/assets/qml/browser.qml | 2 | ||||
| -rw-r--r-- | cmd/mist/ui_lib.go | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cmd/mist/assets/qml/browser.qml b/cmd/mist/assets/qml/browser.qml index f6d2d2d64..fcec774a5 100644 --- a/cmd/mist/assets/qml/browser.qml +++ b/cmd/mist/assets/qml/browser.qml @@ -66,7 +66,7 @@ Rectangle { onMessages: { // Bit of a cheat to get proper JSON var m = JSON.parse(JSON.parse(JSON.stringify(messages))) - webview.postEvent("messages", id, m); + webview.postEvent("eth_changed", id, m); } function onShhMessage(message, id) { diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go index 60c7181c1..f3559183e 100644 --- a/cmd/mist/ui_lib.go +++ b/cmd/mist/ui_lib.go @@ -70,6 +70,7 @@ func NewUiLib(engine *qml.Engine, eth *eth.Ethereum, assetPath string) *UiLib { lib := &UiLib{JSXEth: xeth.NewJSXEth(eth), engine: engine, eth: eth, assetPath: assetPath, jsEngine: javascript.NewJSRE(eth), filterCallbacks: make(map[int][]int)} //, filters: make(map[int]*xeth.JSFilter)} lib.miner = miner.New(eth.KeyManager().Address(), eth) lib.filterManager = filter.NewFilterManager(eth.EventMux()) + go lib.filterManager.Start() return lib } |