feat: use generic account/session keys in authority selection, committee management and runtime (#911)

Author: LGLO

Cargo.lock

@@ -19,6 +19,7 @@ pub struct WizardBindings;
 impl RuntimeTypeWrapper for WizardBindings {
 	type Runtime = partner_chains_demo_runtime::Runtime;
 }
+
 impl PartnerChainRuntime for WizardBindings {
 	fn create_chain_spec(config: &partner_chains_cli::CreateChainSpecConfig) -> serde_json::Value {
 		crate::chain_spec::pc_create_chain_spec(config)

demo/node/src/cli.rs

@@ -98,6 +98,7 @@ pub type Hash = sp_core::H256;
 /// to even the core data structures.
 pub mod opaque {
 	use super::*;
+	use authority_selection_inherents::MaybeFromCandidateKeys;
 	use parity_scale_codec::MaxEncodedLen;
 	use sp_core::{ed25519, sr25519};
 	pub use sp_runtime::OpaqueExtrinsic as UncheckedExtrinsic;
@@ -170,6 +171,8 @@ pub mod opaque {
 		}
 	}
 
+	impl MaybeFromCandidateKeys for SessionKeys {}
+
 	impl_opaque_keys! {
 		pub struct CrossChainKey {
 			pub account: CrossChainPublic,
@@ -400,7 +403,11 @@ impl pallet_session_validator_management::Config for Runtime {
 		input: AuthoritySelectionInputs,
 		sidechain_epoch: ScEpochNumber,
 	) -> Option<BoundedVec<Self::CommitteeMember, Self::MaxValidators>> {
-		select_authorities(Sidechain::genesis_utxo(), input, sidechain_epoch)
+		select_authorities::<opaque::cross_chain_app::Public, SessionKeys, MaxValidators>(
+			Sidechain::genesis_utxo(),
+			input,
+			sidechain_epoch,
+		)
 	}
 
 	fn current_epoch_number() -> ScEpochNumber {
@@ -1065,13 +1072,13 @@ impl_runtime_apis! {
 
 	impl authority_selection_inherents::CandidateValidationApi<Block> for Runtime {
 		fn validate_registered_candidate_data(stake_pool_public_key: &StakePoolPublicKey, registration_data: &RegistrationData) -> Option<RegistrationDataError> {
-			authority_selection_inherents::validate_registration_data(stake_pool_public_key, registration_data, Sidechain::genesis_utxo()).err()
+			authority_selection_inherents::validate_registration_data::<SessionKeys>(stake_pool_public_key, registration_data, Sidechain::genesis_utxo()).err()
 		}
 		fn validate_stake(stake: Option<StakeDelegation>) -> Option<StakeError> {
 			authority_selection_inherents::validate_stake(stake).err()
 		}
 		fn validate_permissioned_candidate_data(candidate: PermissionedCandidateData) -> Option<PermissionedCandidateDataError> {
-			validate_permissioned_candidate_data(candidate).err()
+			validate_permissioned_candidate_data::<SessionKeys>(candidate).err()
 		}
 	}
 

demo/runtime/src/lib.rs

@@ -1,6 +1,6 @@
 use authority_selection_inherents::{
-	AriadneInherentDataProvider, AuthoritySelectionInputs, RegisterValidatorSignedMessage,
-	filter_trustless_candidates_registrations,
+	AriadneInherentDataProvider, AuthoritySelectionInputs, MaybeFromCandidateKeys,
+	RegisterValidatorSignedMessage, filter_trustless_candidates_registrations,
 };
 use frame_support::{
 	Hashable,
@@ -17,6 +17,8 @@ use sp_consensus_grandpa::AuthorityId as GrandpaId;
 use sp_core::crypto::CryptoType;
 use sp_core::sr25519;
 use sp_core::{ByteArray, ConstU128, H256, Pair, crypto::AccountId32, ed25519};
+use sp_runtime::KeyTypeId;
+use sp_runtime::key_types::{AURA, GRANDPA};
 use sp_runtime::{
 	BuildStorage, Digest, DigestItem, MultiSigner, impl_opaque_keys,
 	traits::{BlakeTwo256, IdentifyAccount, IdentityLookup, OpaqueKeys},
@@ -114,6 +116,9 @@ impl_opaque_keys! {
 		pub grandpa: Grandpa,
 	}
 }
+
+impl MaybeFromCandidateKeys for TestSessionKeys {}
+
 impl From<(sr25519::Public, ed25519::Public)> for TestSessionKeys {
 	fn from((aura, grandpa): (sr25519::Public, ed25519::Public)) -> Self {
 		let aura = AuraId::from(aura);
@@ -122,6 +127,19 @@ impl From<(sr25519::Public, ed25519::Public)> for TestSessionKeys {
 	}
 }
 
+impl TryFrom<CandidateKeys> for TestSessionKeys {
+	type Error = KeyTypeId;
+	fn try_from(value: CandidateKeys) -> Result<Self, Self::Error> {
+		let aura = <[u8; 32]>::try_from(value.find_or_empty(AURA))
+			.map_err(|_| AURA)
+			.map(|bytes| AuraId::from(sr25519::Public::from(bytes)))?;
+		let grandpa = <[u8; 32]>::try_from(value.find_or_empty(GRANDPA))
+			.map_err(|_| GRANDPA)
+			.map(|bytes| GrandpaId::from(ed25519::Public::from(bytes)))?;
+		Ok(Self { aura, grandpa })
+	}
+}
+
 pallet_partner_chains_session::impl_pallet_session_config!(Test);
 
 impl pallet_partner_chains_session::Config for Test {

demo/runtime/src/mock.rs

@@ -102,7 +102,7 @@ static REGISTRATION_STATUS_AFTER_HELP: once_cell::sync::Lazy<String> = once_cell
 #[allow(clippy::large_enum_variant)]
 /// Entry point for all Partner Chains specific subcommand.
 pub enum PartnerChainsSubcommand<
-	RuntimeBindings: PartnerChainRuntime,
+	RuntimeBindings: PartnerChainRuntime + Send + Sync,
 	PartnerchainAddress: Clone + Sync + Send + FromStr + 'static,
 > {
 	/// Returns sidechain parameters.
@@ -151,7 +151,7 @@ pub fn run<
 	CommitteeMember,
 	Client,
 	BlockProducerMetadata,
-	RuntimeBindings: PartnerChainRuntime,
+	RuntimeBindings: PartnerChainRuntime + Send + Sync,
 	PartnerchainAddress,
 >(
 	cli: &Cli,

toolkit/cli/node-commands/src/lib.rs

@@ -40,26 +40,27 @@ hex-literal = { workspace = true }
 num-bigint = { workspace = true }
 num-traits = { workspace = true }
 tokio = { workspace = true }
+sp-application-crypto = { workspace = true }
 
 [features]
 default = ["std"]
 std = [
 	"frame-support/std",
 	"sidechain-domain/std",
 	"parity-scale-codec/std",
-    "serde/std",
-    "sidechain-slots",
-    "sidechain-slots/std",
-    "sidechain-slots/serde",
-    "sp-api/std",
-    "sp-session-validator-management/std",
-    "sp-session-validator-management/serde",
-    "sp-core/std",
-    "sp-inherents/std",
-    "sp-runtime/std",
-    "sp-std/std",
-    "thiserror",
-    "async-trait",
-    "selection/std",
+	"serde/std",
+	"sidechain-slots",
+	"sidechain-slots/std",
+	"sidechain-slots/serde",
+	"sp-api/std",
+	"sp-session-validator-management/std",
+	"sp-session-validator-management/serde",
+	"sp-core/std",
+	"sp-inherents/std",
+	"sp-runtime/std",
+	"sp-std/std",
+	"thiserror",
+	"async-trait",
+	"selection/std",
 ]
 mock = []