From d94d53f0faf4a5f60d3cd914f9164370aff3152b Mon Sep 17 00:00:00 2001
From: girazoki <gorka.irazoki@gmail.com>
Date: Mon, 13 Feb 2023 11:30:02 +0100
Subject: [PATCH] Companion for substrate #13159 (#6620)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* SetMembersOrigin

* Update Substrate

* Remove bags list from runtime common

---------

Co-authored-by: Bastian Köcher <info@kchr.de>
# Conflicts:
#	Cargo.lock
#	runtime/common/Cargo.toml
---
 runtime/common/Cargo.toml            | 3 ---
 runtime/kusama/src/governance/old.rs | 2 ++
 runtime/polkadot/src/lib.rs          | 2 ++
 runtime/rococo/src/lib.rs            | 2 ++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
index 1686a9325061..596961bb63e7 100644
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -41,7 +41,6 @@ pallet-treasury = { git = "https://github.com/purestake/substrate", default-feat
 pallet-election-provider-multi-phase = { git = "https://github.com/purestake/substrate", default-features = false , branch = "moonbeam-polkadot-v0.9.38" }
 pallet-beefy-mmr = { git = "https://github.com/purestake/substrate", default-features = false , branch = "moonbeam-polkadot-v0.9.38" }
 frame-election-provider-support = { git = "https://github.com/purestake/substrate", default-features = false , branch = "moonbeam-polkadot-v0.9.38" }
-pallet-bags-list = { git = "https://github.com/purestake/substrate", default-features = false , branch = "moonbeam-polkadot-v0.9.38" }
 
 frame-benchmarking = { git = "https://github.com/purestake/substrate", default-features = false, optional = true , branch = "moonbeam-polkadot-v0.9.38" }
 pallet-babe = { git = "https://github.com/purestake/substrate", default-features = false, optional = true , branch = "moonbeam-polkadot-v0.9.38" }
@@ -102,7 +101,6 @@ std = [
 	"runtime-parachains/std",
 	"xcm/std",
 	"sp-npos-elections/std",
-	"pallet-bags-list/std"
 ]
 runtime-benchmarks = [
 	"libsecp256k1/hmac",
@@ -112,7 +110,6 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"runtime-parachains/runtime-benchmarks",
 	"pallet-babe/runtime-benchmarks",
-	"pallet-bags-list/runtime-benchmarks",
 	"pallet-fast-unstake/runtime-benchmarks"
 ]
 try-runtime = [
diff --git a/runtime/kusama/src/governance/old.rs b/runtime/kusama/src/governance/old.rs
index 9365c903198a..9701bde49bda 100644
--- a/runtime/kusama/src/governance/old.rs
+++ b/runtime/kusama/src/governance/old.rs
@@ -99,6 +99,7 @@ impl pallet_collective::Config<CouncilCollective> for Runtime {
 	type MaxProposals = CouncilMaxProposals;
 	type MaxMembers = CouncilMaxMembers;
 	type DefaultVote = pallet_collective::PrimeDefaultVote;
+	type SetMembersOrigin = EnsureRoot<AccountId>;
 	type WeightInfo = weights::pallet_collective_council::WeightInfo<Runtime>;
 }
 
@@ -155,6 +156,7 @@ impl pallet_collective::Config<TechnicalCollective> for Runtime {
 	type MaxProposals = TechnicalMaxProposals;
 	type MaxMembers = TechnicalMaxMembers;
 	type DefaultVote = pallet_collective::PrimeDefaultVote;
+	type SetMembersOrigin = EnsureRoot<AccountId>;
 	type WeightInfo = weights::pallet_collective_technical_committee::WeightInfo<Runtime>;
 }
 
diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs
index e621489f7fcf..4a2c6bee1ff8 100644
--- a/runtime/polkadot/src/lib.rs
+++ b/runtime/polkadot/src/lib.rs
@@ -740,6 +740,7 @@ impl pallet_collective::Config<CouncilCollective> for Runtime {
 	type MaxProposals = CouncilMaxProposals;
 	type MaxMembers = CouncilMaxMembers;
 	type DefaultVote = pallet_collective::PrimeDefaultVote;
+	type SetMembersOrigin = EnsureRoot<AccountId>;
 	type WeightInfo = weights::pallet_collective_council::WeightInfo<Runtime>;
 }
 
@@ -796,6 +797,7 @@ impl pallet_collective::Config<TechnicalCollective> for Runtime {
 	type MaxProposals = TechnicalMaxProposals;
 	type MaxMembers = TechnicalMaxMembers;
 	type DefaultVote = pallet_collective::PrimeDefaultVote;
+	type SetMembersOrigin = EnsureRoot<AccountId>;
 	type WeightInfo = weights::pallet_collective_technical_committee::WeightInfo<Runtime>;
 }
 
diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs
index afa2ef654a10..ec56997fae3a 100644
--- a/runtime/rococo/src/lib.rs
+++ b/runtime/rococo/src/lib.rs
@@ -458,6 +458,7 @@ impl pallet_collective::Config<CouncilCollective> for Runtime {
 	type MaxProposals = CouncilMaxProposals;
 	type MaxMembers = CouncilMaxMembers;
 	type DefaultVote = pallet_collective::PrimeDefaultVote;
+	type SetMembersOrigin = EnsureRoot<AccountId>;
 	type WeightInfo = weights::pallet_collective_council::WeightInfo<Runtime>;
 }
 
@@ -514,6 +515,7 @@ impl pallet_collective::Config<TechnicalCollective> for Runtime {
 	type MaxProposals = TechnicalMaxProposals;
 	type MaxMembers = TechnicalMaxMembers;
 	type DefaultVote = pallet_collective::PrimeDefaultVote;
+	type SetMembersOrigin = EnsureRoot<AccountId>;
 	type WeightInfo = weights::pallet_collective_technical_committee::WeightInfo<Runtime>;
 }