Add EpochRewards smart contract to calculate epoch rewards and payments #1558
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 30 commits
September 18, 2019 17:44
m-chrzan
reviewed
Nov 9, 2019
| @@ -119,6 +125,23 @@ describe('governance tests', () => { | |||
| return blockNumber % epochSize === 0 | |||
| } | |||
|
|
|||
| const assertAlmostEqual = ( | |||
There was a problem hiding this comment.
Maybe move this to utils.ts?
added 14 commits
November 9, 2019 09:05
m-chrzan
reviewed
Nov 11, 2019
packages/protocol/contracts/governance/test/EpochRewardsTest.sol
Outdated
Show resolved
Hide resolved
| const rewardsMultiplier = { | ||
| max: toFixed(new BigNumber(2)), | ||
| adjustments: { | ||
| underspend: toFixed(new BigNumber(1 / 2)), |
There was a problem hiding this comment.
Will we always want underspend < 1 and overspend > 1? If so, should these conditions be required in the contract?
There was a problem hiding this comment.
Actually, after thinking about this more, I think this doesn't strictly need to be true, wdyt @rcroessmann?
There was a problem hiding this comment.
I think we should enforce both. Especially the condition overspend > 1 seems necessary as the protocol could end up trying to spend more than the remaining cGLD for overspend <= 1.
m-chrzan
approved these changes
Nov 11, 2019
aaronmgdr
added a commit
that referenced
this pull request
Nov 14, 2019
* master: (56 commits) Adjust e2e transfer and governance tests to match new fee distribution and eliminate ProposerFraction (#1585) [Wallet] Add more local currencies (#1698) Switch to correct cluster when fauceting (#1687) [Wallet] Use the country of the phone number for determining the default local currency (#1684) [Wallet] Limit QR code scanner to 1 code per second (#1676) Update Dark backgrounds text color (#1677) Remove integration sync test Minor attestation service fixes (#1680) [wallet] Fixed Native phone picker Use native API instead (#1669) Fix token addresses for notification service (#1674) Add golang to setup docs [wallet] Hide invite education copy after invite was redeemed (#1670) [Wallet] Add spinner, timer, and tip text to Verification input screen (#1656) [Wallet] Fix app deprecation check mechanism (#1358) Point end-to-end governance test back to master (#1665) Add EpochRewards smart contract to calculate epoch rewards and payments (#1558) Optimized Attestation view calls and removal of the reveal TX (#1578) Support claim signatures and support Keybase claims (#1575) [Wallet] Add timestamp to top banner messages (#1657) Export geth metrics on VM testnet (#1351) ... # Conflicts: # yarn.lock
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR adds
EpochRewards.sol, a smart contract for calculating the actual epoch reward to voters and payments to validators.Tested
Unit and end-to-end tests.
Other changes
None
Related issues
Backwards compatibility
Not backwards compatible