aboutsummaryrefslogtreecommitdiffstats
path: root/ethereal
diff options
context:
space:
mode:
authorMaran <maran.hidskes@gmail.com>2014-05-13 20:43:08 +0800
committerMaran <maran.hidskes@gmail.com>2014-05-13 20:43:08 +0800
commit20ea78945e751a1ad11e2b2fc7c4224f4c46e108 (patch)
tree744dd114c51e056d8e4db2f1216c99e901f9586c /ethereal
parentdd60382fc3724ee9c9507cba8df9e6d6db1d5d51 (diff)
downloadgo-tangerine-20ea78945e751a1ad11e2b2fc7c4224f4c46e108.tar
go-tangerine-20ea78945e751a1ad11e2b2fc7c4224f4c46e108.tar.gz
go-tangerine-20ea78945e751a1ad11e2b2fc7c4224f4c46e108.tar.bz2
go-tangerine-20ea78945e751a1ad11e2b2fc7c4224f4c46e108.tar.lz
go-tangerine-20ea78945e751a1ad11e2b2fc7c4224f4c46e108.tar.xz
go-tangerine-20ea78945e751a1ad11e2b2fc7c4224f4c46e108.tar.zst
go-tangerine-20ea78945e751a1ad11e2b2fc7c4224f4c46e108.zip
Implemented new JS/EthPub methods
- getTxCountAt - getPeerCount - getIsMining - getIsListening - getCoinbase
Diffstat (limited to 'ethereal')
-rw-r--r--ethereal/assets/ext/ethereum.js17
-rw-r--r--ethereal/assets/qml/webapp.qml24
2 files changed, 41 insertions, 0 deletions
diff --git a/ethereal/assets/ext/ethereum.js b/ethereal/assets/ext/ethereum.js
index f565e58bd..d4eaf97fd 100644
--- a/ethereal/assets/ext/ethereum.js
+++ b/ethereal/assets/ext/ethereum.js
@@ -36,6 +36,21 @@ window.eth = {
postData({call: "getKey"}, cb);
},
+ getTxCountAt: function(address, cb) {
+ postData({call: "getTxCountAt", args: [address]}, cb);
+ },
+ getIsMining: function(cb){
+ postData({call: "getIsMining"}, cb)
+ },
+ getIsListening: function(cb){
+ postData({call: "getIsListening"}, cb)
+ },
+ getCoinBase: function(cb){
+ postData({call: "getCoinBase"}, cb);
+ },
+ getPeerCount: function(cb){
+ postData({call: "getPeerCount"}, cb);
+ },
getBalanceAt: function(address, cb) {
postData({call: "getBalance", args: [address]}, cb);
},
@@ -115,6 +130,8 @@ window.eth = {
}
}
},
+
+
}
window.eth._callbacks = {}
window.eth._onCallbacks = {}
diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml
index 14f3bd6d0..86eb7fe2f 100644
--- a/ethereal/assets/qml/webapp.qml
+++ b/ethereal/assets/qml/webapp.qml
@@ -47,13 +47,37 @@ ApplicationWindow {
try {
switch(data.call) {
+ case "getCoinBase":
+ postData(data._seed, eth.getCoinBase())
+
+ break
+ case "getIsListening":
+ postData(data._seed, eth.getIsListening())
+
+ break
+ case "getIsMining":
+ postData(data._seed, eth.getIsMining())
+
+ break
+ case "getPeerCount":
+ postData(data._seed, eth.getPeerCount())
+
+ break
+
+ case "getTxCountAt":
+ require(1)
+ postData(data._seed, eth.getTxCountAt(data.args[0]))
+
+ break
case "getBlockByNumber":
var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06")
postData(data._seed, block)
+
break
case "getBlockByHash":
var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06")
postData(data._seed, block)
+
break
case "transact":
require(5)