replace aura-compat feature with generic tools

Author: AmbientTea

Cargo.lock

@@ -72,7 +72,7 @@ frame-benchmarking = { workspace = true, optional = true }
 frame-system-benchmarking = { workspace = true, optional = true }
 
 # Local Dependencies
-pallet-block-production-log = { workspace = true, features = ["block-participation", "aura-compat"] }
+pallet-block-production-log = { workspace = true, features = ["block-participation"] }
 sp-sidechain = { workspace = true }
 pallet-sidechain = { workspace = true }
 pallet-session-validator-management = { workspace = true }

demo/runtime/Cargo.toml

@@ -29,6 +29,7 @@ use frame_support::{
 use frame_system::EnsureRoot;
 use opaque::SessionKeys;
 use pallet_block_producer_metadata;
+use pallet_block_production_log::{FromFindAuthorIndex, FromStorage};
 use pallet_grandpa::AuthorityId as GrandpaId;
 use pallet_session_validator_management::CommitteeMemberOf;
 use pallet_transaction_payment::{ConstFeeMultiplier, FungibleAdapter, Multiplier};
@@ -500,8 +501,8 @@ impl pallet_block_production_log::Config for Runtime {
 
 	type Moment = Slot;
 
-	type GetMoment = Aura;
-	type GetAuthor = Aura;
+	type GetMoment = FromStorage<pallet_aura::CurrentSlot<Runtime>>;
+	type GetAuthor = FromFindAuthorIndex<Runtime, Aura, u32>;
 }
 
 parameter_types! {

demo/runtime/src/lib.rs

@@ -104,7 +104,6 @@ range, a representative timestamp, such as the start of the range should be comp
 
 The pallet should be added to the runtime and configured to use `BlockAuthor` type as its `BlockProducerId`
 and use the `Moment` type. Additionally, it must be provided a source of current block author and moment.
-These are provided out of the box for chains using Aura under feature flag `aura-compat`.
 
 #### Address Associations
 

docs/developer-guides/block-participation-rewards.md

@@ -25,8 +25,6 @@ sp-std = { workspace = true }
 pallet-session-validator-management = { workspace = true }
 
 pallet-block-participation = { workspace = true, optional = true }
-pallet-aura = { workspace = true, optional = true }
-sp-consensus-aura = { workspace = true, optional = true }
 
 [dev-dependencies]
 sp-core = { workspace = true }
@@ -45,8 +43,6 @@ std = [
 	"sp-std/std",
     "pallet-session-validator-management/std",
 	"pallet-block-participation?/std",
-    "pallet-aura?/std",
-    "sp-consensus-aura?/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
@@ -56,7 +52,3 @@ runtime-benchmarks = [
 block-participation = [
     "dep:pallet-block-participation",
 ]
-aura-compat = [
-    "dep:pallet-aura",
-    "dep:sp-consensus-aura",
-]

toolkit/block-production-log/pallet/Cargo.toml

@@ -28,16 +28,13 @@
 //! impl pallet_block_production_log::Config for Runtime {
 //!     type BlockProducerId = BlockAuthor;
 //!
-//! type Moment = Slot;
+//!     type Moment = Slot;
 //!
-//! type GetMoment = Aura;
-//! type GetAuthor = Aura;
+//!     type GetMoment = FromStorage<pallet_aura::CurrentSlot<Runtime>>;
+//!     type GetAuthor = FromFindAuthorIndex<Runtime, Aura, u32>;
 //! }
 //! ```
 //!
-//! Implementations supporting use of Aura and SessionCommitteeManagement as sources of moment and block producer
-//! can be enabled using the `aura-compat` feature flag.
-//!
 //! #### Defining block producer ID
 //!
 //! The pallet expects the Partner Chain to provide a type representing its block producers.
@@ -98,26 +95,30 @@ mod mock;
 #[cfg(test)]
 mod test;
 
+use core::marker::PhantomData;
+
 pub use pallet::*;
 pub use weights::WeightInfo;
 
 /// Source of the current block's author
-///
-/// An implementation that will fetch block author from `pallet_session_validator_management` based on
-/// an index provided by Aura pallet is provided under feature flag `aura-compat`.
 pub trait GetAuthor<BlockProducerId> {
 	/// Returns the current block's author
 	fn get_author() -> Option<BlockProducerId>;
 }
 
+/// [GetAuthor] implementation that uses a [FindAuthor] instance to get the current block's author index
+/// of type `I` and uses it to read the author from `pallet_session_validator_management`.
+pub struct FromFindAuthorIndex<T, FA, I>(PhantomData<(T, FA, I)>);
+
 /// Source of the current block's moment
-///
-/// Implementation that fetches current slot from Aura pallet is provided under feature flat `aura-compat`.
 pub trait GetMoment<Moment> {
 	/// Returns the current block's moment
 	fn get_moment() -> Option<Moment>;
 }
 
+/// [GetMoment] implementation that fetches current block's `Moment` from storage `S`
+pub struct FromStorage<S>(PhantomData<S>);
+
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
@@ -219,25 +220,40 @@ mod block_participation {
 	}
 }
 
-#[cfg(feature = "aura-compat")]
-mod aura_support {
-	use crate::*;
+mod source_impls {
+	use super::*;
+	use frame_support::{
+		pallet_prelude::StorageValue,
+		storage::types::QueryKindTrait,
+		traits::{FindAuthor, StorageInstance},
+	};
 	use pallet_session_validator_management as psvm;
-	use sp_consensus_aura::Slot;
+	use parity_scale_codec::FullCodec;
+	use sp_runtime::traits::Get;
 
-	impl<T: crate::Config + pallet_aura::Config> GetMoment<Slot> for pallet_aura::Pallet<T> {
-		fn get_moment() -> Option<Slot> {
-			Some(pallet_aura::CurrentSlot::<T>::get())
+	impl<BlockProducerId, I, FA, T> GetAuthor<BlockProducerId> for FromFindAuthorIndex<T, FA, I>
+	where
+		FA: FindAuthor<I>,
+		I: TryInto<usize>,
+		T: psvm::Config,
+		psvm::CommitteeMemberOf<T>: Into<BlockProducerId>,
+	{
+		fn get_author() -> Option<BlockProducerId> {
+			Some(psvm::Pallet::<T>::find_current_authority::<I, FA>()?.into())
 		}
 	}
 
-	impl<BlockProducerId, T> GetAuthor<BlockProducerId> for pallet_aura::Pallet<T>
+	impl<Prefix, Value, Moment, QueryKind, OnEmpty> GetMoment<Moment>
+		for FromStorage<StorageValue<Prefix, Value, QueryKind, OnEmpty>>
 	where
-		T: crate::Config + psvm::Config + pallet_aura::Config,
-		psvm::CommitteeMemberOf<T>: Into<BlockProducerId>,
+		Prefix: StorageInstance,
+		Value: FullCodec,
+		QueryKind: QueryKindTrait<Value, OnEmpty>,
+		OnEmpty: Get<QueryKind::Query> + 'static,
+		Option<Moment>: From<<QueryKind as QueryKindTrait<Value, OnEmpty>>::Query>,
 	{
-		fn get_author() -> Option<BlockProducerId> {
-			Some(psvm::Pallet::<T>::find_current_authority::<u32, pallet_aura::Pallet<T>>()?.into())
+		fn get_moment() -> Option<Moment> {
+			StorageValue::<Prefix, Value, QueryKind, OnEmpty>::get().into()
 		}
 	}
 }