Merge branch 'develop' into tests

1 files changed, 9 insertions, 4 deletions

diff --git a/dist/ethereum.js b/dist/ethereum.js
index c87ebf204..30684dbf4 100644
--- a/dist/ethereum.js
+++ b/dist/ethereum.js
@@ -268,7 +268,7 @@ var methodSignature = function (json, name) {
     result += inputTypes.join(',');
     result += ')';
 
-    return web3.sha3(result);
+    return web3.sha3(web3.fromAscii(result));
 };
 
 module.exports = {
@@ -411,6 +411,9 @@ if ("build" !== 'build') {/*
 
 var abi = require('./abi');
 
+// method signature length in bytes
+var ETH_METHOD_SIGNATURE_LENGTH = 4;
+
 var contract = function (address, desc) {
     var inputParser = abi.inputParser(desc);
     var outputParser = abi.outputParser(desc);
@@ -431,7 +434,7 @@ var contract = function (address, desc) {
                     extra = extra || {};
                     extra.to = address;
                     return abi.methodSignature(desc, method.name).then(function (signature) {
-                        extra.data = signature.slice(0, 10) + parsed;
+                        extra.data = signature.slice(0, 2 + ETH_METHOD_SIGNATURE_LENGTH * 2) + parsed;
                         return web3.eth.call(extra).then(onSuccess);
                     });
                 },
@@ -1101,7 +1104,8 @@ function messageHandler(data) {
     }
 }
 
-module.exports = web3;
+if (typeof(module) !== "undefined")
+    module.exports = web3;
 
 },{}],7:[function(require,module,exports){
 /*
@@ -1180,7 +1184,8 @@ Object.defineProperty(WebSocketProvider.prototype, "onmessage", {
     set: function(provider) { this.onMessage(provider); }
 });
 
-module.exports = WebSocketProvider;
+if (typeof(module) !== "undefined")
+    module.exports = WebSocketProvider;
 
 },{}],"web3":[function(require,module,exports){
 var web3 = require('./lib/web3');