828 Commits

Author SHA1 Message Date
Lawrence Forman
9b5ba6806f @0x/contracts-asset-proxy: Fix broken erc1155_proxy tests.
`@0x/contracts-asset-proxy`: Add `ERC1155Proxy.sol` to .solhintignore.
Fix circleci config to work with 3.0 branch.
2019-07-29 23:47:04 -04:00
Amir Bandeali
90d1decb87 Fix build errors 2019-07-24 10:26:28 -07:00
Alex Towle
1d8cb1b107 Addressed lingering review comments 2019-07-23 15:53:26 -07:00
Alex Towle
65e3d9873d Added ERC1155 Aggregation 2019-07-23 15:53:26 -07:00
Alex Towle
50b22c673e Addressed review comments 2019-07-23 15:53:26 -07:00
Alex Towle
4ef8b7f733 Rebased onto 3.0 2019-07-23 15:53:26 -07:00
James Towle
e0ec26255b Fixed lingering issues 2019-07-23 15:53:26 -07:00
James Towle
ffa32f7610 Changed the returndata for batchMatchOrders 2019-07-23 15:53:26 -07:00
James Towle
1c1d257bd9 Addressed lingering review comments 2019-07-23 15:53:26 -07:00
James Towle
5611cb91a0 Adapted tests from matchOrders to test matchOrdersWithMaximalFill 2019-07-23 15:53:26 -07:00
James Towle
e0cff4b74e Updated batchMatchOrders to fix an edge case and added tests 2019-07-23 15:53:26 -07:00
James Towle
c1985e6986 Addessed some review comments 2019-07-23 15:53:26 -07:00
James Towle
416b1aee98 Improved the testing for matchOrders and batchMatchOrders 2019-07-23 15:53:26 -07:00
James Towle
7bb9d8b03a Created a test for case 3 of matchOrdersWithMaximalFill 2019-07-23 15:53:26 -07:00
James Towle
0473c82029 Improved test coverage for batchMatchOrdersWithMaximalFill 2019-07-23 15:53:26 -07:00
James Towle
63bd1a4a22 Ran prettier 2019-07-23 15:53:26 -07:00
James Towle
5a64759c83 Added a reentrancy test for matchOrdersWithMaximalFill 2019-07-23 15:53:26 -07:00
James Towle
0df68a6e06 Added testing for the BatchMatchOrdersError Rich Error 2019-07-23 15:53:26 -07:00
James Towle
29eff3b515 Rebased onto PR #1900 2019-07-23 15:53:26 -07:00
James Towle
073976de10 Split up TestExchangeInternals into two contracts 2019-07-23 15:53:26 -07:00
James Towle
1fe159f432 Polished MixinMatchOrders and removed unimplemented test 2019-07-23 15:53:26 -07:00
James Towle
adad7f4e3f Modified the matchOrders tests to test matchOrdersWithMaximalFill 2019-07-23 15:53:26 -07:00
James Towle
378710533e Implemented matchOrdersWithMaximalFill 2019-07-23 15:53:26 -07:00
James Towle
d966848ef8 Implemented batchMatchOrdersWithMaximalFill 2019-07-23 15:53:26 -07:00
James Towle
d6d613ca37 Added a new test 2019-07-23 15:53:26 -07:00
James Towle
1a385de367 Improved the efficiency of batchMatchOrders 2019-07-23 15:53:25 -07:00
James Towle
73eb56c072 Added RichErrors to batchMatchOrders 2019-07-23 15:53:25 -07:00
James Towle
9651941cce Added getMatchOrdersResultsAsync and getBatchMatchOrdersResultsAsync 2019-07-23 15:53:25 -07:00
James Towle
29be79814f Added a test for partial matching 2019-07-23 15:53:25 -07:00
James Towle
1ea220f44f Removed batchMatchOrdersWithMaximumFill 2019-07-23 15:53:25 -07:00
James Towle
6cf11554de Created tests for batchMatchOrders 2019-07-23 15:53:25 -07:00
James Towle
f289b3112b Implemented batchMatchOrders 2019-07-23 15:53:25 -07:00
James Towle
c61df50167 Updated Changelogs 2019-07-23 15:53:25 -07:00
James Towle
df5ec33330 @0x:contracts-utils Address remaining review comments 2019-07-23 15:53:25 -07:00
James Towle
6384518ee1 @0x:contracts-exchange Updated LibMath to use library rich errors 2019-07-23 15:53:25 -07:00
James Towle
87bf940f89 @0x:contracts-exchange Refactor OrderTransferSimulationUtils 2019-07-23 15:53:25 -07:00
James Towle
53db047a4e @0x:contracts-exchange Eliminated code duplication within LibExchangeRichErrors and IExchangeRichErrors 2019-07-23 15:53:25 -07:00
James Towle
dabef47ce7 @0x:contracts-exchange Updated MixinTransactions to use library RichErrors 2019-07-23 15:53:25 -07:00
James Towle
4de1d69282 @0x:contracts-exchange Updated MixinMatchOrders to use library RichErrors 2019-07-23 15:53:25 -07:00
James Towle
015c35f2b2 @0x:contracts-exchange Updated MixinSignatureValidator to use library RichErrors 2019-07-23 15:53:25 -07:00
James Towle
5a491b2624 @0x:contracts-exchange Updated MixinWrapperFunctions to use library RichErrors 2019-07-23 15:53:25 -07:00
James Towle
3d95817dbe @0x:contracts-exchange Updated MixinAssetProxyDispatcher and MixinExchangeCore to use library RichErrors 2019-07-23 15:53:25 -07:00
James Towle
96ab74dea4 @0x:contracts-utils Refactored utils to exclusively use library RichErrors 2019-07-23 15:53:25 -07:00
James Towle
f937a0b038 @0x:contracts-utils Added RichErrors to ReentrancyGuard 2019-07-23 15:53:25 -07:00
James Towle
da38285046 @0x:contracts-utils Added RichErrors to LibAddressArray 2019-07-23 15:53:25 -07:00
James Towle
d3db2dcfbb @0x:contracts-utils Added RichErrors to LibBytes 2019-07-23 15:53:25 -07:00
Lawrence Forman
c788db785b @0x/contracts-exchange: Use named return values in MixinSignatureValidator.sol 2019-07-23 15:53:25 -07:00
Lawrence Forman
6df41d2562 @0x/contracts-exchange: REALLY make assertValidFill() internal again. 2019-07-23 15:53:25 -07:00
Lawrence Forman
74fb43998e @0x/contracts-exchange: Make assertValidFill() internal again. 2019-07-23 15:53:25 -07:00
Lawrence Forman
c1f8eabd12 @0x/contracts-exchange: Cosmetic changes to contracts. 2019-07-23 15:53:25 -07:00