API changes
This commit is contained in:
parent
64c2550b31
commit
e85d5dd428
@ -1,17 +1,3 @@
|
|||||||
// Helper function for generating pseudo callbacks and sending data to the QML part of the application
|
|
||||||
function postData(data, cb) {
|
|
||||||
data._seed = Math.floor(Math.random() * 1000000)
|
|
||||||
if(cb) {
|
|
||||||
eth._callbacks[data._seed] = cb;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(data.args === undefined) {
|
|
||||||
data.args = [];
|
|
||||||
}
|
|
||||||
|
|
||||||
navigator.qt.postMessage(JSON.stringify(data));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Main Ethereum library
|
// Main Ethereum library
|
||||||
window.eth = {
|
window.eth = {
|
||||||
prototype: Object(),
|
prototype: Object(),
|
||||||
@ -35,8 +21,12 @@ window.eth = {
|
|||||||
//
|
//
|
||||||
// Creates a transaction with the current account
|
// Creates a transaction with the current account
|
||||||
// If no recipient is set, the Ethereum API will see it as a contract creation
|
// If no recipient is set, the Ethereum API will see it as a contract creation
|
||||||
createTx: function(recipient, value, gas, gasPrice, data, cb) {
|
transact: function(sec, recipient, value, gas, gasPrice, data, cb) {
|
||||||
postData({call: "createTx", args: [recipient, value, gas, gasPrice, data]}, cb);
|
postData({call: "transact", args: [sec, recipient, value, gas, gasPrice, data]}, cb);
|
||||||
|
},
|
||||||
|
|
||||||
|
create: function(sec, value, gas, gasPrice, init, body, cb) {
|
||||||
|
postData({call: "create", args: [sec, value, gas, gasPrice, init, body]}, cb);
|
||||||
},
|
},
|
||||||
|
|
||||||
getStorage: function(address, storageAddress, cb) {
|
getStorage: function(address, storageAddress, cb) {
|
||||||
@ -47,10 +37,39 @@ window.eth = {
|
|||||||
postData({call: "getKey"}, cb);
|
postData({call: "getKey"}, cb);
|
||||||
},
|
},
|
||||||
|
|
||||||
watch: function(address) {
|
getBalance: function(address, cb) {
|
||||||
postData({call: "watch", args: [address]});
|
postData({call: "getBalance", args: [address]}, cb);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
watch: function(address, storageAddrOrCb, cb) {
|
||||||
|
var ev = "changed:"+address;
|
||||||
|
|
||||||
|
if(cb === undefined) {
|
||||||
|
cb = storageAddrOrCb;
|
||||||
|
storageAddrOrCb = "";
|
||||||
|
} else {
|
||||||
|
ev += ":"+storageAddrOrCb;
|
||||||
|
}
|
||||||
|
|
||||||
|
eth.on(ev, cb)
|
||||||
|
|
||||||
|
postData({call: "watch", args: [address, storageAddrOrCb]});
|
||||||
|
},
|
||||||
|
|
||||||
|
disconnect: function(address, storageAddrOrCb, cb) {
|
||||||
|
var ev = "changed:"+address;
|
||||||
|
|
||||||
|
if(cb === undefined) {
|
||||||
|
cb = storageAddrOrCb;
|
||||||
|
storageAddrOrCb = null;
|
||||||
|
} else {
|
||||||
|
ev += ":"+storageAddrOrCb;
|
||||||
|
}
|
||||||
|
|
||||||
|
eth.off(ev, cb)
|
||||||
|
|
||||||
|
postData({call: "disconnect", args: [address, storageAddrOrCb]});
|
||||||
|
},
|
||||||
|
|
||||||
on: function(event, cb) {
|
on: function(event, cb) {
|
||||||
if(eth._onCallbacks[event] === undefined) {
|
if(eth._onCallbacks[event] === undefined) {
|
||||||
@ -61,6 +80,7 @@ window.eth = {
|
|||||||
|
|
||||||
return this
|
return this
|
||||||
},
|
},
|
||||||
|
|
||||||
off: function(event, cb) {
|
off: function(event, cb) {
|
||||||
if(eth._onCallbacks[event] !== undefined) {
|
if(eth._onCallbacks[event] !== undefined) {
|
||||||
var callbacks = eth._onCallbacks[event];
|
var callbacks = eth._onCallbacks[event];
|
||||||
@ -100,6 +120,20 @@ function debug(/**/) {
|
|||||||
document.getElementById("debug").innerHTML += "<br>" + msg
|
document.getElementById("debug").innerHTML += "<br>" + msg
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Helper function for generating pseudo callbacks and sending data to the QML part of the application
|
||||||
|
function postData(data, cb) {
|
||||||
|
data._seed = Math.floor(Math.random() * 1000000)
|
||||||
|
if(cb) {
|
||||||
|
eth._callbacks[data._seed] = cb;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(data.args === undefined) {
|
||||||
|
data.args = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
navigator.qt.postMessage(JSON.stringify(data));
|
||||||
|
}
|
||||||
|
|
||||||
navigator.qt.onmessage = function(ev) {
|
navigator.qt.onmessage = function(ev) {
|
||||||
var data = JSON.parse(ev.data)
|
var data = JSON.parse(ev.data)
|
||||||
|
|
||||||
|
@ -42,8 +42,10 @@ ApplicationWindow {
|
|||||||
experimental.userScripts: [ui.assetPath("ethereum.js")]
|
experimental.userScripts: [ui.assetPath("ethereum.js")]
|
||||||
experimental.onMessageReceived: {
|
experimental.onMessageReceived: {
|
||||||
//console.log("[onMessageReceived]: ", message.data)
|
//console.log("[onMessageReceived]: ", message.data)
|
||||||
|
// TODO move to messaging.js
|
||||||
var data = JSON.parse(message.data)
|
var data = JSON.parse(message.data)
|
||||||
|
|
||||||
|
try {
|
||||||
switch(data.call) {
|
switch(data.call) {
|
||||||
case "getBlockByNumber":
|
case "getBlockByNumber":
|
||||||
var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06")
|
var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06")
|
||||||
@ -53,32 +55,54 @@ ApplicationWindow {
|
|||||||
var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06")
|
var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06")
|
||||||
postData(data._seed, block)
|
postData(data._seed, block)
|
||||||
break
|
break
|
||||||
case "createTx":
|
case "transact":
|
||||||
if(data.args.length < 5) {
|
require(5)
|
||||||
postData(data._seed, null)
|
|
||||||
} else {
|
// TODO this will change to 6 soon with sec being teh first argument
|
||||||
var tx = eth.createTx(data.args[0], data.args[1],data.args[2],data.args[3],data.args[4])
|
var tx = eth.transact(data.args[0], data.args[1],data.args[2],data.args[3],data.args[4])
|
||||||
postData(data._seed, tx)
|
postData(data._seed, tx)
|
||||||
}
|
break
|
||||||
|
case "create":
|
||||||
|
postData(data._seed, null)
|
||||||
|
|
||||||
break
|
break
|
||||||
case "getStorage":
|
case "getStorage":
|
||||||
if(data.args.length < 2) {
|
require(2);
|
||||||
postData(data._seed, null)
|
|
||||||
} else {
|
|
||||||
var stateObject = eth.getStateObject(data.args[0])
|
var stateObject = eth.getStateObject(data.args[0])
|
||||||
var storage = stateObject.getStorage(data.args[1])
|
var storage = stateObject.getStorage(data.args[1])
|
||||||
postData(data._seed, storage)
|
postData(data._seed, storage)
|
||||||
}
|
|
||||||
|
break
|
||||||
|
case "getBalance":
|
||||||
|
require(1);
|
||||||
|
|
||||||
|
postData(data._seed, eth.getStateObject(data.args[0]).Value());
|
||||||
|
|
||||||
break
|
break
|
||||||
case "getKey":
|
case "getKey":
|
||||||
var keys = eth.getKey()
|
var keys = eth.getKey()
|
||||||
postData(data._seed, keys)
|
postData(data._seed, keys)
|
||||||
break
|
break
|
||||||
case "watch":
|
case "watch":
|
||||||
if(data.args.length > 0) {
|
require(1)
|
||||||
eth.watch(data.args[0]);
|
eth.watch(data.args[0], data.args[1]);
|
||||||
}
|
|
||||||
break
|
break
|
||||||
|
case "disconnect":
|
||||||
|
require(1)
|
||||||
|
postData(data._seed, null)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
} catch(e) {
|
||||||
|
console.log(data.call + ": " + e)
|
||||||
|
|
||||||
|
postData(data._seed, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function require(args, num) {
|
||||||
|
if(args.length < num) {
|
||||||
|
throw("required argument count of "+num+" got "+args.length);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function postData(seed, data) {
|
function postData(seed, data) {
|
||||||
|
@ -22,14 +22,12 @@ function tests() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function init() {
|
function init() {
|
||||||
eth.watch(jefcoinAddr);
|
|
||||||
|
|
||||||
eth.getKey(function(key) {
|
eth.getKey(function(key) {
|
||||||
eth.getStorage(jefcoinAddr, key, function(storage) {
|
eth.getStorage(jefcoinAddr, key, function(storage) {
|
||||||
document.querySelector("#currentAmount").innerHTML = "Amount: " + storage;
|
document.querySelector("#currentAmount").innerHTML = "Amount: " + storage;
|
||||||
});
|
});
|
||||||
|
|
||||||
eth.on("object:change", function(stateObject) {
|
eth.watch(jefcoinAddr, function(stateObject) {
|
||||||
debug(stateObject);
|
debug(stateObject);
|
||||||
eth.getStorage(jefcoinAddr, key, function(storage) {
|
eth.getStorage(jefcoinAddr, key, function(storage) {
|
||||||
document.querySelector("#currentAmount").innerHTML = "Amount: " + storage;
|
document.querySelector("#currentAmount").innerHTML = "Amount: " + storage;
|
||||||
|
Loading…
Reference in New Issue
Block a user