diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-11-14 22:38:21 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-11-14 22:41:58 +0800 |
| commit | b0e9f5803327f5cbd4ca0cbee7e9217c46a3f1ba (patch) | |
| tree | b72735ba7723c209e0d7cc0b3d458254686044f7 | |
| parent | 4fc457b78b30e761164eac26fe5f1ebcddd11f7d (diff) | |
| download | dexon-0x-contracts-b0e9f5803327f5cbd4ca0cbee7e9217c46a3f1ba.tar.gz dexon-0x-contracts-b0e9f5803327f5cbd4ca0cbee7e9217c46a3f1ba.tar.zst dexon-0x-contracts-b0e9f5803327f5cbd4ca0cbee7e9217c46a3f1ba.zip | |
Fix a bug in an order-watcher order removal when maker token is ZRX
| -rw-r--r-- | packages/order-watcher/CHANGELOG.json | 10 | ||||
| -rw-r--r-- | packages/order-watcher/src/order_watcher/dependent_order_hashes_tracker.ts | 4 |
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[] { |