Commit Graph

253 Commits

Author SHA1 Message Date
Lawrence Forman
da0f6b5e8f @0x/contracts-test-utils: Finish off finalizer tests... for now. 2019-09-22 12:07:46 -04:00
Lawrence Forman
03c59fdaf7 @0x/contracts-staking: More MixinFinalizer unit tests. 2019-09-22 12:07:46 -04:00
Lawrence Forman
f5ab1e6f86 @0x/contracts-staking: Reduce code duplication in MixinFinalizer and add unit tests for it. 2019-09-22 12:07:46 -04:00
Lawrence Forman
a1aad2e55e @0x/contracts-exchange: Fixing tests and writing new ones. 2019-09-22 12:07:46 -04:00
Lawrence Forman
d548ddac0d @0x/contracts-staking: Fixing tests. 2019-09-22 12:07:46 -04:00
Lawrence Forman
6a8242a6ca @0x/contracts-staking: Fix past epoch reward accounting. 2019-09-22 12:07:11 -04:00
Lawrence Forman
46b8bfe338 @0x/contracts-staking: It compiles! (again) 2019-09-22 12:07:11 -04:00
Lawrence Forman
102ca6b854 @0x/contracts-staking: Almost compiling... 2019-09-22 12:07:11 -04:00
Lawrence Forman
06b4d241af @0x/contracts-staking: Working on MBF v2 2019-09-22 12:07:11 -04:00
Lawrence Forman
712b2569e6 @0x/contracts-staking: Fix solidity linter errors. 2019-09-22 12:06:34 -04:00
Lawrence Forman
294be37afc @0x/contracts-staking: Got the solidity compiling. 2019-09-22 12:06:34 -04:00
Lawrence Forman
b57c0a2ebb @0x/contracts-staking: Fully implement MBF (I hope). 2019-09-22 12:05:33 -04:00
Lawrence Forman
e4b9d14f45 @0x/contracts-staking: Tinkering with crediting rewards. 2019-09-22 12:05:33 -04:00
Lawrence Forman
73f1aca4a1 @0x/contracts-staking: More work on MixinFinalizer. 2019-09-22 12:05:33 -04:00
Lawrence Forman
bbae6b3de2 @0x/contracts-staking: Starting MBF. 2019-09-22 12:05:33 -04:00
Amir Bandeali
45c7653850 Initialize Authorizable instead of Ownable in constructors, fix tests that use onlyOwner modifier 2019-09-20 17:16:35 -07:00
Amir Bandeali
8bdd1d7680 Fix linting errors 2019-09-20 16:55:30 -07:00
Amir Bandeali
7b81af2cb4 Change onlyOwner -> onlyAuthorized everywhere 2019-09-20 16:55:30 -07:00
Amir Bandeali
a14ddbfac2 Make enterCatastrophicFailure callable by any authorized address 2019-09-20 16:55:30 -07:00
Amir Bandeali
522994262d Update tests 2019-09-20 16:55:30 -07:00
Amir Bandeali
f9b593da59 Lower length of an epoch to 10 days 2019-09-20 16:53:58 -07:00
Amir Bandeali
a340c817c9 Guarantee that makers can't be added to pools when max amount decreases 2019-09-20 16:53:58 -07:00
Amir Bandeali
cc67f732e1 Move storage assertions into StakingProxy 2019-09-20 16:53:58 -07:00
Michael Zhu
49d223f344 MixinVaultCore unit tests 2019-09-20 16:02:54 -07:00
Lawrence Forman
314d1b9873 Merge pull request #2179 from 0xProject/feat/staking/LibCobbDouglas
Extract `MixinExchangeFees._cobbDouglas()` into LibCobbDouglas
2019-09-20 18:29:40 -04:00
Lawrence Forman
7a33f68138 @0x/contracts-staking: Extract MixinExchangeFees._cobbDouglas() into its own library. 2019-09-20 15:56:26 -04:00
Michael Zhu
f7462c9f2b keep track of globalStakeByStatus + tests 2019-09-18 10:09:45 -07:00
Greg Hysen
2869dd3bac Removed unnecessary sloads in MixinStakingPoolMakers 2019-09-17 20:32:49 -07:00
Greg Hysen
5a225795e1 Updated changelog and ran linter 2019-09-17 17:51:16 -07:00
Greg Hysen
877abeda63 Removed MixinStakingPoolRewards 2019-09-17 17:37:24 -07:00
Greg Hysen
768387fea9 Rebased and addressed PR comments 2019-09-17 17:37:12 -07:00
Greg Hysen
be1a70c461 refactored the staking vault 2019-09-17 17:36:46 -07:00
Amir Bandeali
336e8bafb4 Remove MixinZrxVault 2019-09-17 15:51:41 -07:00
Amir Bandeali
2ea354f748 Merge pull request #2166 from 0xProject/feat/3.0/staking-upgradability
Staking params upgradability
2019-09-17 14:20:25 -07:00
Amir Bandeali
2d125cdc20 Fix typos and remove redundant cached variables 2019-09-17 13:50:18 -07:00
Amir Bandeali
ee5cb6909c Merge pull request #2158 from 0xProject/feat/3.0/cleanup-staking-contracts
Change state var visibilities, delete redundant code
2019-09-17 12:57:51 -07:00
Michael Zhu
7cc1304eca Revert when attempting to delegate to/undelegate from a pool that doesn't exist 2019-09-17 10:29:57 -07:00
Amir Bandeali
94738444de Fix build an tests 2019-09-17 09:41:27 -07:00
Amir Bandeali
4705b15188 Add addresses back as optional params to attachStakingContract 2019-09-17 08:48:14 -07:00
Amir Bandeali
de567da846 Fix typo across files 2019-09-17 08:48:14 -07:00
Amir Bandeali
de9527ce2f Do not initialize stakingProxy in vault constructors 2019-09-17 08:48:14 -07:00
Amir Bandeali
16ebdfad9a Remove redundant setters and require statements 2019-09-17 08:47:19 -07:00
Amir Bandeali
b70db37b4f Set wethAssetProxy, ethVault, rewardVault, and zrxVault using init pattern 2019-09-17 08:47:19 -07:00
Amir Bandeali
3843c64c40 Update visibility, events, and naming in vaults 2019-09-17 08:45:56 -07:00
Amir Bandeali
1d1dd4b6a2 Do not shadow _ethVault 2019-09-16 22:50:47 -07:00
Amir Bandeali
d3a9ace5fd Fix linting errors 2019-09-16 22:50:47 -07:00
Amir Bandeali
778c57320c Update function visibilities 2019-09-16 22:50:47 -07:00
Amir Bandeali
f98f3660f9 Add back balanceOf getters in vaults, remove public variable getters from inherited interfaces 2019-09-16 22:50:47 -07:00
Amir Bandeali
97c107be3e Fix unused stack variable and add missing devdoc comment 2019-09-16 22:50:11 -07:00
Amir Bandeali
2eada9db62 Add IStorage interface 2019-09-16 22:49:25 -07:00