Lawrence Forman
|
1c37334b18
|
@0x/contracts-staking: Add a bunch of LibFixedMath unit tests.
|
2019-09-04 20:18:55 -04:00 |
|
Alex Towle
|
dba0d8469d
|
@0x:contracts-exchange Addressed review feedback
|
2019-08-29 15:20:52 -07:00 |
|
Alex Towle
|
3432083343
|
@0x:contracts-staking Updated payProtocolFee trivially to fix the build.
This is not a real to update to `payProtocolFee`. Rather, the interface
was updated to it's finished state. This will be addressed in my next
PR.
|
2019-08-28 16:15:13 -07:00 |
|
Amir Bandeali
|
1a833d9dfb
|
Remove zrxAssetData param to ensure that it is always in sync with zrxToken
|
2019-08-28 11:06:46 -07:00 |
|
Michael Zhu
|
cd1fc6a1f0
|
fix typos
|
2019-08-26 15:49:09 -07:00 |
|
Greg Hysen
|
d106051ee3
|
CamelCase for timelocks
|
2019-08-21 13:04:20 -07:00 |
|
Greg Hysen
|
a765e47dca
|
Got staking contracts working after rebase
|
2019-08-21 13:04:20 -07:00 |
|
Greg Hysen
|
cd14d1ef0f
|
ran prettier
|
2019-08-21 13:04:19 -07:00 |
|
Greg Hysen
|
93506a4e27
|
Updated Epoch API for readability + documented Timelock Mixin
|
2019-08-21 13:04:19 -07:00 |
|
Greg Hysen
|
ee969261b4
|
Documentation for MixinVaultCore
|
2019-08-21 13:04:19 -07:00 |
|
Greg Hysen
|
598d70c6dc
|
Renamed getStakeDelegatedToPool -> getTotalStakeDelegatedToPool for readability
|
2019-08-21 13:04:19 -07:00 |
|
Greg Hysen
|
3e6cae0ca0
|
Documentation for MixinDelegatedStake
|
2019-08-21 13:04:18 -07:00 |
|
Greg Hysen
|
93844343de
|
Documented MixinStake.sol
|
2019-08-21 13:04:18 -07:00 |
|
Greg Hysen
|
ce15b4c678
|
Fixed linter errors
|
2019-08-21 13:04:18 -07:00 |
|
Greg Hysen
|
35f4e2fb4f
|
Documented MixinStakingPoolRewardVault and StakingPoolRewardVault
|
2019-08-21 13:04:18 -07:00 |
|
Greg Hysen
|
d5249425af
|
Added documentation to MixinStakingPoolRewards
|
2019-08-21 13:04:18 -07:00 |
|
Greg Hysen
|
44c44a2b9c
|
Some renaming pool -> staking pool for readability
|
2019-08-21 13:04:18 -07:00 |
|
Greg Hysen
|
e6a33dea0e
|
Renamed xxxReward... to StakingPoolReward...
|
2019-08-21 13:04:17 -07:00 |
|
Greg Hysen
|
ab3246cc71
|
Cleaned up staking pool mixin
|
2019-08-21 13:04:17 -07:00 |
|
Greg Hysen
|
3f2be5b2da
|
Documenting fees + rewards now use weighted stake in denominator of cobb douglas
|
2019-08-21 13:04:17 -07:00 |
|
Greg Hysen
|
09843c3cf1
|
Got staking contract building again
|
2019-08-21 13:04:17 -07:00 |
|
Greg Hysen
|
f560e7fa96
|
Renamed approval factory
|
2019-08-21 13:04:17 -07:00 |
|
Greg Hysen
|
a934c71ccd
|
Fixing linter errors
|
2019-08-21 13:04:16 -07:00 |
|
Greg Hysen
|
5147b6e699
|
fixing linter errors
|
2019-08-21 13:04:16 -07:00 |
|
Greg Hysen
|
9294bf40a7
|
Ran yarn fix
|
2019-08-21 13:04:16 -07:00 |
|
Greg Hysen
|
a02f96c913
|
ran prettier
|
2019-08-21 13:04:16 -07:00 |
|
Greg Hysen
|
8bc1d5fe3e
|
Run all tests
|
2019-08-21 13:04:16 -07:00 |
|
Greg Hysen
|
180417b581
|
moved another test to the simulator
|
2019-08-21 13:04:16 -07:00 |
|
Greg Hysen
|
786655843b
|
check reward balances of operator ocne withdarwn in simulator
|
2019-08-21 13:04:16 -07:00 |
|
Greg Hysen
|
5e3eeed10f
|
more work on simulator
|
2019-08-21 13:04:16 -07:00 |
|
Greg Hysen
|
8a2df9cd1f
|
Working on simulation to make it easier to follow the end-to-end tests. Mostly working.
|
2019-08-21 13:04:16 -07:00 |
|
Greg Hysen
|
0bb227a79b
|
Delegator Actor
|
2019-08-21 13:04:15 -07:00 |
|
Greg Hysen
|
38cad56bf9
|
Staker Actor
|
2019-08-21 13:04:15 -07:00 |
|
Greg Hysen
|
b36003896f
|
Renamed LibMath to LibFeeMath
|
2019-08-21 13:04:15 -07:00 |
|
Greg Hysen
|
4d2ba9f1e6
|
Replaced any contract-style libraries with real libraries.
|
2019-08-21 13:04:14 -07:00 |
|
Greg Hysen
|
03142d82bc
|
added test for trying to put maker in pool when they havent signed the message properly
|
2019-08-21 13:04:14 -07:00 |
|
Greg Hysen
|
78805b1c39
|
Updated remaining tests to use maker signatures when adding to pool
|
2019-08-21 13:04:14 -07:00 |
|
Greg Hysen
|
e1a5ba9864
|
Pool Management test passing with signatures
|
2019-08-21 13:04:14 -07:00 |
|
Greg Hysen
|
bc0140ef3a
|
Signature validation for adding makers to a staking pool
|
2019-08-21 13:04:14 -07:00 |
|
Greg Hysen
|
36b76550e0
|
Working towards maker signature validation
|
2019-08-21 13:04:14 -07:00 |
|
Greg Hysen
|
1f2e94b585
|
Adding signatures for maker acceptance into pool
|
2019-08-21 13:04:14 -07:00 |
|
Greg Hysen
|
6ca2f7e3ac
|
Cleaned up staking contract with wrappers
|
2019-08-21 13:04:14 -07:00 |
|
Greg Hysen
|
0ba8690120
|
Added functions for reward balances to staking API
|
2019-08-21 13:04:13 -07:00 |
|
Greg Hysen
|
cafa3c827c
|
Updated naming on reward vault
|
2019-08-21 13:04:13 -07:00 |
|
Greg Hysen
|
bbacce2986
|
Removed operator from reward vault
|
2019-08-21 13:04:13 -07:00 |
|
Greg Hysen
|
ead2d26025
|
Test for delegator payouts when we use Shadow ETH
|
2019-08-21 13:04:13 -07:00 |
|
Greg Hysen
|
b3d1b6c499
|
Store separate operator / pool balances in the reward vault. This reduces complexity in the staking contract.
|
2019-08-21 13:04:13 -07:00 |
|
Greg Hysen
|
7d85e61cc5
|
Basic payouts to delegators when the pool is empty and they receive 100% of the reward.
|
2019-08-21 13:04:13 -07:00 |
|
Greg Hysen
|
362a8c8fc5
|
account for delegated stake when computing payouts. Tests pass
|
2019-08-21 13:04:13 -07:00 |
|
Greg Hysen
|
2d39454ce1
|
get logs when available, otherwise do not
|
2019-08-21 13:04:13 -07:00 |
|