New substrate event ExecutedFromXcm to link xcm message hash with ethereum tx hash

pallets/ethereum-xcm/Cargo.toml

@@ -15,6 +15,7 @@ ethereum = { workspace = true, features = [ "with-codec" ] }
 serde = { workspace = true, optional = true }
 
 # Parity
+environmental = { workspace = true }
 ethereum-types = { workspace = true }
 parity-scale-codec = { workspace = true }
 rlp = { workspace = true }
@@ -70,6 +71,7 @@ std = [
 	"pallet-evm/std",
 	"pallet-timestamp/std",
 	# Parity
+	"environmental/std",
 	"parity-scale-codec/std",
 	"rlp/std",
 	"scale-info/std",

pallets/ethereum-xcm/src/lib.rs

@@ -27,12 +27,12 @@ mod mock;
 #[cfg(all(feature = "std", test))]
 mod tests;
 
-use ethereum_types::{H160, U256};
+use ethereum_types::{H160, H256, U256};
 use fp_ethereum::{TransactionData, ValidatedTransaction};
 use fp_evm::{CheckEvmTransaction, CheckEvmTransactionConfig, TransactionValidationError};
 use frame_support::{
 	dispatch::{DispatchResultWithPostInfo, Pays, PostDispatchInfo},
-	traits::{EnsureOrigin, Get},
+	traits::{EnsureOrigin, Get, ProcessMessage},
 	weights::Weight,
 };
 use frame_system::pallet_prelude::OriginFor;
@@ -83,6 +83,25 @@ impl<O: Into<Result<RawOrigin, O>> + From<RawOrigin>> EnsureOrigin<O>
 	}
 }
 
+environmental::environmental!(XCM_MESSAGE_HASH: H256);
+
+pub struct MessageProcessorWrapper<Inner>(core::marker::PhantomData<Inner>);
+impl<Inner: ProcessMessage> ProcessMessage for MessageProcessorWrapper<Inner> {
+	type Origin = <Inner as ProcessMessage>::Origin;
+
+	fn process_message(
+		message: &[u8],
+		origin: Self::Origin,
+		meter: &mut frame_support::weights::WeightMeter,
+		id: &mut [u8; 32],
+	) -> Result<bool, frame_support::traits::ProcessMessageError> {
+		let mut xcm_msg_hash = H256(sp_io::hashing::blake2_256(message));
+		XCM_MESSAGE_HASH::using(&mut xcm_msg_hash, || {
+			Inner::process_message(message, origin, meter, id)
+		})
+	}
+}
+
 pub use self::pallet::*;
 
 #[frame_support::pallet(dev_mode)]
@@ -92,6 +111,8 @@ pub mod pallet {
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config + pallet_evm::Config {
+		/// The overarching event type.
+		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 		/// Invalid transaction error
 		type InvalidEvmTransactionError: From<TransactionValidationError>;
 		/// Handler for applying an already validated transaction
@@ -131,6 +152,16 @@ pub mod pallet {
 		EthereumXcmExecutionSuspended,
 	}
 
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T> {
+		/// Ethereum transaction executed from XCM
+		ExecutedFromXcm {
+			xcm_msg_hash: H256,
+			eth_tx_hash: H256,
+		},
+	}
+
 	#[pallet::call]
 	impl<T: Config> Pallet<T>
 	where
@@ -292,6 +323,7 @@ impl<T: Config> Pallet<T> {
 		let transaction: Option<Transaction> =
 			xcm_transaction.into_transaction_v2(current_nonce, T::ChainId::get(), allow_create);
 		if let Some(transaction) = transaction {
+			let tx_hash = transaction.hash();
 			let transaction_data: TransactionData = (&transaction).into();
 
 			let (weight_limit, proof_size_base_cost) =
@@ -339,6 +371,14 @@ impl<T: Config> Pallet<T> {
 
 			let (dispatch_info, _) =
 				T::ValidatedTransaction::apply(source, transaction, maybe_force_create_address)?;
+
+			XCM_MESSAGE_HASH::with(|xcm_msg_hash| {
+				Self::deposit_event(Event::ExecutedFromXcm {
+					xcm_msg_hash: *xcm_msg_hash,
+					eth_tx_hash: tx_hash,
+				});
+			});
+
 			Ok(dispatch_info)
 		} else {
 			Err(sp_runtime::DispatchErrorWithPostInfo {

pallets/ethereum-xcm/src/mock.rs

@@ -278,6 +278,7 @@ impl xcm_primitives::EnsureProxy<AccountId32> for EthereumXcmEnsureProxy {
 }
 
 impl crate::Config for Test {
+	type RuntimeEvent = RuntimeEvent;
 	type InvalidEvmTransactionError = pallet_ethereum::InvalidTransactionWrapper;
 	type ValidatedTransaction = pallet_ethereum::ValidatedTransaction<Self>;
 	type XcmEthereumOrigin = crate::EnsureXcmEthereumTransaction;

runtime/moonbase/src/lib.rs

@@ -726,6 +726,7 @@ impl xcm_primitives::EnsureProxy<AccountId> for EthereumXcmEnsureProxy {
 }
 
 impl pallet_ethereum_xcm::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
 	type InvalidEvmTransactionError = pallet_ethereum::InvalidTransactionWrapper;
 	type ValidatedTransaction = pallet_ethereum::ValidatedTransaction<Self>;
 	type XcmEthereumOrigin = pallet_ethereum_xcm::EnsureXcmEthereumTransaction;
@@ -1420,7 +1421,7 @@ construct_runtime! {
 		// Previously 35: BaseFee
 		// Previously 36: pallet_assets::<Instance1>
 		MoonbeamOrbiters: pallet_moonbeam_orbiters::{Pallet, Call, Storage, Event<T>, Config<T>} = 37,
-		EthereumXcm: pallet_ethereum_xcm::{Pallet, Call, Storage, Origin} = 38,
+		EthereumXcm: pallet_ethereum_xcm::{Pallet, Call, Storage, Origin, Event<T>} = 38,
 		Randomness: pallet_randomness::{Pallet, Call, Storage, Event<T>, Inherent} = 39,
 		TreasuryCouncilCollective:
 			pallet_collective::<Instance3>::{Pallet, Call, Storage, Event<T>, Origin<T>, Config<T>} = 40,

runtime/moonbase/src/xcm_config.rs

@@ -444,8 +444,9 @@ impl pallet_message_queue::Config for Runtime {
 		cumulus_primitives_core::AggregateMessageOrigin,
 	>;
 	#[cfg(not(feature = "runtime-benchmarks"))]
-	type MessageProcessor =
-		xcm_builder::ProcessXcmMessage<AggregateMessageOrigin, XcmExecutor, RuntimeCall>;
+	type MessageProcessor = pallet_ethereum_xcm::MessageProcessorWrapper<
+		xcm_builder::ProcessXcmMessage<AggregateMessageOrigin, XcmExecutor, RuntimeCall>,
+	>;
 	type Size = u32;
 	type HeapSize = MessageQueueHeapSize;
 	type MaxStale = MessageQueueMaxStale;

runtime/moonbase/tests/xcm_mock/parachain.rs

@@ -1052,6 +1052,7 @@ impl xcm_primitives::EnsureProxy<AccountId> for EthereumXcmEnsureProxy {
 }
 
 impl pallet_ethereum_xcm::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
 	type InvalidEvmTransactionError = pallet_ethereum::InvalidTransactionWrapper;
 	type ValidatedTransaction = pallet_ethereum::ValidatedTransaction<Self>;
 	type XcmEthereumOrigin = pallet_ethereum_xcm::EnsureXcmEthereumTransaction;

runtime/moonbeam/src/lib.rs

@@ -736,6 +736,7 @@ impl xcm_primitives::EnsureProxy<AccountId> for EthereumXcmEnsureProxy {
 }
 
 impl pallet_ethereum_xcm::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
 	type InvalidEvmTransactionError = pallet_ethereum::InvalidTransactionWrapper;
 	type ValidatedTransaction = pallet_ethereum::ValidatedTransaction<Self>;
 	type XcmEthereumOrigin = pallet_ethereum_xcm::EnsureXcmEthereumTransaction;
@@ -1450,7 +1451,7 @@ construct_runtime! {
 		XTokens: orml_xtokens::{Pallet, Call, Storage, Event<T>} = 106,
 		XcmTransactor: pallet_xcm_transactor::{Pallet, Call, Storage, Event<T>} = 107,
 		// Previously 108: pallet_assets::<Instance1>
-		EthereumXcm: pallet_ethereum_xcm::{Pallet, Call, Storage, Origin} = 109,
+		EthereumXcm: pallet_ethereum_xcm::{Pallet, Call, Storage, Origin, Event<T>} = 109,
 		Erc20XcmBridge: pallet_erc20_xcm_bridge::{Pallet} = 110,
 		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>} = 111,
 		RelayStorageRoots: pallet_relay_storage_roots::{Pallet, Storage} = 112,

runtime/moonbeam/src/xcm_config.rs

@@ -434,8 +434,9 @@ impl pallet_message_queue::Config for Runtime {
 		cumulus_primitives_core::AggregateMessageOrigin,
 	>;
 	#[cfg(not(feature = "runtime-benchmarks"))]
-	type MessageProcessor =
-		xcm_builder::ProcessXcmMessage<AggregateMessageOrigin, XcmExecutor, RuntimeCall>;
+	type MessageProcessor = pallet_ethereum_xcm::MessageProcessorWrapper<
+		xcm_builder::ProcessXcmMessage<AggregateMessageOrigin, XcmExecutor, RuntimeCall>,
+	>;
 	type Size = u32;
 	type HeapSize = MessageQueueHeapSize;
 	type MaxStale = MessageQueueMaxStale;

runtime/moonbeam/tests/xcm_mock/parachain.rs

@@ -1037,6 +1037,7 @@ impl xcm_primitives::EnsureProxy<AccountId> for EthereumXcmEnsureProxy {
 }
 
 impl pallet_ethereum_xcm::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
 	type InvalidEvmTransactionError = pallet_ethereum::InvalidTransactionWrapper;
 	type ValidatedTransaction = pallet_ethereum::ValidatedTransaction<Self>;
 	type XcmEthereumOrigin = pallet_ethereum_xcm::EnsureXcmEthereumTransaction;

runtime/moonriver/src/lib.rs

@@ -710,6 +710,7 @@ impl xcm_primitives::EnsureProxy<AccountId> for EthereumXcmEnsureProxy {
 }
 
 impl pallet_ethereum_xcm::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
 	type InvalidEvmTransactionError = pallet_ethereum::InvalidTransactionWrapper;
 	type ValidatedTransaction = pallet_ethereum::ValidatedTransaction<Self>;
 	type XcmEthereumOrigin = pallet_ethereum_xcm::EnsureXcmEthereumTransaction;
@@ -1453,7 +1454,7 @@ construct_runtime! {
 		XTokens: orml_xtokens::{Pallet, Call, Storage, Event<T>} = 106,
 		XcmTransactor: pallet_xcm_transactor::{Pallet, Call, Storage, Event<T>} = 107,
 		// Previously 108: pallet_assets::<Instance1>
-		EthereumXcm: pallet_ethereum_xcm::{Pallet, Call, Storage, Origin} = 109,
+		EthereumXcm: pallet_ethereum_xcm::{Pallet, Call, Storage, Origin, Event<T>} = 109,
 		Erc20XcmBridge: pallet_erc20_xcm_bridge::{Pallet} = 110,
 		MessageQueue: pallet_message_queue::{Pallet, Call, Storage, Event<T>} = 111,
 		RelayStorageRoots: pallet_relay_storage_roots::{Pallet, Storage} = 112,

runtime/moonriver/src/xcm_config.rs

@@ -442,8 +442,9 @@ impl pallet_message_queue::Config for Runtime {
 		cumulus_primitives_core::AggregateMessageOrigin,
 	>;
 	#[cfg(not(feature = "runtime-benchmarks"))]
-	type MessageProcessor =
-		xcm_builder::ProcessXcmMessage<AggregateMessageOrigin, XcmExecutor, RuntimeCall>;
+	type MessageProcessor = pallet_ethereum_xcm::MessageProcessorWrapper<
+		xcm_builder::ProcessXcmMessage<AggregateMessageOrigin, XcmExecutor, RuntimeCall>,
+	>;
 	type Size = u32;
 	type HeapSize = MessageQueueHeapSize;
 	type MaxStale = MessageQueueMaxStale;

runtime/moonriver/tests/xcm_mock/parachain.rs

@@ -1043,6 +1043,7 @@ impl xcm_primitives::EnsureProxy<AccountId> for EthereumXcmEnsureProxy {
 }
 
 impl pallet_ethereum_xcm::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
 	type InvalidEvmTransactionError = pallet_ethereum::InvalidTransactionWrapper;
 	type ValidatedTransaction = pallet_ethereum::ValidatedTransaction<Self>;
 	type XcmEthereumOrigin = pallet_ethereum_xcm::EnsureXcmEthereumTransaction;