Fix error were object could be undefined given an approval event

0xProject · Mar 14, 2019 · f285745 · f285745
1 parent af04c29
commit f285745
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json
@@ -5,6 +5,9 @@
             {
                 "note": "Update websocket from ^1.0.25 to ^1.0.26",
                 "pr": 1685
+            },
+            {
+                "note": "Fix issue where ERC721 Approval events could cause a lookup on undefined object"
             }
         ]
     },

diff --git a/packages/order-watcher/src/order_watcher/dependent_order_hashes_tracker.ts b/packages/order-watcher/src/order_watcher/dependent_order_hashes_tracker.ts
@@ -37,9 +37,15 @@ export class DependentOrderHashesTracker {
         this._zrxTokenAddress = zrxTokenAddress;
     }
     public getDependentOrderHashesByERC721ByMaker(makerAddress: string, tokenAddress: string): string[] {
-        const orderHashSets = _.values(
-            this._orderHashesByERC721AddressByTokenIdByMakerAddress[makerAddress][tokenAddress],
-        );
+        let orderHashSets: Array<Set<string>> = [];
+        if (
+            this._orderHashesByERC721AddressByTokenIdByMakerAddress[makerAddress] &&
+            this._orderHashesByERC721AddressByTokenIdByMakerAddress[makerAddress][tokenAddress]
+        ) {
+            orderHashSets = _.values(
+                this._orderHashesByERC721AddressByTokenIdByMakerAddress[makerAddress][tokenAddress],
+            );
+        }
         const orderHashList = _.reduce(
             orderHashSets,
             (accumulator, orderHashSet) => [...accumulator, ...orderHashSet],
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,9 @@ @@
                 {
                     "note": "Update websocket from ^1.0.25 to ^1.0.26",
                     "pr": 1685
+                },
+                {
+                    "note": "Fix issue where ERC721 Approval events could cause a lookup on undefined object"
                 }
             ]
         },
@@ Expand Down @@