Commit Graph

1072 Commits

Author SHA1 Message Date
Greg Hysen
13d2cca2bc staking looks good, aside from the xfer of zrx 2019-08-21 13:04:10 -07:00
Greg Hysen
7fe8eac511 compiles and deploys 2019-08-21 13:04:10 -07:00
Greg Hysen
c062458188 Writing staking tests 2019-08-21 13:04:09 -07:00
Greg Hysen
3517dd2741 Implemented staking logic and ZRX vault 2019-08-21 13:04:09 -07:00
Lawrence Forman
e9a4b0758b @0x/contracts-exchange: Remove log decoding in ExchangeWrapper test class in favor of awaitTransactionSuccessAsync. 2019-08-21 10:59:34 -04:00
Lawrence Forman
abf076fc05 @0x/contracts-exchange: Remove unused _getOrderHashes() function from MixinWrapperFUnctions. 2019-08-21 10:59:34 -04:00
Lawrence Forman
a497ddfad2 @0x/contracts-exchange: Update CHANGELOG and run prettier. 2019-08-21 10:59:34 -04:00
Lawrence Forman
34f6facdee @0x/contracts-exchange-libs: Update CHANGELOG. 2019-08-21 10:59:34 -04:00
Lawrence Forman
e4475c08e8 @0x/contracts-exchange: Switch to consolidated IncompleteFillError rich error.
`@0x/contracts-exchange`: Allow `marketSell/BuyOrdersNoThrow` to be destructive to orders again.
2019-08-21 10:59:34 -04:00
Lawrence Forman
75a4d129f7 @0x/contracts-exchange-libs: Consolidate FillOrKill errors into IncompleteFillError. 2019-08-21 10:59:34 -04:00
Lawrence Forman
43f38d02ad @0x/contracts-dev-utils: run_mocha package script runs with UNLIMITED_CONTRACT_SIZE=true environment variable. 2019-08-21 10:59:34 -04:00
Lawrence Forman
6b8bc55c74 @0x/contracts-test-utils: web3Wrapper is created with shouldAllowUnlimitedContractSize if UNLIMITED_CONTRACT_SIZE environment variable is set. 2019-08-21 10:59:34 -04:00
Lawrence Forman
edef3bc30e @0x/contracts-exchange: Fix failing wrapper.ts test. 2019-08-21 10:59:34 -04:00
Lawrence Forman
0c7f09b832 ran prettier 2019-08-21 10:59:34 -04:00
Lawrence Forman
34d075ce8c @0x/contracts-exchange: Update marketBuy/SellOrdersNoThrow() to NOT be destructive to the orders.
`@0x/contracts-exchange`: Fix wrapper unit tests to use the actual order hash algorithm, since it can't be overridden anymore.
2019-08-21 10:59:34 -04:00
Lawrence Forman
8c06d660ea Update CHANGELOGs with PR numbers. 2019-08-21 10:59:34 -04:00
Lawrence Forman
748566b4fb @0x/contracts-exchange: Tweak exchangeDataEncoder test utility to work with marketBuy/SellFillOrKill() functions. 2019-08-21 10:59:34 -04:00
Lawrence Forman
fb38867e78 Ran prettier 2019-08-21 10:59:34 -04:00
Lawrence Forman
a2613625c6 @0x/contracts-exchange: Squelch linter errors in LibExchangeRichErrorDecoder. 2019-08-21 10:59:34 -04:00
Lawrence Forman
89f1d54ebc @0x/contracts-dev-utils: Add marketBuy/SellOrdersNoThrow and marketBuy/SellOrdersFillOrKill to LibTransactionDecoder. 2019-08-21 10:59:34 -04:00
Lawrence Forman
fd2a240c9f @0x/contracts-exchange`: Update changelog. 2019-08-21 10:59:34 -04:00
Lawrence Forman
96bef08ac2 @0x/contracts-exchange: Rename marketSellOrders and marketBuyOrders back to marketSellOrdersNoThrow and marketBuyOrdersNoThrow.
`@0x/contracts-exchange`: Introduce new `marketSellOrdersFillOrKill` and `marketBuyOrdersFillOrKill` functions.
`@0x/contracts-exchange`: Add new rich error types: `IncompleteMarketBuyError` and `IncompleteMarketSellError`.
`@0x/contracts-exchange`: Use `abi.decode()` in `LibExchangeRichErrorDecoder` over `LibBytes`.
2019-08-21 10:59:34 -04:00
Lawrence Forman
1698519a6a @0x/contracts-exchange: Overridden functions in ReentrancyTester now return sane values. 2019-08-21 10:59:34 -04:00
Lawrence Forman
d8372f73bc @0x/contracts-exchange-libs: Add new revert types and use abi.decode() instead of LibBytes. 2019-08-21 10:59:34 -04:00
Amir Bandeali
430d068d78 Add truffle compile to build in CI 2019-08-20 12:57:31 -07:00
Amir Bandeali
f09cadb7b3 Add truffle compile option to contract packages 2019-08-20 12:49:33 -07:00
Amir Bandeali
c366a4bd83 Update copyright dates 2019-08-20 12:49:01 -07:00
Alex Towle
22c8a25a26 Merge branch 'development' into 3.0 2019-08-19 11:13:21 -07:00
Amir Bandeali
4c78b7d4bb Merge pull request #2055 from 0xProject/feat/3.0/optimizeConstants
Refactor library usage
2019-08-16 07:40:54 -07:00
Amir Bandeali
8402d211bf Update CHANGELOGs 2019-08-15 16:51:50 -07:00
Amir Bandeali
cc3be9448a Move MatchedFillResults constants closer to tests where they are utilized 2019-08-15 16:51:40 -07:00
Amir Bandeali
7ac30c5153 Merge branch '3.0' into feat/3.0/optimizeConstants 2019-08-15 15:20:48 -07:00
Xianny
38d2b70ba6 Update contract-wrappers everywhere (#2068)
* add validateAndSendTransactionAsync to all wrappers

* remove contract-wrappers from @0x/contracts-extensions

* replace error types in contract-wrappers

* upgrade asset-buyer and asset-swapper to contract-wrappers v11

* update website and 0x.js

* remove calldataOptimizationUtils
2019-08-15 10:53:33 -07:00
Greg Hysz
64bc99101c Merge pull request #2059 from 0xProject/feature/contracts/3.0/fillOrderAssertionWrapper
Fill Order Assertion Wrapper
2019-08-15 00:12:40 +02:00
Greg Hysen
09b5018e65 Readability improvements 2019-08-14 23:45:07 +02:00
Amir Bandeali
1dae1d244c Rename hashing functions in LibOrder and LibZeroExTransaction 2019-08-14 13:38:12 -07:00
Amir Bandeali
2da996f493 Hard code chainId in tests 2019-08-14 11:07:28 -07:00
Amir Bandeali
c5d4559300 Remove generate-exchange-selectors script 2019-08-14 11:07:22 -07:00
James Towle
434d027133 Merge pull request #2043 from jalextowle/feature/contracts/3.0/order-matching-unit-tests
MatchOrders Unit Tests
2019-08-14 11:06:52 -07:00
James Towle
f66212ce23 Merge pull request #2051 from jalextowle/feature/3.0/exchange-libs/unit-tests
`@0x:contracts-exchange-libs` Added unit tests to exchange-libs
2019-08-14 10:52:10 -07:00
Alex Towle
6b4e632101 @0x:contracts-exchange Refactored internal.ts so that it is more readable 2019-08-14 10:39:36 -07:00
Alex Towle
0134b2874b @0x:contracts-exchange Addressed remaining review comments 2019-08-13 17:05:38 -07:00
Alex Towle
e2308aabed @0x:contracts-exchange Reduced the code size of internal.ts 2019-08-13 17:04:42 -07:00
Alex Towle
36fac3532c Removed unused reference functions 2019-08-13 17:04:42 -07:00
Alex Towle
327c6e8ac2 Completed the calculateMatchedFillResultsWithMaximalFill tests 2019-08-13 17:04:25 -07:00
Alex Towle
e9d49d96a6 Changed the testing style to be more assertion based rather than reference based to leverage the fixtures from the integration tests 2019-08-13 17:04:25 -07:00
Alex Towle
929bb86a54 Wrote some test cases for assertValidMatch 2019-08-13 17:04:25 -07:00
Alex Towle
f58e28d1be Implemented reference functions and added tests for _calculateCompleteRightFill 2019-08-13 17:04:25 -07:00
Alex Towle
cdabe21e7a Fixed the tests by using the IsolatedExchange 2019-08-13 17:04:25 -07:00
Alex Towle
a7520eeaa8 Wrote some initial test cases for the matchOrders calculate functions 2019-08-13 17:02:00 -07:00