Merge branch 'develop' into tests

2015-01-09 16:48:44 +01:00
parent b3eda29f41 92f171ec99
commit 29c60c000a
5 changed files with 20 additions and 12 deletions
--- a/lib/abi.js
+++ b/lib/abi.js
@ -267,7 +267,7 @@ var methodSignature = function (json, name) {
    result += inputTypes.join(',');
    result += ')';

-    return web3.sha3(result);
+    return web3.sha3(web3.fromAscii(result));
 };

 module.exports = {