diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-07-18 22:43:25 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-07-18 22:43:25 +0800 |
| commit | 29d5034260b2e3b4b670d856463ed34377bff3ac (patch) | |
| tree | 358b3cce6e4b2c4ea4f4c816668635e2aff758f0 /packages/contracts | |
| parent | f99232095b3effea261b5b24bc01db4f96c416f6 (diff) | |
| parent | 00d1622b3f087943e750f1b3f6ee6ceab7e80285 (diff) | |
| download | dexon-sol-tools-29d5034260b2e3b4b670d856463ed34377bff3ac.tar dexon-sol-tools-29d5034260b2e3b4b670d856463ed34377bff3ac.tar.gz dexon-sol-tools-29d5034260b2e3b4b670d856463ed34377bff3ac.tar.bz2 dexon-sol-tools-29d5034260b2e3b4b670d856463ed34377bff3ac.tar.lz dexon-sol-tools-29d5034260b2e3b4b670d856463ed34377bff3ac.tar.xz dexon-sol-tools-29d5034260b2e3b4b670d856463ed34377bff3ac.tar.zst dexon-sol-tools-29d5034260b2e3b4b670d856463ed34377bff3ac.zip | |
merge v2-prototype
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); |