diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-05-05 20:17:20 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-05-05 20:17:20 +0800 |
| commit | cb9ca992debfcef83f79b2c606955e6688880694 (patch) | |
| tree | 91133b39f56ab5292a538a353ab3c55c3b951383 /ethereal/assets/qml/webapp.qml | |
| parent | e94e5ac75dbbc4ec52228ae11377a4fa71ab95ab (diff) | |
| parent | 91824af46b59b7af84c7591236fe8b34b667ddb8 (diff) | |
| download | go-tangerine-cb9ca992debfcef83f79b2c606955e6688880694.tar go-tangerine-cb9ca992debfcef83f79b2c606955e6688880694.tar.gz go-tangerine-cb9ca992debfcef83f79b2c606955e6688880694.tar.bz2 go-tangerine-cb9ca992debfcef83f79b2c606955e6688880694.tar.lz go-tangerine-cb9ca992debfcef83f79b2c606955e6688880694.tar.xz go-tangerine-cb9ca992debfcef83f79b2c606955e6688880694.tar.zst go-tangerine-cb9ca992debfcef83f79b2c606955e6688880694.zip | |
Merge branch 'develop' into feature/rpc
Diffstat (limited to 'ethereal/assets/qml/webapp.qml')
| -rw-r--r-- | ethereal/assets/qml/webapp.qml | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml index 4bac12ef0..d02c9a82e 100644 --- a/ethereal/assets/qml/webapp.qml +++ b/ethereal/assets/qml/webapp.qml @@ -41,7 +41,7 @@ ApplicationWindow { experimental.preferences.developerExtrasEnabled: true experimental.userScripts: [ui.assetPath("ethereum.js")] experimental.onMessageReceived: { - //console.log("[onMessageReceived]: ", message.data) + console.log("[onMessageReceived]: ", message.data) // TODO move to messaging.js var data = JSON.parse(message.data) @@ -81,8 +81,9 @@ ApplicationWindow { break case "getKey": - var keys = eth.getKey() - postData(data._seed, keys) + var key = eth.getKey().privateKey; + + postData(data._seed, key) break case "watch": require(1) @@ -98,6 +99,14 @@ ApplicationWindow { window[key] = data.args[key]; } } + break; + case "getSecretToAddress": + require(1) + postData(data._seed, eth.secretToAddress(data.args[0])) + break; + case "debug": + console.log(data.args[0]); + break; } } catch(e) { console.log(data.call + ": " + e) @@ -124,7 +133,9 @@ ApplicationWindow { function onObjectChangeCb(stateObject) { postEvent("object:"+stateObject.address(), stateObject) } - function onStorageChangeCb() { + function onStorageChangeCb(storageObject) { + var ev = ["storage", storageObject.stateAddress, storageObject.address].join(":"); + postEvent(ev, [storageObject.address, storageObject.value]) } } |