Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Merge remote-tracking branch 'origin/master' into 3265
  • Loading branch information
gui1117 committed Jul 30, 2021
commit 6fc853506a78bfe3b7a298ad570e5c02b9df1589
7 changes: 6 additions & 1 deletion runtime/kusama/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1525,7 +1525,12 @@ pub type Executive = frame_executive::Executive<
frame_system::ChainContext<Runtime>,
Runtime,
AllPallets,
(RemoveCollectiveFlip, CouncilStoragePrefixMigration, TechnicalCommitteeStoragePrefixMigration),
(
RemoveCollectiveFlip,
MigratePalletVersionToStorageVersion,
CouncilStoragePrefixMigration,
TechnicalCommitteeStoragePrefixMigration
),
>;
/// The payload being signed in the transactions.
pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
Expand Down
7 changes: 6 additions & 1 deletion runtime/polkadot/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1088,7 +1088,12 @@ pub type Executive = frame_executive::Executive<
frame_system::ChainContext<Runtime>,
Runtime,
AllPallets,
(RemoveCollectiveFlip, CouncilStoragePrefixMigration, TechnicalCommitteeStoragePrefixMigration),
(
RemoveCollectiveFlip,
MigratePalletVersionToStorageVersion,
CouncilStoragePrefixMigration,
TechnicalCommitteeStoragePrefixMigration,
),
>;
/// The payload being signed in transactions.
pub type SignedPayload = generic::SignedPayload<Call, SignedExtra>;
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.