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

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

Merged
merged 43 commits into from
Mar 24, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
e1629e7
Revert "Implementation of ah-client and rc-client staking pallets (#7…
Ank4n Mar 16, 2025
82513b0
Revert "[Staking] Bounded Slashing: Paginated Offence Processing & Sl…
Ank4n Mar 16, 2025
1ecb0c4
Revert "[AHM] Multi-block staking election pallet (#7282)"
Ank4n Mar 16, 2025
dcddac6
test compiles, 17 failure
Ank4n Mar 16, 2025
d4364a4
ensure offence is reported to session
Ank4n Mar 16, 2025
42a0b9d
fmt
Ank4n Mar 16, 2025
e14b22b
fix westend
Ank4n Mar 16, 2025
c15fb37
unrevert some stuff that we need
Ank4n Mar 16, 2025
e6fc0c1
bring back some more changes
Ank4n Mar 17, 2025
755aacb
fmt
Ank4n Mar 17, 2025
667d059
fix manual slash test
Ank4n Mar 17, 2025
781e565
fix some more tests
Ank4n Mar 17, 2025
d9ccb91
Fix the failing staking tests
tdimitrov Mar 17, 2025
2721167
Merge branch 'master' into ankn/staking-classic
Ank4n Mar 17, 2025
3ce2484
Fix a compilation error in benchmarks
tdimitrov Mar 17, 2025
f3c83b7
Fix a compilation warning
tdimitrov Mar 17, 2025
82d58e3
fix bench
Ank4n Mar 17, 2025
0f7a0f4
fix root offences
Ank4n Mar 17, 2025
aaa9fea
fix kitchensink genesis
Ank4n Mar 17, 2025
e9a04a6
taplo
Ank4n Mar 17, 2025
202138e
update storage version
Ank4n Mar 17, 2025
e80b05c
node cli
Ank4n Mar 17, 2025
d67bbde
Merge remote-tracking branch 'origin/master' into ankn/staking-classic
tdimitrov Mar 19, 2025
0600e8d
Add `staking-playground` feature to `staging-node-cli` tu suppress a …
tdimitrov Mar 19, 2025
0caa4ac
Fix a warning
tdimitrov Mar 19, 2025
d8619fe
prdoc - initial
tdimitrov Mar 19, 2025
c20653e
Add `pallet-assets-holder` to umbrella
tdimitrov Mar 19, 2025
202ca82
Merge remote-tracking branch 'origin/master' into ankn/staking-classic
tdimitrov Mar 19, 2025
39b755d
no new lines in umbrella's cargo file!!!
tdimitrov Mar 19, 2025
ad6c73f
taplo
tdimitrov Mar 19, 2025
419c265
Code review feedback
tdimitrov Mar 19, 2025
400933e
fix compilation errors
tdimitrov Mar 19, 2025
083679a
Remove `get_staking_playground_config`
tdimitrov Mar 19, 2025
7c19410
Remove unused import
tdimitrov Mar 19, 2025
5e3ea96
newline at the end of the prdoc will make the semver check pass?
tdimitrov Mar 20, 2025
2e03823
Merge branch 'master' into ankn/staking-classic
tdimitrov Mar 20, 2025
e156b2b
Update substrate/frame/staking/src/migrations.rs
Ank4n Mar 24, 2025
0449188
add a note to reverted PR docs.
Ank4n Mar 24, 2025
bf189db
Merge branch 'master' into ankn/staking-classic
Ank4n Mar 24, 2025
ac255e2
fix prdoc bumps
Ank4n Mar 24, 2025
f49e2e4
fix election provider
Ank4n Mar 24, 2025
2340bb9
undo bounds
Ank4n Mar 24, 2025
670b95c
re-prdoc
Ank4n Mar 24, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add a note to reverted PR docs.
  • Loading branch information
Ank4n committed Mar 24, 2025
commit 0449188792069122ab670afde851cea127b0b991
1 change: 1 addition & 0 deletions prdoc/pr_7282.prdoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ title: AHM Multi-block staking election pallet
doc:
- audience: Runtime Dev
description: |
NOTE: This is reverted in #7939.
## Multi Block Election Pallet

This PR adds the first iteration of the multi-block staking pallet.
Expand Down
3 changes: 2 additions & 1 deletion prdoc/pr_7424.prdoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ title: 'Bounded Slashing: Paginated Offence Processing & Slash Application'
doc:
- audience: Runtime Dev
description: |
NOTE: This is reverted in #7939.
This PR refactors the slashing mechanism in `pallet-staking` to be bounded by introducing paged offence processing and paged slash application.

### Key Changes
Expand Down Expand Up @@ -34,4 +35,4 @@ crates:
- name: pallet-session-benchmarking
bump: patch
- name: pallet-root-offences
bump: patch
bump: patch
1 change: 1 addition & 0 deletions prdoc/pr_7582.prdoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ title: Implementation of `ah-client` and `rc-client` staking pallets
doc:
- audience: Runtime Dev
description: |-
NOTE: This is reverted in #7939.
This PR introduces the initial structure for `pallet-ah-client` and `pallet-rc-client`. These
pallets will reside on the relay chain and AssetHub, respectively, and will manage the interaction
between `pallet-session` on the relay chain and `pallet-staking` on AssetHub.
Expand Down
7 changes: 4 additions & 3 deletions prdoc/pr_7939.prdoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ title: Revert pallet-staking changes which should be released as a separate pall
doc:
- audience: Runtime Dev
description: |-
Revert changes to staking pallet for AssetHubNext because they will be released as a separate pallet.
Revert multi-block election, slashing and staking client pallets.

Reverted PRs: #7582, #7424, #7282

crates:
- name: sp-staking
bump: major
Expand Down Expand Up @@ -32,8 +35,6 @@ crates:
bump: major
- name: frame-benchmarking-cli
bump: major
- name: westend-runtime
bump: major
- name: pallet-beefy
bump: major
- name: pallet-delegated-staking
Expand Down
8 changes: 3 additions & 5 deletions substrate/bin/node/runtime/src/genesis_config_presets.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ pub const ENDOWMENT: Balance = 10_000_000 * DOLLARS;
pub const STASH: Balance = ENDOWMENT / 1000;

pub struct StakingPlaygroundConfig {
/// (Validators, Nominators)
pub dev_stakers: (u32, u32),
pub validator_count: u32,
pub minimum_validator_count: u32,
}
Expand All @@ -58,11 +56,11 @@ pub fn kitchensink_genesis(
stakers: Vec<Staker>,
staking_playground_config: Option<StakingPlaygroundConfig>,
) -> serde_json::Value {
let (validator_count, min_validator_count, _dev_stakers) = match staking_playground_config {
Some(c) => (c.validator_count, c.minimum_validator_count, Some(c.dev_stakers)),
let (validator_count, min_validator_count) = match staking_playground_config {
Some(c) => (c.validator_count, c.minimum_validator_count),
None => {
let authorities_count = initial_authorities.len() as u32;
(authorities_count, authorities_count, None)
(authorities_count, authorities_count)
},
};

Expand Down
Loading