1 files changed, 38 insertions, 12 deletions

diff --git a/lib/abi.js b/lib/abi.js
index 72001eaa0..c896ab28a 100644
--- a/lib/abi.js
+++ b/lib/abi.js
@@ -330,15 +330,37 @@ var fromAbiOutput = function (json, methodName, output) {
     return result;
 };
 
+/// @returns display name for method eg. multiply(uint256) -> multiply
+var methodDisplayName = function (method) {
+    var length = method.indexOf('('); 
+    return length !== -1 ? method.substr(0, length) : method;
+};
+
+/// @returns overloaded part of method's name
+var methodTypeName = function (method) {
+    /// TODO: make it not vulnerable
+    var length = method.indexOf('(');
+    return length !== -1 ? method.substr(length + 1, method.length - 1 - (length + 1)) : "";
+};
+
 /// @param json abi for contract
 /// @returns input parser object for given json abi
 var inputParser = function (json) {
     var parser = {};
     json.forEach(function (method) {
-        parser[method.name] = function () {
+        var displayName = methodDisplayName(method.name); 
+        var typeName = methodTypeName(method.name);
+
+        var impl = function () {
             var params = Array.prototype.slice.call(arguments);
             return toAbiInput(json, method.name, params);
         };
+       
+        if (parser[displayName] === undefined) {
+            parser[displayName] = impl;
+        }
+
+        parser[displayName][typeName] = impl;
     });
 
     return parser;
@@ -349,9 +371,19 @@ var inputParser = function (json) {
 var outputParser = function (json) {
     var parser = {};
     json.forEach(function (method) {
-        parser[method.name] = function (output) {
+
+        var displayName = methodDisplayName(method.name); 
+        var typeName = methodTypeName(method.name);
+
+        var impl = function (output) {
             return fromAbiOutput(json, method.name, output);
         };
+
+        if (parser[displayName] === undefined) {
+            parser[displayName] = impl;
+        }
+
+        parser[displayName][typeName] = impl;
     });
 
     return parser;
@@ -361,20 +393,14 @@ var outputParser = function (json) {
 /// @param method name for which we want to get method signature
 /// @returns (promise) contract method signature for method with given name
 var methodSignature = function (json, name) {
-    var method = json[findMethodIndex(json, name)];
-    var result = name + '(';
-    var inputTypes = method.inputs.map(function (inp) {
-        return inp.type;
-    });
-    result += inputTypes.join(',');
-    result += ')';
-
-    return web3.sha3(web3.fromAscii(result));
+    return web3.sha3(web3.fromAscii(name));
 };
 
 module.exports = {
     inputParser: inputParser,
     outputParser: outputParser,
-    methodSignature: methodSignature
+    methodSignature: methodSignature,
+    methodDisplayName: methodDisplayName,
+    methodTypeName: methodTypeName
 };