aboutsummaryrefslogtreecommitdiffstats
path: root/dist/ethereum.js
diff options
context:
space:
mode:
Diffstat (limited to 'dist/ethereum.js')
-rw-r--r--dist/ethereum.js18
1 files changed, 15 insertions, 3 deletions
diff --git a/dist/ethereum.js b/dist/ethereum.js
index 0d62f5060..a002d59b6 100644
--- a/dist/ethereum.js
+++ b/dist/ethereum.js
@@ -451,7 +451,7 @@ module.exports = {
* @date 2014
*/
-var web3 = require('./web3'); // jshint ignore:line
+var web3 = require('./web3');
var abi = require('./abi');
/**
@@ -493,7 +493,17 @@ var contract = function (address, desc) {
var inputParser = abi.inputParser(desc);
var outputParser = abi.outputParser(desc);
- var result = {};
+ var result = {
+ address: address,
+ };
+
+ Object.defineProperty(result, 'topics', {
+ get: function() {
+ return abi.filterEvents(desc).map(function (event) {
+ return abi.methodSignature(event.name);
+ });
+ }
+ });
result.call = function (options) {
result._isTransact = false;
@@ -579,11 +589,13 @@ var contract = function (address, desc) {
var displayName = abi.methodDisplayName(event.name);
var typeName = abi.methodTypeName(event.name);
+
var impl = function (options) {
+ var signature = abi.methodSignature(event.name);
var o = options || {};
o.address = o.address || address;
o.topics = o.topics || [];
- o.topics.push(abi.methodSignature(event.name));
+ o.topics.push(signature);
return web3.eth.watch(o);
};