Merge branch 'develop' into events_refactor

Conflicts: dist/web3-light.js dist/web3-light.js.map dist/web3-light.min.js dist/web3.js dist/web3.js.map dist/web3.min.js lib/web3/filter.js
web3 · Apr 22, 2015 · 4482d5b · 4482d5b
2 parents 76ced9a + f37057e
commit 4482d5b
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 13 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/utils/utils.js b/lib/utils/utils.js
@@ -214,6 +214,9 @@ var fromDecimal = function (value) {
 var toHex = function (val) {
     /*jshint maxcomplexity:7 */
 
+    if(val === null || typeof val === 'undefined')
+        return val;
+
     if (isBoolean(val))
         return fromDecimal(+val);
 

diff --git a/lib/web3/filter.js b/lib/web3/filter.js
@@ -41,9 +41,11 @@ var getOptions = function (options) {
 
     // make sure topics, get converted to hex
     options.topics = options.topics || [];
-    options.topics = options.topics.map(function(topic){
+    options.topics = options.topics.map(function(topic) {
         if (topic === null) {
             return null;
+        } else if (utils.isArray(topic)) {
+            topic = topic.map(utils.toHex);
         }
         return utils.toHex(topic);
     });

diff --git a/test/utils.toHex.js b/test/utils.toHex.js
@@ -4,6 +4,7 @@ var BigNumber = require('bignumber.js');
 var assert = chai.assert;
 
 var tests = [
+    { value: null, expected: null },
     { value: 1, expected: '0x1' },
     { value: '1', expected: '0x1' },
     { value: '0x1', expected: '0x1'},