Merge pull request #1789 from 0xProject/fix/order-watcher-race-condition

Fix OrderWatcher race-condition bug
0xProject · Apr 24, 2019 · 18acf50 · 18acf50
2 parents 509fabb + cc3378b
commit 18acf50
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "version": "4.0.7",
+        "changes": [
+            {
+                "note": "Fix race-condition bug due to async callback modifying shared state",
+                "pr": 1789
+            }
+        ]
+    },
     {
         "version": "4.0.6",
         "changes": [

diff --git a/packages/order-watcher/src/order_watcher/order_watcher.ts b/packages/order-watcher/src/order_watcher/order_watcher.ts
@@ -493,6 +493,9 @@ export class OrderWatcher {
     private async _emitRevalidateOrdersAsync(orderHashes: string[], transactionHash?: string): Promise<void> {
         for (const orderHash of orderHashes) {
             const signedOrder = this._orderByOrderHash[orderHash];
+            if (signedOrder === undefined) {
+                continue;
+            }
             // Most of these calls will never reach the network because the data is fetched from stores
             // and only updated when cache is invalidated
             const orderState = await this._orderStateUtils.getOpenOrderStateAsync(signedOrder, transactionHash);