forked from cerc-io/plugeth
Merge branch 'develop' into tests
This commit is contained in:
commit
29c60c000a
13
dist/ethereum.js
vendored
13
dist/ethereum.js
vendored
@ -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');
|
||||
|
10
dist/ethereum.js.map
vendored
10
dist/ethereum.js.map
vendored
File diff suppressed because one or more lines are too long
2
dist/ethereum.min.js
vendored
2
dist/ethereum.min.js
vendored
File diff suppressed because one or more lines are too long
@ -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 = {
|
||||
|
@ -27,6 +27,9 @@ if (process.env.NODE_ENV !== '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);
|
||||
@ -47,7 +50,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);
|
||||
});
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user