[encointer] introduce collator selection and send fees to authors instead of treasury

CHANGELOG.md

@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Remove DMP queue and allow `system::authorize_upgrade` in XCM's call filter ([polkadot-fellows/runtimes#280](https://github.com/polkadot-fellows/runtimes/pull/280))
 - Add migration to Kusama Coretime to onboard People Chain without long delay ([polkadot-fellows/runtimes#286](https://github.com/polkadot-fellows/runtimes/pull/286))
 - Clean up outdated assignment in Kusama Coretime Chain state ([polkadot-fellows/runtimes#286](https://github.com/polkadot-fellows/runtimes/pull/286))
+- Introduce [Encointer](https://encointer.org) collator selection and send fees to authors instead of treasury ([polkadot-fellows/runtimes#270](https://github.com/polkadot-fellows/runtimes/pull/270))
 
 ### Fixed
 
@@ -31,7 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Remove state-trie-migration pallet from kusama, add state trie migration to V1 on polkadot ([polkadot-fellows/runtimes#170](https://github.com/polkadot-fellows/runtimes/pull/170))
 - Introduce chain spec generator ([polkadot-fellows/runtimes#127](https://github.com/polkadot-fellows/runtimes/pull/127))
 - Add [Encointer](https://encointer.org) system parachain runtime, completing [RFC22](https://github.com/polkadot-fellows/RFCs/blob/main/text/
-0022-adopt-encointer-runtime.md) ([polkadot-fellows/runtimes#80](https://github.com/polkadot-fellows/runtimes/pull/80))
+  0022-adopt-encointer-runtime.md) ([polkadot-fellows/runtimes#80](https://github.com/polkadot-fellows/runtimes/pull/80))
 - Feature for enabling debug prints in the Polkadot and Kusama runtime ([polkadot-fellows/runtimes#85](https://github.com/polkadot-fellows/runtimes/pull/85))
 - Added new "Wish for Change" track ([polkadot-fellows/runtimes#184](https://github.com/polkadot-fellows/runtimes/pull/184))
 - Enable Coretime and on-demand on Kusama ([polkadot-fellows/runtimes#159](https://github.com/polkadot-fellows/runtimes/pull/159))

Cargo.toml

@@ -83,7 +83,7 @@ pallet-encointer-ceremonies = { version = "~6.1.0", default-features = false }
 pallet-encointer-ceremonies-rpc-runtime-api = { version = "~6.1.0", default-features = false }
 pallet-encointer-communities = { version = "~6.1.0", default-features = false }
 pallet-encointer-communities-rpc-runtime-api = { version = "~6.1.0", default-features = false }
-pallet-encointer-faucet = { version = "~6.1.0", default-features = false }
+pallet-encointer-faucet = { version = "~6.2.0", default-features = false }
 pallet-encointer-reputation-commitments = { version = "~6.1.0", default-features = false }
 pallet-encointer-scheduler = { version = "~6.1.0", default-features = false }
 pallet-fast-unstake = { version = "28.0.0", default-features = false }

chain-spec-generator/src/system_parachains_specs.rs

@@ -562,6 +562,23 @@ fn encointer_kusama_genesis(endowed_accounts: Vec<AccountId>, id: u32) -> serde_
 			parachain_id: id.into(),
 			..Default::default()
 		},
+		"collatorSelection": encointer_kusama_runtime::CollatorSelectionConfig {
+			invulnerables: invulnerables().iter().cloned().map(|(acc, _)| acc).collect(),
+			candidacy_bond: ENCOINTER_KUSAMA_ED * 16,
+			..Default::default()
+		},
+		"session": asset_hub_kusama_runtime::SessionConfig {
+			keys: invulnerables()
+				.into_iter()
+				.map(|(acc, aura)| {
+					(
+						acc.clone(),                         // account id
+						acc,                                 // validator id
+						asset_hub_kusama_session_keys(aura), // session keys
+					)
+				})
+				.collect(),
+		},
 		"polkadotXcm": {
 			"safeXcmVersion": Some(SAFE_XCM_VERSION),
 		},

system-parachains/encointer/Cargo.toml

@@ -10,13 +10,11 @@ version.workspace = true
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.9", default-features = false, features = [
-  "derive",
+	"derive",
 ] }
-hex-literal = { optional = true , workspace = true }
+hex-literal = { workspace = true }
 log = { workspace = true }
-scale-info = { features = [
-  "derive",
-] , workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 smallvec = { workspace = true }
 
 
@@ -53,31 +51,32 @@ frame-system-benchmarking = { optional = true, workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
 frame-try-runtime = { optional = true, workspace = true }
 pallet-asset-tx-payment = { workspace = true }
-pallet-aura = { features = ["experimental"] , workspace = true }
+pallet-aura = { features = ["experimental"], workspace = true }
+pallet-authorship = { workspace = true }
 pallet-balances = { workspace = true }
 pallet-collective = { workspace = true }
 pallet-insecure-randomness-collective-flip = { workspace = true }
 pallet-membership = { workspace = true }
 pallet-message-queue = { workspace = true }
 pallet-proxy = { workspace = true }
 pallet-scheduler = { workspace = true }
+pallet-session = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-transaction-payment = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
-pallet-treasury = { workspace = true }
 pallet-utility = { workspace = true }
 sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
 sp-consensus-aura = { workspace = true }
 sp-core = { workspace = true }
+sp-genesis-builder = { workspace = true }
 sp-inherents = { workspace = true }
 sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
 sp-std = { workspace = true }
 sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true }
-sp-genesis-builder = { workspace = true }
 
 # Polkadot dependencies
 pallet-xcm = { workspace = true }
@@ -90,13 +89,15 @@ xcm-executor = { package = "staging-xcm-executor", default-features = false, ver
 # Cumulus dependencies
 cumulus-pallet-aura-ext = { workspace = true }
 cumulus-pallet-parachain-system = { features = [
-  "parameterized-consensus-hook",
+	"parameterized-consensus-hook",
 ], workspace = true }
+cumulus-pallet-session-benchmarking = { optional = true, workspace = true }
 cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
 cumulus-primitives-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
 cumulus-primitives-utility = { workspace = true }
+pallet-collator-selection = { workspace = true }
 parachain-info = { package = "staging-parachain-info", default-features = false, version = "0.8.0" }
 parachains-common = { workspace = true }
 polkadot-core-primitives = { workspace = true }
@@ -118,12 +119,13 @@ default = ["std"]
 runtime-benchmarks = [
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
+	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"hex-literal",
 	"pallet-balances/runtime-benchmarks",
+	"pallet-collator-selection/runtime-benchmarks",
 	"pallet-collective/runtime-benchmarks",
 	"pallet-encointer-balances/runtime-benchmarks",
 	"pallet-encointer-bazaar/runtime-benchmarks",
@@ -136,7 +138,6 @@ runtime-benchmarks = [
 	"pallet-membership/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
-	"pallet-treasury/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
 	"polkadot-runtime-common/runtime-benchmarks",
@@ -151,12 +152,13 @@ runtime-benchmarks = [
 	"pallet-scheduler/runtime-benchmarks",
 	"parachains-common/runtime-benchmarks",
 	"polkadot-parachain-primitives/runtime-benchmarks",
-	"polkadot-primitives/runtime-benchmarks"
+	"polkadot-primitives/runtime-benchmarks",
 ]
 std = [
 	"codec/std",
 	"cumulus-pallet-aura-ext/std",
 	"cumulus-pallet-parachain-system/std",
+	"cumulus-pallet-session-benchmarking?/std",
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
 	"cumulus-primitives-aura/std",
@@ -174,7 +176,9 @@ std = [
 	"log/std",
 	"pallet-asset-tx-payment/std",
 	"pallet-aura/std",
+	"pallet-authorship/std",
 	"pallet-balances/std",
+	"pallet-collator-selection/std",
 	"pallet-collective/std",
 	"pallet-encointer-balances/std",
 	"pallet-encointer-bazaar-rpc-runtime-api/std",
@@ -190,10 +194,10 @@ std = [
 	"pallet-message-queue/std",
 	"pallet-membership/std",
 	"pallet-proxy/std",
+	"pallet-session/std",
 	"pallet-timestamp/std",
 	"pallet-transaction-payment-rpc-runtime-api/std",
 	"pallet-transaction-payment/std",
-	"pallet-treasury/std",
 	"pallet-utility/std",
 	"pallet-xcm/std",
 	"parachain-info/std",
@@ -221,7 +225,7 @@ std = [
 	"polkadot-core-primitives/std",
 	"polkadot-parachain-primitives/std",
 	"polkadot-primitives/std",
-	"polkadot-runtime-common/std"
+	"polkadot-runtime-common/std",
 ]
 
 
@@ -235,7 +239,9 @@ try-runtime = [
 	"frame-try-runtime/try-runtime",
 	"pallet-asset-tx-payment/try-runtime",
 	"pallet-aura/try-runtime",
+	"pallet-authorship/try-runtime",
 	"pallet-balances/try-runtime",
+	"pallet-collator-selection/try-runtime",
 	"pallet-collective/try-runtime",
 	"pallet-encointer-balances/try-runtime",
 	"pallet-encointer-bazaar/try-runtime",
@@ -249,21 +255,20 @@ try-runtime = [
 	"pallet-membership/try-runtime",
 	"pallet-proxy/try-runtime",
 	"pallet-scheduler/try-runtime",
+	"pallet-session/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"pallet-transaction-payment/try-runtime",
-	"pallet-treasury/try-runtime",
 	"pallet-utility/try-runtime",
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
 	"encointer-balances-tx-payment/try-runtime",
 	"encointer-primitives/try-runtime",
 	"frame-support/try-runtime",
 	"polkadot-runtime-common/try-runtime",
-	"sp-runtime/try-runtime"
+	"sp-runtime/try-runtime",
 ]
 
 # A feature that should be enabled when the runtime should be built for on-chain
 # deployment. This will disable stuff that shouldn't be part of the on-chain wasm
 # to make it smaller, like logging for example.
 on-chain-release-build = ["sp-api/disable-logging"]
-