crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,217 Commits 83 Branches 5,211 Tags
Commit Graph

226 Commits

Author SHA1 Message Date
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
Amir Bandeali
e9362439c3 Make some storage vars public and rename internal vars 2019-09-16 22:48:32 -07:00
Amir Bandeali
a2419ab31d Fix getTotalProtocolFeesThisEpoch by adding weth balance 2019-09-16 22:34:55 -07:00
Amir Bandeali
e589f10e23 Cleanup imports 2019-09-16 22:34:55 -07:00
Greg Hysz
5d84d40a2c
Merge pull request #2154 from 0xProject/feature/staking/refCountRewards 
Reference counting for rewards, plus unit tests for cumulative rewards tracking
 2019-09-16 19:20:55 -07:00
Greg Hysen
43d1d0b217 more explicit sanity checks for computing balance in interval (previously all failed with div-by-zero) 
typos
 2019-09-16 18:57:21 -07:00
James Towle
0f802d5a1b
Merge pull request #2153 from 0xProject/feature/staking/batch-execute 
Implement Batch Execute Transaction
 2019-09-16 17:20:33 -07:00
Alex Towle
56efde6e34 @0x:contracts-staking Addressed final review comment 2019-09-16 16:59:50 -07:00
Greg Hysen
e1d51bae73 Tests are passing and ran linter 2019-09-16 16:02:50 -07:00
Greg Hysen
f9163ccc01 Improved readability of API for cumulative rewards 2019-09-16 15:18:08 -07:00
Alex Towle
6353bf545d @0x:contracts-staking Addressed lingering review comments 2019-09-16 10:33:39 -07:00
Greg Hysen
12f0797ace Reference counting for rewards, plus unit tests for cumulative rewards. 2019-09-14 00:04:52 -07:00
mzhu25
c9de423fb8
LibSafeDowncast unit tests (#2143) 2019-09-13 16:09:46 -07:00
Alex Towle
2cd0990c65 @0x:contracts-staking Addressed review feedback by removing simplyProxyCallWithData 2019-09-13 15:41:31 -07:00
Alex Towle
1fc57baac1 @0x:contracts-staking Added tests for simpleProxyCallWithData() 2019-09-12 17:38:39 -07:00
Alex Towle
2ed63970d4 @0x:contracts-staking Add a batchExecute function to the staking contracts 2019-09-12 17:12:14 -07:00
Alex Towle
be83789bee @0x:contracts-staking Added unit tests for LibProxy 2019-09-11 17:15:47 -07:00
Alex Towle
036c8fe920 @0x:contracts-staking Fixed style issues in staking RichErrors 2019-09-11 17:11:04 -07:00
Lawrence Forman
060edf33bd @0x/contracts-staking: Fix compilation error in MixinParams. 2019-09-10 16:30:50 -04:00
Lawrence Forman
656120cd1f @0x/contracts-staking: Rename InvalidParamValue RevertError to InvalidParamValueError. 2019-09-10 15:32:40 -04:00
Lawrence Forman
f45ee486e9 @0x/contracts-staking: Rebase against 3.0 AGAIN AGAIN AGAIN AGAIN AGAIN 2019-09-10 00:45:20 -04:00
Lawrence Forman
2ed39cd18d @0x/contracts-staking: Rename Tuned event to ParamsChanged. 
`@0x/contracts-staking`: Merge `exchange_fees` unit tests into `protocol_fees` unit tests.
`@0x/contracts-staking`: Remove `ProtocolFeeActor` and any use of it.
`@0x/contracts-staking`: Remove unused constants.
`@0x/contracts-staking`: Move WETH assertion constructor into `MixinDeploymentConstants`.
`@0x/contracts-staking`: Add more unit tests.
 2019-09-10 00:32:43 -04:00
Lawrence Forman
6410366f8b @0x/contracts-staking: Fix contracts formatting. 
`@0x/contracts-staking`: Remove typo test suite in `migration.ts`.
`@0x/contracts-staking`: Address minor review comments.
 2019-09-10 00:32:43 -04:00
Lawrence Forman
1c2f4906e6 @0x/contracts-exchange: Remove signature-related IStructs structs. 
`@0x/contracts-exchange`: Create some `payProtocolFee()` unit tests to test new staking minimum.
 2019-09-10 00:32:30 -04:00
Lawrence Forman
25787ea806 @0x/contracts-staking: Rename MixinHyperParameters -> MixinParams. 
`@0x/contracts-staking`: Move params storage variables into `MixinStorage`.
`@0x/contracts-staking`: Add storage layout tests for new state vars.
`@0x/contracts-staking`: Add more migration tests.
`@0x/contracts-staking`: Add `_initMixinParams()` function that sets up `MixinParams` state.
 2019-09-10 00:31:50 -04:00
Lawrence Forman
0cc94bcf19 @0x/contracts-staking: Add maximumMakersInPool hyper parameter. 
`@0x/contracts-staking`: Add assertions against `maximumMakersInPool` and `rewardDelegatedStakeWeight`.
`@0x/contracts-staking`: Rebase against 3.0 (again).
 2019-09-10 00:31:24 -04:00
Lawrence Forman
9dcda6113d @0x/contracts-staking: Rebase against 3.0. 2019-09-10 00:31:24 -04:00
Lawrence Forman
7d50117903 @0x/contract-staking: Refactor out contract attach logic so it's shared between the constructor and attachStakingContract(). 
`@0x/contract-staking`: Introduce migration tests to test the `init()` pattern.
 2019-09-10 00:31:24 -04:00