diff options
| author | Jacob Evans <dekz@dekz.net> | 2019-01-15 10:23:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-15 10:23:45 +0800 |
| commit | b4621f6a69378fa780c960bfbbc2ca2d27536575 (patch) | |
| tree | a637cdd84aed1184e3aba656b5916bf3be4481bd /packages | |
| parent | c859788fdee8d8c2af0cdc69403a61f861fec0e5 (diff) | |
| parent | 007a2d7deb1d7c7bb62cb5cfd07dc5f3714b9cb4 (diff) | |
| download | dexon-sol-tools-b4621f6a69378fa780c960bfbbc2ca2d27536575.tar dexon-sol-tools-b4621f6a69378fa780c960bfbbc2ca2d27536575.tar.gz dexon-sol-tools-b4621f6a69378fa780c960bfbbc2ca2d27536575.tar.bz2 dexon-sol-tools-b4621f6a69378fa780c960bfbbc2ca2d27536575.tar.lz dexon-sol-tools-b4621f6a69378fa780c960bfbbc2ca2d27536575.tar.xz dexon-sol-tools-b4621f6a69378fa780c960bfbbc2ca2d27536575.tar.zst dexon-sol-tools-b4621f6a69378fa780c960bfbbc2ca2d27536575.zip | |
Merge pull request #1514 from 0xProject/bug/exchange-wrapper-matchOrders
Remove optimization from matchOrdersAsync in Exchange wrapper
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/contract-wrappers/CHANGELOG.json | 4 | ||||
| -rw-r--r-- | packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json index 9a225726a..c6af3adee 100644 --- a/packages/contract-wrappers/CHANGELOG.json +++ b/packages/contract-wrappers/CHANGELOG.json @@ -5,6 +5,10 @@ { "note": "Renamed OrderStatus enum members to PascalCase to conform with tslint enum-naming rule", "pr": 1474 + }, + { + "note": "Remove Exchange `matchOrdersAsync` optimization", + "pr": 1514 } ] }, diff --git a/packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts b/packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts index c9556971a..49193f816 100644 --- a/packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts +++ b/packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts @@ -743,10 +743,6 @@ export class ExchangeWrapper extends ContractWrapper { rightSignedOrder.takerAssetData !== leftSignedOrder.makerAssetData ) { throw new Error(ExchangeWrapperError.AssetDataMismatch); - } else { - // Smart contracts assigns the asset data from the left order to the right one so we can save gas on reducing the size of call data - rightSignedOrder.makerAssetData = '0x'; - rightSignedOrder.takerAssetData = '0x'; } const exchangeInstance = await this._getExchangeContractAsync(); if (orderTransactionOpts.shouldValidate) { |