roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

sha3 method signature

Browse Source
This commit is contained in:
Marek Kotewicz 2015-01-09 12:55:04 +01:00
parent 807ec60e63
commit 0538c11576
5 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dist/ethereum.js vendored
View File

@ -141,7 +141,6 @@ var toAbiInput = function (json, methodName, params) {
return; return;
} }
bytes = "0x" + padLeft(index.toString(16), 2);
var method = json[index]; var method = json[index];
for (var i = 0; i < method.inputs.length; i++) { for (var i = 0; i < method.inputs.length; i++) {
@ -260,9 +259,22 @@ var outputParser = function (json) {
return parser; return parser;
}; };
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(result);
};
module.exports = { module.exports = {
inputParser: inputParser, inputParser: inputParser,
outputParser: outputParser outputParser: outputParser,
methodSignature: methodSignature
}; };
},{}],2:[function(require,module,exports){ },{}],2:[function(require,module,exports){
@ -418,8 +430,10 @@ var contract = function (address, desc) {
call: function (extra) { call: function (extra) {
extra = extra || {}; extra = extra || {};
extra.to = address; extra.to = address;
extra.data = parsed; return abi.methodSignature(desc, method.name).then(function (signature) {
extra.data = signature.slice(0, 10) + parsed;
return web3.eth.call(extra).then(onSuccess); return web3.eth.call(extra).then(onSuccess);
});
}, },
transact: function (extra) { transact: function (extra) {
extra = extra || {}; extra = extra || {};

6
dist/ethereum.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/ethereum.min.js vendored
View File

File diff suppressed because one or more lines are too long

16
lib/abi.js
View File

@ -140,7 +140,6 @@ var toAbiInput = function (json, methodName, params) {
return; return;
} }
bytes = "0x" + padLeft(index.toString(16), 2);
var method = json[index]; var method = json[index];
for (var i = 0; i < method.inputs.length; i++) { for (var i = 0; i < method.inputs.length; i++) {
@ -259,7 +258,20 @@ var outputParser = function (json) {
return parser; return parser;
}; };
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(result);
};
module.exports = { module.exports = {
inputParser: inputParser, inputParser: inputParser,
outputParser: outputParser outputParser: outputParser,
methodSignature: methodSignature
}; };

4
lib/contract.js
View File

@ -46,8 +46,10 @@ var contract = function (address, desc) {
call: function (extra) { call: function (extra) {
extra = extra || {}; extra = extra || {};
extra.to = address; extra.to = address;
extra.data = parsed; return abi.methodSignature(desc, method.name).then(function (signature) {
extra.data = signature.slice(0, 10) + parsed;
return web3.eth.call(extra).then(onSuccess); return web3.eth.call(extra).then(onSuccess);
});
}, },
transact: function (extra) { transact: function (extra) {
extra = extra || {}; extra = extra || {};