From 1e787a764615bd3df839f2cb117b711be297b9d5 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 17 Jul 2018 12:04:29 +0200
Subject: Remove stateLayer OrderWatcher config and instead temporarily
 hard-code until we get pending block to work with Blockstream

---
 packages/0x.js/CHANGELOG.json | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'packages/0x.js')

diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 3ec09cd7e..9419311dd 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -32,6 +32,10 @@
             {
                 "note": "0x.js exports renamed contract events and event arg types",
                 "pr": 863
+            },
+            {
+                "note": "Remove stateLayer config from OrderWatcher. It now always operates on the latest block",
+                "pr": 875
             }
         ]
     },
-- 
cgit 


From edcdc9b1b903158cc61529853d7e9028ecbc266a Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 17 Jul 2018 12:58:42 +0200
Subject: Upgrade tslint to the newest version

---
 packages/0x.js/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/0x.js')

diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 966770cf0..502a346e4 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -94,7 +94,7 @@
         "shx": "^0.2.2",
         "sinon": "^4.0.0",
         "source-map-support": "^0.5.0",
-        "tslint": "5.8.0",
+        "tslint": "5.11.0",
         "typedoc": "0xProject/typedoc",
         "typescript": "2.7.1",
         "webpack": "^3.1.0"
-- 
cgit 


From bf8ac3b9e6ee59f267f7850418febfe84dedceb8 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Tue, 17 Jul 2018 12:59:02 +0200
Subject: Fix tslint issues

---
 packages/0x.js/src/0x.ts            | 2 +-
 packages/0x.js/test/global_hooks.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/0x.js')

diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts
index 5d9a03719..1d33eb7ca 100644
--- a/packages/0x.js/src/0x.ts
+++ b/packages/0x.js/src/0x.ts
@@ -61,7 +61,7 @@ export class ZeroEx {
      * ERC721 proxy smart contract.
      */
     public erc721Proxy: ERC721ProxyWrapper;
-    private _contractWrappers: ContractWrappers;
+    private readonly _contractWrappers: ContractWrappers;
     /**
      * Generates a pseudo-random 256-bit salt.
      * The salt can be included in a 0x order, ensuring that the order generates a unique orderHash
diff --git a/packages/0x.js/test/global_hooks.ts b/packages/0x.js/test/global_hooks.ts
index 3d74634fe..364828231 100644
--- a/packages/0x.js/test/global_hooks.ts
+++ b/packages/0x.js/test/global_hooks.ts
@@ -7,7 +7,7 @@ before('migrate contracts', async function(): Promise<void> {
     // HACK: Since the migrations take longer then our global mocha timeout limit
     // we manually increase it for this before hook.
     const mochaTestTimeoutMs = 20000;
-    this.timeout(mochaTestTimeoutMs);
+    this.timeout(mochaTestTimeoutMs); // tslint:disable-line:no-invalid-this
     const txDefaults = {
         gas: devConstants.GAS_LIMIT,
         from: devConstants.TESTRPC_FIRST_ADDRESS,
-- 
cgit