aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packages/order-watcher/CHANGELOG.json10
-rw-r--r--packages/order-watcher/src/order_watcher/dependent_order_hashes_tracker.ts4
2 files changed, 13 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..4c8585985 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,9 @@ export class DependentOrderHashesTracker {
(decodedMakerAssetData as ERC721AssetData).tokenId,
);
}
- this._removeFromERC20DependentOrderhashes(signedOrder, this._zrxTokenAddress);
+ if ((decodedMakerAssetData as ERC20AssetData).tokenAddress !== this._zrxTokenAddress) {
+ this._removeFromERC20DependentOrderhashes(signedOrder, this._zrxTokenAddress);
+ }
this._removeFromMakerDependentOrderhashes(signedOrder);
}
private _getDependentOrderHashesByERC20AssetData(makerAddress: string, erc20AssetData: string): string[] {