1469 Commits

Author SHA1 Message Date
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
e224e6cde5 updated changelog 2019-09-16 16:03:40 -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
6fd9308e1b @0x:contract-staking Added integration tests for 2019-09-12 18:17:00 -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
cc43c5b28c @0x:contracts-staking Cleaned up combinatorial tests 2019-09-12 12:30:25 -07:00
Alex Towle
b7f25ee3b6 @0x:contracts-staking Addressed review comments 2019-09-11 17:16:33 -07:00
Alex Towle
82afdda256 @0x:contracts-staking Fixed compilation errors and ran prettier 2019-09-11 17:16:33 -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
7eb4bebac3 @0x/contracts-staking: Fix typos. 2019-09-10 00:58:33 -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
89bd42de04 @0x/contracts-staking: Fix linter errors. 2019-09-10 00:32:43 -04:00
Lawrence Forman
51b460d432 @0x/contracts-staking: Rebase against 3.0 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
bed90fa8ec @0x/contracts-staking: Update changelog. 2019-09-10 00:31:51 -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
Lawrence Forman
76c5517739 @0x/contract-staking: Update CHANGELOG.
`@0x/contract-staking`: Add `DEFAULT_HYPER_PARAMETERS` to test constants.
`@0x/contract-staking`: Appease linter gods.
`@0x/contract-staking`: Remove `setCobbDouglasAlpha()` tests.
`@0x/contract-staking`: Add `tune()` tests.
2019-09-10 00:31:24 -04:00
Lawrence Forman
d37679c129 @0x/contracts-test-utils: Add Numberish type. 2019-09-10 00:30:43 -04:00
Lawrence Forman
d01cfee455 @0x/contracts-staking: Add getHyperParameters() to MixinHyperParameters. 2019-09-10 00:30:43 -04:00
Lawrence Forman
182d360302 @0x/contracts-storage: Move init() out of IStaking and into IStorageInit. 2019-09-10 00:30:43 -04:00
Lawrence Forman
0d9069ecfe @0x/contracts-staking: Fix compilation issues.
`@0x/contracts-staking`: Check that `Staking.init()` succeded.
`@0x/contracts-staking`: Flip some functions from `view` to `pure`.
2019-09-10 00:30:43 -04:00
Lawrence Forman
6488f91e6e @0x/contracts-staking: Replace MixinDeploymentConstants with MixinHyperParameters.
`@0x/contracts-staking`: Add `init()` to `Staking` contract.
`@0x/contracts-staking`: Add `_initMixinScheduler()` to `MixinScheduler`.
`@0x/contracts-staking`: Automaticallly call `Staking.init()` in `StakingProxy.attachStakingContract()`.
`@0x/contracts-staking`: Remove `setCobbDouglasAlpha()` in favor of `tune()`.
`@0x/contracts-staking`: Exclude pools with `stake < minimumPoolStake` in `payProtocolFee()`.
2019-09-10 00:30:43 -04:00
Michael Zhu
faa0d83013 remove unnecessary pointer variable 2019-09-09 17:41:18 -07:00
Michael Zhu
6f1f226ed0 Use storage pointer to update Pool structs, test decreaseStakingPoolOperatorShare where newOperatorShare == oldOperatorShare 2019-09-09 17:11:00 -07:00
Michael Zhu
1d6406bbd6 move operator from staking logic to vault, allow operator to decrease operatorShare 2019-09-09 16:29:19 -07:00
Michael Zhu
6d83b2676e rip staking_wrapper.ts, use wrapped staking proxy pattern instead 2019-09-09 15:47:15 -07:00
James Towle
c21bce9641
Merge pull request #2130 from 0xProject/feature/staking/protocol-fees
Feature/staking/protocol fees
2019-09-09 15:13:33 -07:00
Alex Towle
1d5c175316 @0x:contracts-staking Fixed lingering review comments 2019-09-09 14:27:44 -07:00
Alex Towle
2fdd4e9760 @0x:contracts-staking Addressed some review comments 2019-09-09 10:25:19 -07:00
Amir Bandeali
67ef17f929 Consolidate TransactionSignatureError with SignatureError 2019-09-08 18:55:42 -07:00