diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-07-18 22:38:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-18 22:38:16 +0800 |
| commit | 00d1622b3f087943e750f1b3f6ee6ceab7e80285 (patch) | |
| tree | 44789fff181ec24846728d885ba541c23f682321 /packages/contracts | |
| parent | e2fb49a8f871fd4b631bb01bb641c632b7c19435 (diff) | |
| parent | a1acf19ff3c1948214dde05a91eb3fbeac728d2c (diff) | |
| download | dexon-sol-tools-00d1622b3f087943e750f1b3f6ee6ceab7e80285.tar dexon-sol-tools-00d1622b3f087943e750f1b3f6ee6ceab7e80285.tar.gz dexon-sol-tools-00d1622b3f087943e750f1b3f6ee6ceab7e80285.tar.bz2 dexon-sol-tools-00d1622b3f087943e750f1b3f6ee6ceab7e80285.tar.lz dexon-sol-tools-00d1622b3f087943e750f1b3f6ee6ceab7e80285.tar.xz dexon-sol-tools-00d1622b3f087943e750f1b3f6ee6ceab7e80285.tar.zst dexon-sol-tools-00d1622b3f087943e750f1b3f6ee6ceab7e80285.zip | |
Merge pull request #887 from 0xProject/feature/order-watcher-v2
Order watcher v2
Diffstat (limited to 'packages/contracts')
| -rw-r--r-- | packages/contracts/compiler.json | 1 | ||||
| -rw-r--r-- | packages/contracts/test/utils/forwarder_wrapper.ts | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/packages/contracts/compiler.json b/packages/contracts/compiler.json index 5ace566d8..2a7f8bbb9 100644 --- a/packages/contracts/compiler.json +++ b/packages/contracts/compiler.json @@ -25,6 +25,7 @@ "DummyERC721Token", "ERC20Proxy", "ERC20Token", + "ERC721Token", "ERC721Proxy", "Exchange", "ExchangeWrapper", diff --git a/packages/contracts/test/utils/forwarder_wrapper.ts b/packages/contracts/test/utils/forwarder_wrapper.ts index 04faaf9f3..e39df14b1 100644 --- a/packages/contracts/test/utils/forwarder_wrapper.ts +++ b/packages/contracts/test/utils/forwarder_wrapper.ts @@ -145,7 +145,7 @@ export class ForwarderWrapper { feeProportion: number, makerAssetFillAmount: BigNumber, ): Promise<BigNumber> { - const makerAssetData = assetDataUtils.decodeAssetData(orders[0].makerAssetData); + const makerAssetData = assetDataUtils.decodeAssetDataOrThrow(orders[0].makerAssetData); const makerAssetToken = makerAssetData.tokenAddress; const params = formatters.createMarketBuyOrders(orders, makerAssetFillAmount); |