difftreelog
feat impl decimals, name, symbol
in: master
3 files changed
pallets/balances-adapter/src/erc.rsdiffbeforeafterboth--- a/pallets/balances-adapter/src/erc.rs
+++ b/pallets/balances-adapter/src/erc.rs
@@ -7,7 +7,7 @@
execution::{PreDispatch, Result},
frontier_contract, WithRecorder, SubstrateRecorder,
};
-use sp_core::{U256};
+use sp_core::{U256, Get};
use sp_std::vec::Vec;
frontier_contract! {
@@ -63,26 +63,15 @@
}
fn decimals(&self) -> Result<u8> {
- // Ok(if let CollectionMode::Fungible(decimals) = &self.mode {
- // *decimals
- // } else {
- // unreachable!
- // })
-
- // From config 18
- todo!()
+ Ok(T::Decimals::get())
}
fn name(&self) -> Result<String> {
- // Ok(decode_utf16(self.name.iter().copied())
- // .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))
- // .collect::<String>())
- todo!()
+ Ok(T::Name::get())
}
fn symbol(&self) -> Result<String> {
- // Ok(String::from_utf8_lossy(&self.token_prefix).into())
- todo!()
+ Ok(T::Symbol::get())
}
fn total_supply(&self) -> Result<U256> {
pallets/balances-adapter/src/lib.rsdiffbeforeafterboth--- a/pallets/balances-adapter/src/lib.rs
+++ b/pallets/balances-adapter/src/lib.rs
@@ -8,6 +8,7 @@
#[frame_support::pallet]
pub mod pallet {
+ use frame_support::traits::Get;
use sp_core::U256;
#[pallet::config]
@@ -17,6 +18,10 @@
Balance = Self::CurrencyBalance,
>;
type CurrencyBalance: Into<U256>;
+
+ type Decimals: Get<u8>;
+ type Name: Get<String>;
+ type Symbol: Get<String>;
}
#[pallet::pallet]
pub struct Pallet<T>(_);
runtime/common/config/pallets/mod.rsdiffbeforeafterboth1// 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, Currency};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 Currency = Balances;88 type CurrencyBalance = <Balances as Currency<Self::AccountId>>::Balance;89}9091parameter_types! {92 pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied93}9495/// Used for the pallet inflation96impl pallet_inflation::Config for Runtime {97 type Currency = Balances;98 type TreasuryAccountId = TreasuryAccountId;99 type InflationBlockInterval = InflationBlockInterval;100 type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;101}102103impl pallet_unique::Config for Runtime {104 type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;105 type CommonWeightInfo = CommonWeights<Self>;106 type RefungibleExtensionsWeightInfo = CommonWeights<Self>;107}108109parameter_types! {110 pub AppPromotionDailyRate: Perbill = Perbill::from_rational(5u32, 10_000);111 pub const MaxCollators: u32 = MAX_COLLATORS;112 pub const LicenseBond: Balance = GENESIS_LICENSE_BOND;113 pub const SessionPeriod: BlockNumber = SESSION_LENGTH;114 pub const DayRelayBlocks: BlockNumber = RELAY_DAYS;115}116117impl pallet_configuration::Config for Runtime {118 type RuntimeEvent = RuntimeEvent;119 type Currency = Balances;120 type DefaultWeightToFeeCoefficient = ConstU64<{ up_common::constants::WEIGHT_TO_FEE_COEFF }>;121 type DefaultMinGasPrice = ConstU64<{ up_common::constants::MIN_GAS_PRICE }>;122 type DefaultCollatorSelectionMaxCollators = MaxCollators;123 type DefaultCollatorSelectionKickThreshold = SessionPeriod;124 type DefaultCollatorSelectionLicenseBond = LicenseBond;125 type MaxXcmAllowedLocations = ConstU32<16>;126 type AppPromotionDailyRate = AppPromotionDailyRate;127 type DayRelayBlocks = DayRelayBlocks;128 type WeightInfo = pallet_configuration::weights::SubstrateWeight<Self>;129}130131impl pallet_maintenance::Config for Runtime {132 type RuntimeEvent = RuntimeEvent;133 type RuntimeOrigin = RuntimeOrigin;134 type RuntimeCall = RuntimeCall;135 #[cfg(feature = "preimage")]136 type Preimages = crate::Preimage;137 #[cfg(not(feature = "preimage"))]138 type Preimages = ();139 type WeightInfo = pallet_maintenance::weights::SubstrateWeight<Self>;140}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, RUNTIME_NAME, TOKEN_SYMBOL, Balances,27};28use frame_support::traits::{ConstU32, ConstU64, Currency};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 const CollectionCreationPrice: Balance = 2 * UNIQUE;55 pub const Decimals: u8 = 32;56 pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account_truncating();57 pub Name: String = RUNTIME_NAME.to_string();58 pub Symbol: String = TOKEN_SYMBOL.to_string();59}6061impl pallet_common::Config for Runtime {62 type WeightInfo = pallet_common::weights::SubstrateWeight<Self>;63 type RuntimeEvent = RuntimeEvent;64 type Currency = Balances;65 type CollectionCreationPrice = CollectionCreationPrice;66 type TreasuryAccountId = TreasuryAccountId;67 type CollectionDispatch = CollectionDispatchT<Self>;6869 type EvmTokenAddressMapping = EvmTokenAddressMapping;70 type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;71 type ContractAddress = EvmCollectionHelpersAddress;72}7374impl pallet_structure::Config for Runtime {75 type RuntimeEvent = RuntimeEvent;76 type RuntimeCall = RuntimeCall;77 type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;78}7980impl pallet_fungible::Config for Runtime {81 type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;82}83impl pallet_refungible::Config for Runtime {84 type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;85}86impl pallet_nonfungible::Config for Runtime {87 type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;88}89impl pallet_balances_adapter::Config for Runtime {90 type Currency = Balances;91 type CurrencyBalance = <Balances as Currency<Self::AccountId>>::Balance;92 type Decimals = Decimals;93 type Name = Name;94 type Symbol = Symbol;95}9697parameter_types! {98 pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied99}100101/// Used for the pallet inflation102impl pallet_inflation::Config for Runtime {103 type Currency = Balances;104 type TreasuryAccountId = TreasuryAccountId;105 type InflationBlockInterval = InflationBlockInterval;106 type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;107}108109impl pallet_unique::Config for Runtime {110 type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;111 type CommonWeightInfo = CommonWeights<Self>;112 type RefungibleExtensionsWeightInfo = CommonWeights<Self>;113}114115parameter_types! {116 pub AppPromotionDailyRate: Perbill = Perbill::from_rational(5u32, 10_000);117 pub const MaxCollators: u32 = MAX_COLLATORS;118 pub const LicenseBond: Balance = GENESIS_LICENSE_BOND;119 pub const SessionPeriod: BlockNumber = SESSION_LENGTH;120 pub const DayRelayBlocks: BlockNumber = RELAY_DAYS;121}122123impl pallet_configuration::Config for Runtime {124 type RuntimeEvent = RuntimeEvent;125 type Currency = Balances;126 type DefaultWeightToFeeCoefficient = ConstU64<{ up_common::constants::WEIGHT_TO_FEE_COEFF }>;127 type DefaultMinGasPrice = ConstU64<{ up_common::constants::MIN_GAS_PRICE }>;128 type DefaultCollatorSelectionMaxCollators = MaxCollators;129 type DefaultCollatorSelectionKickThreshold = SessionPeriod;130 type DefaultCollatorSelectionLicenseBond = LicenseBond;131 type MaxXcmAllowedLocations = ConstU32<16>;132 type AppPromotionDailyRate = AppPromotionDailyRate;133 type DayRelayBlocks = DayRelayBlocks;134 type WeightInfo = pallet_configuration::weights::SubstrateWeight<Self>;135}136137impl pallet_maintenance::Config for Runtime {138 type RuntimeEvent = RuntimeEvent;139 type RuntimeOrigin = RuntimeOrigin;140 type RuntimeCall = RuntimeCall;141 #[cfg(feature = "preimage")]142 type Preimages = crate::Preimage;143 #[cfg(not(feature = "preimage"))]144 type Preimages = ();145 type WeightInfo = pallet_maintenance::weights::SubstrateWeight<Self>;146}