From 0d6479e1d63598baed0b0c41d4dd8ff9f7ecc449 Mon Sep 17 00:00:00 2001
From: Marek Kotewicz <marek.kotewicz@gmail.com>
Date: Fri, 7 Nov 2014 14:03:46 +0100
Subject: [PATCH 1/3] proper error handling proposal

---
 httprpc.js |  5 +++--
 main.js    | 26 +++++++++++++++-----------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/httprpc.js b/httprpc.js
index ef29133e8..e738e1f0f 100644
--- a/httprpc.js
+++ b/httprpc.js
@@ -40,7 +40,8 @@
        
         return {
             _id: object.id,
-            data: object.result
+            data: object.result,
+            error: object.error
         };
     };
 
@@ -70,7 +71,7 @@
         var self = this;
         this.sendRequest(payload, function (request) {
             var parsed = JSON.parse(request.responseText);
-            if (parsed.result instanceof Array ? parsed.result.length === 0 : !parsed.result) {
+            if (parsed.error || (parsed.result instanceof Array ? parsed.result.length === 0 : !parsed.result)) {
                 return;
             }
             self.handlers.forEach(function (handler) {
diff --git a/main.js b/main.js
index ee98d55a3..1c544ef81 100644
--- a/main.js
+++ b/main.js
@@ -153,15 +153,15 @@
                     return {call: call, args: args};
                 }).then(function (request) {
                     return new Promise(function (resolve, reject) {
-                        web3.provider.send(request, function (result) {
-                            if (result || typeof result === "boolean") {
+                        web3.provider.send(request, function (err, result) {
+                            if (!err) {
                                 resolve(result);
                                 return;
                             } 
-                            reject(result);
+                            reject(err);
                         });
                     });
-                }).catch(function( err) {
+                }).catch(function(err) {
                     console.error(err);
                 });
             };
@@ -173,8 +173,12 @@
             var proto = {};
             proto.get = function () {
                 return new Promise(function(resolve, reject) {
-                    web3.provider.send({call: property.getter}, function(result) {
-                        resolve(result);
+                    web3.provider.send({call: property.getter}, function(err, result) {
+                        if (!err) {
+                            resolve(result);
+                            return
+                        }
+                        reject(err);
                     });
                 });
             };
@@ -182,12 +186,12 @@
                 proto.set = function (val) {
                     return flattenPromise([val]).then(function (args) {
                         return new Promise(function (resolve) {
-                            web3.provider.send({call: property.setter, args: args}, function (result) {
-                                if (result) {
+                            web3.provider.send({call: property.setter, args: args}, function (err, result) {
+                                if (!err) {
                                     resolve(result);
-                                } else {
-                                    reject(result);
+                                    return
                                 }
+                                reject(err);
                             });
                         });
                     }).catch(function (err) {
@@ -438,7 +442,7 @@
         if(data._id) {
             var cb = web3._callbacks[data._id];
             if (cb) {
-                cb.call(this, data.data)
+                cb.call(this, data.error, data.data)
                 delete web3._callbacks[data._id];
             }
         }

From e3ad9be4c8053c18ed30775d62692f6fe91b1451 Mon Sep 17 00:00:00 2001
From: Marek Kotewicz <marek.kotewicz@gmail.com>
Date: Fri, 7 Nov 2014 14:07:01 +0100
Subject: [PATCH 2/3] missing semicolons

---
 main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main.js b/main.js
index 1c544ef81..34b059fef 100644
--- a/main.js
+++ b/main.js
@@ -176,7 +176,7 @@
                     web3.provider.send({call: property.getter}, function(err, result) {
                         if (!err) {
                             resolve(result);
-                            return
+                            return;
                         }
                         reject(err);
                     });
@@ -189,7 +189,7 @@
                             web3.provider.send({call: property.setter, args: args}, function (err, result) {
                                 if (!err) {
                                     resolve(result);
-                                    return
+                                    return;
                                 }
                                 reject(err);
                             });

From 8ca991ecd200d6552a60d47ff4b358e167d41e1e Mon Sep 17 00:00:00 2001
From: Marek Kotewicz <marek.kotewicz@gmail.com>
Date: Fri, 7 Nov 2014 14:36:07 +0100
Subject: [PATCH 3/3] corresponding changes from cpp-ethereum

---
 main.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/main.js b/main.js
index ee98d55a3..40f0a991f 100644
--- a/main.js
+++ b/main.js
@@ -217,6 +217,8 @@
             // Find termination
             var str = "";
             var i = 0, l = hex.length;
+            if (hex.substring(0, 2) == '0x')
+                i = 2;
             for(; i < l; i+=2) {
                 var code = hex.charCodeAt(i)
                 if(code == 0) {
@@ -238,7 +240,7 @@
             var hex = this.toHex(str);
             while(hex.length < pad*2)
                 hex += "00";
-            return hex
+            return "0x" + hex;
         },
 
         eth: {