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

1634 Commits

Author SHA1 Message Date
Alex Towle
aa7f082d56 @0x:contracts-staking Addressed review comments 2019-09-25 16:48:34 -07:00
Alex Towle
b178d025b5 @0x:contracts-staking Added unit tests for MixinExchangeManager 2019-09-25 15:32:02 -07:00
Lawrence Forman
96c8da9fdd Merge pull request #2207 from 0xProject/fix/3.0/improve-readability 
Improve readability, fix `_trySetCumulativeReward` logic
 2019-09-25 17:14:06 -04:00
Greg Hysen
b9b135cfa2 Finished removing outdated contract comments 2019-09-25 13:41:27 -07:00
Lawrence Forman
f925c35344 @0x/contracts-staking: Always do _withdrawAndSyncDelegatorRewards() before staking operations and always add a CR (if unset) in _withdrawSyncDelegatorRewards()`. 2019-09-25 16:34:06 -04:00
Greg Hysen
ca2e9bed27 Updated README to point to new specification, plus removed images we no longer need. 2019-09-25 12:48:12 -07:00
Lawrence Forman
5b77e2c8ac @0x/contracts-staking: Fix stake accounting. 2019-09-25 15:29:22 -04:00
Amir Bandeali
9e3331d018 Fix ordering of function calls, remove optimization in _forceSetCumulativeReward 2019-09-25 11:31:30 -07:00
Amir Bandeali
4440075425 Inline _forceSetMostRecentCumulativeRewardEpoch 2019-09-25 11:03:26 -07:00
Amir Bandeali
25cb1c1138 Remove epoch param that is always equivalent to currentEpoch 2019-09-25 10:58:16 -07:00
Amir Bandeali
22a6de48ae Remove arguments that are unnecessarily passed around 2019-09-25 10:43:14 -07:00
Amir Bandeali
d07005dcbe Change increment -> increase and decrement -> decrease 2019-09-24 23:04:37 -07:00
Michael Zhu
dc06497cae consolidate MixinVaultCore and ZrxVault 2019-09-24 23:04:17 -07:00
Amir Bandeali
c1871b5bca Fix xumulative reward tests 2019-09-24 23:01:44 -07:00
Amir Bandeali
410b9c50d3 Flatten _withdrawAndSyncDelegatorRewards function, fix bug where cumulative rewards are always reset 2019-09-24 23:01:31 -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
f30c2c4a23 Make setZrxProxy callable by authorized address rather than only owner 2019-09-24 17:27:53 -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
1b159f5ccc Make deployment constant getters public 2019-09-24 16:43:08 -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
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
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
Alex Towle
ef04248191 @0x:contracts-staking Addressed review comments 2019-09-24 10:58:51 -07: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
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