diff options
| author | Leonid <logvinov.leon@gmail.com> | 2018-02-05 19:00:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-05 19:00:05 +0800 |
| commit | f18fa8e9477b5a6e17216b292b70b3bd60a792ef (patch) | |
| tree | 6c35f5a813f6bcba9559a7f78186a13c4f40bfbe /packages/0x.js/src | |
| parent | 03b1b12ef1e4cdf9b834ff5cc1312b2eda3d2778 (diff) | |
| parent | 44cd185c66b08a5a9b081c972e7cb6764c066506 (diff) | |
| download | dexon-sol-tools-f18fa8e9477b5a6e17216b292b70b3bd60a792ef.tar dexon-sol-tools-f18fa8e9477b5a6e17216b292b70b3bd60a792ef.tar.gz dexon-sol-tools-f18fa8e9477b5a6e17216b292b70b3bd60a792ef.tar.bz2 dexon-sol-tools-f18fa8e9477b5a6e17216b292b70b3bd60a792ef.tar.lz dexon-sol-tools-f18fa8e9477b5a6e17216b292b70b3bd60a792ef.tar.xz dexon-sol-tools-f18fa8e9477b5a6e17216b292b70b3bd60a792ef.tar.zst dexon-sol-tools-f18fa8e9477b5a6e17216b292b70b3bd60a792ef.zip | |
Merge branch 'development' into feature/build_watch
Diffstat (limited to 'packages/0x.js/src')
| -rw-r--r-- | packages/0x.js/src/order_watcher/order_state_watcher.ts | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/0x.js/src/order_watcher/order_state_watcher.ts b/packages/0x.js/src/order_watcher/order_state_watcher.ts index 576be00c8..1ad1a90b1 100644 --- a/packages/0x.js/src/order_watcher/order_state_watcher.ts +++ b/packages/0x.js/src/order_watcher/order_state_watcher.ts @@ -133,8 +133,12 @@ export class OrderStateWatcher { delete this._orderStateByOrderHashCache[orderHash]; const exchange = (this._orderFilledCancelledLazyStore as any)._exchange as ExchangeWrapper; const zrxTokenAddress = exchange.getZRXTokenAddress(); + this._removeFromDependentOrderHashes(signedOrder.maker, zrxTokenAddress, orderHash); - this._removeFromDependentOrderHashes(signedOrder.maker, signedOrder.makerTokenAddress, orderHash); + if (zrxTokenAddress !== signedOrder.makerTokenAddress) { + this._removeFromDependentOrderHashes(signedOrder.maker, signedOrder.makerTokenAddress, orderHash); + } + this._expirationWatcher.removeOrder(orderHash); } /** |