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(

--- a/pallets/balances-adapter/src/erc.rs
+++ b/pallets/balances-adapter/src/erc.rs
@@ -1,6 +1,5 @@
 use crate::{Config, NativeFungibleHandle, Pallet, SelfWeightOf};
 use evm_coder::{abi::AbiType, generate_stubgen, solidity_interface, types::*};
-use frame_support::traits::{Currency};
 use pallet_balances::WeightInfo;
 use pallet_common::{
 	erc::{CommonEvmHandler, CrossAccountId, PrecompileHandle, PrecompileResult},
@@ -32,7 +31,7 @@
 	fn balance_of(&self, owner: Address) -> Result<U256> {
 		self.consume_store_reads(1)?;
 		let owner = T::CrossAccountId::from_eth(owner);
-		let balance = <T as Config>::Currency::free_balance(owner.as_sub());
+		let balance = <Pallet<T>>::balance_of(&owner);
 		Ok(balance.into())
 	}
 
@@ -50,8 +49,7 @@
 
 	fn total_supply(&self) -> Result<U256> {
 		self.consume_store_reads(1)?;
-		let total = <T as Config>::Currency::total_issuance();
-		Ok(total.into())
+		Ok(<Pallet<T>>::total_issuance().into())
 	}
 
 	#[weight(<SelfWeightOf<T>>::transfer_allow_death())]
@@ -98,7 +96,7 @@
 	fn balance_of_cross(&self, owner: CrossAddress) -> Result<U256> {
 		self.consume_store_reads(1)?;
 		let owner = owner.into_sub_cross_account::<T>()?;
-		let balance = <T as Config>::Currency::free_balance(owner.as_sub());
+		let balance = <Pallet<T>>::balance_of(&owner);
 		Ok(balance.into())
 	}
 

55		dispatch::PostDispatchInfo,55		dispatch::PostDispatchInfo,
56		ensure,56		ensure,
57		pallet_prelude::{DispatchResultWithPostInfo, Pays},57		pallet_prelude::{DispatchResultWithPostInfo, Pays},
58		traits::{Currency, ExistenceRequirement, Get},58		traits::{
59			Get,
60			fungible::{Inspect, Mutate},
61			tokens::Preservation,
62		},
59	};63	};
60	use pallet_balances::WeightInfo;64	use pallet_balances::WeightInfo;
71		+ pallet_common::Config75		+ pallet_common::Config
72		+ pallet_structure::Config76		+ pallet_structure::Config
73	{77	{
74		/// Currency from `pallet_balances`78		/// Inspect from `pallet_balances`
75		type Currency: frame_support::traits::Currency<79		type Inspect: frame_support::traits::tokens::fungible::Inspect<
76			Self::AccountId,80			Self::AccountId,
77			Balance = Self::CurrencyBalance,81			Balance = Self::CurrencyBalance,
78		>;82		>;
83
84		/// Mutate from `pallet_balances`
85		type Mutate: frame_support::traits::tokens::fungible::Mutate<
86			Self::AccountId,
87			Balance = Self::CurrencyBalance,
88		>;
89
79		/// Balance type of chain90		/// Balance type of chain
80		type CurrencyBalance: Into<U256> + TryFrom<U256> + TryFrom<u128> + Into<u128>;91		type CurrencyBalance: Into<U256> + TryFrom<U256> + TryFrom<u128> + Into<u128>;
93	pub struct Pallet<T>(_);104	pub struct Pallet<T>(_);
94105
95	impl<T: Config> Pallet<T> {106	impl<T: Config> Pallet<T> {
107		pub fn balance_of(account: &T::CrossAccountId) -> u128 {
108			T::Inspect::balance(account.as_sub()).into()
109		}
110
111		pub fn total_balance(account: &T::CrossAccountId) -> u128 {
112			T::Inspect::total_balance(account.as_sub()).into()
113		}
114
115		pub fn total_issuance() -> u128 {
116			T::Inspect::total_issuance().into()
117		}
118
96		/// Checks if a non-owner has (enough) allowance from the owner to perform operations on the tokens.119		/// Checks if a non-owner has (enough) allowance from the owner to perform operations on the tokens.
97		/// Returns the expected remaining allowance - it should be set manually if the transaction proceeds.120		/// Returns the expected remaining allowance - it should be set manually if the transaction proceeds.
121				return Ok(0);144				return Ok(0);
122			}145			}
123146
124			Ok(<T as Config>::Currency::free_balance(from.as_sub()).into())147			Ok(Self::balance_of(from))
125		}148		}
126149
127		/// Transfers the specified amount of tokens. Will check that150		/// Transfers the specified amount of tokens. Will check that
142			<PalletCommon<T>>::ensure_correct_receiver(to)?;165			<PalletCommon<T>>::ensure_correct_receiver(to)?;
143166
144			if from != to && amount != 0 {167			if from != to && amount != 0 {
168				let amount = amount
169					.try_into()
170					.map_err(|_| sp_runtime::ArithmeticError::Overflow)?;
145				<T as Config>::Currency::transfer(171				T::Mutate::transfer(from.as_sub(), to.as_sub(), amount, Preservation::Expendable)?;
146					from.as_sub(),
147					to.as_sub(),
148					amount
149						.try_into()
150						.map_err(|_| sp_runtime::ArithmeticError::Overflow)?,
151					ExistenceRequirement::AllowDeath,
152				)?;
153			};172			};
154173

--- 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;