aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-05-13 22:39:23 +0800
committerobscuren <geffobscura@gmail.com>2014-05-13 22:39:23 +0800
commit7f94b266c7c986651f09b57ef919ef3eaf147e66 (patch)
treee715af8868adc78a2649e8a62ccdad36063a30f7
parent9caf53f8c63cb30a174d2b33ef85176c8f6f8204 (diff)
parentfca36cc03db129619b27133285b18b9877f82d19 (diff)
downloaddexon-7f94b266c7c986651f09b57ef919ef3eaf147e66.tar.gz
dexon-7f94b266c7c986651f09b57ef919ef3eaf147e66.tar.zst
dexon-7f94b266c7c986651f09b57ef919ef3eaf147e66.zip
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
-rw-r--r--ethereal/assets/qml/webapp.qml4
1 files changed, 2 insertions, 2 deletions
diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml
index 7af006f77..d3cffeeca 100644
--- a/ethereal/assets/qml/webapp.qml
+++ b/ethereal/assets/qml/webapp.qml
@@ -70,12 +70,12 @@ ApplicationWindow {
break
case "getBlockByNumber":
- var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06")
+ var block = eth.getBlock(data.args[0])
postData(data._seed, block)
break
case "getBlockByHash":
- var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06")
+ var block = eth.getBlock(data.args[0])
postData(data._seed, block)
break