Bound some storage items for pallet `staking` and clean up deprecated exposures by re-gius · Pull Request #7483 · paritytech/polkadot-sdk

re-gius · 2025-02-05T14:54:23Z

Building from #6445 on top of #7282

Changes

Bound Invulnerables, vector of validators invulnerable to slashing.
- Add MaxInvulnerables to bound Invulnerables Vec -> BoundedVec.
- Set to constant 20 in the pallet (must be >= 17 for backward compatibility with runtime westend).
Bound Disabled Validators, vector of validators that have offended in a given era and have been disabled.
- Add MaxDisabledValidators to bound DisabledValidators Vec -> BoundedVec.
- Set to constant 100 in the pallet (it should be <= 1/3 * MaxValidatorsCount according to the current disabling strategy).
Remove ErasStakers and ErasStakersClipped (see Tracker issue for cleaning up old non-paged exposure logic in staking pallet #433 ), non-paged validators exposures.
- They were deprecated in v14 and could have been removed since staking era 1504 (now it's > 1700).
- They are already empty on Polkadot and Kusama.
- Completing the task from [pallet-staking] Clean up stale non paged exposure storages in the pallet #5986.

Migrating pallet staking storage to v17 to apply all changes.

TO DO (in a follow-up PR)

Bound ErasStakersPaged
- this needs bounding ExposurePage.others vector
Bound BondedEras vector
Bound ClaimedRewards pages vector
Bound ErasRewardPoints
- this needs bounding EraRewardPoints.individual BTreeMap
Bound UnappliedSlashes
Bound SlashingSpans
- this needs bounding SlashingSpans.prior vector

re-gius · 2025-02-06T10:57:33Z

/cmd prdoc --audience runtime_dev --bump patch

…ump patch'

re-gius · 2025-02-06T11:32:59Z

Deferring prdoc to #7282

kianenigma · 2025-02-10T14:47:04Z

substrate/frame/staking/src/pallet/mod.rs

 			MinimumValidatorCount::<T>::put(self.minimum_validator_count);
-			Invulnerables::<T>::put(&self.invulnerables);
+			assert!(
+				self.invulnerables.len() as u32 <= T::MaxInvulnerables::get(),


self.invulnerables is already bounded, we don't need this check.

kianenigma · 2025-02-10T14:57:46Z

substrate/frame/staking/src/migrations.rs

+			let disabled_validators_maybe = BoundedVec::try_from(old_disabled_validators);
+			match disabled_validators_maybe {
+				Ok(disabled_validators) => {
+					y = y.saturating_add(1);


You have read the storage already no matter if the match is Ok or Err.

kianenigma · 2025-02-10T14:59:34Z

substrate/frame/staking/src/migrations.rs

+			match disabled_validators_maybe {
+				Ok(disabled_validators) => {
+					y = y.saturating_add(1);
+					DisabledValidators::<T>::set(disabled_validators);


The main point that might be missed here is that the encoding of a Vec<_> and BoundedVec<_> is exactly the same. So no data actually needs to be migrated.

What the migration would have to do is to check if the data won't fit into BoundedVec<_>, and in this case truncate it.

If hypothetically DisabledValidators is too large, your migration will not touch it, which means the runtime will still fail to decode it upon next access.

kianenigma · 2025-02-10T15:01:28Z

substrate/frame/staking/src/migrations.rs

+				log!(warn, "v17 failed to bound some storage items.");
+			}
+
+			T::DbWeight::get().reads_writes(x.into(), y.into())


In any case I will temp remove this migration as we will start from a fresh state and migrate the data. So any failed bounding will be detected in the migration testing.

kianenigma · 2025-02-10T15:02:25Z

substrate/frame/staking/src/slashing.rs

-					<Pallet<T>>::deposit_event(super::Event::<T>::ValidatorDisabled {
-						stash: params.stash.clone(),
-					});
+					if disabled.try_insert(index, (offender_idx, new_severity)).is_ok() {


For this you can use .defensive, worth reading up on it.

paritytech-workflow-stopper · 2025-02-10T15:15:26Z

All GitHub workflows were cancelled due to failure one of the required jobs.
Failed workflow url: https://github.com/paritytech/polkadot-sdk/actions/runs/13244012343
Failed job name: fmt

@tdimitrov

## Multi Block Election Pallet This PR adds the first iteration of the multi-block staking pallet. From this point onwards, the staking and its election provider pallets are being customized to work in AssetHub. While usage in solo-chains is still possible, it is not longer the main focus of this pallet. For a safer usage, please fork and user an older version of this pallet. --- ## Replaces - [x] #6034 - [x] #5272 ## Related PRs: - [x] #7483 - [ ] #7357 - [ ] #7424 - [ ] paritytech/polkadot-staking-miner#955 This branch can be periodically merged into #7358 -> #6996 ## TODOs: - [x] rebase to master - Benchmarking for staking critical path - [x] snapshot - [x] election result - Benchmarking for EPMB critical path - [x] snapshot - [x] verification - [x] submission - [x] unsigned submission - [ ] election results fetching - [ ] Fix deletion weights. Either of - [ ] Garbage collector + lazy removal of all paged storage items - [ ] Confirm that deletion is small PoV footprint. - [ ] Move election prediction to be push based. @tdimitrov - [ ] integrity checks for bounds - [ ] Properly benchmark this as a part of CI -- for now I will remove them as they are too slow - [x] add try-state to all pallets - [x] Staking to allow genesis dev accounts to be created internally - [x] Decouple miner config so @niklasad1 can work on the miner 72841b7 - [x] duplicate snapshot page reported by @niklasad1 - [ ] #6520 or equivalent -- during snapshot, `VoterList` must be locked - [ ] Move target snapshot to a separate block --------- Co-authored-by: Gonçalo Pestana <g6pestana@gmail.com> Co-authored-by: Ankan <10196091+Ank4n@users.noreply.github.com> Co-authored-by: command-bot <> Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> Co-authored-by: Giuseppe Re <giuseppe.re@parity.io> Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>

@tdimitrov

## Multi Block Election Pallet This PR adds the first iteration of the multi-block staking pallet. From this point onwards, the staking and its election provider pallets are being customized to work in AssetHub. While usage in solo-chains is still possible, it is not longer the main focus of this pallet. For a safer usage, please fork and user an older version of this pallet. --- ## Replaces - [x] paritytech#6034 - [x] paritytech#5272 ## Related PRs: - [x] paritytech#7483 - [ ] paritytech#7357 - [ ] paritytech#7424 - [ ] paritytech/polkadot-staking-miner#955 This branch can be periodically merged into paritytech#7358 -> paritytech#6996 ## TODOs: - [x] rebase to master - Benchmarking for staking critical path - [x] snapshot - [x] election result - Benchmarking for EPMB critical path - [x] snapshot - [x] verification - [x] submission - [x] unsigned submission - [ ] election results fetching - [ ] Fix deletion weights. Either of - [ ] Garbage collector + lazy removal of all paged storage items - [ ] Confirm that deletion is small PoV footprint. - [ ] Move election prediction to be push based. @tdimitrov - [ ] integrity checks for bounds - [ ] Properly benchmark this as a part of CI -- for now I will remove them as they are too slow - [x] add try-state to all pallets - [x] Staking to allow genesis dev accounts to be created internally - [x] Decouple miner config so @niklasad1 can work on the miner 72841b7 - [x] duplicate snapshot page reported by @niklasad1 - [ ] paritytech#6520 or equivalent -- during snapshot, `VoterList` must be locked - [ ] Move target snapshot to a separate block --------- Co-authored-by: Gonçalo Pestana <g6pestana@gmail.com> Co-authored-by: Ankan <10196091+Ank4n@users.noreply.github.com> Co-authored-by: command-bot <> Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> Co-authored-by: Giuseppe Re <giuseppe.re@parity.io> Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Add MaxInvulnerables to bound Invulnerables

ee83020

re-gius added the T1-FRAME This PR/Issue is related to core FRAME, the framework. label Feb 5, 2025

re-gius self-assigned this Feb 5, 2025

re-gius added 3 commits February 5, 2025 16:04

migration nit

c9784f8

Add MaxDisabledValidators to bound DisabledValidators

dc4fcae

fix tests

35b0f7c

This was referenced Feb 5, 2025

[tracking] remove without_storage_info for pallets migrating to AH #6289

Closed

Add storage bounds for pallet staking and clean up deprecated non paged exposure storages #6445

Closed

re-gius added 2 commits February 5, 2025 17:44

Remove ErasStakers and ErasStakersClipped

2110f9c

Fix tests and migration read/writes

48a76bf

re-gius changed the title ~~Bound storage items for pallet staking and clean up deprecated exposures~~ Bound some storage items for pallet staking and clean up deprecated exposures Feb 5, 2025

github-actions bot and others added 2 commits February 6, 2025 10:59

Update from re-gius running command 'prdoc --audience runtime_dev --b…

45e52aa

…ump patch'

remove prdoc

c0585f4

re-gius added the R0-no-crate-publish-required The change does not require any crates to be re-published. label Feb 6, 2025

re-gius marked this pull request as ready for review February 6, 2025 14:32

re-gius requested review from a team and acatangiu as code owners February 6, 2025 14:32

kianenigma reviewed Feb 10, 2025

View reviewed changes

final cleanup, merging

4aadbac

kianenigma merged commit 0fa010d into kiz-multi-block-eletion Feb 10, 2025
60 of 143 checks passed

kianenigma deleted the re-gius/staking/bound-storage-items branch February 10, 2025 15:17

kianenigma mentioned this pull request Feb 12, 2025

[AHM] Multi-block staking election pallet #7282

Merged

26 tasks

Ank4n mentioned this pull request Mar 17, 2025

[AHM] Revert multi-block election, slashing and staking client pallets #7939

Merged

miss-stake moved this from In progress to Scheduled in Security Audit (PRs) - SRLabs Mar 24, 2025

miss-stake moved this from Scheduled to In progress in Security Audit (PRs) - SRLabs Apr 29, 2025

redzsina moved this from In progress to Waiting for fix in Security Audit (PRs) - SRLabs Jun 30, 2025

redzsina moved this from Waiting for fix to Audited in Security Audit (PRs) - SRLabs Feb 5, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bound some storage items for pallet `staking` and clean up deprecated exposures#7483

Bound some storage items for pallet `staking` and clean up deprecated exposures#7483
kianenigma merged 9 commits intokiz-multi-block-eletionfrom
re-gius/staking/bound-storage-items

re-gius commented Feb 5, 2025 •

edited

Loading

Uh oh!

re-gius commented Feb 6, 2025

Uh oh!

re-gius commented Feb 6, 2025

Uh oh!

kianenigma Feb 10, 2025

Uh oh!

kianenigma Feb 10, 2025

Uh oh!

kianenigma Feb 10, 2025

Uh oh!

kianenigma Feb 10, 2025

Uh oh!

kianenigma Feb 10, 2025

Uh oh!

paritytech-workflow-stopper bot commented Feb 10, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

re-gius commented Feb 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

re-gius commented Feb 6, 2025

Uh oh!

re-gius commented Feb 6, 2025

Uh oh!

kianenigma Feb 10, 2025

Choose a reason for hiding this comment

Uh oh!

kianenigma Feb 10, 2025

Choose a reason for hiding this comment

Uh oh!

kianenigma Feb 10, 2025

Choose a reason for hiding this comment

Uh oh!

kianenigma Feb 10, 2025

Choose a reason for hiding this comment

Uh oh!

kianenigma Feb 10, 2025

Choose a reason for hiding this comment

Uh oh!

paritytech-workflow-stopper bot commented Feb 10, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

re-gius commented Feb 5, 2025 •

edited

Loading