Box big params

bin/node/runtime/src/lib.rs

@@ -111,6 +111,11 @@ mod voter_bags;
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
+/// Max size for serialized extrinsic params for this testing runtime.
+/// This is a quite arbitrary but empirically battle tested value.
+#[cfg(test)]
+pub const CALL_PARAMS_MAX_SIZE: usize = 208;
+
 /// Wasm binary unwrapped. If built with `SKIP_WASM_BUILD`, the function panics.
 #[cfg(feature = "std")]
 pub fn wasm_binary_unwrap() -> &'static [u8] {
@@ -2352,10 +2357,10 @@ mod tests {
 	fn call_size() {
 		let size = core::mem::size_of::<RuntimeCall>();
 		assert!(
-			size <= 208,
-			"size of RuntimeCall {} is more than 208 bytes: some calls have too big arguments, use Box to reduce the
-			size of RuntimeCall.
-			If the limit is too strong, maybe consider increase the limit to 300.",
+			size <= CALL_PARAMS_MAX_SIZE,
+			"size of RuntimeCall {} is more than {CALL_PARAMS_MAX_SIZE} bytes.
+			 Some calls have too big arguments, use Box to reduce the  size of RuntimeCall.
+			If the limit is too strong, maybe consider fine tune the limit.",
 			size,
 		);
 	}

frame/babe/src/equivocation.rs

@@ -100,7 +100,6 @@ impl<Offender: Clone> Offence<Offender> for EquivocationOffence<Offender> {
 /// using existing subsystems that are part of frame (type bounds described
 /// below) and will dispatch to them directly, it's only purpose is to wire all
 /// subsystems together.
-#[derive(Default)]
 pub struct EquivocationReportSystem<T, R, P, L>(sp_std::marker::PhantomData<(T, R, P, L)>);
 
 // We use the authorship pallet to fetch the current block author and use
@@ -142,15 +141,15 @@ where
 		let epoch_index =
 			*slot.saturating_sub(crate::GenesisSlot::<T>::get()) / T::EpochDuration::get();
 
+		// TODO DAVXY: CAN ALL THESE VALIDITY CHECK BE PERFORMED ONLY BY CHECK-EVIDENCE???
+
 		// Check that the slot number is consistent with the session index
 		// in the key ownership proof (i.e. slot is for that epoch)
-		// TODO: this should be part of `check_evidence`...
 		if Pallet::<T>::session_index_for_epoch(epoch_index) != session_index {
 			return Err(Error::<T>::InvalidKeyOwnershipProof.into())
 		}
 
 		// Check the membership proof and extract the offender's id
-		// TODO: These checks were alread yperformed by check evidence...
 		let offender = P::check_proof((KEY_TYPE, offender), key_owner_proof)
 			.ok_or(Error::<T>::InvalidKeyOwnershipProof)?;
 
@@ -185,7 +184,10 @@ where
 	) -> bool {
 		use frame_system::offchain::SubmitTransaction;
 
-		let call = Call::report_equivocation_unsigned { equivocation_proof, key_owner_proof };
+		let call = Call::report_equivocation_unsigned {
+			equivocation_proof: Box::new(equivocation_proof),
+			key_owner_proof,
+		};
 		let res = SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call.into());
 		match res {
 			Ok(()) => info!(target: LOG_TARGET, "Submitted equivocation report."),
@@ -216,7 +218,7 @@ impl<T: Config> Pallet<T> {
 			}
 
 			// Check report validity
-			// TODO DAVXY: propagate error
+			// TODO DAVXY: propagate check error
 			T::EquivocationReportSystem::check_evidence(equivocation_proof, key_owner_proof)
 				.map_err(|_| InvalidTransaction::Stale)?;
 

frame/babe/src/lib.rs

@@ -415,13 +415,13 @@ pub mod pallet {
 		))]
 		pub fn report_equivocation(
 			origin: OriginFor<T>,
-			equivocation_proof: EquivocationProof<T::Header>,
+			equivocation_proof: Box<EquivocationProof<T::Header>>,
 			key_owner_proof: T::KeyOwnerProof,
 		) -> DispatchResultWithPostInfo {
-			let reporter = Some(ensure_signed(origin)?);
+			let reporter = ensure_signed(origin)?;
 			T::EquivocationReportSystem::report_evidence(
-				reporter,
-				equivocation_proof,
+				Some(reporter),
+				*equivocation_proof,
 				key_owner_proof,
 			)?;
 			// Waive the fee since the report is valid and beneficial
@@ -442,13 +442,13 @@ pub mod pallet {
 		))]
 		pub fn report_equivocation_unsigned(
 			origin: OriginFor<T>,
-			equivocation_proof: EquivocationProof<T::Header>,
+			equivocation_proof: Box<EquivocationProof<T::Header>>,
 			key_owner_proof: T::KeyOwnerProof,
 		) -> DispatchResultWithPostInfo {
 			ensure_none(origin)?;
 			T::EquivocationReportSystem::report_evidence(
 				None,
-				equivocation_proof,
+				*equivocation_proof,
 				key_owner_proof,
 			)?;
 			// Waive the fee since the report is valid and beneficial

frame/babe/src/tests.rs

@@ -465,7 +465,7 @@ fn report_equivocation_current_session_works() {
 		// report the equivocation
 		Babe::report_equivocation_unsigned(
 			RuntimeOrigin::none(),
-			equivocation_proof,
+			Box::new(equivocation_proof),
 			key_owner_proof,
 		)
 		.unwrap();
@@ -537,7 +537,7 @@ fn report_equivocation_old_session_works() {
 		// report the equivocation
 		Babe::report_equivocation_unsigned(
 			RuntimeOrigin::none(),
-			equivocation_proof,
+			Box::new(equivocation_proof),
 			key_owner_proof,
 		)
 		.unwrap();
@@ -589,7 +589,7 @@ fn report_equivocation_invalid_key_owner_proof() {
 		assert_err!(
 			Babe::report_equivocation_unsigned(
 				RuntimeOrigin::none(),
-				equivocation_proof.clone(),
+				Box::new(equivocation_proof.clone()),
 				key_owner_proof
 			),
 			Error::<Test>::InvalidKeyOwnershipProof,
@@ -609,7 +609,7 @@ fn report_equivocation_invalid_key_owner_proof() {
 		assert_err!(
 			Babe::report_equivocation_unsigned(
 				RuntimeOrigin::none(),
-				equivocation_proof,
+				Box::new(equivocation_proof),
 				key_owner_proof,
 			),
 			Error::<Test>::InvalidKeyOwnershipProof,
@@ -643,7 +643,7 @@ fn report_equivocation_invalid_equivocation_proof() {
 			assert_err!(
 				Babe::report_equivocation_unsigned(
 					RuntimeOrigin::none(),
-					equivocation_proof,
+					Box::new(equivocation_proof),
 					key_owner_proof.clone(),
 				),
 				Error::<Test>::InvalidEquivocationProof,
@@ -750,7 +750,7 @@ fn report_equivocation_validate_unsigned_prevents_duplicates() {
 		let key_owner_proof = Historical::prove(key).unwrap();
 
 		let inner = Call::report_equivocation_unsigned {
-			equivocation_proof: equivocation_proof.clone(),
+			equivocation_proof: Box::new(equivocation_proof.clone()),
 			key_owner_proof: key_owner_proof.clone(),
 		};
 
@@ -786,7 +786,7 @@ fn report_equivocation_validate_unsigned_prevents_duplicates() {
 		// we submit the report
 		Babe::report_equivocation_unsigned(
 			RuntimeOrigin::none(),
-			equivocation_proof,
+			Box::new(equivocation_proof),
 			key_owner_proof,
 		)
 		.unwrap();
@@ -870,7 +870,7 @@ fn report_equivocation_after_skipped_epochs_works() {
 		// between epoch index and session index must be checked.
 		assert!(Babe::report_equivocation_unsigned(
 			RuntimeOrigin::none(),
-			equivocation_proof,
+			Box::new(equivocation_proof),
 			key_owner_proof
 		)
 		.is_ok());
@@ -897,7 +897,7 @@ fn valid_equivocation_reports_dont_pay_fees() {
 
 		// check the dispatch info for the call.
 		let info = Call::<Test>::report_equivocation_unsigned {
-			equivocation_proof: equivocation_proof.clone(),
+			equivocation_proof: Box::new(equivocation_proof.clone()),
 			key_owner_proof: key_owner_proof.clone(),
 		}
 		.get_dispatch_info();
@@ -910,7 +910,7 @@ fn valid_equivocation_reports_dont_pay_fees() {
 		// report the equivocation.
 		let post_info = Babe::report_equivocation_unsigned(
 			RuntimeOrigin::none(),
-			equivocation_proof.clone(),
+			Box::new(equivocation_proof.clone()),
 			key_owner_proof.clone(),
 		)
 		.unwrap();
@@ -924,7 +924,7 @@ fn valid_equivocation_reports_dont_pay_fees() {
 		// duplicate.
 		let post_info = Babe::report_equivocation_unsigned(
 			RuntimeOrigin::none(),
-			equivocation_proof,
+			Box::new(equivocation_proof),
 			key_owner_proof,
 		)
 		.err()

frame/grandpa/src/equivocation.rs

@@ -110,7 +110,6 @@ impl<Offender: Clone> Offence<Offender> for EquivocationOffence<Offender> {
 /// using existing subsystems that are part of frame (type bounds described
 /// below) and will dispatch to them directly, it's only purpose is to wire all
 /// subsystems together.
-#[derive(Default)]
 pub struct EquivocationReportSystem<T, R, P, L>(sp_std::marker::PhantomData<(T, R, P, L)>);
 
 // We use the authorship pallet to fetch the current block author and use
@@ -221,7 +220,10 @@ where
 	) -> bool {
 		use frame_system::offchain::SubmitTransaction;
 
-		let call = Call::report_equivocation_unsigned { equivocation_proof, key_owner_proof };
+		let call = Call::report_equivocation_unsigned {
+			equivocation_proof: Box::new(equivocation_proof),
+			key_owner_proof,
+		};
 		let res = SubmitTransaction::<T, Call<T>>::submit_unsigned_transaction(call.into());
 		match res {
 			Ok(()) => info!(target: LOG_TARGET, "Submitted equivocation report."),

frame/grandpa/src/lib.rs

@@ -196,14 +196,14 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::report_equivocation(key_owner_proof.validator_count()))]
 		pub fn report_equivocation(
 			origin: OriginFor<T>,
-			equivocation_proof: EquivocationProof<T::Hash, T::BlockNumber>,
+			equivocation_proof: Box<EquivocationProof<T::Hash, T::BlockNumber>>,
 			key_owner_proof: T::KeyOwnerProof,
 		) -> DispatchResultWithPostInfo {
-			let reporter = Some(ensure_signed(origin)?);
+			let reporter = ensure_signed(origin)?;
 
 			T::EquivocationReportSystem::report_evidence(
-				reporter,
-				equivocation_proof,
+				Some(reporter),
+				*equivocation_proof,
 				key_owner_proof,
 			)?;
 			// Waive the fee since the report is valid and beneficial
@@ -223,14 +223,14 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::report_equivocation(key_owner_proof.validator_count()))]
 		pub fn report_equivocation_unsigned(
 			origin: OriginFor<T>,
-			equivocation_proof: EquivocationProof<T::Hash, T::BlockNumber>,
+			equivocation_proof: Box<EquivocationProof<T::Hash, T::BlockNumber>>,
 			key_owner_proof: T::KeyOwnerProof,
 		) -> DispatchResultWithPostInfo {
 			ensure_none(origin)?;
 
 			T::EquivocationReportSystem::report_evidence(
 				None,
-				equivocation_proof,
+				*equivocation_proof,
 				key_owner_proof,
 			)?;
 			// Waive the fee since the report is valid and beneficial

frame/grandpa/src/tests.rs

@@ -359,7 +359,7 @@ fn report_equivocation_current_set_works() {
 		// report the equivocation and the tx should be dispatched successfully
 		assert_ok!(Grandpa::report_equivocation_unsigned(
 			RuntimeOrigin::none(),
-			equivocation_proof,
+			Box::new(equivocation_proof),
 			key_owner_proof,
 		),);
 
@@ -437,7 +437,7 @@ fn report_equivocation_old_set_works() {
 		// the old set, the tx should be dispatched successfully
 		assert_ok!(Grandpa::report_equivocation_unsigned(
 			RuntimeOrigin::none(),
-			equivocation_proof,
+			Box::new(equivocation_proof),
 			key_owner_proof,
 		),);
 
@@ -500,7 +500,7 @@ fn report_equivocation_invalid_set_id() {
 		assert_err!(
 			Grandpa::report_equivocation_unsigned(
 				RuntimeOrigin::none(),
-				equivocation_proof,
+				Box::new(equivocation_proof),
 				key_owner_proof,
 			),
 			Error::<Test>::InvalidEquivocationProof,
@@ -541,7 +541,7 @@ fn report_equivocation_invalid_session() {
 		assert_err!(
 			Grandpa::report_equivocation_unsigned(
 				RuntimeOrigin::none(),
-				equivocation_proof,
+				Box::new(equivocation_proof),
 				key_owner_proof,
 			),
 			Error::<Test>::InvalidEquivocationProof,
@@ -586,7 +586,7 @@ fn report_equivocation_invalid_key_owner_proof() {
 		assert_err!(
 			Grandpa::report_equivocation_unsigned(
 				RuntimeOrigin::none(),
-				equivocation_proof,
+				Box::new(equivocation_proof),
 				invalid_key_owner_proof,
 			),
 			Error::<Test>::InvalidKeyOwnershipProof,
@@ -617,7 +617,7 @@ fn report_equivocation_invalid_equivocation_proof() {
 			assert_err!(
 				Grandpa::report_equivocation_unsigned(
 					RuntimeOrigin::none(),
-					equivocation_proof,
+					Box::new(equivocation_proof),
 					key_owner_proof.clone(),
 				),
 				Error::<Test>::InvalidEquivocationProof,
@@ -687,7 +687,7 @@ fn report_equivocation_validate_unsigned_prevents_duplicates() {
 			Historical::prove((sp_finality_grandpa::KEY_TYPE, &equivocation_key)).unwrap();
 
 		let call = Call::report_equivocation_unsigned {
-			equivocation_proof: equivocation_proof.clone(),
+			equivocation_proof: Box::new(equivocation_proof.clone()),
 			key_owner_proof: key_owner_proof.clone(),
 		};
 
@@ -726,7 +726,7 @@ fn report_equivocation_validate_unsigned_prevents_duplicates() {
 		// we submit the report
 		Grandpa::report_equivocation_unsigned(
 			RuntimeOrigin::none(),
-			equivocation_proof,
+			Box::new(equivocation_proof),
 			key_owner_proof,
 		)
 		.unwrap();
@@ -879,7 +879,7 @@ fn valid_equivocation_reports_dont_pay_fees() {
 
 		// check the dispatch info for the call.
 		let info = Call::<Test>::report_equivocation_unsigned {
-			equivocation_proof: equivocation_proof.clone(),
+			equivocation_proof: Box::new(equivocation_proof.clone()),
 			key_owner_proof: key_owner_proof.clone(),
 		}
 		.get_dispatch_info();
@@ -891,7 +891,7 @@ fn valid_equivocation_reports_dont_pay_fees() {
 		// report the equivocation.
 		let post_info = Grandpa::report_equivocation_unsigned(
 			RuntimeOrigin::none(),
-			equivocation_proof.clone(),
+			Box::new(equivocation_proof.clone()),
 			key_owner_proof.clone(),
 		)
 		.unwrap();
@@ -905,7 +905,7 @@ fn valid_equivocation_reports_dont_pay_fees() {
 		// duplicate.
 		let post_info = Grandpa::report_equivocation_unsigned(
 			RuntimeOrigin::none(),
-			equivocation_proof,
+			Box::new(equivocation_proof),
 			key_owner_proof,
 		)
 		.err()