Companion for substrate #13159 (#6620)

* SetMembersOrigin

* Update Substrate

* Remove bags list from runtime common

---------

Co-authored-by: Bastian Köcher <info@kchr.de>
This commit is contained in:
girazoki
2023-02-13 11:30:02 +01:00
committed by GitHub
parent f17ea2cdd0
commit 91bb2ae3d0
5 changed files with 187 additions and 185 deletions
+181 -182
View File
File diff suppressed because it is too large Load Diff
-3
View File
@@ -41,7 +41,6 @@ pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "m
pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-beefy-mmr = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-beefy-mmr = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-election-provider-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-election-provider-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-bags-list = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true } pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
@@ -102,7 +101,6 @@ std = [
"runtime-parachains/std", "runtime-parachains/std",
"xcm/std", "xcm/std",
"sp-npos-elections/std", "sp-npos-elections/std",
"pallet-bags-list/std"
] ]
runtime-benchmarks = [ runtime-benchmarks = [
"libsecp256k1/hmac", "libsecp256k1/hmac",
@@ -112,7 +110,6 @@ runtime-benchmarks = [
"frame-system/runtime-benchmarks", "frame-system/runtime-benchmarks",
"runtime-parachains/runtime-benchmarks", "runtime-parachains/runtime-benchmarks",
"pallet-babe/runtime-benchmarks", "pallet-babe/runtime-benchmarks",
"pallet-bags-list/runtime-benchmarks",
"pallet-fast-unstake/runtime-benchmarks" "pallet-fast-unstake/runtime-benchmarks"
] ]
try-runtime = [ try-runtime = [
@@ -99,6 +99,7 @@ impl pallet_collective::Config<CouncilCollective> for Runtime {
type MaxProposals = CouncilMaxProposals; type MaxProposals = CouncilMaxProposals;
type MaxMembers = CouncilMaxMembers; type MaxMembers = CouncilMaxMembers;
type DefaultVote = pallet_collective::PrimeDefaultVote; type DefaultVote = pallet_collective::PrimeDefaultVote;
type SetMembersOrigin = EnsureRoot<AccountId>;
type WeightInfo = weights::pallet_collective_council::WeightInfo<Runtime>; type WeightInfo = weights::pallet_collective_council::WeightInfo<Runtime>;
} }
@@ -157,6 +158,7 @@ impl pallet_collective::Config<TechnicalCollective> for Runtime {
type MaxProposals = TechnicalMaxProposals; type MaxProposals = TechnicalMaxProposals;
type MaxMembers = TechnicalMaxMembers; type MaxMembers = TechnicalMaxMembers;
type DefaultVote = pallet_collective::PrimeDefaultVote; type DefaultVote = pallet_collective::PrimeDefaultVote;
type SetMembersOrigin = EnsureRoot<AccountId>;
type WeightInfo = weights::pallet_collective_technical_committee::WeightInfo<Runtime>; type WeightInfo = weights::pallet_collective_technical_committee::WeightInfo<Runtime>;
} }
+2
View File
@@ -740,6 +740,7 @@ impl pallet_collective::Config<CouncilCollective> for Runtime {
type MaxProposals = CouncilMaxProposals; type MaxProposals = CouncilMaxProposals;
type MaxMembers = CouncilMaxMembers; type MaxMembers = CouncilMaxMembers;
type DefaultVote = pallet_collective::PrimeDefaultVote; type DefaultVote = pallet_collective::PrimeDefaultVote;
type SetMembersOrigin = EnsureRoot<AccountId>;
type WeightInfo = weights::pallet_collective_council::WeightInfo<Runtime>; type WeightInfo = weights::pallet_collective_council::WeightInfo<Runtime>;
} }
@@ -798,6 +799,7 @@ impl pallet_collective::Config<TechnicalCollective> for Runtime {
type MaxProposals = TechnicalMaxProposals; type MaxProposals = TechnicalMaxProposals;
type MaxMembers = TechnicalMaxMembers; type MaxMembers = TechnicalMaxMembers;
type DefaultVote = pallet_collective::PrimeDefaultVote; type DefaultVote = pallet_collective::PrimeDefaultVote;
type SetMembersOrigin = EnsureRoot<AccountId>;
type WeightInfo = weights::pallet_collective_technical_committee::WeightInfo<Runtime>; type WeightInfo = weights::pallet_collective_technical_committee::WeightInfo<Runtime>;
} }
+2
View File
@@ -458,6 +458,7 @@ impl pallet_collective::Config<CouncilCollective> for Runtime {
type MaxProposals = CouncilMaxProposals; type MaxProposals = CouncilMaxProposals;
type MaxMembers = CouncilMaxMembers; type MaxMembers = CouncilMaxMembers;
type DefaultVote = pallet_collective::PrimeDefaultVote; type DefaultVote = pallet_collective::PrimeDefaultVote;
type SetMembersOrigin = EnsureRoot<AccountId>;
type WeightInfo = weights::pallet_collective_council::WeightInfo<Runtime>; type WeightInfo = weights::pallet_collective_council::WeightInfo<Runtime>;
} }
@@ -516,6 +517,7 @@ impl pallet_collective::Config<TechnicalCollective> for Runtime {
type MaxProposals = TechnicalMaxProposals; type MaxProposals = TechnicalMaxProposals;
type MaxMembers = TechnicalMaxMembers; type MaxMembers = TechnicalMaxMembers;
type DefaultVote = pallet_collective::PrimeDefaultVote; type DefaultVote = pallet_collective::PrimeDefaultVote;
type SetMembersOrigin = EnsureRoot<AccountId>;
type WeightInfo = weights::pallet_collective_technical_committee::WeightInfo<Runtime>; type WeightInfo = weights::pallet_collective_technical_committee::WeightInfo<Runtime>;
} }