diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-13 03:36:45 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-13 03:36:45 +0800 |
| commit | 34689cb3f369ad71164b81d0c05238d78cb67945 (patch) | |
| tree | 63b0d68be8d3d719e3a46ef73d39bb49b6de9f5f /cmd/mist | |
| parent | 8a1b51c716abdc21a8af43282e106d77eda3706b (diff) | |
| download | dexon-34689cb3f369ad71164b81d0c05238d78cb67945.tar dexon-34689cb3f369ad71164b81d0c05238d78cb67945.tar.gz dexon-34689cb3f369ad71164b81d0c05238d78cb67945.tar.bz2 dexon-34689cb3f369ad71164b81d0c05238d78cb67945.tar.lz dexon-34689cb3f369ad71164b81d0c05238d78cb67945.tar.xz dexon-34689cb3f369ad71164b81d0c05238d78cb67945.tar.zst dexon-34689cb3f369ad71164b81d0c05238d78cb67945.zip | |
Added manual triggering of filters
Diffstat (limited to 'cmd/mist')
| -rw-r--r-- | cmd/mist/assets/ext/ethereum.js/lib/web3.js | 2 | ||||
| -rw-r--r-- | cmd/mist/assets/qml/browser.qml | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/cmd/mist/assets/ext/ethereum.js/lib/web3.js b/cmd/mist/assets/ext/ethereum.js/lib/web3.js index 9a85c4d1b..2fe414259 100644 --- a/cmd/mist/assets/ext/ethereum.js/lib/web3.js +++ b/cmd/mist/assets/ext/ethereum.js/lib/web3.js @@ -150,7 +150,7 @@ var shhWatchMethods = function () { return [ { name: 'newFilter', call: 'shh_newFilter' }, { name: 'uninstallFilter', call: 'shh_uninstallFilter' }, - { name: 'getMessage', call: 'shh_getMessages' } + { name: 'getMessages', call: 'shh_getMessages' } ]; }; diff --git a/cmd/mist/assets/qml/browser.qml b/cmd/mist/assets/qml/browser.qml index fcec774a5..7e8ed75bf 100644 --- a/cmd/mist/assets/qml/browser.qml +++ b/cmd/mist/assets/qml/browser.qml @@ -310,7 +310,7 @@ Rectangle { postData(data._id, id); break; - case "eth_messages": + case "eth_filterLogs": require(1); var messages = eth.messages(data.args[0]); @@ -353,6 +353,13 @@ Rectangle { shh.post(params.payload, params.to, params.from, params.topics, params.priority, params.ttl); break; + + case "shh_getMessages": + require(1); + + shh.trigger(data.args[0]); + + break; } } catch(e) { console.log(data.call + ": " + e) |