Merge pull request #11 from debris/master

Update

1 files changed, 42 insertions, 6 deletions

diff --git a/lib/abi.js b/lib/abi.js
index 1e3759918..3df0fe684 100644
--- a/lib/abi.js
+++ b/lib/abi.js
@@ -1,3 +1,24 @@
+/*
+    This file is part of ethereum.js.
+
+    ethereum.js is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ethereum.js is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with ethereum.js.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file abi.js
+ * @authors:
+ *   Marek Kotewicz <marek@ethdev.com>
+ * @date 2014
+ */
 
 var findIndex = function (array, callback) {
     var end = false;
@@ -71,7 +92,8 @@ var toAbiInput = function (json, methodName, params) {
     for (var i = 0; i < method.inputs.length; i++) {
         var found = false;
         for (var j = 0; j < inputTypes.length && !found; j++) {
-            found = inputTypes[j](method.inputs[i].type, params[i]);
+            var val = parseInt(params[i]).toString(16);
+            found = inputTypes[j](method.inputs[i].type, val);
         }
         if (!found) {
             console.error('unsupported json type: ' + method.inputs[i].type);
@@ -148,17 +170,31 @@ var fromAbiOutput = function (json, methodName, output) {
     return result;
 };
 
-var load = function (json) {
-    var contract = {};
+var inputParser = function (json) {
+    var parser = {};
     json.forEach(function (method) {
-        contract[method.name] = function () {
+        parser[method.name] = function () {
             var params = Array.prototype.slice.call(arguments);
             return toAbiInput(json, method.name, params);
         };
     });
 
-    return contract;
+    return parser;
 };
 
-module.exports = load;
+var outputParser = function (json) {
+    var parser = {};
+    json.forEach(function (method) {
+        parser[method.name] = function (output) {
+            return fromAbiOutput(json, method.name, output);
+        };
+    });
+
+    return parser;
+};
+
+module.exports = {
+    inputParser: inputParser,
+    outputParser: outputParser
+};