git.delta.rocks / unique-network / refs/commits / 293d68a70153

difftreelog

Merge pull request #491 from UniqueNetwork/fix/common-constants-and-changelog

Yaroslav Bolyukin2022-08-15parents: #b1129f6 #c986696.patch.diff
in: master
Fix/common constants and changelog

6 files changed

deletedruntime/common/CHANGELOG.mddiffbeforeafterboth
--- a/runtime/common/CHANGELOG.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-
-## [0.9.25] - 2022-07-14
-
-### Added
-
- - Implementation of RPC method `token_owners` returning 10 owners in no particular order.
-    This was an internal request to improve the web interface and support fractionalization event. 
-
-
- 
\ No newline at end of file
deletedruntime/common/constants.rsdiffbeforeafterboth
--- a/runtime/common/constants.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
-// This file is part of Unique Network.
-
-// Unique Network is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Unique Network is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-
-use sp_runtime::Perbill;
-use frame_support::{
-	parameter_types,
-	weights::{Weight, constants::WEIGHT_PER_SECOND},
-};
-use up_common::types::{BlockNumber, Balance};
-
-pub const MILLISECS_PER_BLOCK: u64 = 12000;
-
-pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;
-
-// These time units are defined in number of blocks.
-pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);
-pub const HOURS: BlockNumber = MINUTES * 60;
-pub const DAYS: BlockNumber = HOURS * 24;
-
-pub const MICROUNIQUE: Balance = 1_000_000_000_000;
-pub const MILLIUNIQUE: Balance = 1_000 * MICROUNIQUE;
-pub const CENTIUNIQUE: Balance = 10 * MILLIUNIQUE;
-pub const UNIQUE: Balance = 100 * CENTIUNIQUE;
-
-// Targeting 0.1 UNQ per transfer
-pub const WEIGHT_TO_FEE_COEFF: u32 = 207_890_902;
-
-// Targeting 0.15 UNQ per transfer via ETH
-pub const MIN_GAS_PRICE: u64 = 1_019_493_469_850;
-
-/// We assume that ~10% of the block weight is consumed by `on_initalize` handlers.
-/// This is used to limit the maximal weight of a single extrinsic.
-pub const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);
-/// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used
-/// by  Operational  extrinsics.
-pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
-/// We allow for 2 seconds of compute with a 6 second average block time.
-pub const MAXIMUM_BLOCK_WEIGHT: Weight = WEIGHT_PER_SECOND / 2;
-
-parameter_types! {
-	pub const TransactionByteFee: Balance = 501 * MICROUNIQUE;
-}
modifiedruntime/common/mod.rsdiffbeforeafterboth
before · runtime/common/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/>.1617pub mod config;18pub mod constants;19pub mod construct_runtime;20pub mod dispatch;21pub mod ethereum;22pub mod instance;23pub mod runtime_apis;24pub mod scheduler;25pub mod sponsoring;26pub mod weights;2728use sp_core::H160;29use frame_support::traits::{Currency, OnUnbalanced, Imbalance};30use sp_runtime::{31	generic,32	traits::{BlakeTwo256, BlockNumberProvider},33	impl_opaque_keys,34};35use sp_std::vec::Vec;3637#[cfg(feature = "std")]38use sp_version::NativeVersion;3940use crate::{41	Runtime, Call, Balances, Treasury, Aura, Signature, AllPalletsReversedWithSystemFirst,42	InherentDataExt,43};44use up_common::types::{AccountId, BlockNumber};4546#[macro_export]47macro_rules! unsupported {48	() => {49		pallet_common::unsupported!($crate::Runtime)50	};51}5253/// The address format for describing accounts.54pub type Address = sp_runtime::MultiAddress<AccountId, ()>;55/// Block header type as expected by this runtime.56pub type Header = generic::Header<BlockNumber, BlakeTwo256>;57/// Block type as expected by this runtime.58pub type Block = generic::Block<Header, UncheckedExtrinsic>;59/// A Block signed with a Justification60pub type SignedBlock = generic::SignedBlock<Block>;61/// BlockId type as expected by this runtime.62pub type BlockId = generic::BlockId<Block>;6364impl_opaque_keys! {65	pub struct SessionKeys {66		pub aura: Aura,67	}68}6970/// The version information used to identify this runtime when compiled natively.71#[cfg(feature = "std")]72pub fn native_version() -> NativeVersion {73	NativeVersion {74		runtime_version: crate::VERSION,75		can_author_with: Default::default(),76	}77}7879pub type ChargeTransactionPayment = pallet_charge_transaction::ChargeTransactionPayment<Runtime>;8081pub type SignedExtra = (82	frame_system::CheckSpecVersion<Runtime>,83	// system::CheckTxVersion<Runtime>,84	frame_system::CheckGenesis<Runtime>,85	frame_system::CheckEra<Runtime>,86	frame_system::CheckNonce<Runtime>,87	frame_system::CheckWeight<Runtime>,88	ChargeTransactionPayment,89	//pallet_contract_helpers::ContractHelpersExtension<Runtime>,90	pallet_ethereum::FakeTransactionFinalizer<Runtime>,91);9293/// Unchecked extrinsic type as expected by this runtime.94pub type UncheckedExtrinsic =95	fp_self_contained::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;9697/// Extrinsic type that has already been checked.98pub type CheckedExtrinsic = fp_self_contained::CheckedExtrinsic<AccountId, Call, SignedExtra, H160>;99100/// Executive: handles dispatch to the various modules.101pub type Executive = frame_executive::Executive<102	Runtime,103	Block,104	frame_system::ChainContext<Runtime>,105	Runtime,106	AllPalletsReversedWithSystemFirst,107>;108109type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;110111pub struct DealWithFees;112impl OnUnbalanced<NegativeImbalance> for DealWithFees {113	fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {114		if let Some(fees) = fees_then_tips.next() {115			// for fees, 100% to treasury116			let mut split = fees.ration(100, 0);117			if let Some(tips) = fees_then_tips.next() {118				// for tips, if any, 100% to treasury119				tips.ration_merge_into(100, 0, &mut split);120			}121			Treasury::on_unbalanced(split.0);122			// Author::on_unbalanced(split.1);123		}124	}125}126127pub struct RelayChainBlockNumberProvider<T>(sp_std::marker::PhantomData<T>);128129impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider130	for RelayChainBlockNumberProvider<T>131{132	type BlockNumber = BlockNumber;133134	fn current_block_number() -> Self::BlockNumber {135		cumulus_pallet_parachain_system::Pallet::<T>::validation_data()136			.map(|d| d.relay_parent_number)137			.unwrap_or_default()138	}139}140141pub(crate) struct CheckInherents;142143impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {144	fn check_inherents(145		block: &Block,146		relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,147	) -> sp_inherents::CheckInherentsResult {148		let relay_chain_slot = relay_state_proof149			.read_slot()150			.expect("Could not read the relay chain slot from the proof");151152		let inherent_data =153			cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(154				relay_chain_slot,155				sp_std::time::Duration::from_secs(6),156			)157			.create_inherent_data()158			.expect("Could not create the timestamp inherent data");159160		inherent_data.check_extrinsics(block)161	}162}163164#[derive(codec::Encode, codec::Decode)]165pub enum XCMPMessage<XAccountId, XBalance> {166	/// Transfer tokens to the given account from the Parachain account.167	TransferToken(XAccountId, XBalance),168}
after · runtime/common/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/>.1617pub mod config;18pub mod construct_runtime;19pub mod dispatch;20pub mod ethereum;21pub mod instance;22pub mod runtime_apis;23pub mod scheduler;24pub mod sponsoring;25pub mod weights;2627use sp_core::H160;28use frame_support::traits::{Currency, OnUnbalanced, Imbalance};29use sp_runtime::{30	generic,31	traits::{BlakeTwo256, BlockNumberProvider},32	impl_opaque_keys,33};34use sp_std::vec::Vec;3536#[cfg(feature = "std")]37use sp_version::NativeVersion;3839use crate::{40	Runtime, Call, Balances, Treasury, Aura, Signature, AllPalletsReversedWithSystemFirst,41	InherentDataExt,42};43use up_common::types::{AccountId, BlockNumber};4445#[macro_export]46macro_rules! unsupported {47	() => {48		pallet_common::unsupported!($crate::Runtime)49	};50}5152/// The address format for describing accounts.53pub type Address = sp_runtime::MultiAddress<AccountId, ()>;54/// Block header type as expected by this runtime.55pub type Header = generic::Header<BlockNumber, BlakeTwo256>;56/// Block type as expected by this runtime.57pub type Block = generic::Block<Header, UncheckedExtrinsic>;58/// A Block signed with a Justification59pub type SignedBlock = generic::SignedBlock<Block>;60/// BlockId type as expected by this runtime.61pub type BlockId = generic::BlockId<Block>;6263impl_opaque_keys! {64	pub struct SessionKeys {65		pub aura: Aura,66	}67}6869/// The version information used to identify this runtime when compiled natively.70#[cfg(feature = "std")]71pub fn native_version() -> NativeVersion {72	NativeVersion {73		runtime_version: crate::VERSION,74		can_author_with: Default::default(),75	}76}7778pub type ChargeTransactionPayment = pallet_charge_transaction::ChargeTransactionPayment<Runtime>;7980pub type SignedExtra = (81	frame_system::CheckSpecVersion<Runtime>,82	// system::CheckTxVersion<Runtime>,83	frame_system::CheckGenesis<Runtime>,84	frame_system::CheckEra<Runtime>,85	frame_system::CheckNonce<Runtime>,86	frame_system::CheckWeight<Runtime>,87	ChargeTransactionPayment,88	//pallet_contract_helpers::ContractHelpersExtension<Runtime>,89	pallet_ethereum::FakeTransactionFinalizer<Runtime>,90);9192/// Unchecked extrinsic type as expected by this runtime.93pub type UncheckedExtrinsic =94	fp_self_contained::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;9596/// Extrinsic type that has already been checked.97pub type CheckedExtrinsic = fp_self_contained::CheckedExtrinsic<AccountId, Call, SignedExtra, H160>;9899/// Executive: handles dispatch to the various modules.100pub type Executive = frame_executive::Executive<101	Runtime,102	Block,103	frame_system::ChainContext<Runtime>,104	Runtime,105	AllPalletsReversedWithSystemFirst,106>;107108type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;109110pub struct DealWithFees;111impl OnUnbalanced<NegativeImbalance> for DealWithFees {112	fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {113		if let Some(fees) = fees_then_tips.next() {114			// for fees, 100% to treasury115			let mut split = fees.ration(100, 0);116			if let Some(tips) = fees_then_tips.next() {117				// for tips, if any, 100% to treasury118				tips.ration_merge_into(100, 0, &mut split);119			}120			Treasury::on_unbalanced(split.0);121			// Author::on_unbalanced(split.1);122		}123	}124}125126pub struct RelayChainBlockNumberProvider<T>(sp_std::marker::PhantomData<T>);127128impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider129	for RelayChainBlockNumberProvider<T>130{131	type BlockNumber = BlockNumber;132133	fn current_block_number() -> Self::BlockNumber {134		cumulus_pallet_parachain_system::Pallet::<T>::validation_data()135			.map(|d| d.relay_parent_number)136			.unwrap_or_default()137	}138}139140pub(crate) struct CheckInherents;141142impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {143	fn check_inherents(144		block: &Block,145		relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,146	) -> sp_inherents::CheckInherentsResult {147		let relay_chain_slot = relay_state_proof148			.read_slot()149			.expect("Could not read the relay chain slot from the proof");150151		let inherent_data =152			cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(153				relay_chain_slot,154				sp_std::time::Duration::from_secs(6),155			)156			.create_inherent_data()157			.expect("Could not create the timestamp inherent data");158159		inherent_data.check_extrinsics(block)160	}161}162163#[derive(codec::Encode, codec::Decode)]164pub enum XCMPMessage<XAccountId, XBalance> {165	/// Transfer tokens to the given account from the Parachain account.166	TransferToken(XAccountId, XBalance),167}
addedruntime/opal/CHANGELOG.mddiffbeforeafterboth
--- /dev/null
+++ b/runtime/opal/CHANGELOG.md
@@ -0,0 +1,3 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
addedruntime/quartz/CHANGELOG.mddiffbeforeafterboth
--- /dev/null
+++ b/runtime/quartz/CHANGELOG.md
@@ -0,0 +1,3 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
addedruntime/unique/CHANGELOG.mddiffbeforeafterboth
--- /dev/null
+++ b/runtime/unique/CHANGELOG.md
@@ -0,0 +1,3 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.