do not use default when real origin not found (#1378)

AcalaNetwork · Aug 31, 2021 · 8043791 · 8043791
1 parent b4ebb19
commit 8043791
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/modules/currencies/src/lib.rs b/modules/currencies/src/lib.rs
@@ -102,6 +102,8 @@ pub mod module {
 		Erc20InvalidOperation,
 		/// EVM account not found
 		EvmAccountNotFound,
+		/// Real origin not found
+		RealOriginNotFound,
 	}
 
 	#[pallet::event]
@@ -274,7 +276,7 @@ impl<T: Config> MultiCurrency<T::AccountId> for Pallet<T> {
 		match currency_id {
 			CurrencyId::Erc20(contract) => {
 				let sender = T::AddressMapping::get_evm_address(from).ok_or(Error::<T>::EvmAccountNotFound)?;
-				let origin = T::EVMBridge::get_origin().unwrap_or_default();
+				let origin = T::EVMBridge::get_origin().ok_or(Error::<T>::RealOriginNotFound)?;
 				let origin_address = T::AddressMapping::get_or_create_evm_address(&origin);
 				let address = T::AddressMapping::get_or_create_evm_address(to);
 				T::EVMBridge::transfer(

diff --git a/modules/currencies/src/tests.rs b/modules/currencies/src/tests.rs
@@ -480,8 +480,16 @@ fn erc20_transfer_should_fail() {
 		.build()
 		.execute_with(|| {
 			deploy_contracts();
+
+			// Real origin not found
+			assert_noop!(
+				Currencies::transfer(Origin::signed(alice()), bob(), CurrencyId::Erc20(erc20_address()), 100),
+				Error::<Runtime>::RealOriginNotFound
+			);
+
 			<EVM as EVMTrait<AccountId>>::set_origin(alice());
 			<EVM as EVMTrait<AccountId>>::set_origin(bob());
+
 			// empty address
 			assert!(
 				Currencies::transfer(Origin::signed(alice()), bob(), CurrencyId::Erc20(H160::default()), 100).is_err()