crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[@0x/order-watcher] Fix a bug in an order removal when maker token is ZRX
This commit is contained in:
Leonid Logvinov
2018-11-14 16:04:25 +01:00
committed by GitHub
parent 4fc457b78b 77c77631e1
commit 06dcf24496
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/order-watcher/CHANGELOG.json
View File

@@ -1,4 +1,14 @@
[ [
{
"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", "version": "2.2.3",
"changes": [ "changes": [

5
packages/order-watcher/src/order_watcher/dependent_order_hashes_tracker.ts
View File

@@ -89,7 +89,10 @@ export class DependentOrderHashesTracker {
(decodedMakerAssetData as ERC721AssetData).tokenId, (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); this._removeFromMakerDependentOrderhashes(signedOrder);
} }
private _getDependentOrderHashesByERC20AssetData(makerAddress: string, erc20AssetData: string): string[] { private _getDependentOrderHashesByERC20AssetData(makerAddress: string, erc20AssetData: string): string[] {