Fabio Berger
77290c1efa
Run yarn a second time if the first fails
2018-08-27 10:51:38 +01:00
Fabio Berger
cb7660fbe7
Merge pull request #1009 from 0xProject/fix/ci-yarn-1.9.4
...
fix: Use yarn version 1.9.4 on CI
2018-08-27 10:33:02 +01:00
Fabio Berger
82e51b8787
Fix command
2018-08-27 10:15:27 +01:00
Fabio Berger
fffa96bba7
Move md files to lib folder during build
2018-08-27 10:15:13 +01:00
Fabio Berger
e6cb2e0fcd
Change exit code to failure
2018-08-27 10:14:43 +01:00
Fabio Berger
38abeaed9c
Fix sra-spec main and types in package.json
2018-08-27 10:13:17 +01:00
Fabio Berger
9df87a199a
Merge pull request #1026 from 0xProject/fix/contract-wrappers/block-param-literal
...
[contract_templates] Issue #1025 BlockParam unroll
2018-08-27 10:07:06 +01:00
Jacob Evans
7e9ba50502
Issue #1025 BlockParam unroll
...
BlockParam unrolls into number | BlockParamLiteral, though BlockParamLiteral does not get imported. This results in type build errors in downstream projects where tslint checks libs
2018-08-27 15:59:43 +10:00
Fabio Berger
35ba3e6f7c
Bumop 0x.js version
2018-08-26 17:35:17 +01:00
Fabio Berger
3ac182ee91
Fix file path to main and types in package.json
2018-08-26 17:12:13 +01:00
Amir Bandeali
00e7c70b4d
Merge pull request #986 from 0xProject/feature/contracts/assertions
...
Add more assertions to assertValidFill
2018-08-24 20:03:28 -07:00
Amir Bandeali
0aa9ed3839
Merge pull request #1008 from 0xProject/fix/contracts/robustMatching
...
Robustness in Order Matching
2018-08-24 19:00:53 -07:00
Remco Bloemen
d652deea23
Merge branch 'fix/contracts/robustMatching' of github.com:0xProject/0x.js into fix/contracts/robustMatching
2018-08-24 18:54:15 -07:00
Greg Hysen
878db3b849
Added comments to order matching
2018-08-24 18:48:29 -07:00
Greg Hysen
ec2e726be0
Rephrased some of the math in MixinMatchOrders to improve readability
2018-08-24 18:20:26 -07:00
Greg Hysen
287830d6e0
Run all tests
2018-08-24 18:20:26 -07:00
Greg Hysen
c7a7ae7e18
Give right maker better price when correct value is not integral
2018-08-24 18:20:26 -07:00
Greg Hysen
1c7ba6a315
Extract only fill event logs
2018-08-24 18:20:26 -07:00
Greg Hysen
0a6f107243
Added temporary @todo to MixinMatchOrders
2018-08-24 18:20:25 -07:00
Greg Hysen
a93f95c55e
Wording in MixinMatchOrders
2018-08-24 18:20:25 -07:00
Greg Hysen
6833e243b7
Addressed linter errors in match order tesster
2018-08-24 18:20:25 -07:00
Greg Hysen
81dc893d1d
Removed a redundant comment from matchOrders
2018-08-24 18:20:25 -07:00
Greg Hysen
f8e565bc06
Tests for matchOrders edge cases
2018-08-24 18:20:25 -07:00
Greg Hysen
ba15fb6a06
Swapped direction of expect values to match output in failure cases
2018-08-24 18:20:25 -07:00
Greg Hysen
1e6b83719a
Renaming verify -> assert in order matching
2018-08-24 18:20:25 -07:00
Greg Hysen
9fcb2dda73
Fixed a function comment
2018-08-24 18:20:25 -07:00
Greg Hysen
9a5ec8d030
Added function signature comments
2018-08-24 18:20:25 -07:00
Greg Hysen
ac872e5181
Added expect messages for checking left/right order states
2018-08-24 18:20:25 -07:00
Greg Hysen
70863cca08
Ran prettier and linter
2018-08-24 18:20:25 -07:00
Greg Hysen
5a1dce15be
Updated all existing match order tests to use new format
2018-08-24 18:19:43 -07:00
Greg Hysen
d291256158
Passes comprehensive test
2018-08-24 18:18:30 -07:00
Greg Hysen
8c706ac639
Verify logs
2018-08-24 18:18:30 -07:00
Greg Hysen
f697814849
First balance test with intentional values
2018-08-24 18:18:30 -07:00
Greg Hysen
ca5c9e77c0
Ironing out the new set of test cases for order matchubng
2018-08-24 18:17:27 -07:00
Greg Hysen
a32b201afe
Rounding for fees in match orders addressed, plus example
2018-08-24 18:17:27 -07:00
Greg Hysen
0ecdf1e213
All existing tests pass.
2018-08-24 18:17:26 -07:00
Greg Hysen
057891b342
Added fees to matchOrders (previously in calculateFillResults
2018-08-24 18:17:26 -07:00
Greg Hysen
407f63ef20
Removed calculateFillResults from matchOrders workflow. Eliminates compounded rounding errors.
2018-08-24 18:17:26 -07:00
Amir Bandeali
f938c989e3
Merge pull request #1002 from 0xProject/feature/contracts/mutex
...
[contracts] Add mutexes and reentrancy guards
2018-08-24 18:15:22 -07:00
Amir Bandeali
c8500cab10
Fix build
2018-08-24 17:30:56 -07:00
Amir Bandeali
c28c3db63f
Only use one nonReentrant modifier, remove modifier from fillOrderNoThrow variations
2018-08-24 17:30:56 -07:00
Amir Bandeali
a09ee90739
Add tests for matchOrders
2018-08-24 17:30:56 -07:00
Amir Bandeali
7d5a23969d
Add reentrancy tests for fillOrder and wrapper functions
2018-08-24 17:30:56 -07:00
Amir Bandeali
56c3c29feb
Update ReentrantERC20Token with new functions and check that revert is occuring for correct reason
2018-08-24 17:30:56 -07:00
Amir Bandeali
c75212bef0
Add nonReentrant modifiers on functions that use getCurrentContextAddress only, add lockMutex modifier on functions that make external calls
2018-08-24 17:30:56 -07:00
Amir Bandeali
6d0dedc62c
Split modifiers into check only and check, lock, unlock
2018-08-24 17:30:56 -07:00
Amir Bandeali
cf12daea2f
Add ReentrantToken
2018-08-24 17:30:56 -07:00
Amir Bandeali
6f88e9bdbd
Add internal fill functions, add reentrancy guard to public functions that make external calls
2018-08-24 17:30:56 -07:00
Amir Bandeali
d8cb56caa3
Add ReentrancyGuard contract
2018-08-24 17:30:56 -07:00
Amir Bandeali
044415e23d
Remove redundant sload from getCurrentContextAddress
2018-08-24 17:30:56 -07:00
