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

Ank4n · 2025-03-16T23:47:35Z

Revert the following PRs which we are pulling from release stable2503:

and leave pallet-staking in its pre-AHM state.

Context

We are forking pallet-staking into pallet-staking (also referred as staking-classic, this is the version that will stay on RC) and pallet-staking-next which will live on AH post AHM.

Additional context: #7858 (comment)

These changes in crate pallet-staking will become the staking classic. The staking next version is worked in the PR #7601.

For AHM migration

The UnappliedSlashes storage will need to be translated from rc::staking-classic to ah::staking-next. Bookmarking [1, 2] the code that can be referred for this.

Follow ups

(cc: @tdimitrov and @seadanda )

Revert pallet-staking v17 migration in westend.

Update in code storage version of pallet-staking storage from 17 to 16 (separate PR).
Update on chain storage version of pallet-staking storage from 17 to 16. The storage key for pallet-staking on chain version is 0x5f3e4907f716ac89b6347d15ececedca4e7b9012096b41c4eb3aaf947f6ea429 which should be set currently to 0x1100, and needs to be updated to 0x1000.
After the runtime upgrade with the code from this PR is deployed on Westend, kill the following storage prefixes under the Pallet prefix Staking:
- OffenceQueue
- OffenceQueueEras
- ProcessingOffence
- UnappliedSlashes: This also exists in staking-classic as a storage map (one key) and in pre-revert code as double storage map (two keys). Killing with prefix UnappliedSlashes may kill the ones created post upgrade (but that's okay for westend).
- VoterSnapshotStatus
- NextElectionPage
- ElectableStashes

Remove exposure dependency
Worked in the PR: [AHM] Replace Validator FullIdentification from Exposure to Existence #7936.

)" This reverts commit 669b889.

…ash Application (#7424)" This reverts commit dda2cb5.

This reverts commit a025562.

Ank4n · 2025-03-17T00:02:25Z

polkadot/runtime/westend/src/lib.rs

@@ -1874,7 +1863,6 @@ pub mod migrations {
 		parachains_shared::migration::MigrateToV1<Runtime>,
 		parachains_scheduler::migration::MigrateV2ToV3<Runtime>,
 		pallet_staking::migrations::v16::MigrateV15ToV16<Runtime>,
-		pallet_staking::migrations::v17::MigrateV16ToV17<Runtime>,


In westend this has already been applied, but we can just sudo kill any storage keys created (if any). If there are any slashes it will be dropped, but for the testnet that's okay.

Ank4n · 2025-03-21T16:06:39Z

There are a few follow-up tasks I’ve mentioned in the PR description that we’ll need to address separately.
Kian also suggested keeping some changes in master, which we can handle in a separate PR.

seadanda · 2025-03-21T16:12:54Z

Great, sounds good. happy to merge. Edit: when the semver check is happy

Overkillus

Had a look at the changes today and have questions and things I want to confirm.

There was supposed to be a clear distinction between pallet-staking-classic and pallet-staking-next. Will there be a rename for pallet-staking-classic? Or is out of scope of this PR? From Kian's comment:

Backport this to stable 2503. This means in stable2503 there should(n't) be pallet-staking, there should be only pallet-staking-classic and pallet-staking-next.

I'm just trying to understand what changes are within the scope of this PR.

Just a triple check confirmation but we are "backporting" ONLY to 2503? Or will changes propagate to 2412 as well in form of patch releases?
I understand that we are doing an on master revert and for the sake of history preservation the now reverted prdocs will still show up in the next release but they should be edited to clearly link to this PR/prdoc otherwise audiences might mistakenly think they were actually shipped and never reverted.

Thanks Tsveto for taking over 🙏

substrate/frame/staking/src/migrations.rs

seadanda · 2025-03-22T08:31:18Z

There was supposed to be a clear distinction between pallet-staking-classic and pallet-staking-next. Will there be a rename for pallet-staking-classic?

I'm opposed to renaming 'pallet-staking', and actually don't think 'staking-next' will age well. I just think 'pallet-staking' vs 'pallet-staking-parachain'/'cumulus-pallet-staking' or 'pallet-staking-multi-block' or something along those lines is a good distinction that will stay relevant through the years.

Just a triple check confirmation but we are "backporting" ONLY to 2503? Or will changes propagate to 2412 as well in form of patch releases?

Yea the changes didn't exist in master when 2412 was branched off so there's nothing to revert there.

I understand that we are doing an on master revert and for the sake of history preservation the now reverted prdocs will still show up in the next release but they should be edited to clearly link to this PR/prdoc otherwise audiences might mistakenly think they were actually shipped and never reverted.

Yea I agree, I think the old prdocs should be removed as their key purpose is to alert users to changes, and with a reversion there are none except those small ones introduced by this PR (#7939 (comment)). There's still some tidying to do to satisfy the semver bot.

Co-authored-by: Maciej <maciej.zyszkiewicz@parity.io>

paritytech-workflow-stopper · 2025-03-24T11:43:27Z

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

paritytech-release-backport-bot · 2025-03-24T14:00:02Z

Git push to origin failed for stable2503 with exitcode 1

@tdimitrov

#7939) Revert the following PRs which we are pulling from release stable2503: - #7582 - #7424 - #7282 and leave pallet-staking in its pre-AHM state. We are forking pallet-staking into `pallet-staking` (also referred as staking-classic, this is the version that will stay on RC) and `pallet-staking-next` which will live on AH post AHM. Additional context: #7858 (comment) These changes in crate `pallet-staking` will become the staking classic. The staking next version is worked in the PR #7601. The `UnappliedSlashes` storage will need to be translated from `rc::staking-classic` to `ah::staking-next`. [Bookmarking](https://github.com/paritytech/polkadot-sdk/blob/master/substrate/frame/staking/src/migrations.rs#L91) the code that can be referred for this. (cc: @tdimitrov and @seadanda ) 1) Revert pallet-staking v17 migration in westend. - Update `in code storage version` of pallet-staking storage from 17 to 16 (separate PR). - Update `on chain storage version` of pallet-staking storage from 17 to 16. The storage key for pallet-staking on chain version is `0x5f3e4907f716ac89b6347d15ececedca4e7b9012096b41c4eb3aaf947f6ea429` which should be set currently to `0x1100`, and needs to be updated to `0x1000`. - After the runtime upgrade with the code from this PR is deployed on Westend, kill the following storage prefixes under the Pallet prefix `Staking`: - OffenceQueue - OffenceQueueEras - ProcessingOffence - UnappliedSlashes: This also exists in staking-classic as a storage map (one key) and in pre-revert code as double storage map (two keys). Killing with prefix `UnappliedSlashes` may kill the ones created post upgrade (but that's okay for westend). - VoterSnapshotStatus - NextElectionPage - ElectableStashes 2) Remove exposure dependency Worked in the PR: #7936. --------- Co-authored-by: Tsvetomir Dimitrov <tsvetomir@parity.io> Co-authored-by: Maciej <maciej.zyszkiewicz@parity.io>

Backports #7939 into stable2503

Ank4n added 8 commits March 16, 2025 22:43

Revert "Implementation of ah-client and rc-client staking pallets (#7582

e1629e7

)" This reverts commit 669b889.

Revert "[Staking] Bounded Slashing: Paginated Offence Processing & Sl…

82513b0

…ash Application (#7424)" This reverts commit dda2cb5.

Revert "[AHM] Multi-block staking election pallet (#7282)"

1ecb0c4

This reverts commit a025562.

test compiles, 17 failure

dcddac6

ensure offence is reported to session

d4364a4

fmt

42a0b9d

fix westend

e14b22b

unrevert some stuff that we need

c15fb37

Ank4n commented Mar 17, 2025

View reviewed changes

Ank4n added 2 commits March 17, 2025 01:55

bring back some more changes

e6fc0c1

fmt

755aacb

Ank4n added I4-refactor Code needs refactoring. T2-pallets This PR/Issue is related to a particular pallet. labels Mar 17, 2025

Ank4n marked this pull request as ready for review March 17, 2025 06:42

Ank4n requested review from acatangiu and a team as code owners March 17, 2025 06:42

tdimitrov mentioned this pull request Mar 17, 2025

[AHM] Revert some AH-next staking changes from master #7937

Closed

3 tasks

Ank4n and others added 11 commits March 17, 2025 08:47

fix manual slash test

667d059

fix some more tests

781e565

Fix the failing staking tests

d9ccb91

Merge branch 'master' into ankn/staking-classic

2721167

Fix a compilation error in benchmarks

3ce2484

Fix a compilation warning

f3c83b7

fix bench

82d58e3

fix root offences

0f7a0f4

fix kitchensink genesis

aaa9fea

taplo

e9a04a6

update storage version

202138e

seadanda changed the title ~~[AHM] Revert multi-block election and slashing from staking-classic~~ [AHM] Revert multi-block election, slashing and staking client pallets Mar 21, 2025

seadanda enabled auto-merge March 21, 2025 16:13

Overkillus reviewed Mar 21, 2025

View reviewed changes

substrate/frame/staking/src/migrations.rs Show resolved Hide resolved

seadanda mentioned this pull request Mar 21, 2025

[AHM] The Asset Hub Migration on Westend (WIP) #7997

Draft

9 tasks

Update substrate/frame/staking/src/migrations.rs

e156b2b

Co-authored-by: Maciej <maciej.zyszkiewicz@parity.io>

seadanda added this pull request to the merge queue Mar 24, 2025

add a note to reverted PR docs.

0449188

Ank4n removed this pull request from the merge queue due to a manual request Mar 24, 2025

Merge branch 'master' into ankn/staking-classic

bf189db

Ank4n enabled auto-merge March 24, 2025 09:41

Ank4n added this pull request to the merge queue Mar 24, 2025

Ank4n removed this pull request from the merge queue due to a manual request Mar 24, 2025

fix prdoc bumps

ac255e2

Ank4n added 2 commits March 24, 2025 12:47

fix election provider

f49e2e4

undo bounds

2340bb9

Ank4n mentioned this pull request Mar 24, 2025

Re-bench pallet-session on RC #8005

Open

re-prdoc

670b95c

Ank4n enabled auto-merge March 24, 2025 13:15

Ank4n added this pull request to the merge queue Mar 24, 2025

Merged via the queue into master with commit b82ef54 Mar 24, 2025
247 of 259 checks passed

Ank4n deleted the ankn/staking-classic branch March 24, 2025 13:59

Ank4n mentioned this pull request Mar 26, 2025

Manual backport of #7939 into stable2503 #8039

Merged

EgorPopelyaev pushed a commit that referenced this pull request Mar 26, 2025

Manual backport of #7939 into stable2503 (#8039)

212aee7

Backports #7939 into stable2503

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

Ank4n commented Mar 16, 2025 •

edited

Loading

Ank4n Mar 17, 2025

Ank4n commented Mar 21, 2025

seadanda commented Mar 21, 2025 •

edited

Loading

Overkillus left a comment

seadanda commented Mar 22, 2025

paritytech-workflow-stopper bot commented Mar 24, 2025

paritytech-release-backport-bot bot commented Mar 24, 2025

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

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

Conversation

Ank4n commented Mar 16, 2025 • edited Loading

Context

For AHM migration

Follow ups

Ank4n Mar 17, 2025

Choose a reason for hiding this comment

Ank4n commented Mar 21, 2025

seadanda commented Mar 21, 2025 • edited Loading

Overkillus left a comment

Choose a reason for hiding this comment

seadanda commented Mar 22, 2025

paritytech-workflow-stopper bot commented Mar 24, 2025

paritytech-release-backport-bot bot commented Mar 24, 2025

Ank4n commented Mar 16, 2025 •

edited

Loading

seadanda commented Mar 21, 2025 •

edited

Loading