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: block, transaction, uncle by hash and number separately

---
 main.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'main.js')

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
-- 
cgit v1.2.3