diff --git a/ethereal/assets/ethereum.js b/ethereal/assets/ethereum.js
index 64a7ff47c..8f1a60300 100644
--- a/ethereal/assets/ethereum.js
+++ b/ethereal/assets/ethereum.js
@@ -40,6 +40,10 @@ window.eth = {
postData({call: "getBalance", args: [address]}, cb);
},
+ getSecretToAddress: function(sec, cb) {
+ postData({call: "getSecretToAddress", args: [sec]}, cb);
+ },
+
watch: function(address, storageAddrOrCb, cb) {
var ev;
if(cb === undefined) {
@@ -101,7 +105,13 @@ window.eth = {
var callbacks = eth._onCallbacks[event];
if(callbacks !== undefined) {
for(var i = 0; i < callbacks.length; i++) {
- callbacks[i](data);
+ // Figure out whether the returned data was an array
+ // array means multiple return arguments (multiple params)
+ if(data instanceof Array) {
+ callbacks[i].apply(this, data);
+ } else {
+ callbacks[i].call(this, data);
+ }
}
}
},
@@ -109,6 +119,11 @@ window.eth = {
window.eth._callbacks = {}
window.eth._onCallbacks = {}
+function hello() {
+ debug("hello")
+ window.dataTest = true;
+}
+
function debug(/**/) {
var args = arguments;
var msg = ""
@@ -120,6 +135,7 @@ function debug(/**/) {
}
}
+ postData({call:"debug", args:[msg]})
document.getElementById("debug").innerHTML += "
" + msg
}
@@ -146,8 +162,14 @@ navigator.qt.onmessage = function(ev) {
if(data._seed) {
var cb = eth._callbacks[data._seed];
if(cb) {
- // Call the callback
- cb(data.data);
+ // Figure out whether the returned data was an array
+ // array means multiple return arguments (multiple params)
+ if(data.data instanceof Array) {
+ cb.apply(this, data.data)
+ } else {
+ cb.call(this, data.data)
+ }
+
// Remove the "trigger" callback
delete eth._callbacks[ev._seed];
}
@@ -211,3 +233,4 @@ String.prototype.hex2bin = function() {
String.prototype.num2bin = function() {
return ("0x"+parseInt(this).toString(16)).bin()
}
+
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])
}
}
diff --git a/ethereal/assets/samplecoin/samplecoin.html b/ethereal/assets/samplecoin/samplecoin.html
index 02e2bd6ea..c1ee941a2 100644
--- a/ethereal/assets/samplecoin/samplecoin.html
+++ b/ethereal/assets/samplecoin/samplecoin.html
@@ -5,9 +5,11 @@
+