xianny
245c87f026
re-enable test-rest
2019-09-25 10:48:55 -07:00
mzhu25
e4ab832ced
Merge pull request #2205 from 0xProject/feature/contracts-staking/rip-mixin-vault-core
...
Consolidate MixinVaultCore and ZrxVault + unit tests
2019-09-24 23:23:32 -07:00
Michael Zhu
dc06497cae
consolidate MixinVaultCore and ZrxVault
2019-09-24 23:04:17 -07:00
James Towle
1c42d0ab3c
Merge pull request #2206 from 0xProject/fix/3.0/cleanup-inheritance-again
...
Cleanup inheritance... again
2019-09-24 19:13:54 -07:00
Amir Bandeali
98698f702f
Remove redundant inheritance and imports
2019-09-24 18:47:27 -07:00
Amir Bandeali
4784131dca
Merge pull request #2203 from 0xProject/feat/3.0/consolidate-rich-reverts
...
Cleanup rich reverts
2019-09-24 18:32:41 -07:00
James Towle
6eb28b792a
Merge pull request #2204 from 0xProject/feature/staking/move-storage-layout-assertions
...
Feature/staking/move storage layout assertions
2019-09-24 18:32:12 -07:00
Amir Bandeali
57f5b12e24
Cleanup rich reverts
2019-09-24 18:13:37 -07:00
Amir Bandeali
e5aaf68277
Use uin8 instead of uint256 for status
2019-09-24 18:13:37 -07:00
Alex Towle
b62486923f
@0x:contracts-staking Removed storage assertions from Staking and moved them to a test contract
2019-09-24 18:12:00 -07:00
Amir Bandeali
322a0a5967
Merge pull request #2201 from 0xProject/fix/3.0/rename-owner
...
Rename shadowed instances of `owner` to `staker`
2019-09-24 17:46:38 -07:00
Amir Bandeali
f30c2c4a23
Make setZrxProxy callable by authorized address rather than only owner
2019-09-24 17:27:53 -07:00
xianny
44e5fa5b25
improve readability of async error tests
2019-09-24 16:53:59 -07:00
Amir Bandeali
18a86ef234
Replace all shadowed instances of 'owner' with 'staker'
2019-09-24 16:52:09 -07:00
Alex Towle
a6af3744e2
@0x:contracts-staking Improved the test coverage of MixinStakingPool
2019-09-24 16:49:34 -07:00
Amir Bandeali
9b40164787
Merge pull request #2195 from 0xProject/feat/3.0/deployment-constants
...
Make wethAssetProxy and zrxVault deployment constants
2019-09-24 16:46:21 -07:00
xianny
52e8cf1366
really fix async error tests
2019-09-24 16:45:24 -07:00
Amir Bandeali
1b159f5ccc
Make deployment constant getters public
2019-09-24 16:43:08 -07:00
xianny
893ae35296
exclude lib files from tsc build
2019-09-24 16:24:44 -07:00
Amir Bandeali
85e56706bf
Remove wethAssetProxy and zrxVault from storage layout assertions
2019-09-24 16:19:53 -07:00
Amir Bandeali
b8b21cefe3
Make deployment constants private and use string reverts for constructor assertions
2019-09-24 16:19:53 -07:00
Amir Bandeali
6d7bf12ade
Make wethAssetProxy and zrxVault deployment constants
2019-09-24 16:19:53 -07:00
Xianny
5266816dd6
Quick fix to abi-gen test ( #2197 )
2019-09-24 16:11:17 -07:00
Amir Bandeali
0c5f0271c7
Merge pull request #2190 from 0xProject/feat/3.0/consolidate-pool-mixins
...
Consolidate staking pool mixins
2019-09-24 14:00:28 -07:00
Greg Hysz
b65fd06e95
Merge pull request #2188 from 0xProject/feature/staking/remove-ref-counting
...
Remove reference counting for cumulative rewards
2019-09-24 14:00:17 -07:00
Amir Bandeali
7f51822bfc
Fix storage layout assertions
2019-09-24 13:38:48 -07:00
Amir Bandeali
1acd8d9577
Make _poolJoinedByMakerAddress internal
2019-09-24 13:36:54 -07:00
Amir Bandeali
8aa302f6fc
Update OnlyCallableByPoolOperatorOrMakerError params and address PR feedback
2019-09-24 13:36:54 -07:00
Amir Bandeali
f8af5879af
Remove _getStakingPoolOperator internal getter function
2019-09-24 13:36:54 -07:00
Amir Bandeali
a7aa7feff4
Remove getAvailableRewardsBalance public function, make wethReservedForPoolRewards public
2019-09-24 13:36:54 -07:00
Amir Bandeali
b6a96cea23
Address PR comments
2019-09-24 13:36:54 -07:00
Amir Bandeali
50b02a4a55
Add more pool tests
2019-09-24 13:36:54 -07:00
Amir Bandeali
8a2b178e6f
Remove isMakerAssignedToStakingPool to reduce sloads
2019-09-24 13:36:54 -07:00
Amir Bandeali
7f1afb57b0
Consolidate MixinStakingPool, MixinStakingPoolMakers, and MixinStakingPoolModifiers
2019-09-24 13:36:54 -07:00
Amir Bandeali
0bc4b50818
Add codesize tests
2019-09-24 13:36:54 -07:00
Greg Hysen
91de2194eb
Removed reference counting from storage layout test
2019-09-24 13:35:41 -07:00
Greg Hysen
fef06908ec
Removed instances fo a frivilous currentEpoch parameter
2019-09-24 13:32:20 -07:00
Greg Hysen
a012eb0cae
Updated changelog and ran prettier
2019-09-24 13:32:20 -07:00
Greg Hysen
08c805a489
Removed explicit dependency for delegator on the next epoch after staking.
2019-09-24 13:32:20 -07:00
Greg Hysen
5b595dd080
Remove reference counting for cumulative rewards
2019-09-24 13:32:20 -07:00
James Towle
c29a22187c
Merge pull request #2199 from 0xProject/feature/staking/storage-layout-assertion
...
Feature/staking/storage layout assertion
2019-09-24 13:30:56 -07:00
Jacob Evans
44f6d21e9b
Merge pull request #2196 from 0xProject/quick-fixes
...
Quick fixes
2019-09-24 21:48:58 +02:00
Alex Towle
ef04248191
@0x:contracts-staking Addressed review comments
2019-09-24 10:58:51 -07:00
Jacob Evans
1b47c473b4
Quick fixes
...
* Fixed the webpack publish for asset swapper to be in line with 0x.js
* Modified the migration snapshot name to not clobber v2 until we're
ready to overwrite
* Added filler transactions to keep contract addresses stable whilst
asset proxy is disabled
* Non-private package publish for orderbook
2019-09-24 15:48:35 +02:00
Amir Bandeali
fe1fea9a2d
Merge pull request #2172 from 0xProject/fix/3.0/exchange/eip712domain
...
Fix eip712 domain
2019-09-23 21:07:59 -07:00
Alex Towle
970f77beb0
@0x:contracts-staking Added storage layout assertions to the staking contract
2019-09-23 18:26:51 -07:00
Amir Bandeali
2587cd380f
Merge pull request #2186 from 0xProject/feat/3.0/delete-vaults
...
Delete `StakingPoolRewardVault` and `EthVault`
2019-09-23 18:05:53 -07:00
Amir Bandeali
04eab19f15
Fix lingering cases of verifyingContractAddress
2019-09-23 17:56:42 -07:00
Amir Bandeali
abb2b46ed3
Remove vaults from variable names and comments
2019-09-23 17:37:04 -07:00
Alex Towle
db241e8f90
@0x:contracts-staking Modified Staking events to improve their usability
2019-09-23 17:32:52 -07:00
