Merge commit '38ffac065a2d27b4e416f4ec4a275114f02463a7' into ethereumjs

10 years ago · e0c41befd7
4 changed files with 6 additions and 5 deletions
--- a/libjsqrc/ethereumjs/dist/ethereum.js
+++ b/libjsqrc/ethereumjs/dist/ethereum.js
@ -268,7 +268,8 @@ var methodSignature = function (json, name) {
    result += inputTypes.join(',');
    result += ')';

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

 module.exports = {
--- a/libjsqrc/ethereumjs/dist/ethereum.js.map
+++ b/libjsqrc/ethereumjs/dist/ethereum.js.map
--- a/libjsqrc/ethereumjs/dist/ethereum.min.js
+++ b/libjsqrc/ethereumjs/dist/ethereum.min.js
--- a/libjsqrc/ethereumjs/lib/abi.js
+++ b/libjsqrc/ethereumjs/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 = {