git.delta.rocks / unique-network / refs/commits / 11719c8f16e9

--- a/pallets/balances-adapter/src/common.rs
+++ b/pallets/balances-adapter/src/common.rs
@@ -1,9 +1,9 @@
 use alloc::{vec, vec::Vec};
 use core::marker::PhantomData;
 use crate::{Config, NativeFungibleHandle, Pallet};
-use frame_support::{fail, traits::Currency, weights::Weight};
+use frame_support::{fail, weights::Weight};
 use pallet_balances::{weights::SubstrateWeight as BalancesWeight, WeightInfo};
-use pallet_common::{erc::CrossAccountId, CommonCollectionOperations, CommonWeightInfo};
+use pallet_common::{CommonCollectionOperations, CommonWeightInfo};
 use up_data_structs::TokenId;
 
 pub struct CommonWeights<T: Config>(PhantomData<T>);
@@ -250,8 +250,7 @@
 	fn unnest(&self, _under: TokenId, _to_nest: (up_data_structs::CollectionId, TokenId)) {}
 
 	fn account_tokens(&self, account: <T>::CrossAccountId) -> Vec<TokenId> {
-		let balance = <T as Config>::Currency::total_balance(account.as_sub());
-		let balance: u128 = balance.into();
+		let balance = <Pallet<T>>::total_balance(&account);
 		if balance != 0 {
 			vec![TokenId::default()]
 		} else {
@@ -302,24 +301,23 @@
 		1
 	}
 
-	fn account_balance(&self, account: <T>::CrossAccountId) -> u32 {
-		let balance: u128 = <T as Config>::Currency::free_balance(account.as_sub()).into();
+	fn account_balance(&self, account: T::CrossAccountId) -> u32 {
+		let balance = <Pallet<T>>::balance_of(&account);
 		(balance != 0).into()
 	}
 
-	fn balance(&self, account: <T>::CrossAccountId, token: TokenId) -> u128 {
+	fn balance(&self, account: T::CrossAccountId, token: TokenId) -> u128 {
 		if token != TokenId::default() {
 			return 0;
 		}
-		<T as Config>::Currency::free_balance(account.as_sub()).into()
+		<Pallet<T>>::balance_of(&account)
 	}
 
 	fn total_pieces(&self, token: TokenId) -> Option<u128> {
 		if token != TokenId::default() {
 			return None;
 		}
-		let total = <T as Config>::Currency::total_issuance();
-		Some(total.into())
+		Some(<Pallet<T>>::total_issuance())
 	}
 
 	fn allowance(

1use crate::{Config, NativeFungibleHandle, Pallet, SelfWeightOf};1use crate::{Config, NativeFungibleHandle, Pallet, SelfWeightOf};
2use evm_coder::{abi::AbiType, generate_stubgen, solidity_interface, types::*};2use evm_coder::{abi::AbiType, generate_stubgen, solidity_interface, types::*};
3use frame_support::traits::{Currency};
4use pallet_balances::WeightInfo;3use pallet_balances::WeightInfo;
5use pallet_common::{4use pallet_common::{
6	erc::{CommonEvmHandler, CrossAccountId, PrecompileHandle, PrecompileResult},5	erc::{CommonEvmHandler, CrossAccountId, PrecompileHandle, PrecompileResult},
32	fn balance_of(&self, owner: Address) -> Result<U256> {31	fn balance_of(&self, owner: Address) -> Result<U256> {
33		self.consume_store_reads(1)?;32		self.consume_store_reads(1)?;
34		let owner = T::CrossAccountId::from_eth(owner);33		let owner = T::CrossAccountId::from_eth(owner);
35		let balance = <T as Config>::Currency::free_balance(owner.as_sub());34		let balance = <Pallet<T>>::balance_of(&owner);
36		Ok(balance.into())35		Ok(balance.into())
37	}36	}
3837
5049
51	fn total_supply(&self) -> Result<U256> {50	fn total_supply(&self) -> Result<U256> {
52		self.consume_store_reads(1)?;51		self.consume_store_reads(1)?;
53		let total = <T as Config>::Currency::total_issuance();52		Ok(<Pallet<T>>::total_issuance().into())
54		Ok(total.into())
55	}53	}
5654
57	#[weight(<SelfWeightOf<T>>::transfer_allow_death())]55	#[weight(<SelfWeightOf<T>>::transfer_allow_death())]
98	fn balance_of_cross(&self, owner: CrossAddress) -> Result<U256> {96	fn balance_of_cross(&self, owner: CrossAddress) -> Result<U256> {
99		self.consume_store_reads(1)?;97		self.consume_store_reads(1)?;
100		let owner = owner.into_sub_cross_account::<T>()?;98		let owner = owner.into_sub_cross_account::<T>()?;
101		let balance = <T as Config>::Currency::free_balance(owner.as_sub());99		let balance = <Pallet<T>>::balance_of(&owner);
102		Ok(balance.into())100		Ok(balance.into())
103	}101	}
104102

--- a/pallets/balances-adapter/src/lib.rs
+++ b/pallets/balances-adapter/src/lib.rs
@@ -55,7 +55,11 @@
 		dispatch::PostDispatchInfo,
 		ensure,
 		pallet_prelude::{DispatchResultWithPostInfo, Pays},
-		traits::{Currency, ExistenceRequirement, Get},
+		traits::{
+			Get,
+			fungible::{Inspect, Mutate},
+			tokens::Preservation,
+		},
 	};
 	use pallet_balances::WeightInfo;
 	use pallet_common::{erc::CrossAccountId, Error as CommonError, Pallet as PalletCommon};
@@ -71,11 +75,18 @@
 		+ pallet_common::Config
 		+ pallet_structure::Config
 	{
-		/// Currency from `pallet_balances`
-		type Currency: frame_support::traits::Currency<
+		/// Inspect from `pallet_balances`
+		type Inspect: frame_support::traits::tokens::fungible::Inspect<
+			Self::AccountId,
+			Balance = Self::CurrencyBalance,
+		>;
+
+		/// Mutate from `pallet_balances`
+		type Mutate: frame_support::traits::tokens::fungible::Mutate<
 			Self::AccountId,
 			Balance = Self::CurrencyBalance,
 		>;
+
 		/// Balance type of chain
 		type CurrencyBalance: Into<U256> + TryFrom<U256> + TryFrom<u128> + Into<u128>;
 
@@ -93,6 +104,18 @@
 	pub struct Pallet<T>(_);
 
 	impl<T: Config> Pallet<T> {
+		pub fn balance_of(account: &T::CrossAccountId) -> u128 {
+			T::Inspect::balance(account.as_sub()).into()
+		}
+
+		pub fn total_balance(account: &T::CrossAccountId) -> u128 {
+			T::Inspect::total_balance(account.as_sub()).into()
+		}
+
+		pub fn total_issuance() -> u128 {
+			T::Inspect::total_issuance().into()
+		}
+
 		/// Checks if a non-owner has (enough) allowance from the owner to perform operations on the tokens.
 		/// Returns the expected remaining allowance - it should be set manually if the transaction proceeds.
 		///
@@ -121,7 +144,7 @@
 				return Ok(0);
 			}
 
-			Ok(<T as Config>::Currency::free_balance(from.as_sub()).into())
+			Ok(Self::balance_of(from))
 		}
 
 		/// Transfers the specified amount of tokens. Will check that
@@ -142,14 +165,10 @@
 			<PalletCommon<T>>::ensure_correct_receiver(to)?;
 
 			if from != to && amount != 0 {
-				<T as Config>::Currency::transfer(
-					from.as_sub(),
-					to.as_sub(),
-					amount
-						.try_into()
-						.map_err(|_| sp_runtime::ArithmeticError::Overflow)?,
-					ExistenceRequirement::AllowDeath,
-				)?;
+				let amount = amount
+					.try_into()
+					.map_err(|_| sp_runtime::ArithmeticError::Overflow)?;
+				T::Mutate::transfer(from.as_sub(), to.as_sub(), amount, Preservation::Expendable)?;
 			};
 
 			Ok(PostDispatchInfo {

--- a/runtime/common/config/pallets/mod.rs
+++ b/runtime/common/config/pallets/mod.rs
@@ -92,7 +92,8 @@
 	pub Symbol: String = TOKEN_SYMBOL.to_string();
 }
 impl pallet_balances_adapter::Config for Runtime {
-	type Currency = Balances;
+	type Inspect = Balances;
+	type Mutate = Balances;
 	type CurrencyBalance = <Balances as Currency<Self::AccountId>>::Balance;
 	type Decimals = Decimals;
 	type Name = Name;