From ea3048421fb54abd98f610d79294634015d0e58e Mon Sep 17 00:00:00 2001
From: Marek Kotewicz <marek.kotewicz@gmail.com>
Date: Wed, 22 Oct 2014 15:58:24 +0200
Subject: [PATCH] block, transaction, uncle by hash and number separately
---
http.js | 2 --
index.html | 2 ++
main.js | 13 ++++++-------
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/http.js b/http.js
index 88869c689..4f6296d08 100644
--- a/http.js
+++ b/http.js
@@ -4,7 +4,6 @@
this.host = host;
};
- //TODO unify the format of object passed to 'send method'
function formatJsonRpcObject(object) {
return {
jsonrpc: '2.0',
@@ -14,7 +13,6 @@
}
};
- //TODO unify the format of output messages, maybe there should be objects instead
function formatJsonRpcMessage(message) {
var object = JSON.parse(message);
diff --git a/index.html b/index.html
index fc658c00a..6d27af1df 100644
--- a/index.html
+++ b/index.html
@@ -5,7 +5,9 @@
<script type="text/javascript" src="main.js"></script>
<script type="text/javascript" src="websocket.js"></script>
<script type="text/javascript" src="qt.js"></script>
+<script type="text/javascript" src="http.js"></script>
<script type="text/javascript">
+web3.setProvider(new web3.providers.HttpProvider('http://localhost:8080'));
function registerName() {
var name = document.querySelector("#name").value;
name = web3.fromAscii(name);
diff --git a/main.js b/main.js
index 708e9b0e6..bc6163f35 100644
--- a/main.js
+++ b/main.js
@@ -49,11 +49,10 @@
eth: {
prototype: Object(),
- //TODO solve the issue with numberOrHash impl
block: function(numberOrHash) {
return new Promise(function(resolve, reject) {
- var args = typeof numberOrHash === "string" ? [0, numberOrHash] : [numberOrHash, ""];
- web3.provider.send({call: "block", args: args}, function(block) {
+ var call = typeof numberOrHash === "string" ? 'blockByHash' : 'blockByNumber';
+ web3.provider.send({call: call, args: [numberOrHash]}, function(block) {
if(block)
resolve(block);
else
@@ -64,8 +63,8 @@
transaction: function(numberOrHash, nth) {
return new Promise(function(resolve, reject) {
- var args = typeof numberOrHash === "string" ? [0, numberOrHash, nth] : [numberOrHash, "", nth];
- web3.provider.send({call: "transaction", args: args}, function(block) {
+ var call = typeof numberOrHash === "string" ? 'transactionByHash' : 'transactonByNumber';
+ web3.provider.send({call: call, args: [numberOrHash, nth]}, function(block) {
if(block)
resolve(block);
else
@@ -76,8 +75,8 @@
uncle: function(numberOrHash, nth) {
return new Promise(function(resolve, reject) {
- var args = typeof numberOrHash === "string" ? [0, numberOrHash, nth] : [numberOrHash, "", nth];
- web3.provider.send({call: "uncle", args: args}, function(block) {
+ var call = typeof numberOrHash === "string" ? 'uncleByHash' : 'uncleByNumber';
+ web3.provider.send({call: call, args: [numberOrHash, nth]}, function(block) {
if(block)
resolve(block);
else
--
GitLab