make origin configurable

Author: girazoki

frame/ethereum/src/lib.rs

@@ -47,7 +47,7 @@ use frame_support::{
 	weights::{DispatchInfo, Pays, PostDispatchInfo, Weight},
 };
 use frame_system::{pallet_prelude::OriginFor, CheckWeight, WeightInfo};
-use pallet_evm::{BlockHashMapping, EnsureAddressOrigin, FeeCalculator, GasWeightMapping, Runner};
+use pallet_evm::{BlockHashMapping, FeeCalculator, GasWeightMapping, Runner};
 use sha3::{Digest, Keccak256};
 use sp_runtime::{
 	generic::DigestItem,
@@ -239,7 +239,7 @@ pub mod pallet {
 		/// How Ethereum state root is calculated.
 		type StateRoot: Get<H256>;
 		/// Origin for xcm transact
-		type XcmTransactOrigin: EnsureAddressOrigin<Self::Origin>;
+		type XcmEthereumOrigin: EnsureOrigin<Self::Origin>;
 	}
 
 	#[pallet::pallet]

frame/ethereum/src/mock.rs

@@ -174,7 +174,7 @@ impl pallet_evm::Config for Test {
 impl crate::Config for Test {
 	type Event = Event;
 	type StateRoot = IntermediateStateRoot<Self>;
-	type XcmTransactOrigin = pallet_evm::EnsureAddressTruncated;
+	type XcmEthereumOrigin = crate::EnsureXcmEthereumTransaction;
 }
 
 impl fp_self_contained::SelfContainedCall for Call {

template/runtime/src/lib.rs

@@ -347,7 +347,7 @@ impl pallet_evm::Config for Runtime {
 impl pallet_ethereum::Config for Runtime {
 	type Event = Event;
 	type StateRoot = pallet_ethereum::IntermediateStateRoot<Self>;
-	type XcmTransactOrigin = pallet_evm::EnsureAddressTruncated;
+	type XcmEthereumOrigin = pallet_ethereum::EnsureXcmEthereumTransaction;
 }
 
 frame_support::parameter_types! {