difftreelog
fix wasm runtime version section
in: master
9 files changed
node/cli/Cargo.tomldiffbeforeafterboth--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -108,4 +108,3 @@
runtime-benchmarks = ['opal-runtime/runtime-benchmarks', 'polkadot-cli/runtime-benchmarks', 'polkadot-service/runtime-benchmarks', 'quartz-runtime?/runtime-benchmarks', 'sc-service/runtime-benchmarks', 'unique-runtime?/runtime-benchmarks']
sapphire-runtime = ['quartz-runtime', 'quartz-runtime/become-sapphire']
try-runtime = ['opal-runtime?/try-runtime', 'quartz-runtime?/try-runtime', 'try-runtime-cli/try-runtime', 'unique-runtime?/try-runtime']
-state-version-0 = ['opal-runtime?/state-version-0', 'quartz-runtime?/state-version-0', 'unique-runtime?/state-version-0']
node/cli/src/chain_spec.rsdiffbeforeafterboth--- a/node/cli/src/chain_spec.rs
+++ b/node/cli/src/chain_spec.rs
@@ -281,7 +281,7 @@
// Name
format!(
"{}{}",
- default_runtime::RUNTIME_NAME.to_uppercase(),
+ default_runtime::VERSION.spec_name.to_uppercase(),
if cfg!(feature = "unique-runtime") {
""
} else {
@@ -290,7 +290,7 @@
)
.as_str(),
// ID
- format!("{}_dev", default_runtime::RUNTIME_NAME).as_str(),
+ format!("{}_dev", default_runtime::VERSION.spec_name).as_str(),
ChainType::Local,
move || {
testnet_genesis!(
@@ -355,7 +355,7 @@
// Name
format!(
"{}{}",
- default_runtime::RUNTIME_NAME.to_uppercase(),
+ default_runtime::VERSION.impl_name.to_uppercase(),
if cfg!(feature = "unique-runtime") {
""
} else {
@@ -364,7 +364,7 @@
)
.as_str(),
// ID
- format!("{}_local", default_runtime::RUNTIME_NAME).as_str(),
+ format!("{}_local", default_runtime::VERSION.spec_name).as_str(),
ChainType::Local,
move || {
testnet_genesis!(
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 alloc::string::{String, ToString};18use frame_support::parameter_types;19use sp_runtime::traits::AccountIdConversion;20use crate::{21 runtime_common::{22 dispatch::CollectionDispatchT,23 config::{substrate::TreasuryModuleId, ethereum::EvmCollectionHelpersAddress},24 weights::CommonWeights,25 RelayChainBlockNumberProvider,26 },27 Runtime, RuntimeEvent, RuntimeCall, RUNTIME_NAME, TOKEN_SYMBOL, DECIMALS, Balances,28};29use frame_support::traits::{ConstU32, ConstU64, Currency};30use up_common::{31 types::{AccountId, Balance, BlockNumber},32 constants::*,33};34use up_data_structs::{35 mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},36};37use sp_arithmetic::Perbill;3839#[cfg(feature = "governance")]40use crate::runtime_common::config::governance;4142#[cfg(feature = "unique-scheduler")]43pub mod scheduler;4445#[cfg(feature = "foreign-assets")]46pub mod foreign_asset;4748#[cfg(feature = "app-promotion")]49pub mod app_promotion;5051#[cfg(feature = "collator-selection")]52pub mod collator_selection;5354#[cfg(feature = "preimage")]55pub mod preimage;5657parameter_types! {58 pub const CollectionCreationPrice: Balance = 2 * UNIQUE;59 pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account_truncating();60}6162impl pallet_common::Config for Runtime {63 type WeightInfo = pallet_common::weights::SubstrateWeight<Self>;64 type RuntimeEvent = RuntimeEvent;65 type Currency = Balances;66 type CollectionCreationPrice = CollectionCreationPrice;67 type TreasuryAccountId = TreasuryAccountId;68 type CollectionDispatch = CollectionDispatchT<Self>;6970 type EvmTokenAddressMapping = EvmTokenAddressMapping;71 type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;72 type ContractAddress = EvmCollectionHelpersAddress;73}7475impl pallet_structure::Config for Runtime {76 type RuntimeEvent = RuntimeEvent;77 type RuntimeCall = RuntimeCall;78 type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;79}8081impl pallet_fungible::Config for Runtime {82 type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;83}84impl pallet_refungible::Config for Runtime {85 type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;86}87impl pallet_nonfungible::Config for Runtime {88 type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;89}9091parameter_types! {92 pub const Decimals: u8 = DECIMALS;93 pub Name: String = RUNTIME_NAME.to_string();94 pub Symbol: String = TOKEN_SYMBOL.to_string();95}96impl pallet_balances_adapter::Config for Runtime {97 type Inspect = Balances;98 type Mutate = Balances;99 type CurrencyBalance = <Balances as Currency<Self::AccountId>>::Balance;100 type Decimals = Decimals;101 type Name = Name;102 type Symbol = Symbol;103 type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;104}105106parameter_types! {107 pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied108}109110/// Used for the pallet inflation111impl pallet_inflation::Config for Runtime {112 type Currency = Balances;113 type TreasuryAccountId = TreasuryAccountId;114 type InflationBlockInterval = InflationBlockInterval;115 type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;116}117118impl pallet_unique::Config for Runtime {119 type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;120 type CommonWeightInfo = CommonWeights<Self>;121 type RefungibleExtensionsWeightInfo = CommonWeights<Self>;122}123124parameter_types! {125 pub AppPromotionDailyRate: Perbill = Perbill::from_rational(5u32, 10_000);126 pub const MaxCollators: u32 = MAX_COLLATORS;127 pub const LicenseBond: Balance = GENESIS_LICENSE_BOND;128 pub const SessionPeriod: BlockNumber = SESSION_LENGTH;129 pub const DayRelayBlocks: BlockNumber = RELAY_DAYS;130}131132impl pallet_configuration::Config for Runtime {133 type RuntimeEvent = RuntimeEvent;134 type Balance = Balance;135 type DefaultWeightToFeeCoefficient = ConstU64<{ up_common::constants::WEIGHT_TO_FEE_COEFF }>;136 type DefaultMinGasPrice = ConstU64<{ up_common::constants::MIN_GAS_PRICE }>;137 type DefaultCollatorSelectionMaxCollators = MaxCollators;138 type DefaultCollatorSelectionKickThreshold = SessionPeriod;139 type DefaultCollatorSelectionLicenseBond = LicenseBond;140 type MaxXcmAllowedLocations = ConstU32<16>;141 type AppPromotionDailyRate = AppPromotionDailyRate;142 type DayRelayBlocks = DayRelayBlocks;143 type WeightInfo = pallet_configuration::weights::SubstrateWeight<Self>;144}145146impl pallet_maintenance::Config for Runtime {147 type RuntimeEvent = RuntimeEvent;148149 type RuntimeCall = RuntimeCall;150151 #[cfg(feature = "governance")]152 type ManagerOrigin = governance::RootOrTechnicalCommitteeMember;153154 #[cfg(not(feature = "governance"))]155 type ManagerOrigin = frame_system::EnsureRoot<AccountId>;156157 type PreimageOrigin = frame_system::EnsureRoot<AccountId>;158159 #[cfg(feature = "preimage")]160 type Preimages = crate::Preimage;161 #[cfg(not(feature = "preimage"))]162 type Preimages = ();163 type WeightInfo = pallet_maintenance::weights::SubstrateWeight<Self>;164}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 alloc::string::{String, ToString};18use frame_support::parameter_types;19use sp_runtime::traits::AccountIdConversion;20use crate::{21 runtime_common::{22 dispatch::CollectionDispatchT,23 config::{substrate::TreasuryModuleId, ethereum::EvmCollectionHelpersAddress},24 weights::CommonWeights,25 RelayChainBlockNumberProvider,26 },27 Runtime, RuntimeEvent, RuntimeCall, VERSION, TOKEN_SYMBOL, DECIMALS, Balances,28};29use frame_support::traits::{ConstU32, ConstU64, Currency};30use up_common::{31 types::{AccountId, Balance, BlockNumber},32 constants::*,33};34use up_data_structs::{35 mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},36};37use sp_arithmetic::Perbill;3839#[cfg(feature = "governance")]40use crate::runtime_common::config::governance;4142#[cfg(feature = "unique-scheduler")]43pub mod scheduler;4445#[cfg(feature = "foreign-assets")]46pub mod foreign_asset;4748#[cfg(feature = "app-promotion")]49pub mod app_promotion;5051#[cfg(feature = "collator-selection")]52pub mod collator_selection;5354#[cfg(feature = "preimage")]55pub mod preimage;5657parameter_types! {58 pub const CollectionCreationPrice: Balance = 2 * UNIQUE;59 pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account_truncating();60}6162impl pallet_common::Config for Runtime {63 type WeightInfo = pallet_common::weights::SubstrateWeight<Self>;64 type RuntimeEvent = RuntimeEvent;65 type Currency = Balances;66 type CollectionCreationPrice = CollectionCreationPrice;67 type TreasuryAccountId = TreasuryAccountId;68 type CollectionDispatch = CollectionDispatchT<Self>;6970 type EvmTokenAddressMapping = EvmTokenAddressMapping;71 type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;72 type ContractAddress = EvmCollectionHelpersAddress;73}7475impl pallet_structure::Config for Runtime {76 type RuntimeEvent = RuntimeEvent;77 type RuntimeCall = RuntimeCall;78 type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;79}8081impl pallet_fungible::Config for Runtime {82 type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;83}84impl pallet_refungible::Config for Runtime {85 type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;86}87impl pallet_nonfungible::Config for Runtime {88 type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;89}9091parameter_types! {92 pub const Decimals: u8 = DECIMALS;93 pub Name: String = String::from_utf8_lossy(VERSION.impl_name.as_ref()).to_string();94 pub Symbol: String = TOKEN_SYMBOL.to_string();95}96impl pallet_balances_adapter::Config for Runtime {97 type Inspect = Balances;98 type Mutate = Balances;99 type CurrencyBalance = <Balances as Currency<Self::AccountId>>::Balance;100 type Decimals = Decimals;101 type Name = Name;102 type Symbol = Symbol;103 type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;104}105106parameter_types! {107 pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied108}109110/// Used for the pallet inflation111impl pallet_inflation::Config for Runtime {112 type Currency = Balances;113 type TreasuryAccountId = TreasuryAccountId;114 type InflationBlockInterval = InflationBlockInterval;115 type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;116}117118impl pallet_unique::Config for Runtime {119 type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;120 type CommonWeightInfo = CommonWeights<Self>;121 type RefungibleExtensionsWeightInfo = CommonWeights<Self>;122}123124parameter_types! {125 pub AppPromotionDailyRate: Perbill = Perbill::from_rational(5u32, 10_000);126 pub const MaxCollators: u32 = MAX_COLLATORS;127 pub const LicenseBond: Balance = GENESIS_LICENSE_BOND;128 pub const SessionPeriod: BlockNumber = SESSION_LENGTH;129 pub const DayRelayBlocks: BlockNumber = RELAY_DAYS;130}131132impl pallet_configuration::Config for Runtime {133 type RuntimeEvent = RuntimeEvent;134 type Balance = Balance;135 type DefaultWeightToFeeCoefficient = ConstU64<{ up_common::constants::WEIGHT_TO_FEE_COEFF }>;136 type DefaultMinGasPrice = ConstU64<{ up_common::constants::MIN_GAS_PRICE }>;137 type DefaultCollatorSelectionMaxCollators = MaxCollators;138 type DefaultCollatorSelectionKickThreshold = SessionPeriod;139 type DefaultCollatorSelectionLicenseBond = LicenseBond;140 type MaxXcmAllowedLocations = ConstU32<16>;141 type AppPromotionDailyRate = AppPromotionDailyRate;142 type DayRelayBlocks = DayRelayBlocks;143 type WeightInfo = pallet_configuration::weights::SubstrateWeight<Self>;144}145146impl pallet_maintenance::Config for Runtime {147 type RuntimeEvent = RuntimeEvent;148149 type RuntimeCall = RuntimeCall;150151 #[cfg(feature = "governance")]152 type ManagerOrigin = governance::RootOrTechnicalCommitteeMember;153154 #[cfg(not(feature = "governance"))]155 type ManagerOrigin = frame_system::EnsureRoot<AccountId>;156157 type PreimageOrigin = frame_system::EnsureRoot<AccountId>;158159 #[cfg(feature = "preimage")]160 type Preimages = crate::Preimage;161 #[cfg(not(feature = "preimage"))]162 type Preimages = ();163 type WeightInfo = pallet_maintenance::weights::SubstrateWeight<Self>;164}runtime/opal/Cargo.tomldiffbeforeafterboth--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -64,7 +64,6 @@
'sp-runtime/runtime-benchmarks',
'xcm-builder/runtime-benchmarks',
]
-state-version-0 = []
std = [
'codec/std',
'cumulus-pallet-aura-ext/std',
runtime/opal/src/lib.rsdiffbeforeafterboth--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -43,22 +43,19 @@
pub use runtime_common::*;
-pub const RUNTIME_NAME: &str = "opal";
pub const TOKEN_SYMBOL: &str = "OPL";
pub const DECIMALS: u8 = 18;
/// This runtime version.
+#[sp_version::runtime_version]
pub const VERSION: RuntimeVersion = RuntimeVersion {
- spec_name: create_runtime_str!(RUNTIME_NAME),
- impl_name: create_runtime_str!(RUNTIME_NAME),
+ spec_name: create_runtime_str!("opal"),
+ impl_name: create_runtime_str!("opal"),
authoring_version: 1,
spec_version: 943060,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 3,
- #[cfg(feature = "state-version-0")]
- state_version: 0,
- #[cfg(not(feature = "state-version-0"))]
state_version: 1,
};
runtime/quartz/Cargo.tomldiffbeforeafterboth--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -60,7 +60,6 @@
'sp-runtime/runtime-benchmarks',
'xcm-builder/runtime-benchmarks',
]
-state-version-0 = []
std = [
'codec/std',
'cumulus-pallet-aura-ext/std',
runtime/quartz/src/lib.rsdiffbeforeafterboth--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -43,25 +43,34 @@
pub use runtime_common::*;
-#[cfg(feature = "become-sapphire")]
-pub const RUNTIME_NAME: &str = "sapphire";
-#[cfg(not(feature = "become-sapphire"))]
-pub const RUNTIME_NAME: &str = "quartz";
pub const TOKEN_SYMBOL: &str = "QTZ";
pub const DECIMALS: u8 = 18;
/// This runtime version.
+#[cfg(not(feature = "become-sapphire"))]
+#[sp_version::runtime_version]
pub const VERSION: RuntimeVersion = RuntimeVersion {
- spec_name: create_runtime_str!(RUNTIME_NAME),
- impl_name: create_runtime_str!(RUNTIME_NAME),
+ spec_name: create_runtime_str!("quartz"),
+ impl_name: create_runtime_str!("quartz"),
+
+ authoring_version: 1,
+ spec_version: 943060,
+ impl_version: 0,
+ apis: RUNTIME_API_VERSIONS,
+ transaction_version: 3,
+ state_version: 1,
+};
+#[cfg(feature = "become-sapphire")]
+#[sp_version::runtime_version]
+pub const VERSION: RuntimeVersion = RuntimeVersion {
+ spec_name: create_runtime_str!("sapphire"),
+ impl_name: create_runtime_str!("sapphire"),
+
authoring_version: 1,
spec_version: 943060,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 3,
- #[cfg(feature = "state-version-0")]
- state_version: 0,
- #[cfg(not(feature = "state-version-0"))]
state_version: 1,
};
runtime/unique/Cargo.tomldiffbeforeafterboth--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -58,7 +58,6 @@
'up-data-structs/runtime-benchmarks',
'xcm-builder/runtime-benchmarks',
]
-state-version-0 = []
std = [
'codec/std',
'cumulus-pallet-aura-ext/std',
runtime/unique/src/lib.rsdiffbeforeafterboth--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -43,22 +43,19 @@
pub use runtime_common::*;
-pub const RUNTIME_NAME: &str = "unique";
pub const TOKEN_SYMBOL: &str = "UNQ";
pub const DECIMALS: u8 = 18;
/// This runtime version.
+#[sp_version::runtime_version]
pub const VERSION: RuntimeVersion = RuntimeVersion {
- spec_name: create_runtime_str!(RUNTIME_NAME),
- impl_name: create_runtime_str!(RUNTIME_NAME),
+ spec_name: create_runtime_str!("unique"),
+ impl_name: create_runtime_str!("unique"),
authoring_version: 1,
spec_version: 943060,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 3,
- #[cfg(feature = "state-version-0")]
- state_version: 0,
- #[cfg(not(feature = "state-version-0"))]
state_version: 1,
};