Merge pull request #1259 from 0xProject/feature/ow-zrx-bug

[@0x/order-watcher] Fix a bug in an order removal when maker token is ZRX

2 files changed, 14 insertions, 1 deletions

diff --git a/packages/order-watcher/CHANGELOG.json b/packages/order-watcher/CHANGELOG.json
index 7119d7953..fd6167bd4 100644
--- a/packages/order-watcher/CHANGELOG.json
+++ b/packages/order-watcher/CHANGELOG.json
@@ -1,5 +1,15 @@
 [
     {
+        "version": "2.2.4",
+        "changes": [
+            {
+                "note":
+                    "Fix the bug when order watcher was throwing an error on order removal when maker token was ZRX",
+                "pr": 1259
+            }
+        ]
+    },
+    {
         "version": "2.2.3",
         "changes": [
             {
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
index 1ec568a9b..a956a94db 100644
--- a/packages/order-watcher/src/order_watcher/dependent_order_hashes_tracker.ts
+++ b/packages/order-watcher/src/order_watcher/dependent_order_hashes_tracker.ts
@@ -89,7 +89,10 @@ export class DependentOrderHashesTracker {
                 (decodedMakerAssetData as ERC721AssetData).tokenId,
             );
         }
-        this._removeFromERC20DependentOrderhashes(signedOrder, this._zrxTokenAddress);
+        // If makerToken === ZRX then we already removed it and we don't need to remove it again.
+        if ((decodedMakerAssetData as ERC20AssetData).tokenAddress !== this._zrxTokenAddress) {
+            this._removeFromERC20DependentOrderhashes(signedOrder, this._zrxTokenAddress);
+        }
         this._removeFromMakerDependentOrderhashes(signedOrder);
     }
     private _getDependentOrderHashesByERC20AssetData(makerAddress: string, erc20AssetData: string): string[] {