[Tokenomics] Implement difficulty proportional rewards #840
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
23 tasks
…onal-rewards' into feat/difficulty-proportional-rewards
bryanchriswhite
requested changes
Oct 7, 2024
…onal-rewards' into feat/difficulty-proportional-rewards
## Summary This PR prepares for claimed amount calculation to use the `RelayDifficultyMultiplier`. * It removes the `RelayDifficultyTargetHash` `proof` param. * Replace `prooftypes.DefaultRelayDifficultyTargetHash` occurrences with `protocol.BaseRelayDifficultyHashBz`. * Moves the `RleayMiningDifficulty` logic to the `service` module due to cyclic dependencies. * Rename `num_compute_units` to `num_claimed_compute_units` and add `num_estimated_compute_units` and `claimed_amount_upokt` * Remove the no longer used tokenomics querier to retrieve a service difficulty target hash. The PR is only renaming and moving of files most (~13200LOC) changes are auto-generated code. ## Type of change Select one or more from the following: - [ ] New feature, functionality or library - [x] Consensus breaking; add the `consensus-breaking` label if so. See #791 for details - [ ] Bug fix - [x] Code health or cleanup - [ ] Documentation - [ ] Other (specify) ## Testing - [ ] **Documentation**: `make docusaurus_start`; only needed if you make doc changes - [x] **Unit Tests**: `make go_develop_and_test` - [x] **LocalNet E2E Tests**: `make test_e2e` - [ ] **DevNet E2E Tests**: Add the `devnet-test-e2e` label to the PR. ## Sanity Checklist - [x] I have tested my changes using the available tooling - [x] I have commented my code - [x] I have performed a self-review of my own code; both comments & source code - [ ] I create and reference any new tickets, if applicable - [ ] I have left TODOs throughout the codebase, if applicable
|
The CI will now also run the e2e tests on devnet, which increases the time it takes to complete all CI checks. You may need to run GCP workloads (requires changing the namespace to 840) |
github-actions
bot
added
devnet
push-image
bryanchriswhite
approved these changes
Oct 11, 2024
|
|
||
| // Prepare the test supplier. | ||
| supplierAddress := sample.AccAddress() | ||
| supplierStake := sdk.NewInt64Coin(volatile.DenomuPOKT, 1000) |
There was a problem hiding this comment.
Suggested change
| supplierStake := sdk.NewInt64Coin(volatile.DenomuPOKT, 1000) | |
| supplierStake := suppliertypes.DefaultMinStake |
There was a problem hiding this comment.
Supplier min stake is not merged yet
| require.NoError(t, err) | ||
|
|
||
| // +1 to push threshold above s.claim's compute units | ||
| proofRequirementThreshold, err := tokenomics.NumComputeUnitsToCoin(sharedParams, numClaimComputeUnits+1) | ||
| require.NoError(t, err) | ||
| proofRequirementThreshold = proofRequirementThreshold.Add(uPOKTCoin(1)) |
There was a problem hiding this comment.
Loving this pattern ❤️; nice and 🧼! 😎
Comment on lines
+514
to
+515
| // The current test suite sets the CUPR to 1, making sum == count * CUPR | ||
| // valid. So, we can change the last byte to 'b' to make it invalid. |
## Summary Updates `ProcessTokenLogicModules()` logic to unbond applications whose stake is below the minimum **after** processing all TLMs. ## Dependencies - #809 - #843 - #844 - #845 - #847 ## Dependents - #849 - #850 - #857 - #852 - #861 - #851 - #863 ## Issue - #612 ## Type of change Select one or more from the following: - [x] New feature, functionality or library - [ ] Consensus breaking; add the `consensus-breaking` label if so. See #791 for details - [ ] Bug fix - [ ] Code health or cleanup - [ ] Documentation - [ ] Other (specify) ## Testing - [ ] **Documentation**: `make docusaurus_start`; only needed if you make doc changes - [x] **Unit Tests**: `make go_develop_and_test` - [ ] **LocalNet E2E Tests**: `make test_e2e` - [ ] **DevNet E2E Tests**: Add the `devnet-test-e2e` label to the PR. ## Sanity Checklist - [x] I have tested my changes using the available tooling - [x] I have commented my code - [x] I have performed a self-review of my own code; both comments & source code - [ ] I create and reference any new tickets, if applicable - [x] I have left TODOs throughout the codebase, if applicable --------- Co-authored-by: Redouane Lakrache <[email protected]> Co-authored-by: Daniel Olshansky <[email protected]> Co-authored-by: red-0ne <[email protected]>
red-0ne
merged commit aab06af
into
feat/prepare-difficulty-proportional-rewards
4 checks passed
This was referenced Oct 11, 2024
Closed
red-0ne
added a commit
that referenced
this pull request
Oct 14, 2024
**This is a repost of PR #840 which did not get merged into main** ## Summary This PR incorporated the mining difficulty into the claim reward calculation. * Encapsulates the claimed tokens into a `claim.GetClaimeduPOKT(params, difficulty)` * Implements a test to assert that the difficulty based rewards are proportional to the off-chain relays served. * Removes unused `min_relay_difficulty_bits` gov. param. It is based on the preparation work of PR #836. ## Issue - #781 - #758 ## Type of change Select one or more from the following: - [x] New feature, functionality or library - [ ] Consensus breaking; add the `consensus-breaking` label if so. See #791 for details - [ ] Bug fix - [ ] Code health or cleanup - [ ] Documentation - [ ] Other (specify) ## Testing - [x] **Unit Tests**: `make go_develop_and_test` - [x] **LocalNet E2E Tests**: `make test_e2e` - [ ] **DevNet E2E Tests**: Add the `devnet-test-e2e` label to the PR. ## Sanity Checklist - [x] I have tested my changes using the available tooling - [x] I have commented my code - [x] I have performed a self-review of my own code; both comments & source code - [ ] I create and reference any new tickets, if applicable - [x] I have left TODOs throughout the codebase, if applicable
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.
Summary
This PR incorporated the mining difficulty into the claim reward calculation.
claim.GetClaimeduPOKT(params, difficulty)min_relay_difficulty_bitsgov. param.It is based on the preparation work of PR #836.
Issue
Type of change
Select one or more from the following:
consensus-breakinglabel if so. See [Infra] Automatically add theconsensus-breakinglabel #791 for detailsTesting
make go_develop_and_testmake test_e2edevnet-test-e2elabel to the PR.Sanity Checklist