Merge branch 'master' into jg-subscription-check

2016-12-09 02:34:07 +01:00
parent 6b65a1f872 f9a24f3c8e
commit 8f9fdb350c
10 changed files with 31 additions and 194 deletions
--- a/js/src/api/contract/contract.js
+++ b/js/src/api/contract/contract.js
@@ -262,12 +262,11 @@ export default class Contract {
    }

    const options = this._getFilterOptions(event, _options);
+    options.fromBlock = 0;
+    options.toBlock = 'latest';
+
    return this._api.eth
-      .getLogs({
-        fromBlock: 0,
-        toBlock: 'latest',
-        ...options
-      })
+      .getLogs(options)
      .then((logs) => this.parseEventLogs(logs));
  }