poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changed getkey and secrettoaddress

This commit is contained in:
obscuren 2014-05-05 13:09:11 +02:00
parent dd45197bcd
commit 91824af46b
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ethereal/assets/ethereum.js
View File

@ -36,11 +36,14 @@ window.eth = {
postData({call: "getKey"}, cb); postData({call: "getKey"}, cb);
}, },
getBalanceAt: function(address, cb) { getBalanceAt: function(address, cb) {
postData({call: "getBalance", args: [address]}, cb); postData({call: "getBalance", args: [address]}, cb);
}, },
getSecretToAddress: function(sec, cb) {
postData({call: "getSecretToAddress", args: [sec]}, cb);
},
watch: function(address, storageAddrOrCb, cb) { watch: function(address, storageAddrOrCb, cb) {
var ev; var ev;
if(cb === undefined) { if(cb === undefined) {

15
ethereal/assets/qml/webapp.qml
View File

@ -81,8 +81,9 @@ ApplicationWindow {
break break
case "getKey": case "getKey":
var keys = eth.getKey() var key = eth.getKey().privateKey;
postData(data._seed, keys)
postData(data._seed, key)
break break
case "watch": case "watch":
require(1) require(1)
@ -99,14 +100,13 @@ ApplicationWindow {
} }
} }
break; break;
case "getSecretToAddress":
require(1)
postData(data._seed, eth.secretToAddress(data.args[0]))
break;
case "debug": case "debug":
console.log(data.args[0]); console.log(data.args[0]);
break; break;
case "test":
console.log("in")
webview.experimental.evaluateJavaScript("hello()")
console.log("out")
break;
} }
} catch(e) { } catch(e) {
console.log(data.call + ": " + e) console.log(data.call + ": " + e)
@ -134,7 +134,6 @@ ApplicationWindow {
postEvent("object:"+stateObject.address(), stateObject) postEvent("object:"+stateObject.address(), stateObject)
} }
function onStorageChangeCb(storageObject) { function onStorageChangeCb(storageObject) {
console.log("storage object cb", storageObject)
var ev = ["storage", storageObject.stateAddress, storageObject.address].join(":"); var ev = ["storage", storageObject.stateAddress, storageObject.address].join(":");
postEvent(ev, [storageObject.address, storageObject.value]) postEvent(ev, [storageObject.address, storageObject.value])
} }

16
ethereal/assets/samplecoin/samplecoin.html
View File

@ -26,15 +26,17 @@ function createTransaction() {
function init() { function init() {
eth.set({width: 500}); eth.set({width: 500});
eth.getKey(function(keyPair) { eth.getKey(function(sec) {
mAddr = keyPair.privateKey; eth.getSecretToAddress(sec, function(addr) {
mAddr = addr;
eth.getStorageAt(jefcoinAddr, keyPair.address, function(storage) { eth.getStorageAt(jefcoinAddr, addr, function(storage) {
document.querySelector("#current-amount").innerHTML = storage; document.querySelector("#current-amount").innerHTML = storage;
}); });
eth.watch(jefcoinAddr, keyPair.address, function(addr, value) { eth.watch(jefcoinAddr, addr, function(addr, value) {
document.querySelector("#current-amount").innerHTML = value document.querySelector("#current-amount").innerHTML = value
});
}); });
}); });
} }