James Towle
55e1045000
Added a comment about inheritance in the exchange
2019-07-23 15:51:43 -07:00
James Towle
fc96df63fd
Fixed most of the nits
2019-07-23 15:51:43 -07:00
James Towle
9b787a6bc2
Removed enums from Mixins in the coordinator package
2019-07-23 15:51:43 -07:00
James Towle
201dc7c28d
Removed events from the Mixins in asset-proxy
2019-07-23 15:51:43 -07:00
James Towle
5189fa6483
Fixed the inheritance hierarchy
2019-07-23 15:51:43 -07:00
James Towle
1992478cee
Updated the mixins
2019-07-23 15:51:43 -07:00
James Towle
5ad6b48289
Refactored into interfaces
2019-07-23 15:51:43 -07:00
James Towle
9ef55023f2
Removed all mixins/ directories from the repository
2019-07-23 15:51:43 -07:00
Amir Bandeali
f2f81b0f7b
Fix dev-utils tests
2019-07-23 15:51:43 -07:00
Amir Bandeali
c22ed861d1
Remove ZRX fees from dev-utils contracts
2019-07-23 15:51:43 -07:00
Amir Bandeali
39bed4d306
temp
2019-07-23 15:51:43 -07:00
James Towle
5813bb9ca8
Updated any remaining contracts using 0.5.5 to 0.5.9
2019-07-23 15:46:16 -07:00
Amir Bandeali
c48ad5c90f
Fix outdated comments
2019-07-23 15:46:16 -07:00
Amir Bandeali
4fdc1b3e19
Update CHANGELOGs
2019-07-23 15:46:16 -07:00
Amir Bandeali
dc372a43fe
Fix incorrect function call for fillOrderNoThrow test
2019-07-23 15:46:16 -07:00
Amir Bandeali
589b791cd7
Add names to return values and fix breaking transactions tests
2019-07-23 15:46:16 -07:00
Amir Bandeali
564dbea126
Remove formatters and clarify comments about pointing assetData to the same memory location
2019-07-23 15:46:16 -07:00
Amir Bandeali
1bc4bc613e
Add return value checks to wrapper tests
2019-07-23 15:46:16 -07:00
Amir Bandeali
11a25cb1ae
Return FillResults[] for batch fill methods
2019-07-23 15:46:16 -07:00
Lawrence Forman
d6c1bf691c
Reorder event assertions in transactions tests.
2019-07-23 15:46:16 -07:00
Amir Bandeali
e6443a2612
Update CHANGELOGs
2019-07-23 15:46:16 -07:00
Amir Bandeali
d79714a3cf
Fix merge conflict remnant
2019-07-23 15:46:15 -07:00
Amir Bandeali
4bb1312cf1
Fix coordinator package build
2019-07-23 15:46:15 -07:00
Amir Bandeali
4e2abcaefa
Fix linting errors
2019-07-23 15:46:15 -07:00
Amir Bandeali
d463d4c46b
Add transaction expiration tests
2019-07-23 15:46:15 -07:00
Amir Bandeali
435c81da98
Revert if transaction is expired
2019-07-23 15:46:15 -07:00
Amir Bandeali
4f818d55fa
Add TransactionExecution log tests
2019-07-23 15:46:15 -07:00
Amir Bandeali
c96a81e319
Fix exchange package build
2019-07-23 15:46:15 -07:00
Amir Bandeali
7cff9ba86a
Refactor tests
2019-07-23 15:46:15 -07:00
Amir Bandeali
6ddaa6f52a
Add expirationTimeSeconds to ZeroExTransaction schema throughout codebase
2019-07-23 15:46:15 -07:00
Amir Bandeali
238877b627
Log TransactionExecution event when transaction is successfully executed
2019-07-23 15:46:15 -07:00
Lawrence Forman
95e7999e45
@0x/contracts-exchange: Update settlement test simulators to match settlement optimizations in the Exchange.
2019-07-23 15:46:15 -07:00
Lawrence Forman
2f464ee8f0
@0x/contracts-exchange: Fix critical error in fillOrder() and matchOrders() redundant transfer optimization code.
...
`@0x/contracts-exchange`: Rearrange `Fill` event params to make regular `emit` code work without breaking the stack.
`@0x/contracts-exchange`: Add edge case tests for redundant transfer optimizations.
2019-07-23 15:46:15 -07:00
Lawrence Forman
8fe9883b62
Update contracts/exchange/contracts/src/MixinMatchOrders.sol
...
`@0x/contracts-exchange`: Minor code change to save an mload.
2019-07-23 15:46:15 -07:00
Lawrence Forman
de896f9159
@0x/contracts-exchange: Remove TODO comment in fill_order_combinatorial_utils.ts.
2019-07-23 15:46:15 -07:00
Lawrence Forman
a2468e8129
@0x/contracts-exchange: Update changelog.
2019-07-23 15:46:15 -07:00
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
