fix: remove generic error from OnCheckEvmTransaction

Author: Grigoriy Simonov

frame/ethereum/src/lib.rs

@@ -492,7 +492,7 @@ impl<T: Config> Pallet<T> {
 		let (base_fee, _) = T::FeeCalculator::min_gas_price();
 		let (who, _) = pallet_evm::Pallet::<T>::account_basic(&origin);
 
-		let mut v = CheckEvmTransaction::<InvalidTransactionWrapper>::new(
+		let mut v = CheckEvmTransaction::new(
 			who.clone(),
 			CheckEvmTransactionConfig {
 				evm_config: T::config(),
@@ -506,16 +506,14 @@ impl<T: Config> Pallet<T> {
 			proof_size_base_cost,
 		);
 
-		T::OnCheckEvmTransaction::<InvalidTransactionWrapper>::on_check_evm_transaction(
-			&mut v, &origin,
-		)
-		.map_err(|e| e.0)?;
+		T::OnCheckEvmTransaction::on_check_evm_transaction(&mut v, &origin)
+			.map_err(|e| InvalidTransactionWrapper::from(e).0)?;
 
-		v.validate_in_pool_for()
+		v.validate_in_pool()
 			.and_then(|v| v.with_chain_id())
 			.and_then(|v| v.with_base_fee())
 			.and_then(|v| v.with_balance())
-			.map_err(|e| e.0)?;
+			.map_err(|e| InvalidTransactionWrapper::from(e).0)?;
 
 		// EIP-3607: https://eips.ethereum.org/EIPS/eip-3607
 		// Do not allow transactions for which `tx.sender` has any code deployed.
@@ -867,7 +865,7 @@ impl<T: Config> Pallet<T> {
 		let (base_fee, _) = T::FeeCalculator::min_gas_price();
 		let (who, _) = pallet_evm::Pallet::<T>::account_basic(&origin);
 
-		let mut v = CheckEvmTransaction::<InvalidTransactionWrapper>::new(
+		let mut v = CheckEvmTransaction::new(
 			who,
 			CheckEvmTransactionConfig {
 				evm_config: T::config(),
@@ -881,16 +879,14 @@ impl<T: Config> Pallet<T> {
 			proof_size_base_cost,
 		);
 
-		T::OnCheckEvmTransaction::<InvalidTransactionWrapper>::on_check_evm_transaction(
-			&mut v, &origin,
-		)
-		.map_err(|e| TransactionValidityError::Invalid(e.0))?;
+		T::OnCheckEvmTransaction::on_check_evm_transaction(&mut v, &origin)
+			.map_err(|e| TransactionValidityError::Invalid(InvalidTransactionWrapper::from(e).0))?;
 
 		v.validate_in_block()
 			.and_then(|v| v.with_chain_id())
 			.and_then(|v| v.with_base_fee())
 			.and_then(|v| v.with_balance())
-			.map_err(|e| TransactionValidityError::Invalid(e.0))?;
+			.map_err(|e| TransactionValidityError::Invalid(InvalidTransactionWrapper::from(e).0))?;
 
 		Ok(())
 	}

frame/ethereum/src/mock.rs

@@ -180,7 +180,7 @@ impl pallet_evm::Config for Test {
 	type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
 	type Timestamp = Timestamp;
 	type WeightInfo = ();
-	type OnCheckEvmTransaction<E: From<pallet_evm::TransactionValidationError>> = ();
+	type OnCheckEvmTransaction = ();
 }
 
 parameter_types! {

frame/evm/precompile/dispatch/src/mock.rs

@@ -166,7 +166,7 @@ impl pallet_evm::Config for Test {
 	type GasLimitPovSizeRatio = ();
 	type Timestamp = Timestamp;
 	type WeightInfo = ();
-	type OnCheckEvmTransaction<E: From<pallet_evm::TransactionValidationError>> = ();
+	type OnCheckEvmTransaction = ();
 }
 
 pub(crate) struct MockHandle {

frame/evm/src/lib.rs

@@ -179,10 +179,7 @@ pub mod pallet {
 		}
 
 		// Called when transaction info for validation is created
-		type OnCheckEvmTransaction<E: From<TransactionValidationError>>: OnCheckEvmTransaction<
-			Self,
-			E,
-		>;
+		type OnCheckEvmTransaction: OnCheckEvmTransaction<Self>;
 	}
 
 	#[pallet::call]
@@ -1054,12 +1051,18 @@ impl<T> OnCreate<T> for Tuple {
 	}
 }
 
-pub trait OnCheckEvmTransaction<T: Config, E: From<TransactionValidationError>> {
-	fn on_check_evm_transaction(v: &mut CheckEvmTransaction<E>, origin: &H160) -> Result<(), E>;
+pub trait OnCheckEvmTransaction<T: Config> {
+	fn on_check_evm_transaction(
+		v: &mut CheckEvmTransaction,
+		origin: &H160,
+	) -> Result<(), TransactionValidationError>;
 }
 
-impl<T: Config, E: From<TransactionValidationError>> OnCheckEvmTransaction<T, E> for () {
-	fn on_check_evm_transaction(_v: &mut CheckEvmTransaction<E>, _origin: &H160) -> Result<(), E> {
+impl<T: Config> OnCheckEvmTransaction<T> for () {
+	fn on_check_evm_transaction(
+		_v: &mut CheckEvmTransaction,
+		_origin: &H160,
+	) -> Result<(), TransactionValidationError> {
 		Ok(())
 	}
 }

frame/evm/src/mock.rs

@@ -33,7 +33,6 @@ use sp_std::{boxed::Box, prelude::*, str::FromStr};
 use crate::{
 	EnsureAddressNever, EnsureAddressRoot, FeeCalculator, IdentityAddressMapping,
 	IsPrecompileResult, Precompile, PrecompileHandle, PrecompileResult, PrecompileSet,
-	TransactionValidationError,
 };
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
@@ -163,7 +162,7 @@ impl crate::Config for Test {
 	type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
 	type Timestamp = Timestamp;
 	type WeightInfo = ();
-	type OnCheckEvmTransaction<E: From<TransactionValidationError>> = ();
+	type OnCheckEvmTransaction = ();
 }
 
 /// Example PrecompileSet with only Identity precompile.

frame/evm/src/runner/stack.rs

@@ -377,7 +377,7 @@ where
 		weight = weight.saturating_add(inner_weight);
 		let nonce = nonce.unwrap_or(source_account.nonce);
 
-		let mut v = fp_evm::CheckEvmTransaction::<Self::Error>::new(
+		let mut v = fp_evm::CheckEvmTransaction::new(
 			source_account,
 			fp_evm::CheckEvmTransactionConfig {
 				evm_config,
@@ -402,13 +402,20 @@ where
 			proof_size_base_cost,
 		);
 
-		T::OnCheckEvmTransaction::<Error<T>>::on_check_evm_transaction(&mut v, &source)
-			.map_err(|error| RunnerError { error, weight })?;
+		T::OnCheckEvmTransaction::on_check_evm_transaction(&mut v, &source).map_err(|error| {
+			RunnerError {
+				error: error.into(),
+				weight,
+			}
+		})?;
 
 		v.validate_in_block()
 			.and_then(|v| v.with_base_fee())
 			.and_then(|v| v.with_balance())
-			.map_err(|error| RunnerError { error, weight })?;
+			.map_err(|error| RunnerError {
+				error: error.into(),
+				weight,
+			})?;
 		Ok(())
 	}
 

precompiles/tests-external/lib.rs

@@ -254,6 +254,7 @@ mod tests {
 		type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
 		type Timestamp = Timestamp;
 		type WeightInfo = pallet_evm::weights::SubstrateWeight<Runtime>;
+		type OnCheckEvmTransaction = ();
 	}
 
 	parameter_types! {