use FindAuthor in babe & grandpa directly

serai-dex · Jun 25, 2024 · 615a248 · 615a248
1 parent 6e3f07b
commit 615a248
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/frame/babe/src/equivocation.rs b/frame/babe/src/equivocation.rs
@@ -34,7 +34,7 @@
 //! that the `ValidateUnsigned` for the BABE pallet is used in the runtime
 //! definition.
 
-use frame_support::traits::{Get, KeyOwnerProofSystem};
+use frame_support::traits::{Get, KeyOwnerProofSystem, FindAuthor};
 use frame_system::pallet_prelude::HeaderFor;
 use log::{error, info};
 
@@ -164,7 +164,11 @@ where
 		evidence: (EquivocationProof<HeaderFor<T>>, T::KeyOwnerProof),
 	) -> Result<(), DispatchError> {
 		let (equivocation_proof, key_owner_proof) = evidence;
-		let reporter = reporter.or_else(|| <pallet_authorship::Pallet<T>>::author());
+		let reporter = reporter.or_else(|| {
+			let digest = <frame_system::Pallet<T>>::digest();
+			let pre_runtime_digests = digest.logs.iter().filter_map(|d| d.as_pre_runtime());
+			<T as Config>::FindAuthor::find_author(pre_runtime_digests)
+		});
 		let offender = equivocation_proof.offender.clone();
 		let slot = equivocation_proof.slot;
 

diff --git a/frame/babe/src/lib.rs b/frame/babe/src/lib.rs
@@ -166,6 +166,8 @@ pub mod pallet {
 			Option<Self::AccountId>,
 			(EquivocationProof<HeaderFor<Self>>, Self::KeyOwnerProof),
 		>;
+
+		type FindAuthor: FindAuthor<Self::AccountId>;
 	}
 
 	#[pallet::error]

diff --git a/frame/grandpa/src/equivocation.rs b/frame/grandpa/src/equivocation.rs
@@ -37,7 +37,7 @@
 //! definition.
 
 use codec::{self as codec, Decode, Encode};
-use frame_support::traits::{Get, KeyOwnerProofSystem};
+use frame_support::traits::{Get, KeyOwnerProofSystem, FindAuthor};
 use frame_system::pallet_prelude::BlockNumberFor;
 use log::{error, info};
 use sp_consensus_grandpa::{AuthorityId, EquivocationProof, RoundNumber, SetId, KEY_TYPE};
@@ -177,7 +177,11 @@ where
 		evidence: (EquivocationProof<T::Hash, BlockNumberFor<T>>, T::KeyOwnerProof),
 	) -> Result<(), DispatchError> {
 		let (equivocation_proof, key_owner_proof) = evidence;
-		let reporter = reporter.or_else(|| <pallet_authorship::Pallet<T>>::author());
+		let reporter = reporter.or_else(|| {
+			let digest = <frame_system::Pallet<T>>::digest();
+			let pre_runtime_digests = digest.logs.iter().filter_map(|d| d.as_pre_runtime());
+			<T as Config>::FindAuthor::find_author(pre_runtime_digests)
+		});
 		let offender = equivocation_proof.offender().clone();
 
 		// We check the equivocation within the context of its set id (and

diff --git a/frame/grandpa/src/lib.rs b/frame/grandpa/src/lib.rs
@@ -39,7 +39,7 @@ use frame_support::{
 	dispatch::{DispatchResultWithPostInfo, Pays},
 	pallet_prelude::Get,
 	storage,
-	traits::OneSessionHandler,
+	traits::{OneSessionHandler, FindAuthor},
 	weights::Weight,
 	WeakBoundedVec,
 };
@@ -117,6 +117,8 @@ pub mod pallet {
 			Option<Self::AccountId>,
 			(EquivocationProof<Self::Hash, BlockNumberFor<Self>>, Self::KeyOwnerProof),
 		>;
+
+		type FindAuthor: FindAuthor<Self::AccountId>;
 	}
 
 	#[pallet::hooks]