From dd45197bcd174e16adc3b738bf390cc3018a5a28 Mon Sep 17 00:00:00 2001 From: obscuren Date: Mon, 5 May 2014 11:56:05 +0200 Subject: Added storage watch --- ethereal/assets/qml/webapp.qml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'ethereal/assets/qml') diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml index 4bac12ef0..2267ab4bf 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) @@ -98,6 +98,15 @@ ApplicationWindow { window[key] = data.args[key]; } } + break; + case "debug": + console.log(data.args[0]); + break; + case "test": + console.log("in") + webview.experimental.evaluateJavaScript("hello()") + console.log("out") + break; } } catch(e) { console.log(data.call + ": " + e) @@ -124,7 +133,10 @@ ApplicationWindow { function onObjectChangeCb(stateObject) { postEvent("object:"+stateObject.address(), stateObject) } - function onStorageChangeCb() { + function onStorageChangeCb(storageObject) { + console.log("storage object cb", storageObject) + var ev = ["storage", storageObject.stateAddress, storageObject.address].join(":"); + postEvent(ev, [storageObject.address, storageObject.value]) } } -- cgit v1.2.3 From 91824af46b59b7af84c7591236fe8b34b667ddb8 Mon Sep 17 00:00:00 2001 From: obscuren Date: Mon, 5 May 2014 13:09:11 +0200 Subject: Changed getkey and secrettoaddress --- ethereal/assets/qml/webapp.qml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'ethereal/assets/qml') diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml index 2267ab4bf..d02c9a82e 100644 --- a/ethereal/assets/qml/webapp.qml +++ b/ethereal/assets/qml/webapp.qml @@ -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) @@ -99,14 +100,13 @@ ApplicationWindow { } } break; + case "getSecretToAddress": + require(1) + postData(data._seed, eth.secretToAddress(data.args[0])) + break; case "debug": console.log(data.args[0]); break; - case "test": - console.log("in") - webview.experimental.evaluateJavaScript("hello()") - console.log("out") - break; } } catch(e) { console.log(data.call + ": " + e) @@ -134,7 +134,6 @@ ApplicationWindow { postEvent("object:"+stateObject.address(), stateObject) } function onStorageChangeCb(storageObject) { - console.log("storage object cb", storageObject) var ev = ["storage", storageObject.stateAddress, storageObject.address].join(":"); postEvent(ev, [storageObject.address, storageObject.value]) } -- cgit v1.2.3