refactor into MinerConfig

Author: kianenigma

substrate/bin/node/runtime/src/lib.rs

@@ -914,14 +914,31 @@ pub(crate) mod multi_block_impls {
 	parameter_types! {
 		pub Pages: u32 = 4;
 		// nominators snapshot size
-		pub VoterSnapshotPerBlock: u32 = 22500 / 4;
+		pub VoterSnapshotPerBlock: u32 = 22500 / Pages::get();
 		// validator snapshot size
 		pub TargetSnapshotPerBlock: u32 = 1000;
 		pub SignedPhase: u32 = EPOCH_DURATION_IN_BLOCKS / 4;
-		pub SignedValidation: u32 = 8;
+		pub SignedValidation: u32 = Pages::get() * 2;
 		pub UnsignedPhase: u32 = EPOCH_DURATION_IN_BLOCKS / 4;
 	}
 
+	impl multi_block::unsigned::miner::MinerConfig for Runtime {
+		type AccountId = AccountId;
+		type Hash = Hash;
+		type MaxBackersPerWinner = <Self as multi_block::verifier::Config>::MaxBackersPerWinner;
+		type MaxBackersPerWinnerFinal =
+			<Self as multi_block::verifier::Config>::MaxBackersPerWinnerFinal;
+		type MaxWinnersPerPage = <Self as multi_block::verifier::Config>::MaxWinnersPerPage;
+		type MaxVotesPerVoter =
+			<<Self as multi_block::Config>::DataProvider as ElectionDataProvider>::MaxVotesPerVoter;
+		type MaxLength = MinerMaxLength;
+		type Solver = <Runtime as multi_block::unsigned::Config>::OffchainSolver;
+		type Pages = Pages;
+		type Solution = NposSolution16;
+		type VoterSnapshotPerBlock = <Runtime as multi_block::Config>::VoterSnapshotPerBlock;
+		type TargetSnapshotPerBlock = <Runtime as multi_block::Config>::TargetSnapshotPerBlock;
+	}
+
 	impl multi_block::Config for Runtime {
 		type AdminOrigin = EnsureRoot<AccountId>;
 		type RuntimeEvent = RuntimeEvent;
@@ -939,10 +956,10 @@ pub(crate) mod multi_block_impls {
 		// TODO: sanity check that the length of all phases is within reason.
 		type SignedPhase = SignedPhase;
 		type UnsignedPhase = UnsignedPhase;
-		type Solution = NposSolution16;
 		type TargetSnapshotPerBlock = TargetSnapshotPerBlock;
 		type VoterSnapshotPerBlock = VoterSnapshotPerBlock;
 		type Verifier = MultiBlockVerifier;
+		type MinerConfig = Self;
 		type WeightInfo = ();
 	}
 
@@ -979,8 +996,6 @@ pub(crate) mod multi_block_impls {
 	impl multi_block::unsigned::Config for Runtime {
 		// TODO: split into MinerConfig so the staker miner can easily configure these.
 		// miner configs.
-		type MinerMaxLength = MinerMaxLength;
-		type MinerMaxWeight = MinerMaxWeight;
 		type OffchainSolver = <Runtime as multi_phase::Config>::Solver;
 
 		// offchain usage of miner configs
@@ -1032,7 +1047,7 @@ parameter_types! {
 	pub ElectionBoundsMultiPhase: ElectionBounds = ElectionBoundsBuilder::default()
 		.voters_count(5000.into()).targets_count(10.into()).build();
 	pub ElectionBoundsOnChain: ElectionBounds = ElectionBoundsBuilder::default()
-		.voters_count(50_000.into()).targets_count(1000.into()).build();
+		.voters_count(1000.into()).targets_count(1000.into()).build();
 
 	pub MaxNominations: u32 = <NposSolution16 as frame_election_provider_support::NposSolution>::LIMIT as u32;
 	/// The maximum winners that can be elected by the Election pallet which is equivalent to the

substrate/frame/election-provider-multi-block/src/helpers.rs

@@ -19,7 +19,8 @@
 
 use crate::{
 	types::{PageIndex, VoterOf},
-	AllVoterPagesOf, Config, SolutionTargetIndexOf, SolutionVoterIndexOf, VoteWeight,
+	unsigned::miner::MinerConfig,
+	AllVoterPagesOf, SolutionTargetIndexOf, SolutionVoterIndexOf, VoteWeight,
 };
 use frame_support::{traits::Get, BoundedVec};
 use sp_runtime::SaturatedConversion;
@@ -35,6 +36,7 @@ macro_rules! log {
 	};
 }
 
+#[macro_export]
 macro_rules! sublog {
 	($level:tt, $sub_pallet:tt, $pattern:expr $(, $values:expr)* $(,)?) => {
 		#[cfg(not(feature = "std"))]
@@ -47,8 +49,18 @@ macro_rules! sublog {
 	};
 }
 
+#[macro_export]
+macro_rules! miner_log {
+	($level:tt, $pattern:expr $(, $values:expr)* $(,)?) => {
+		log::$level!(
+			target: $crate::LOG_PREFIX,
+			concat!("[⛏️miner] 🗳🗳🗳  ", $pattern) $(, $values)*
+		)
+	};
+}
+
 /// Generate an `efficient closure of voters and the page in which they live in.
-pub fn generate_voter_page_fn<T: Config>(
+pub fn generate_voter_page_fn<T: MinerConfig>(
 	paged_snapshot: &AllVoterPagesOf<T>,
 ) -> impl Fn(&T::AccountId) -> Option<PageIndex> {
 	let mut cache: BTreeMap<T::AccountId, PageIndex> = BTreeMap::new();
@@ -73,7 +85,7 @@ pub fn generate_voter_page_fn<T: Config>(
 /// voters.
 ///
 /// This can be used to efficiently build index getter closures.
-pub fn generate_voter_cache<T: Config, AnyBound: Get<u32>>(
+pub fn generate_voter_cache<T: MinerConfig, AnyBound: Get<u32>>(
 	snapshot: &BoundedVec<VoterOf<T>, AnyBound>,
 ) -> BTreeMap<T::AccountId, usize> {
 	let mut cache: BTreeMap<T::AccountId, usize> = BTreeMap::new();
@@ -94,7 +106,7 @@ pub fn generate_voter_cache<T: Config, AnyBound: Get<u32>>(
 /// ## Warning
 ///
 /// Note that this will represent the snapshot data from which the `cache` is generated.
-pub fn voter_index_fn<T: Config>(
+pub fn voter_index_fn<T: MinerConfig>(
 	cache: &BTreeMap<T::AccountId, usize>,
 ) -> impl Fn(&T::AccountId) -> Option<SolutionVoterIndexOf<T>> + '_ {
 	move |who| {
@@ -108,7 +120,7 @@ pub fn voter_index_fn<T: Config>(
 ///
 /// Same as [`voter_index_fn`] but the returned function owns all its necessary data; nothing is
 /// borrowed.
-pub fn voter_index_fn_owned<T: Config>(
+pub fn voter_index_fn_owned<T: MinerConfig>(
 	cache: BTreeMap<T::AccountId, usize>,
 ) -> impl Fn(&T::AccountId) -> Option<SolutionVoterIndexOf<T>> {
 	move |who| {
@@ -123,7 +135,7 @@ pub fn voter_index_fn_owned<T: Config>(
 /// ## Warning
 ///
 /// Note that this will represent the snapshot data from which the `cache` is generated.
-pub fn voter_index_fn_usize<T: Config>(
+pub fn voter_index_fn_usize<T: MinerConfig>(
 	cache: &BTreeMap<T::AccountId, usize>,
 ) -> impl Fn(&T::AccountId) -> Option<usize> + '_ {
 	move |who| cache.get(who).cloned()
@@ -136,7 +148,7 @@ pub fn voter_index_fn_usize<T: Config>(
 ///
 /// Not meant to be used in production.
 #[cfg(test)]
-pub fn voter_index_fn_linear<T: Config>(
+pub fn voter_index_fn_linear<T: MinerConfig>(
 	snapshot: &Vec<VoterOf<T>>,
 ) -> impl Fn(&T::AccountId) -> Option<SolutionVoterIndexOf<T>> + '_ {
 	move |who| {
@@ -154,7 +166,7 @@ pub fn voter_index_fn_linear<T: Config>(
 /// Note: to the extent possible, the returned function should be cached and reused. Producing that
 /// function requires a `O(n log n)` data transform. Each invocation of that function completes
 /// in `O(log n)`.
-pub fn target_index_fn<T: Config>(
+pub fn target_index_fn<T: MinerConfig>(
 	snapshot: &Vec<T::AccountId>,
 ) -> impl Fn(&T::AccountId) -> Option<SolutionTargetIndexOf<T>> + '_ {
 	let cache: BTreeMap<_, _> =
@@ -174,7 +186,7 @@ pub fn target_index_fn<T: Config>(
 ///
 /// Not meant to be used in production.
 #[cfg(test)]
-pub fn target_index_fn_linear<T: Config>(
+pub fn target_index_fn_linear<T: MinerConfig>(
 	snapshot: &Vec<T::AccountId>,
 ) -> impl Fn(&T::AccountId) -> Option<SolutionTargetIndexOf<T>> + '_ {
 	move |who| {
@@ -187,7 +199,7 @@ pub fn target_index_fn_linear<T: Config>(
 
 /// Create a function that can map a voter index ([`SolutionVoterIndexOf`]) to the actual voter
 /// account using a linearly indexible snapshot.
-pub fn voter_at_fn<T: Config>(
+pub fn voter_at_fn<T: MinerConfig>(
 	snapshot: &Vec<VoterOf<T>>,
 ) -> impl Fn(SolutionVoterIndexOf<T>) -> Option<T::AccountId> + '_ {
 	move |i| {
@@ -199,7 +211,7 @@ pub fn voter_at_fn<T: Config>(
 
 /// Create a function that can map a target index ([`SolutionTargetIndexOf`]) to the actual target
 /// account using a linearly indexible snapshot.
-pub fn target_at_fn<T: Config>(
+pub fn target_at_fn<T: MinerConfig>(
 	snapshot: &Vec<T::AccountId>,
 ) -> impl Fn(SolutionTargetIndexOf<T>) -> Option<T::AccountId> + '_ {
 	move |i| {
@@ -213,7 +225,7 @@ pub fn target_at_fn<T: Config>(
 ///
 /// This is not optimized and uses a linear search.
 #[cfg(test)]
-pub fn stake_of_fn_linear<T: Config>(
+pub fn stake_of_fn_linear<T: MinerConfig>(
 	snapshot: &Vec<VoterOf<T>>,
 ) -> impl Fn(&T::AccountId) -> VoteWeight + '_ {
 	move |who| {
@@ -231,7 +243,7 @@ pub fn stake_of_fn_linear<T: Config>(
 ///
 /// The cache need must be derived from the same snapshot. Zero is returned if a voter is
 /// non-existent.
-pub fn stake_of_fn<'a, T: Config, AnyBound: Get<u32>>(
+pub fn stake_of_fn<'a, T: MinerConfig, AnyBound: Get<u32>>(
 	snapshot: &'a BoundedVec<VoterOf<T>, AnyBound>,
 	cache: &'a BTreeMap<T::AccountId, usize>,
 ) -> impl Fn(&T::AccountId) -> VoteWeight + 'a {