Feat/dyn tier thresholds #1306

ipapandinas · 2024-07-24T18:01:44Z

Pull Request Summary

New tier thresholds as percentage of the total issuance. Should be merged after v5.42.2 is deployed to Astar/Shiden.
Closes #1295

Types: TierThreshold enum updated

For TierThreshold enum: previous DynamicTvlAmount & FixedTvlAmount variants were deleted and new ones are added instead: DynamicPercentage & FixedPercentage. They support Perbill percentages and are intended to be used in the same way as the previous ones for TVL amounts. Genesis configurations, mocks and tests were updated accordingly.

Migrations

Two migrations are introduced:

In TierConfig: TiersConfiguration type is refactored - number_of_slots is removed and tier_thresholds is translated from BoundedVec<TierThreshold, NT> to BoundedVec<Balance, NT>.
In StaticTierParams: tier_thresholds is updated for each runtime with calculated percentage based on the the total issuance when dApp staking v3 was launched.

`try-runtime` results

shibuya

[2024-07-29T14:37:26Z INFO  remote-ext] scraping key-pairs from remote at block height 0xea0d18ef4a469c8a83285c6b0f2721953aa7a0baa749068b0aafe3cb976f9277
...
[2024-07-29T14:38:08Z INFO  shibuya_runtime] try-runtime::on_runtime_upgrade
[2024-07-29T14:38:08Z WARN  frame_support::migrations] 🚚 Pallet "XcmpQueue" VersionedMigration migration 3->4 can be removed; on-chain is already at StorageVersion(4).
[2024-07-29T14:38:08Z WARN  frame_support::migrations] 🚚 Pallet "DappStaking" VersionedMigration migration 7->8 can be removed; on-chain is already at StorageVersion(8).
[2024-07-29T14:38:08Z INFO  runtime::frame-support] ⚠️ Ethereum declares internal migrations (which *might* execute). On-chain `StorageVersion(0)` vs in-code storage version `NoStorageVersionSet`
[2024-07-29T14:38:08Z INFO  runtime::executive] ✅ Entire runtime state decodes without error. 373904 bytes total.
[2024-07-29T14:38:08Z INFO  try-runtime::cli] PoV size (zstd-compressed compact proof): 1.3 KB. For parachains, it's your responsibility to verify that a PoV of this size fits within any relaychain constraints.
[2024-07-29T14:38:08Z INFO  try-runtime::cli] Consumed ref_time: 0.006775s (1.36% of max 0.5s)
[2024-07-29T14:38:08Z INFO  try-runtime::cli] ✅ No weight safety issues detected.

Check list

added or updated unit tests
updated Astar official documentation
added OnRuntimeUpgrade hook for precompile revert code registration
added benchmarks & weights for any modified runtime logics.

… total issuance

ipapandinas · 2024-07-26T08:16:54Z

/runtime-upgrade-test runtime=shibuya

github-actions · 2024-07-26T08:16:56Z

Runtime upgrade test is scheduled at https://github.com/AstarNetwork/Astar/actions/runs/10108041768.
Please wait for a while.
Runtime: shibuya
Branch: feat/dyn-tier-thresholds
SHA: 68887d7

Dinonard

Nice, well done!

Did a quick review and left some comments.
Will do a more detailed review tomorrow.

pallets/dapp-staking-v3/src/lib.rs

pallets/dapp-staking-v3/src/types.rs

runtime/shiden/src/lib.rs

pallets/dapp-staking-v3/src/migration.rs

Dinonard

2 more comments, otherwise LGTM.

pallets/dapp-staking-v3/src/migration.rs

pallets/dapp-staking-v3/src/types.rs

Dinonard

Did a thorough review now - just a few small comments. 🙈

pallets/dapp-staking-v3/src/types.rs

pallets/dapp-staking-v3/src/benchmarking/utils.rs

pallets/dapp-staking-v3/src/lib.rs

pallets/dapp-staking-v3/src/migration.rs

Dinonard

LGTM

Dinonard · 2024-08-06T06:56:38Z

runtime/astar/src/lib.rs

@@ -1258,6 +1258,7 @@ pub type Executive = frame_executive::Executive<
 >;

 parameter_types! {
+    // percentages below are calulated based on total issuance at the time when dApp staking v3 was launched (8.4B)


Might be worth considering adding more checks for this into the try-runtime check 🙂

For another PR though.

Are you thinking of sanity checks in pre_upgrade, like:

#[cfg(feature = "try-runtime")] fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> { let tier_thresholds: Result<BoundedVec<TierThreshold, T::NumberOfTiers>, _> = BoundedVec::try_from(TierThresholds::get().to_vec()); assert!(tier_thresholds.is_ok()); ... }

Both pre & post.

E.g. take current thresholds (active ones) in pre-upgrade, send them to post upgrade.

In post-upgrade, after you derive the new thresholds, ensure they are e.g. within 10% of the old ones.

github-actions · 2024-08-06T07:15:26Z

Package	Line Rate	Branch Rate	Health
primitives/src/xcm	65%	0%	➖
primitives/src	60%	0%	➖
pallets/astar-xcm-benchmarks/src	86%	0%	✔
pallets/collator-selection/src	92%	0%	✔
pallets/xc-asset-config/src	50%	0%	➖
pallets/dapp-staking-v3/src/test	0%	0%	❌
chain-extensions/unified-accounts/src	0%	0%	❌
pallets/dapp-staking-v3/rpc/runtime-api/src	0%	0%	❌
chain-extensions/pallet-assets/src	56%	0%	➖
pallets/astar-xcm-benchmarks/src/generic	100%	0%	✔
pallets/unified-accounts/src	77%	0%	➖
precompiles/dapp-staking-v3/src/test	0%	0%	❌
precompiles/sr25519/src	64%	0%	➖
pallets/price-aggregator/src	75%	0%	➖
pallets/dapp-staking-v3/src/benchmarking	98%	0%	✔
pallets/collective-proxy/src	86%	0%	✔
pallets/dapp-staking-migration/src	0%	0%	❌
pallets/ethereum-checked/src	74%	0%	➖
precompiles/substrate-ecdsa/src	74%	0%	➖
precompiles/xcm/src	71%	0%	➖
chain-extensions/types/unified-accounts/src	0%	0%	❌
pallets/astar-xcm-benchmarks/src/fungible	100%	0%	✔
pallets/dynamic-evm-base-fee/src	89%	0%	✔
precompiles/dapp-staking-v3/src	90%	0%	✔
chain-extensions/types/assets/src	0%	0%	❌
precompiles/unified-accounts/src	100%	0%	✔
precompiles/dispatch-lockdrop/src	86%	0%	✔
precompiles/assets-erc20/src	78%	0%	➖
pallets/dapp-staking-v3/src	86%	0%	✔
pallets/inflation/src	86%	0%	✔
pallets/static-price-provider/src	52%	0%	➖
Summary	77% (3576 / 4647)	0% (0 / 0)	➖

Minimum allowed line rate is 50%

Dinonard · 2024-08-06T11:53:02Z

@ermalkaleci any more comments here?

ermalkaleci · 2024-08-06T11:55:03Z

@ermalkaleci any more comments here?

I'm reviewing now. The only concern is to double check percentage

ipapandinas added 6 commits July 22, 2024 12:50

remove number_of_slots from TiersConfiguration

815ed11

remove use of TierThreshold enum in TiersConfiguration

04ea0df

percentage variants added to TierThreshold for values derivation from…

26dd611

… total issuance

dyn tier percentages adjusted

13001f6

sanity checks for total issuance percentages customisable via config

24a09ae

storage migration

5b5affa

ipapandinas added enhancement New feature or request dapps-staking Dapps Staking runtime This PR/Issue is related to the topic “runtime”. labels Jul 25, 2024

storage version checks added

68887d7

ipapandinas added 6 commits July 26, 2024 12:48

storage version checks adjusted

27a6d32

new threshold calculation adjusted

9276ffd

field renamed

f735aea

try-runtime sanity check to ensure same number of slots

5195002

add small tolerance to try-runtime sanity check

fbb0bda

README updated

ce58e5c

ipapandinas marked this pull request as ready for review July 29, 2024 15:02

AstarNetwork deleted a comment from github-actions bot Jul 29, 2024

ipapandinas requested review from Dinonard and ermalkaleci July 29, 2024 15:04

Dinonard reviewed Jul 29, 2024

View reviewed changes

ermalkaleci reviewed Jul 29, 2024

View reviewed changes

pallets/dapp-staking-v3/src/migration.rs Outdated Show resolved Hide resolved

ipapandinas added 6 commits July 30, 2024 12:20

remove configurable min/max percentage checks for extra safety

5fbb35d

preserve not applied migrations

ca710c8

useless procedural macros removed

657b658

tvl amount variants removed from TierThreshold

32dd3f0

from conversion

aa4d147

field renamed

18725d0

versioned migration used for static tier params

c87cdaa

ermalkaleci reviewed Aug 1, 2024

View reviewed changes

pallets/dapp-staking-v3/src/migration.rs Show resolved Hide resolved

Dinonard reviewed Aug 5, 2024

View reviewed changes

pallets/dapp-staking-v3/src/migration.rs Outdated Show resolved Hide resolved

pallets/dapp-staking-v3/src/types.rs Outdated Show resolved Hide resolved

pallets/dapp-staking-v3/src/types.rs Outdated Show resolved Hide resolved

PR review fixes

853bc6e

Dinonard reviewed Aug 5, 2024

View reviewed changes

ipapandinas mentioned this pull request Aug 5, 2024

dAppStakingV3 - Tier Thresolds Derivation AstarNetwork/astar-apps#1367

Closed

ipapandinas added 2 commits August 6, 2024 08:24

adjust percentages

352eaaf

review feedbacks

d2d4287

Dinonard approved these changes Aug 6, 2024

View reviewed changes

ermalkaleci approved these changes Aug 6, 2024

View reviewed changes

ipapandinas mentioned this pull request Aug 6, 2024

Feat/dyn tier thresholds AstarNetwork/astar-docs#699

Merged

ipapandinas merged commit 6f34256 into master Aug 6, 2024
8 checks passed

ipapandinas deleted the feat/dyn-tier-thresholds branch August 6, 2024 15:12

ipapandinas mentioned this pull request Aug 7, 2024

chore: try-runtime variation check on new thresholds #1317

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat/dyn tier thresholds #1306

Feat/dyn tier thresholds #1306

ipapandinas commented Jul 24, 2024 •

edited

Loading

ipapandinas commented Jul 26, 2024

github-actions bot commented Jul 26, 2024

Dinonard left a comment

Dinonard left a comment

Dinonard left a comment

Dinonard left a comment

Dinonard Aug 6, 2024

ipapandinas Aug 6, 2024

Dinonard Aug 6, 2024

github-actions bot commented Aug 6, 2024

Dinonard commented Aug 6, 2024

ermalkaleci commented Aug 6, 2024

Feat/dyn tier thresholds #1306

Feat/dyn tier thresholds #1306

Conversation

ipapandinas commented Jul 24, 2024 • edited Loading

Types: TierThreshold enum updated

Migrations

try-runtime results

ipapandinas commented Jul 26, 2024

github-actions bot commented Jul 26, 2024

Dinonard left a comment

Choose a reason for hiding this comment

Dinonard left a comment

Choose a reason for hiding this comment

Dinonard left a comment

Choose a reason for hiding this comment

Dinonard left a comment

Choose a reason for hiding this comment

Dinonard Aug 6, 2024

Choose a reason for hiding this comment

ipapandinas Aug 6, 2024

Choose a reason for hiding this comment

Dinonard Aug 6, 2024

Choose a reason for hiding this comment

github-actions bot commented Aug 6, 2024

Dinonard commented Aug 6, 2024

ermalkaleci commented Aug 6, 2024

ipapandinas commented Jul 24, 2024 •

edited

Loading

`try-runtime` results