Lawrence Forman
ee89f74afd
@0x/contracts-exchange: Avoid redundant transfer in matchOrders() when maker/feeRecipient and takerAssetData/makerFeeAssetData are the same.
...
`@0x/conracts-exchange`: Disable combinatorial tests by default. Can be run by setting env var `TEST_ALL=1`.
2019-07-23 15:46:15 -07:00
Lawrence Forman
cd08c3e8fa
@0x/contracts-exchange: Avoid redundant trasfer in fillOrder() when maker/taker is the same as feeRecipient and the assets match.
...
`@0x/contracts-exchange`: Swap fill order in `fillOrder()` from maker -> taker to taker -> maker first
2019-07-23 15:46:15 -07:00
Lawrence Forman
9cc8933eec
@0x/contracs-test-utils: Increase number of deployed ERC721 and ERC1155 tokens to 2 to fix broken asset-proxy tests.
2019-07-23 15:46:15 -07:00
Lawrence Forman
91c27ff972
@0x/contracts-exchange: Fix build error.
2019-07-23 15:46:15 -07:00
Lawrence Forman
07e3ba014c
@0x/contracts-exchange: Fully incorporate ERC1155 and MultiAsset tests into the fillOrder and matchOrders test suites.
2019-07-23 15:46:15 -07:00
Lawrence Forman
57ac0ca6e8
@0x/contracts-test-utils: Reduce number of test token deployments to speed up tests.
2019-07-23 15:46:15 -07:00
Lawrence Forman
816368b1fe
@0x/contracts-exchange: Re-eanble all exchange tests.
...
`@0x/contracts-echange`: Set up 1155 and MAP proxies for `matchOrders()` tests.
2019-07-23 15:46:15 -07:00
Lawrence Forman
85ea291745
@0x/contracts-exchange: Add MultiAssetProxy, ERC1155Fungible, and ERC1155NonFungible combinatorial tests.
2019-07-23 15:46:15 -07:00
Lawrence Forman
741fdfa52e
@0x/contracts-erc1155: Add mintKnownFungibleTokensAsync(), isNonFungibleItemAsync(), isFungibleItemAsync(), getOwnerOfAsync(), getBalanceAsync() to Erc1155Wrapper.
2019-07-23 15:46:15 -07:00
Lawrence Forman
348ec5bc3c
@0x/contracts-asset-proxy: Add setProxyAllowanceForAllAsync() to ERC1155ProxyWrapper.
2019-07-23 15:45:39 -07:00
Lawrence Forman
518f351235
@0x/contracts-exchange: Correct coding convention in match_orders.ts
2019-07-23 15:44:58 -07:00
Lawrence Forman
d79a07e2c4
@0x/contracts-exchange: Fix indentation in matchOrders().
2019-07-23 15:44:58 -07:00
Lawrence Forman
b636057251
@0x/contracts-exchange-libs: Make EIP712_ORDER_SCHEMA_HASH public.
2019-07-23 15:44:58 -07:00
Lawrence Forman
c692c8f055
@0x/contracts-exchange-libs: Regenerate LibExchangeSelectors.sol
2019-07-23 15:44:58 -07:00
Lawrence Forman
1c8468d248
@0x/contracts-exchange: Use function/event selectors from LibExchangeSelectors.
...
`@0x/contracts-exchange`: Add memory map comments to `Fill` emit code.
2019-07-23 15:43:23 -07:00
Lawrence Forman
575842eab4
@0x/contracts-exchange-libs: Convert generate-exchange-selectors script to typescript.
2019-07-23 15:43:23 -07:00
Lawrence Forman
f7f55cad43
@0x/contracts-exchange: Removed dependency on OrderValidationUtils. The tests using it didn't really warrant the full validation suite.
...
`@0x/contracts-test-utils`: Move all the `OrderScenario` related types into the `contracts-exchange` package because no one else is using them.
2019-07-23 15:43:23 -07:00
Lawrence Forman
acd857a8c0
@0x/contracts-asset-proxy: Fix broken proxies test.
2019-07-23 15:43:23 -07:00
Lawrence Forman
53ff248176
@0x/contracts-exchange: Revert internal tests.
2019-07-23 15:43:23 -07:00
Lawrence Forman
aebb923c2d
@0x/contracts-exchange: Major rework of fill_order_combinatorial_utils.
...
`@0x/contracts-exchange`: Add more arbitrary fee token tests.
`@0x/contracts-exchange`: Fix broken tests.
2019-07-23 15:43:23 -07:00
Lawrence Forman
76d577a08d
@0x/contracts-test-utils: Add more OrderScenario related types.
2019-07-23 15:43:23 -07:00
Lawrence Forman
3fb34a2a83
@0x/contracts-asset-proxy: Make setProxyAllowanceForAll() just accept a ownerAddress and give the proxy full control.
2019-07-23 15:43:23 -07:00
Lawrence Forman
14167412e0
@0x/contracts-exchange-libs: Make generate-exchange-selectors terminate file with a newline.
2019-07-23 15:26:59 -07:00
Lawrence Forman
7c0f075d1f
Update changelogs with PR #s
2019-07-23 15:26:59 -07:00
Lawrence Forman
f4aea76c6e
Ran prettier
2019-07-23 15:26:59 -07:00
Lawrence Forman
d263382365
@0x/contracts-coordinator: Fix broken coordinator tests.
2019-07-23 15:26:59 -07:00
Lawrence Forman
2109ed8464
@0x/contracts-exchange-libs: Add generate-exchange-selectors package script to regenerate LibExchangeSelectors from Exchange artifacts.
2019-07-23 15:26:59 -07:00
Lawrence Forman
d11444b983
@0x/contracts-exchange: Fix Exchange Wrappers tests.
2019-07-23 15:26:59 -07:00
Lawrence Forman
0508a45681
@0x/contracts-echange: Fix transactions test bug with ExchangeWrapper example due to deduping.
2019-07-23 15:26:59 -07:00
Lawrence Forman
a5c0b95f8b
Update changelogs
2019-07-23 15:26:59 -07:00
Lawrence Forman
9d257497bd
Ran prettier and fixed linter errors
2019-07-23 15:23:40 -07:00
Lawrence Forman
79f40b4ce0
@0x/contracts-exchange: Enable all exchange tests.
2019-07-23 15:23:40 -07:00
Lawrence Forman
1ab62b7a80
@0x/contracts-exchange: Fix broken match orders tests
2019-07-23 15:23:40 -07:00
Lawrence Forman
d2f10d5834
@0x/contracts-exchange: Allow custom ExchangeWrapper.matchOrders() call in MatchOrdersTester.
2019-07-23 15:23:40 -07:00
Lawrence Forman
c326ec9d1e
@0x/contracts-exchange: Rewrote MatchOrderTester class to be simpler and more flexible.
2019-07-23 15:23:40 -07:00
Lawrence Forman
26317d16ff
@0x/contracts-exchange: Fix matchOrders() not paying fees if same feeRecipient but different feeAssetDatas.
2019-07-23 15:23:40 -07:00
Lawrence Forman
79b8f85cdf
@0x/contracts-test-utils: Remove TransferAmountsByMatchOrders and TransferAmountsLoggedByMatchOrders.
...
`@0x/contracts-test-utils`: Add `TokenBalancesByOwner` type.
2019-07-23 15:23:40 -07:00
Lawrence Forman
c84a0b8415
@0x/contracts-exchange: Fix matchOrders and signature tests.
2019-07-23 15:23:40 -07:00
Lawrence Forman
be5336d074
@0x/contracts-exchange: Enable all tests.
2019-07-23 15:23:40 -07:00
Lawrence Forman
aecb2efad9
@0x/contracts-exchange: Fix combinatorial fillOrder test bugs.
...
`@0x/contracts-exchange`: Fix emit `Fill` event code.
2019-07-23 15:23:40 -07:00
Lawrence Forman
d8fd61955c
@0x/contracts-test-utils: Increase deployment numbers for dummy tokens.
2019-07-23 15:23:40 -07:00
Lawrence Forman
8c2fa64c47
@0x/contracts-exchange: Remove dependency on LibAbiEncoder.
2019-07-23 15:23:40 -07:00
Lawrence Forman
12ae9fced5
@0x/contracts-exchange-forwarder: Remove dependency on LibAbiEncoder.
2019-07-23 15:23:40 -07:00
Lawrence Forman
e3bca7e7e7
@0x/exchange-libs: Remove LibAbiEncoder
2019-07-23 15:23:40 -07:00
Lawrence Forman
bca199e118
@0x/contracts-exchange: Fix Fill emit code.
2019-07-23 15:23:40 -07:00
Lawrence Forman
938ae5f27c
@0x/contracts-coordinator: Remove ZRX token from coordinator tests.
2019-07-23 15:23:40 -07:00
Lawrence Forman
8aa3b535f0
@0x/contracts-exchange: Update fill order tests for arbitrary fee tokens. (Still more to do)
2019-07-23 15:23:40 -07:00
Lawrence Forman
f4bf4ee0f2
@0x/contracts-test-utils: Update types for arbitrary fee tokens.
2019-07-23 15:23:40 -07:00
Lawrence Forman
7cb6795d40
@0x/contracts-exchange-libs: Add takerFeeAssetData and makerFeeAssetData to Order struct.
2019-07-23 15:23:40 -07:00
Lawrence Forman
a5f4478e20
@0x/contracts-exchange: Remove zrxAssetData from constructor and remove dependency on LibConstants.
...
`@0x/contracts-exchange`: Update `fillOrder()` and `matchOrders()` to settle arbitrary fees.
`@0x/contracts-exchange`: emit `Fill()` events the hard way to avoid a stack overflow.
2019-07-23 15:23:40 -07:00
