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.

Sign up for GitHub

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

revert paritytech/polkadot#6577 & related changes #3108

Merged
merged 5 commits into from
Jan 30, 2024
Merged

revert paritytech/polkadot#6577 & related changes #3108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6c77907
revert paritytech/polkadot#6577 & related changes
Lederstrumpf Jan 29, 2024
0e2ff1a
add prdoc
Lederstrumpf Jan 30, 2024
18061f7
add to Westend runtime & update prdoc
Lederstrumpf Jan 30, 2024
ea9ffaa
Merge branch 'master' into rhmb/revert-6577
acatangiu Jan 30, 2024
56765f7
add kitchensink runtime
Lederstrumpf Jan 30, 2024
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
14 changes: 7 additions & 7 deletions polkadot/runtime/rococo/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1331,13 +1331,6 @@ construct_runtime! {
Offences: pallet_offences = 7,
Historical: session_historical = 34,

// BEEFY Bridges support.
Beefy: pallet_beefy = 240,
// MMR leaf construction must be before session in order to have leaf contents
// refer to block<N-1> consistently. see substrate issue #11797 for details.
Mmr: pallet_mmr = 241,
MmrLeaf: pallet_beefy_mmr = 242,

Session: pallet_session = 8,
Grandpa: pallet_grandpa = 10,
AuthorityDiscovery: pallet_authority_discovery = 12,
Expand Down Expand Up @@ -1423,6 +1416,13 @@ construct_runtime! {
// Pallet for sending XCM.
XcmPallet: pallet_xcm = 99,

// BEEFY Bridges support.
Beefy: pallet_beefy = 240,
// MMR leaf construction must be after session in order to have a leaf's next_auth_set
// refer to block<N>. See issue polkadot-fellows/runtimes#160 for details.
Mmr: pallet_mmr = 241,
MmrLeaf: pallet_beefy_mmr = 242,

// Pallet for migrating Identity to a parachain. To be removed post-migration.
IdentityMigrator: identity_migrator = 248,

Expand Down
14 changes: 7 additions & 7 deletions polkadot/runtime/westend/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1413,13 +1413,6 @@ construct_runtime! {
Offences: pallet_offences = 7,
Historical: session_historical = 27,

// BEEFY Bridges support.
Beefy: pallet_beefy = 200,
// MMR leaf construction must be before session in order to have leaf contents refer to
// block<N-1> consistently. see substrate issue #11797 for details.
Mmr: pallet_mmr = 201,
BeefyMmrLeaf: pallet_beefy_mmr = 202,

Session: pallet_session = 8,
Grandpa: pallet_grandpa = 10,
AuthorityDiscovery: pallet_authority_discovery = 12,
Expand Down Expand Up @@ -1509,6 +1502,13 @@ construct_runtime! {
// Root testing pallet.
RootTesting: pallet_root_testing = 102,

// BEEFY Bridges support.
Beefy: pallet_beefy = 200,
// MMR leaf construction must be after session in order to have a leaf's next_auth_set
// refer to block<N>. See issue polkadot-fellows/runtimes#160 for details.
Mmr: pallet_mmr = 201,
BeefyMmrLeaf: pallet_beefy_mmr = 202,

// Pallet for migrating Identity to a parachain. To be removed post-migration.
IdentityMigrator: identity_migrator = 248,
}
Expand Down
18 changes: 18 additions & 0 deletions prdoc/pr_3108.prdoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json

title: revert paritytech/polkadot#6577 & related changes

doc:
- audience: Node Dev
description: |
Moves BEEFY related pallets behind `session_pallet` for Rococo and Westend runtimes.
Effects that each `MmrLeaf` in the MMR generated by `mmr_pallet` for `block<N>` references the `next_auth_set` of `block<N>` and not `block<N-1>`.
Breaking change for proofs generated by `mmr_generateProof`
- audience: Runtime Dev
description: |
Moves BEEFY related pallets behind `session_pallet` for Rococo and Westend runtimes.
Effects that each `MmrLeaf` in the MMR generated by `mmr_pallet` for `block<N>` references the `next_auth_set` of `block<N>` and not `block<N-1>`.


crates: []
10 changes: 5 additions & 5 deletions substrate/bin/node/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2099,11 +2099,6 @@ construct_runtime!(
AssetConversionTxPayment: pallet_asset_conversion_tx_payment,
ElectionProviderMultiPhase: pallet_election_provider_multi_phase,
Staking: pallet_staking,
Beefy: pallet_beefy,
// MMR leaf construction must be before session in order to have leaf contents
// refer to block<N-1> consistently. see substrate issue #11797 for details.
Mmr: pallet_mmr,
MmrLeaf: pallet_beefy_mmr,
Session: pallet_session,
Democracy: pallet_democracy,
Council: pallet_collective::<Instance1>,
Expand Down Expand Up @@ -2133,6 +2128,11 @@ construct_runtime!(
Tips: pallet_tips,
Assets: pallet_assets::<Instance1>,
PoolAssets: pallet_assets::<Instance2>,
Beefy: pallet_beefy,
// MMR leaf construction must be after session in order to have a leaf's next_auth_set
// refer to block<N>. See issue polkadot-fellows/runtimes#160 for details.
Mmr: pallet_mmr,
MmrLeaf: pallet_beefy_mmr,
Lottery: pallet_lottery,
Nis: pallet_nis,
Uniques: pallet_uniques,
Expand Down
Loading