Rollback to normal

bin/node/runtime/src/lib.rs

@@ -441,13 +441,6 @@ parameter_types! {
 	pub const MaxIterations: u32 = 10;
 	// 0.05%. The higher the value, the more strict solution acceptance becomes.
 	pub MinSolutionScoreBump: Perbill = Perbill::from_rational_approximation(5u32, 10_000);
-	// The unsigned solution is mandatory, and this is the absolute maximum weight that we allow for
-	// it.
-	pub OffchainSolutionWeightLimit: Weight =
-		MaximumBlockWeight::get()
-			.saturating_sub(BlockExecutionWeight::get())
-			.saturating_sub(ExtrinsicBaseWeight::get())
-			.saturating_sub(AVERAGE_ON_INITIALIZE_WEIGHT * MaximumBlockWeight::get());
 }
 
 impl pallet_staking::Trait for Runtime {
@@ -476,7 +469,9 @@ impl pallet_staking::Trait for Runtime {
 	type MinSolutionScoreBump = MinSolutionScoreBump;
 	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
 	type UnsignedPriority = StakingUnsignedPriority;
-	type OffchainSolutionWeightLimit = OffchainSolutionWeightLimit;
+	// The unsigned solution weight targeted by the OCW. We set it to the maximum possible value of
+	// a single extrinsic.
+	type OffchainSolutionWeightLimit = MaximumExtrinsicWeight;
 	type WeightInfo = weights::pallet_staking::WeightInfo<Runtime>;
 }
 

frame/staking/src/lib.rs

@@ -1239,8 +1239,6 @@ decl_error! {
 		OffchainElectionBogusScore,
 		/// The election size is invalid.
 		OffchainElectionBogusElectionSize,
-		/// The election weight is invalid.
-		OffchainElectionBogusElectionWeight,
 		/// The call is not allowed at the given time due to restrictions of election period.
 		CallNotAllowed,
 		/// Incorrect previous history depth input provided.
@@ -1303,6 +1301,7 @@ decl_module! {
 				consumed_weight += T::DbWeight::get().reads_writes(reads, writes);
 				consumed_weight += weight;
 			};
+
 			if
 				// if we don't have any ongoing offchain compute.
 				Self::era_election_status().is_closed() &&
@@ -2150,15 +2149,14 @@ decl_module! {
 		/// transaction in the block.
 		///
 		/// # <weight>
-		/// The weight of this call is not enforced by the system module and is enforced in this
-		/// module directly.
+		/// See [`submit_election_solution`].
 		/// # </weight>
-		#[weight = (T::WeightInfo::submit_solution_better(
+		#[weight = T::WeightInfo::submit_solution_better(
 			size.validators.into(),
 			size.nominators.into(),
 			compact.len() as u32,
 			winners.len() as u32,
-		), frame_support::weights::DispatchClass::Mandatory)]
+		)]
 		pub fn submit_election_solution_unsigned(
 			origin,
 			winners: Vec<ValidatorIndex>,
@@ -2168,13 +2166,6 @@ decl_module! {
 			size: ElectionSize,
 		) -> DispatchResultWithPostInfo {
 			ensure_none(origin)?;
-			// The signed solution is `Normal` and the system module checks the weight. But for this
-			// mandatory one, we need to do it.
-			ensure!(
-				Self::check_unsigned_solution_weight(&winners, &compact, &size),
-				Error::<T>::OffchainElectionBogusElectionWeight.with_weight(0),
-			);
-
 			let adjustments = Self::check_and_replace_solution(
 				winners,
 				compact,
@@ -3378,11 +3369,11 @@ impl<T: Trait> frame_support::unsigned::ValidateUnsigned for Module<T> {
 	type Call = Call<T>;
 	fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
 		if let Call::submit_election_solution_unsigned(
-			winners,
-			compact,
+			_,
+			_,
 			score,
 			era,
-			size,
+			_,
 		) = call {
 			use offchain_election::DEFAULT_LONGEVITY;
 
@@ -3395,11 +3386,6 @@ impl<T: Trait> frame_support::unsigned::ValidateUnsigned for Module<T> {
 				}
 			}
 
-			// discard solution if it is too big.
-			if !Self::check_unsigned_solution_weight(winners, compact, size) {
-				return Err(InvalidTransaction::ExhaustsResources.into())
-			}
-
 			if let Err(error_with_post_info) = Self::pre_dispatch_checks(*score, *era) {
 				let invalid = to_invalid(error_with_post_info);
 				log!(