Change to XCM Origin

Author: girazoki

frame/ethereum/src/lib.rs

@@ -69,6 +69,7 @@ pub use fp_xcm::{EthereumXcmTransaction, XcmToEthereum};
 #[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
 pub enum RawOrigin {
 	EthereumTransaction(H160),
+	XcmEthereumTransaction(H160),
 }
 
 pub fn ensure_ethereum_transaction<OuterOrigin>(o: OuterOrigin) -> Result<H160, &'static str>
@@ -81,6 +82,16 @@ where
 	}
 }
 
+pub fn ensure_xcm_ethereum_transaction<OuterOrigin>(o: OuterOrigin) -> Result<H160, &'static str>
+where
+	OuterOrigin: Into<Result<RawOrigin, OuterOrigin>>,
+{
+	match o.into() {
+		Ok(RawOrigin::XcmEthereumTransaction(n)) => Ok(n),
+		_ => Err("bad origin: expected to be a xcm Ethereum transaction"),
+	}
+}
+
 #[derive(Clone, Debug, Encode, Decode, PartialEq, Eq)]
 struct TransactionData {
 	action: TransactionAction,
@@ -122,8 +133,9 @@ impl<O: Into<Result<RawOrigin, O>> + From<RawOrigin>> EnsureOrigin<O>
 {
 	type Success = H160;
 	fn try_origin(o: O) -> Result<Self::Success, O> {
-		o.into().map(|o| match o {
-			RawOrigin::EthereumTransaction(id) => id,
+		o.into().and_then(|o| match o {
+			RawOrigin::EthereumTransaction(id) => Ok(id),
+			_ => Err(o.into()),
 		})
 	}
 
@@ -133,6 +145,24 @@ impl<O: Into<Result<RawOrigin, O>> + From<RawOrigin>> EnsureOrigin<O>
 	}
 }
 
+pub struct EnsureXcmEthereumTransaction;
+impl<O: Into<Result<RawOrigin, O>> + From<RawOrigin>> EnsureOrigin<O>
+	for EnsureXcmEthereumTransaction
+{
+	type Success = H160;
+	fn try_origin(o: O) -> Result<Self::Success, O> {
+		o.into().and_then(|o| match o {
+			RawOrigin::XcmEthereumTransaction(id) => Ok(id),
+			_ => Err(o.into()),
+		})
+	}
+
+	#[cfg(feature = "runtime-benchmarks")]
+	fn successful_origin() -> O {
+		O::from(RawOrigin::XcmEthereumTransaction(Default::default()))
+	}
+}
+
 impl<T> Call<T>
 where
 	OriginFor<T>: Into<Result<RawOrigin, OriginFor<T>>>,
@@ -316,11 +346,7 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			xcm_transaction: EthereumXcmTransaction,
 		) -> DispatchResultWithPostInfo {
-			let source = match &xcm_transaction {
-				EthereumXcmTransaction::V1(v1_tx) => v1_tx.from,
-			};
-
-			T::XcmTransactOrigin::ensure_address_origin(&source, origin)?;
+			let source = ensure_xcm_ethereum_transaction(origin)?;
 
 			let (base_fee, base_fee_weight) = T::FeeCalculator::min_gas_price();
 			let (who, account_weight) = pallet_evm::Pallet::<T>::account_basic(&source);

primitives/xcm/src/lib.rs

@@ -80,8 +80,6 @@ pub struct EthereumXcmTransactionV1 {
 	pub input: Vec<u8>,
 	/// Map of addresses to be pre-paid to warm storage.
 	pub access_list: Option<Vec<(H160, Vec<H256>)>>,
-	/// account calling the dispatchable
-	pub from: H160,
 }
 
 pub trait XcmToEthereum {
@@ -197,7 +195,6 @@ mod tests {
 			value: U256::from(0),
 			input: vec![1u8],
 			access_list: None,
-			from: H160::default(),
 		};
 		let nonce = U256::from(0);
 		let base_fee = U256::from(1);
@@ -231,7 +228,6 @@ mod tests {
 			value: U256::from(0),
 			input: vec![1u8],
 			access_list: None,
-			from: H160::default(),
 		};
 		let nonce = U256::from(0);
 		let base_fee = U256::from(1);
@@ -265,7 +261,6 @@ mod tests {
 			value: U256::from(0),
 			input: vec![1u8],
 			access_list: None,
-			from: H160::default(),
 		};
 		let nonce = U256::from(0);
 		let base_fee = U256::from(1);