proper formatting event options

web3 · Apr 22, 2015 · b5eabd8 · b5eabd8
1 parent 93b323f
commit b5eabd8
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 27 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
@@ -89,10 +89,17 @@ SolidityEvent.prototype.signature = function () {
 SolidityEvent.prototype.encode = function (indexed, options) {
     indexed = indexed || {};
     options = options || {};
+    var result = {};
 
-    options.address = this._address;
-    options.topics = options.topics || [];
-    options.topics.push('0x' + this.signature());
+    ['fromBlock', 'toBlock'].filter(function (f) {
+        return options[f] !== undefined;
+    }).forEach(function (f) {
+        result[f] = utils.toHex(options[f]);
+    });
+
+    result.address = this._address;
+    result.topics = [];
+    result.topics.push('0x' + this.signature());
 
     var indexedTopics = this._params.filter(function (i) {
         return i.indexed === true;
@@ -110,9 +117,9 @@ SolidityEvent.prototype.encode = function (indexed, options) {
         return '0x' + coder.encodeParam(i.type, value);
     });
 
-    options.topics = options.topics.concat(indexedTopics);
+    result.topics = result.topics.concat(indexedTopics);
 
-    return options;
+    return result;
 };
 
 /**

diff --git a/test/event.encode.js b/test/event.encode.js
@@ -118,6 +118,31 @@ var tests = [{
             null
         ]
     }
+}, {
+    abi: {
+        name: 'event1',
+        inputs: [{
+            type: 'int',
+            name: 'a',
+            indexed: true
+        }]
+    },
+    indexed: {
+        a: 1
+    },
+    options: {
+        fromBlock: 4,
+        toBlock: 10
+    },
+    expected: {
+        address: address,
+        fromBlock: '0x4',
+        toBlock: '0xa',
+        topics: [
+            signature,
+            '0x0000000000000000000000000000000000000000000000000000000000000001'
+        ]
+    }
 }];
 
 describe('lib/web3/event', function () {