From fb65772dd68d5ec5271ff2171560b306f013d09d Mon Sep 17 00:00:00 2001 From: Richard Moore Date: Fri, 27 Oct 2017 00:24:59 -0400 Subject: [PATCH] Added sighash and signature the Interface function properties. --- contracts/interface.js | 12 ++++++++---- contracts/package.json | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/contracts/interface.js b/contracts/interface.js index 0d6d3a7a9..366f93ca3 100644 --- a/contracts/interface.js +++ b/contracts/interface.js @@ -383,11 +383,13 @@ function Interface(abi) { var outputNames = getKeys(method.outputs, 'name', true); } + var signature = method.name + '(' + getKeys(method.inputs, 'type').join(',') + ')'; + var sighash = utils.keccak256(utils.toUtf8Bytes(signature)).substring(0, 10); var func = function() { - var signature = method.name + '(' + getKeys(method.inputs, 'type').join(',') + ')'; var result = { name: method.name, signature: signature, + sighash: sighash }; var params = Array.prototype.slice.call(arguments, 0); @@ -398,9 +400,7 @@ function Interface(abi) { throwError('too many parameters'); } - signature = utils.keccak256(utils.toUtf8Bytes(signature)).substring(0, 10); - - result.data = signature + Interface.encodeParams(inputTypes, params).substring(2); + result.data = sighash + Interface.encodeParams(inputTypes, params).substring(2); if (method.constant) { result.parse = function(data) { return Interface.decodeParams( @@ -417,6 +417,8 @@ function Interface(abi) { defineFrozen(func, 'inputs', getKeys(method.inputs, 'name')); defineFrozen(func, 'outputs', getKeys(method.outputs, 'name')); + utils.defineProperty(func, 'signature', signature); + utils.defineProperty(func, 'sighash', sighash); return func; })(); @@ -487,7 +489,9 @@ function Interface(abi) { }; return populateDescription(new EventDescription(), result); } + defineFrozen(func, 'inputs', getKeys(method.inputs, 'name')); + return func; })(); diff --git a/contracts/package.json b/contracts/package.json index a97b0fb80..df91a847d 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -1,6 +1,6 @@ { "name": "ethers-contracts", - "version": "2.1.2", + "version": "2.1.3", "description": "Contract and Interface (ABI) library for Ethereum.", "bugs": { "url": "http://github.com/ethers-io/ethers.js/issues",