61 Commits

Author SHA1 Message Date
Michael Zhu
329719472a Move LibAssetDataTransfer and MixinWeth(Utils) to contracts-extensions 2020-02-04 10:13:02 -08:00
Michael Zhu
3da7c5d3e2 Move LibAssetDataTransfer from forwarder to exchange-libs package 2020-02-04 10:08:21 -08:00
Amir
2275e27b87 Rename internal functions in LibAssetDataTransfer and fix tests 2020-01-15 18:33:02 -08:00
Amir
62b06cd204 Add tests for transfering ERC1155 tokens out 2020-01-15 18:33:02 -08:00
Michael Zhu
87cd5fca90 address comments 2020-01-07 11:03:18 -08:00
Michael Zhu
b70cb726c5 remove _noTakerFee (i.e. disallow StaticCall takerFeeAssetData) 2020-01-07 11:03:18 -08:00
Michael Zhu
295811ed5a add integrations tests 2020-01-07 11:03:18 -08:00
Michael Zhu
4bc55551c6 Add unit tests 2020-01-07 11:03:18 -08:00
Amir Bandeali
c7c8a4891f Update TS boilerplate 2020-01-06 22:12:05 -08:00
Xianny
fcbcbac889
Remove assetDataUtils everywhere (#2373)
* remove assetDataUtils everywhere

* export IAssetDataContract from @0x/contract-wrappers to allow @0x/instant to decode asset data  synchronously

* export generic function `decodeAssetDataOrThrow` and add ERC20Bridge support

* export `hexUtils` from order-utils instead of contracts-test-utils
2019-12-04 13:08:08 -08:00
Jacob Evans
ad8caa2b51
Remove moved RevertErrors 2019-11-27 11:52:14 +11:00
Michael Zhu
41576652dc address more comments 2019-11-26 14:19:37 -08:00
Michael Zhu
2542b1b44d address comments and tests 2019-11-26 14:16:54 -08:00
Michael Zhu
d51bbb0008 Unit tests 2019-11-26 14:16:54 -08:00
fabioberger
15a5bc02ef Fix remaining build issues 2019-11-11 00:13:44 +00:00
Michael Zhu
3d56c06ff3 Move Forwarder test to integrations; update to use new framework 2019-10-29 11:26:56 -07:00
Michael Zhu
589d2212ee Test coordinator protocol fees 2019-10-06 12:44:58 -07:00
Michael Zhu
8077123e9f update contracts and tests to support different maker assets 2019-10-01 16:19:47 -07:00
Michael Zhu
0ff8b12770 rmeove maker asset equality check; update to reflect removal of weth asset proxy 2019-10-01 13:08:17 -07:00
Michael Zhu
b01de802cb address styling nits; only calculate protocol fee once 2019-09-30 21:51:34 -07:00
Michael Zhu
e954e9ca20 update tests 2019-09-30 21:51:34 -07:00
fragosti
9870f55d24 Remove domain from Order type 2019-09-25 18:44:19 -07:00
Amir Bandeali
ae75aed55e Change verifyingContractAddress -> verifyingContract everywhere 2019-09-23 16:00:37 -07:00
Amir Bandeali
18b65a61ff Fix build 2019-09-01 19:14:16 -07:00
Amir Bandeali
798fb183a5 Address remaining PR feedback 2019-08-23 15:14:04 -07:00
Amir Bandeali
830d6f726e Use default gasPrice in Forwarder tests 2019-08-23 09:33:05 -07:00
Michael Zhu
66f175b659 post-rebase fix 2019-08-20 17:41:26 -07:00
Michael Zhu
755ef35955 prettier 2019-08-20 17:24:59 -07:00
Michael Zhu
b5d6156ffa use mocha extensions 2019-08-20 17:24:59 -07:00
Michael Zhu
8dd8cf8673 might as well change ethValueAdjustment to number too 2019-08-20 17:24:59 -07:00
Michael Zhu
9e46099ced change fractionalNumberOfOrdersToFill to number 2019-08-20 17:24:59 -07:00
Michael Zhu
9f4fe259f9 update some RichErrors and @return directives per comments 2019-08-20 17:24:59 -07:00
Michael Zhu
b9e75769a3 add tests for partially filled, unfillable orders 2019-08-20 17:24:59 -07:00
Michael Zhu
17a9edd8c3 check order statuses 2019-08-20 17:24:59 -07:00
Michael Zhu
090b83a237 tests for invalid fee assets 2019-08-20 17:24:59 -07:00
Michael Zhu
2b572cc28f fix lint 2019-08-20 17:24:59 -07:00
Michael Zhu
1934dddcbe use different maker/taker amounts in tests 2019-08-20 17:24:59 -07:00
Michael Zhu
f1c51bd0db refactor + revert when takerFeeAssetData is neither WETH nor makerAssetData 2019-08-20 17:24:59 -07:00
Michael Zhu
d91fc59a28 change marketSell/marketBuy to return relevant amounts, change marketBuy so that makerAssetBuyAmount == makerAssetAcquiredAmount 2019-08-20 17:24:59 -07:00
Michael Zhu
f8025feda2 update tests to use RevertErrors 2019-08-20 17:24:58 -07:00
Michael Zhu
3da55ad836 lint 2019-08-20 17:23:55 -07:00
Michael Zhu
26bfcccedc use ForwarderTestFactory for most forwarder tests + some comments in forwarder_test_factory 2019-08-20 17:23:55 -07:00
Michael Zhu
af6243afb0 handle reverts and ERC721 in ForwarderTestFactory + refactoring 2019-08-20 17:23:55 -07:00
Michael Zhu
673a341626 make approveMakerAssetProxy an external function and update comments 2019-08-20 17:23:55 -07:00
Michael Zhu
a1aee7111a minor fixes 2019-08-20 17:23:55 -07:00
Michael Zhu
688209e272 refactoring and marketBuyTestAsync 2019-08-20 17:23:55 -07:00
Michael Zhu
116945047b forwarder test factory first pass (supports orders with no fees and percentage fees) 2019-08-20 17:23:55 -07:00
Michael Zhu
7ff7e9d2e7 Tests for orders without fees, orders with percentage-based fees (no forwarder fees) 2019-08-20 17:23:55 -07:00
Michael Zhu
34be9830af fix imports and inheritance, update tests for forwarder 2019-08-20 17:23:55 -07:00
Alex Towle
22c8a25a26 Merge branch 'development' into 3.0 2019-08-19 11:13:21 -07:00