Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dApp Staking v3 - Rewards As Tree #1123

Merged
merged 3 commits into from
Jan 5, 2024
Merged

Conversation

Dinonard
Copy link
Member

@Dinonard Dinonard commented Jan 3, 2024

Pull Request Summary

Replaces the sorted vector for rewards, with a BTreeMap.
This allows for efficient removal of entries from the tree, once reward has been claimed.

Error DAppRewardAlreadyClaimed has been removed.
Once dApp reward has been claimed for an era, further claim calls will result in
NoClaimableRewards error.

Also includes a minor storage migration, only to be used on Shibuya.
Moved all migration logic under a new module, for better readability.

Benchmarks will be re-run at another time.

@Dinonard Dinonard added runtime This PR/Issue is related to the topic “runtime”. shibuya related to shibuya labels Jan 3, 2024
@Dinonard Dinonard requested review from PierreOssun, ashutoshvarma and shaunxw and removed request for PierreOssun and ashutoshvarma January 3, 2024 13:30
Copy link
Member

@ashutoshvarma ashutoshvarma left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!
Minor nitpick comment

pallets/dapp-staking-v3/src/migrations.rs Outdated Show resolved Hide resolved
runtime/shibuya/src/lib.rs Show resolved Hide resolved
Co-authored-by: Ashutosh Varma <ashutoshvarma11@live.com>
Copy link

github-actions bot commented Jan 4, 2024

Code Coverage

Package Line Rate Branch Rate Health
precompiles/xvm/src 74% 0%
precompiles/sr25519/src 64% 0%
precompiles/dapp-staking-v3/src 90% 0%
primitives/src 66% 0%
pallets/dynamic-evm-base-fee/src 81% 0%
primitives/src/xcm 66% 0%
precompiles/substrate-ecdsa/src 74% 0%
chain-extensions/xvm/src 0% 0%
chain-extensions/types/assets/src 0% 0%
precompiles/assets-erc20/src 81% 0%
pallets/dapps-staking/src/pallet 85% 0%
precompiles/unified-accounts/src 100% 0%
chain-extensions/unified-accounts/src 0% 0%
pallets/dapp-staking-migration/src 39% 0%
chain-extensions/pallet-assets/src 0% 0%
pallets/dapp-staking-v3/src/test 0% 0%
chain-extensions/types/unified-accounts/src 0% 0%
pallets/collator-selection/src 69% 0%
pallets/xc-asset-config/src 53% 0%
precompiles/dapps-staking/src 94% 0%
pallets/unified-accounts/src 84% 0%
pallets/xvm/src 40% 0%
pallets/dapp-staking-v3/rpc/runtime-api/src 0% 0%
pallets/inflation/src 70% 0%
pallets/dapp-staking-v3/src/benchmarking 0% 0%
pallets/dapp-staking-v3/src 76% 0%
pallets/ethereum-checked/src 48% 0%
chain-extensions/types/xvm/src 0% 0%
pallets/dapps-staking/src 81% 0%
pallets/block-rewards-hybrid/src 87% 0%
precompiles/xcm/src 72% 0%
precompiles/dapp-staking-v3/src/test 0% 0%
Summary 67% (3171 / 4715) 0% (0 / 0)

Minimum allowed line rate is 50%

@Dinonard Dinonard merged commit 6575334 into master Jan 5, 2024
9 checks passed
@Dinonard Dinonard deleted the feat/dsv3-rewards-as-tree branch January 5, 2024 11:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
runtime This PR/Issue is related to the topic “runtime”. shibuya related to shibuya
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants