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

240 Commits

Author SHA1 Message Date
Amir Bandeali
a5692690dc Fix protocol fees tests 2019-09-30 09:37:57 -07:00
Michael Zhu
6cfc17de35 MixinStakeStorage unit tests 2019-09-27 13:01:20 -07:00
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
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
Lawrence Forman
5b77e2c8ac @0x/contracts-staking: Fix stake accounting. 2019-09-25 15:29:22 -04:00
Amir Bandeali
4440075425 Inline _forceSetMostRecentCumulativeRewardEpoch 2019-09-25 11:03:26 -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
4784131dca
Merge pull request #2203 from 0xProject/feat/3.0/consolidate-rich-reverts 
Cleanup rich reverts
 2019-09-24 18:32:41 -07:00
Amir Bandeali
57f5b12e24 Cleanup rich reverts 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
Alex Towle
a6af3744e2 @0x:contracts-staking Improved the test coverage of MixinStakingPool 2019-09-24 16:49:34 -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
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
a7aa7feff4 Remove getAvailableRewardsBalance public function, make wethReservedForPoolRewards public 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
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
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
Amir Bandeali
abb2b46ed3 Remove vaults from variable names and comments 2019-09-23 17:37:04 -07:00
Amir Bandeali
e9f0f4af86 Rename functions and variables for clarity 2019-09-23 16:38:22 -07:00
Amir Bandeali
5ce988957f Fix tests 2019-09-23 15:55:28 -07:00
Amir Bandeali
62663ed6d2 Fix rewards tests 2019-09-23 15:34:12 -07:00
Amir Bandeali
fd35249de8 Track WETH reserved for rewards 2019-09-23 15:34:12 -07:00
Amir Bandeali
ee687a7dc4 Fix delegator reward unit tests 2019-09-23 15:34:12 -07:00
Amir Bandeali
ef645e601c Fix all tests except for reward tests (skipped) 2019-09-23 15:30:55 -07:00
Amir Bandeali
639026ea66 Delete vaults and fix contract build 2019-09-23 15:29:36 -07:00
Lawrence Forman
3883297991 @0x/contracts-staking: Remove getTotalBalance() function. 
`@0x/contracts-staking`: Fix linter errors.
 2019-09-23 14:21:18 -04:00
Lawrence Forman
9dd8c61a2f @0x/contract-staking: Address review nits. 
`@0x/contracts-utils`: Use `safeDiv()` in `LibFractions.normalize()`.
 2019-09-23 11:55:02 -04:00
Lawrence Forman
eac4520406 @0x/contracts-staking: Rebase against 3.0 2019-09-22 13:11:42 -04:00
Lawrence Forman
c72a15b488 @0x/contracts-staking: All tests back up and running. 2019-09-22 12:20:42 -04:00
Lawrence Forman
6a29654d7d @0x/contracts-staking: Updating tests and making the contracts testable. 2019-09-22 12:20:04 -04:00
Lawrence Forman
3ad7728a0e @0x/contracts-staking: Remove IStructs.CumulativeRewardInfo, etc. 
`@0x/contracts-staking`: Convert all rewards to WETH.
`@0x/contracts-staking`: Style changes.
`@0x/contracts-staking`: Address misc. review comments.
`@0x/contracts-staking`: Make `LibFractions` scaling a separate step.
 2019-09-22 12:17:05 -04:00
Lawrence Forman
14c4491b8c @0x/contracts-staking: Add some extra finalizer tests and light refactorings. 
`@0x/contracts-staking`: Add finalization-related protocol fees unit tests.
 2019-09-22 12:13:24 -04:00
Lawrence Forman
2eff213840 @0x/contracts-staking: Import randomAddress() instead of defining our own. 2019-09-22 12:13:24 -04:00
Lawrence Forman
d064543108 @0x/contracts-staking: Add some computeRewardBalanceOfOperator() tests. 2019-09-22 12:13:24 -04:00
Lawrence Forman
86106713dd @0x/contracts-staking: Gag! All tests passing? 2019-09-22 12:13:24 -04:00
Lawrence Forman
b43fa88606 @0x/contracts-staking: All tests but rewards_test working. 2019-09-22 12:13:24 -04:00
Lawrence Forman
d33080cf08 @0x/contracts-staking: Finalizer tests passing. 2019-09-22 12:11:47 -04:00
Lawrence Forman
993f05d5ac @0x/contracts-staking: Fixing tests. 2019-09-22 12:11:47 -04:00
Lawrence Forman
7fb5ed0b42 @0x/contracts-staking: Add another test case to delegator rewards tests. 
`@0x/contracts-staking`: Rename `delegator_reward_balance_test.ts` -> `delegator_reward_test.ts`.
`@0x/contracts-staking`: Last call before rebasing against 3.0.
 2019-09-22 12:11:06 -04:00
Lawrence Forman
a43b494302 @0x/contracts-staking: All tests passing! 2019-09-22 12:11:06 -04:00
Lawrence Forman
e267a0e855 @0x/contracts-staking: Transition to V3 2019-09-22 12:10:41 -04:00
Lawrence Forman
0196ce18f3 @0x/contracts-staking: Last call before embarking of V3 of staking integration. 2019-09-22 12:10:41 -04:00