git.delta.rocks / unique-network / refs/commits / d5c411b79f24

difftreelog

feat impl approve, allowance, balance_of

Trubnikov Sergey2023-04-20parent: #b3a27fe.patch.diff
in: master

3 files changed

modifiedpallets/balances-adapter/src/erc.rsdiffbeforeafterboth
--- a/pallets/balances-adapter/src/erc.rs
+++ b/pallets/balances-adapter/src/erc.rs
@@ -1,6 +1,7 @@
 use crate::Config;
 use evm_coder::{abi::AbiType, AbiCoder, ToLog, generate_stubgen, solidity_interface, types::*};
-use pallet_common::erc::{CommonEvmHandler, PrecompileHandle, PrecompileResult};
+use frame_support::traits::Currency;
+use pallet_common::erc::{CommonEvmHandler, CrossAccountId, PrecompileHandle, PrecompileResult};
 use pallet_evm_coder_substrate::{
 	call, dispatch_to_evm,
 	execution::{PreDispatch, Result},
@@ -45,37 +46,48 @@
 
 #[solidity_interface(name = ERC20, events(ERC20Events), enum(derive(PreDispatch)), enum_attr(weight), expect_selector = 0x942e8b22)]
 impl<T: Config> NativeFungibleHandle<T> {
-	fn name(&self) -> Result<String> {
-		// Ok(decode_utf16(self.name.iter().copied())
-		// 	.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))
-		// 	.collect::<String>())
-		todo!()
+	fn allowance(&self, owner: Address, spender: Address) -> Result<U256> {
+		Ok(U256::zero())
 	}
 
-	fn symbol(&self) -> Result<String> {
-		// Ok(String::from_utf8_lossy(&self.token_prefix).into())
-		todo!()
+	// #[weight(<SelfWeightOf<T>>::approve())]
+	fn approve(&mut self, caller: Caller, spender: Address, amount: U256) -> Result<bool> {
+		// self.consume_store_reads(1)?;
+		Err("Approve not supported now".into())
 	}
-	fn total_supply(&self) -> Result<U256> {
+	fn balance_of(&self, owner: Address) -> Result<U256> {
 		// self.consume_store_reads(1)?;
-		// Ok(<TotalSupply<T>>::get(self.id).into())
-		todo!()
+		let owner = T::CrossAccountId::from_eth(owner);
+		let a = <T as Config>::Currency::free_balance(owner.as_sub());
+		Ok(a.into())
 	}
 
 	fn decimals(&self) -> Result<u8> {
 		// Ok(if let CollectionMode::Fungible(decimals) = &self.mode {
 		// 	*decimals
 		// } else {
-		// 	unreachable!()
+		// 	unreachable!
 		// })
+
+		// From config 18
 		todo!()
 	}
 
-	fn balance_of(&self, owner: Address) -> Result<U256> {
+	fn name(&self) -> Result<String> {
+		// Ok(decode_utf16(self.name.iter().copied())
+		// 	.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))
+		// 	.collect::<String>())
+		todo!()
+	}
+
+	fn symbol(&self) -> Result<String> {
+		// Ok(String::from_utf8_lossy(&self.token_prefix).into())
+		todo!()
+	}
+
+	fn total_supply(&self) -> Result<U256> {
 		// self.consume_store_reads(1)?;
-		// let owner = T::CrossAccountId::from_eth(owner);
-		// let balance = <Balance<T>>::get((self.id, owner));
-		// Ok(balance.into())
+		// Ok(<TotalSupply<T>>::get(self.id).into())
 		todo!()
 	}
 
@@ -112,27 +124,6 @@
 		// <Pallet<T>>::transfer_from(self, &caller, &from, &to, amount, &budget)
 		// 	.map_err(dispatch_to_evm::<T>)?;
 		// Ok(true)
-		todo!()
-	}
-
-	// #[weight(<SelfWeightOf<T>>::approve())]
-	fn approve(&mut self, caller: Caller, spender: Address, amount: U256) -> Result<bool> {
-		// let caller = T::CrossAccountId::from_eth(caller);
-		// let spender = T::CrossAccountId::from_eth(spender);
-		// let amount = amount.try_into().map_err(|_| "amount overflow")?;
-
-		// <Pallet<T>>::set_allowance(self, &caller, &spender, amount)
-		// 	.map_err(dispatch_to_evm::<T>)?;
-		// Ok(true)
-		todo!()
-	}
-
-	fn allowance(&self, owner: Address, spender: Address) -> Result<U256> {
-		// self.consume_store_reads(1)?;
-		// let owner = T::CrossAccountId::from_eth(owner);
-		// let spender = T::CrossAccountId::from_eth(spender);
-
-		// Ok(<Allowance<T>>::get((self.id, owner, spender)).into())
 		todo!()
 	}
 }
modifiedpallets/balances-adapter/src/lib.rsdiffbeforeafterboth
--- a/pallets/balances-adapter/src/lib.rs
+++ b/pallets/balances-adapter/src/lib.rs
@@ -8,8 +8,16 @@
 
 #[frame_support::pallet]
 pub mod pallet {
+	use sp_core::U256;
+
 	#[pallet::config]
-	pub trait Config: frame_system::Config + pallet_evm_coder_substrate::Config {}
+	pub trait Config: frame_system::Config + pallet_evm_coder_substrate::Config {
+		type Currency: frame_support::traits::Currency<
+			Self::AccountId,
+			Balance = Self::CurrencyBalance,
+		>;
+		type CurrencyBalance: Into<U256>;
+	}
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);
modifiedruntime/common/config/pallets/mod.rsdiffbeforeafterboth
before · runtime/common/config/pallets/mod.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use frame_support::parameter_types;18use sp_runtime::traits::AccountIdConversion;19use crate::{20	runtime_common::{21		dispatch::CollectionDispatchT,22		config::{substrate::TreasuryModuleId, ethereum::EvmCollectionHelpersAddress},23		weights::CommonWeights,24		RelayChainBlockNumberProvider,25	},26	Runtime, RuntimeEvent, RuntimeCall, RuntimeOrigin, Balances,27};28use frame_support::traits::{ConstU32, ConstU64};29use up_common::{30	types::{AccountId, Balance, BlockNumber},31	constants::*,32};33use up_data_structs::{34	mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},35};36use sp_arithmetic::Perbill;3738#[cfg(feature = "scheduler")]39pub mod scheduler;4041#[cfg(feature = "foreign-assets")]42pub mod foreign_asset;4344#[cfg(feature = "app-promotion")]45pub mod app_promotion;4647#[cfg(feature = "collator-selection")]48pub mod collator_selection;4950#[cfg(feature = "preimage")]51pub mod preimage;5253parameter_types! {54	pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account_truncating();55	pub const CollectionCreationPrice: Balance = 2 * UNIQUE;56}5758impl pallet_common::Config for Runtime {59	type WeightInfo = pallet_common::weights::SubstrateWeight<Self>;60	type RuntimeEvent = RuntimeEvent;61	type Currency = Balances;62	type CollectionCreationPrice = CollectionCreationPrice;63	type TreasuryAccountId = TreasuryAccountId;64	type CollectionDispatch = CollectionDispatchT<Self>;6566	type EvmTokenAddressMapping = EvmTokenAddressMapping;67	type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;68	type ContractAddress = EvmCollectionHelpersAddress;69}7071impl pallet_structure::Config for Runtime {72	type RuntimeEvent = RuntimeEvent;73	type RuntimeCall = RuntimeCall;74	type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;75}7677impl pallet_fungible::Config for Runtime {78	type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;79}80impl pallet_refungible::Config for Runtime {81	type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;82}83impl pallet_nonfungible::Config for Runtime {84	type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;85}86impl pallet_balances_adapter::Config for Runtime {87	// type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;88}8990parameter_types! {91	pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied92}9394/// Used for the pallet inflation95impl pallet_inflation::Config for Runtime {96	type Currency = Balances;97	type TreasuryAccountId = TreasuryAccountId;98	type InflationBlockInterval = InflationBlockInterval;99	type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;100}101102impl pallet_unique::Config for Runtime {103	type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;104	type CommonWeightInfo = CommonWeights<Self>;105	type RefungibleExtensionsWeightInfo = CommonWeights<Self>;106}107108parameter_types! {109	pub AppPromotionDailyRate: Perbill = Perbill::from_rational(5u32, 10_000);110	pub const MaxCollators: u32 = MAX_COLLATORS;111	pub const LicenseBond: Balance = GENESIS_LICENSE_BOND;112	pub const SessionPeriod: BlockNumber = SESSION_LENGTH;113	pub const DayRelayBlocks: BlockNumber = RELAY_DAYS;114}115116impl pallet_configuration::Config for Runtime {117	type RuntimeEvent = RuntimeEvent;118	type Currency = Balances;119	type DefaultWeightToFeeCoefficient = ConstU64<{ up_common::constants::WEIGHT_TO_FEE_COEFF }>;120	type DefaultMinGasPrice = ConstU64<{ up_common::constants::MIN_GAS_PRICE }>;121	type DefaultCollatorSelectionMaxCollators = MaxCollators;122	type DefaultCollatorSelectionKickThreshold = SessionPeriod;123	type DefaultCollatorSelectionLicenseBond = LicenseBond;124	type MaxXcmAllowedLocations = ConstU32<16>;125	type AppPromotionDailyRate = AppPromotionDailyRate;126	type DayRelayBlocks = DayRelayBlocks;127	type WeightInfo = pallet_configuration::weights::SubstrateWeight<Self>;128}129130impl pallet_maintenance::Config for Runtime {131	type RuntimeEvent = RuntimeEvent;132	type RuntimeOrigin = RuntimeOrigin;133	type RuntimeCall = RuntimeCall;134	#[cfg(feature = "preimage")]135	type Preimages = crate::Preimage;136	#[cfg(not(feature = "preimage"))]137	type Preimages = ();138	type WeightInfo = pallet_maintenance::weights::SubstrateWeight<Self>;139}