anonymous events implementation && tests

web3 · Apr 22, 2015 · 9f7d6a9 · 9f7d6a9
1 parent b5eabd8
commit 9f7d6a9
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 14 deletions.
diff --git a/dist/web3-light.js b/dist/web3-light.js
diff --git a/dist/web3-light.js.map b/dist/web3-light.js.map
diff --git a/dist/web3-light.min.js b/dist/web3-light.min.js
diff --git a/dist/web3.js b/dist/web3.js
diff --git a/dist/web3.js.map b/dist/web3.js.map
diff --git a/dist/web3.min.js b/dist/web3.min.js
diff --git a/lib/web3/event.js b/lib/web3/event.js
@@ -31,6 +31,7 @@ var SolidityEvent = function (json, address) {
     this._params = json.inputs;
     this._name = utils.transformToFullName(json);
     this._address = address;
+    this._anonymous = json.anonymous;
 };
 
 /**
@@ -97,9 +98,12 @@ SolidityEvent.prototype.encode = function (indexed, options) {
         result[f] = utils.toHex(options[f]);
     });
 
-    result.address = this._address;
     result.topics = [];
-    result.topics.push('0x' + this.signature());
+
+    if (!this._anonymous) {
+        result.address = this._address;
+        result.topics.push('0x' + this.signature());
+    }
 
     var indexedTopics = this._params.filter(function (i) {
         return i.indexed === true;

diff --git a/test/event.encode.js b/test/event.encode.js
@@ -143,6 +143,25 @@ var tests = [{
             '0x0000000000000000000000000000000000000000000000000000000000000001'
         ]
     }
+}, {
+    abi: {
+        name: 'event1',
+        inputs: [{
+            type: 'int',
+            name: 'a',
+            indexed: true
+        }],
+        anonymous: true
+    },
+    indexed: {
+        a: 1
+    },
+    options: {},
+    expected: {
+        topics: [
+            '0x0000000000000000000000000000000000000000000000000000000000000001'
+        ]
+    }
 }];
 
 describe('lib/web3/event', function () {