charge storage fee to support non native asset

modules/asset-registry/src/mock.rs

@@ -104,7 +104,7 @@ impl module_evm::Config for Runtime {
 	type PrecompilesValue = ();
 	type ChainId = ();
 	type GasToWeight = ();
-	type ChargeTransactionPayment = ();
+	type ChargeTransactionPayment = module_support::mocks::MockReservedTransactionPayment<Balances>;
 	type NetworkContractOrigin = EnsureSignedBy<NetworkContractAccount, AccountId>;
 	type NetworkContractSource = NetworkContractSource;
 

modules/currencies/src/mock.rs

@@ -157,7 +157,7 @@ impl module_evm::Config for Runtime {
 	type PrecompilesValue = ();
 	type ChainId = ();
 	type GasToWeight = GasToWeight;
-	type ChargeTransactionPayment = ();
+	type ChargeTransactionPayment = support::mocks::MockReservedTransactionPayment<Balances>;
 	type NetworkContractOrigin = EnsureSignedBy<NetworkContractAccount, AccountId>;
 	type NetworkContractSource = NetworkContractSource;
 

modules/evm-bridge/src/mock.rs

@@ -109,7 +109,7 @@ impl module_evm::Config for Runtime {
 	type PrecompilesValue = ();
 	type ChainId = ();
 	type GasToWeight = ();
-	type ChargeTransactionPayment = ();
+	type ChargeTransactionPayment = support::mocks::MockReservedTransactionPayment<Balances>;
 	type NetworkContractOrigin = EnsureSignedBy<NetworkContractAccount, AccountId32>;
 	type NetworkContractSource = NetworkContractSource;
 

modules/evm/src/bench/mock.rs

@@ -22,7 +22,7 @@ use super::super::*;
 
 use frame_support::{
 	construct_runtime, ord_parameter_types, parameter_types,
-	traits::{ConstU128, ConstU32, ConstU64, Everything, FindAuthor, Nothing},
+	traits::{ConstU128, ConstU32, ConstU64, Everything, FindAuthor, Imbalance, Nothing},
 	ConsensusEngineId,
 };
 use frame_system::EnsureSignedBy;
@@ -37,6 +37,7 @@ use sp_runtime::{
 	traits::{BlakeTwo256, BlockNumberProvider, IdentityLookup},
 	AccountId32,
 };
+use std::marker::PhantomData;
 
 type Balance = u128;
 
@@ -128,7 +129,6 @@ define_combined_task! {
 }
 
 pub struct MockBlockNumberProvider;
-
 impl BlockNumberProvider for MockBlockNumberProvider {
 	type BlockNumber = u32;
 
@@ -147,7 +147,6 @@ impl module_idle_scheduler::Config for Runtime {
 }
 
 pub struct GasToWeight;
-
 impl Convert<u64, u64> for GasToWeight {
 	fn convert(a: u64) -> u64 {
 		a
@@ -188,7 +187,7 @@ impl Config for Runtime {
 	type PrecompilesValue = ();
 	type ChainId = ConstU64<1>;
 	type GasToWeight = GasToWeight;
-	type ChargeTransactionPayment = DefaultTransactionPayment;
+	type ChargeTransactionPayment = DefaultTransactionPayment<Balances>;
 
 	type NetworkContractOrigin = EnsureSignedBy<NetworkContractAccount, AccountId32>;
 	type NetworkContractSource = NetworkContractSource;
@@ -204,17 +203,26 @@ impl Config for Runtime {
 	type WeightInfo = ();
 }
 
-pub struct DefaultTransactionPayment;
-
-use frame_support::traits::Imbalance;
-impl<AccountId, Balance: Default + Copy, NegativeImbalance: Imbalance<Balance>>
-	TransactionPayment<AccountId, Balance, NegativeImbalance> for DefaultTransactionPayment
+pub struct DefaultTransactionPayment<Currency>(PhantomData<Currency>);
+impl<
+		AccountId,
+		Balance: Default + Copy,
+		NegativeImbalance: Imbalance<Balance>,
+		Currency: frame_support::traits::NamedReservableCurrency<
+			AccountId,
+			ReserveIdentifier = ReserveIdentifier,
+			Balance = Balance,
+		>,
+	> TransactionPayment<AccountId, Balance, NegativeImbalance> for DefaultTransactionPayment<Currency>
 {
-	fn reserve_fee(_who: &AccountId, _weight: Weight) -> Result<Balance, DispatchError> {
-		Ok(Default::default())
+	fn reserve_fee(who: &AccountId, fee: Balance, named: Option<ReserveIdentifier>) -> Result<Balance, DispatchError> {
+		Currency::reserve_named(&named.unwrap(), who, fee)?;
+		Ok(fee)
 	}
 
-	fn unreserve_fee(_who: &AccountId, _fee: Balance) {}
+	fn unreserve_fee(_who: &AccountId, _fee: Balance, _named: Option<ReserveIdentifier>) -> Balance {
+		Default::default()
+	}
 
 	fn unreserve_and_charge_fee(
 		_who: &AccountId,

modules/evm/src/lib.rs

@@ -1476,7 +1476,7 @@ impl<T: Config> Pallet<T> {
 	///
 	/// - Ensures signer is maintainer or root.
 	/// - Update codes info.
-	/// - Save `code`if not saved yet.
+	/// - Save `code` if not saved yet.
 	fn do_set_code(root_or_signed: Either<(), T::AccountId>, contract: EvmAddress, code: Vec<u8>) -> DispatchResult {
 		Accounts::<T>::mutate(contract, |maybe_account_info| -> DispatchResult {
 			let account_info = maybe_account_info.as_mut().ok_or(Error::<T>::ContractNotFound)?;
@@ -1501,20 +1501,20 @@ impl<T: Config> Pallet<T> {
 			let code_hash = code_hash(bounded_code.as_slice());
 			let code_size = bounded_code.len() as u32;
 			// The code_hash of the same contract is definitely different.
-			// The `contract_info.code_hash` hashed by on_contract_initialization which constructored.
+			// The `contract_info.code_hash` hashed by on_contract_initialization which constructed.
 			// Still check it here.
 			if code_hash == contract_info.code_hash {
 				return Ok(());
 			}
 
-			let storage_size_chainged: i32 =
+			let storage_size_changed: i32 =
 				code_size.saturating_add(T::NewContractExtraBytes::get()) as i32 - old_code_info.code_size as i32;
 
-			if storage_size_chainged.is_positive() {
-				Self::reserve_storage(&source, storage_size_chainged as u32)?;
+			if storage_size_changed.is_positive() {
+				Self::reserve_storage(&source, storage_size_changed as u32)?;
 			}
-			Self::charge_storage(&source, &contract, storage_size_chainged)?;
-			Self::update_contract_storage_size(&contract, storage_size_chainged);
+			Self::charge_storage(&source, &contract, storage_size_changed)?;
+			Self::update_contract_storage_size(&contract, storage_size_changed);
 
 			// try remove old codes
 			CodeInfos::<T>::mutate_exists(&contract_info.code_hash, |maybe_code_info| -> DispatchResult {
@@ -1577,7 +1577,7 @@ impl<T: Config> Pallet<T> {
 			// when rpc is called, from is empty, allowing the call
 			published || maintainer == *caller || Self::is_developer_or_contract(caller) || *caller == H160::default()
 		} else {
-			// contract non exist, we don't override defualt evm behaviour
+			// contract non exist, we don't override default evm behaviour
 			true
 		}
 	}
@@ -1606,7 +1606,8 @@ impl<T: Config> Pallet<T> {
 			caller, user, limit, amount
 		);
 
-		T::Currency::reserve_named(&RESERVE_ID_STORAGE_DEPOSIT, &user, amount)
+		T::ChargeTransactionPayment::reserve_fee(&user, amount, Some(RESERVE_ID_STORAGE_DEPOSIT))?;
+		Ok(())
 	}
 
 	fn unreserve_storage(caller: &H160, limit: u32, used: u32, refunded: u32) -> DispatchResult {

modules/evm/src/mock.rs

@@ -192,7 +192,7 @@ impl Config for Runtime {
 	type PrecompilesValue = ();
 	type ChainId = ConstU64<1>;
 	type GasToWeight = GasToWeight;
-	type ChargeTransactionPayment = ();
+	type ChargeTransactionPayment = module_support::mocks::MockReservedTransactionPayment<Balances>;
 
 	type NetworkContractOrigin = EnsureSignedBy<NetworkContractAccount, AccountId32>;
 	type NetworkContractSource = NetworkContractSource;

modules/idle-scheduler/src/lib.rs

@@ -53,7 +53,7 @@ pub mod module {
 		/// Weight information for the extrinsics in this module.
 		type WeightInfo: WeightInfo;
 
-		/// Dispatchable tasks
+		/// Dispatchable tasks.
 		type Task: DispatchableTask + FullCodec + Debug + Clone + PartialEq + TypeInfo;
 
 		/// The minimum weight that should remain before idle tasks are dispatched.
@@ -63,9 +63,9 @@ pub mod module {
 		/// Gets RelayChain Block Number
 		type RelayChainBlockNumberProvider: BlockNumberProvider<BlockNumber = BlockNumber>;
 
-		/// Number of Relay Chain blocks skipped to disable `on_idle` dispatching scheduled tasks
+		/// Number of Relay Chain blocks skipped to disable `on_idle` dispatching scheduled tasks,
 		/// this shuts down idle-scheduler when block production is slower than this number of
-		/// relaychain blocks
+		/// relaychain blocks.
 		#[pallet::constant]
 		type DisableBlockThreshold: Get<BlockNumber>;
 	}
@@ -79,16 +79,19 @@ pub mod module {
 		TaskAdded { task_id: Nonce, task: T::Task },
 	}
 
-	/// Some documentation
+	/// The schedule tasks waiting to dispatch. After task is dispatched, it's removed.
+	///
+	/// Tasks: map Nonce => Task
 	#[pallet::storage]
 	#[pallet::getter(fn tasks)]
 	pub type Tasks<T: Config> = StorageMap<_, Twox64Concat, Nonce, T::Task, OptionQuery>;
 
+	/// The task id used to index tasks.
 	#[pallet::storage]
 	#[pallet::getter(fn next_task_id)]
 	pub type NextTaskId<T: Config> = StorageValue<_, Nonce, ValueQuery>;
 
-	///
+	/// A temporary variable used to check if should skip dispatch schedule task or not.
 	#[pallet::storage]
 	#[pallet::getter(fn previous_relay_block)]
 	pub type PreviousRelayBlockNumber<T: Config> = StorageValue<_, BlockNumber, ValueQuery>;
@@ -121,7 +124,7 @@ pub mod module {
 					current_relay_block_number,
 					previous_relay_block_number
 				);
-				// something is not correct so exaust all remaining weight (note: any on_idle hooks after
+				// something is not correct so exhaust all remaining weight (note: any on_idle hooks after
 				// IdleScheduler won't execute)
 				remaining_weight
 			} else {
@@ -146,7 +149,7 @@ pub mod module {
 }
 
 impl<T: Config> Pallet<T> {
-	/// Add the task to the queue to be dispatched later
+	/// Add the task to the queue to be dispatched later.
 	fn do_schedule_task(task: T::Task) -> DispatchResult {
 		let id = Self::get_next_task_id()?;
 		Tasks::<T>::insert(id, &task);
@@ -192,7 +195,7 @@ impl<T: Config> Pallet<T> {
 		total_weight.saturating_sub(weight_remaining)
 	}
 
-	// Removes completed tasks and deposits events
+	/// Removes completed tasks and deposits events.
 	pub fn remove_completed_tasks(completed_tasks: Vec<(Nonce, TaskResult)>) {
 		// Deposit event and remove completed tasks.
 		for (id, result) in completed_tasks {

modules/support/src/lib.rs

@@ -21,12 +21,11 @@
 
 use codec::FullCodec;
 use frame_support::pallet_prelude::{DispatchClass, Pays, Weight};
-use primitives::{task::TaskResult, CurrencyId};
+use primitives::{task::TaskResult, CurrencyId, ReserveIdentifier};
 use sp_runtime::{
 	traits::CheckedDiv, transaction_validity::TransactionValidityError, DispatchError, DispatchResult, FixedU128,
 };
 use sp_std::prelude::*;
-
 use xcm::latest::prelude::*;
 
 pub mod dex;
@@ -84,8 +83,8 @@ impl<AccountId, CurrencyId, Balance> DEXIncentives<AccountId, CurrencyId, Balanc
 }
 
 pub trait TransactionPayment<AccountId, Balance, NegativeImbalance> {
-	fn reserve_fee(who: &AccountId, weight: Weight) -> Result<Balance, DispatchError>;
-	fn unreserve_fee(who: &AccountId, fee: Balance);
+	fn reserve_fee(who: &AccountId, fee: Balance, named: Option<ReserveIdentifier>) -> Result<Balance, DispatchError>;
+	fn unreserve_fee(who: &AccountId, fee: Balance, named: Option<ReserveIdentifier>) -> Balance;
 	fn unreserve_and_charge_fee(
 		who: &AccountId,
 		weight: Weight,
@@ -101,45 +100,6 @@ pub trait TransactionPayment<AccountId, Balance, NegativeImbalance> {
 	) -> Result<(), TransactionValidityError>;
 }
 
-#[cfg(feature = "std")]
-use frame_support::traits::Imbalance;
-#[cfg(feature = "std")]
-impl<AccountId, Balance: Default + Copy, NegativeImbalance: Imbalance<Balance>>
-	TransactionPayment<AccountId, Balance, NegativeImbalance> for ()
-{
-	fn reserve_fee(_who: &AccountId, _weight: Weight) -> Result<Balance, DispatchError> {
-		Ok(Default::default())
-	}
-
-	fn unreserve_fee(_who: &AccountId, _fee: Balance) {}
-
-	fn unreserve_and_charge_fee(
-		_who: &AccountId,
-		_weight: Weight,
-	) -> Result<(Balance, NegativeImbalance), TransactionValidityError> {
-		Ok((Default::default(), Imbalance::zero()))
-	}
-
-	fn refund_fee(
-		_who: &AccountId,
-		_weight: Weight,
-		_payed: NegativeImbalance,
-	) -> Result<(), TransactionValidityError> {
-		Ok(())
-	}
-
-	fn charge_fee(
-		_who: &AccountId,
-		_len: u32,
-		_weight: Weight,
-		_tip: Balance,
-		_pays_fee: Pays,
-		_class: DispatchClass,
-	) -> Result<(), TransactionValidityError> {
-		Ok(())
-	}
-}
-
 /// Used to interface with the Compound's Cash module
 pub trait CompoundCashTrait<Balance, Moment> {
 	fn set_future_yield(next_cash_yield: Balance, yield_index: u128, timestamp_effective: Moment) -> DispatchResult;