git.delta.rocks / unique-network / refs/commits / 8f77dc2402c4

difftreelog

Move TransactionByteFee to common

Daniel Shiposha2022-03-14parent: #9190bc3.patch.diff
in: master

4 files changed

modifiedruntime/common/src/constants.rsdiffbeforeafterboth
before · runtime/common/src/constants.rs
1use sp_runtime::Perbill;2use frame_support::{3	parameter_types,4	weights::{Weight, constants::WEIGHT_PER_SECOND},5};6use crate::types::BlockNumber;78pub const MILLISECS_PER_BLOCK: u64 = 12000;910pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;1112// These time units are defined in number of blocks.13pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);14pub const HOURS: BlockNumber = MINUTES * 60;15pub const DAYS: BlockNumber = HOURS * 24;1617pub const WEIGHT_TO_FEE_COEFF: u32 = 142_688_000;1819/// We assume that ~10% of the block weight is consumed by `on_initalize` handlers.20/// This is used to limit the maximal weight of a single extrinsic.21pub const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);22/// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used23/// by  Operational  extrinsics.24pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);25/// We allow for 2 seconds of compute with a 6 second average block time.26pub const MAXIMUM_BLOCK_WEIGHT: Weight = WEIGHT_PER_SECOND / 2;2728parameter_types! {29	pub const DefaultSponsoringRateLimit: BlockNumber = 1 * DAYS;30}
after · runtime/common/src/constants.rs
1use sp_runtime::Perbill;2use frame_support::{3	parameter_types,4	weights::{Weight, constants::WEIGHT_PER_SECOND},5};6use crate::types::{BlockNumber, Balance};78pub const MILLISECS_PER_BLOCK: u64 = 12000;910pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;1112// These time units are defined in number of blocks.13pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);14pub const HOURS: BlockNumber = MINUTES * 60;15pub const DAYS: BlockNumber = HOURS * 24;1617pub const MICROUNIQUE: Balance = 1_000_000_000_000;18pub const MILLIUNIQUE: Balance = 1_000 * MICROUNIQUE;19pub const CENTIUNIQUE: Balance = 10 * MILLIUNIQUE;20pub const UNIQUE: Balance = 100 * CENTIUNIQUE;2122pub const WEIGHT_TO_FEE_COEFF: u32 = 142_688_000;2324/// We assume that ~10% of the block weight is consumed by `on_initalize` handlers.25/// This is used to limit the maximal weight of a single extrinsic.26pub const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);27/// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used28/// by  Operational  extrinsics.29pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);30/// We allow for 2 seconds of compute with a 6 second average block time.31pub const MAXIMUM_BLOCK_WEIGHT: Weight = WEIGHT_PER_SECOND / 2;3233parameter_types! {34	pub const DefaultSponsoringRateLimit: BlockNumber = 1 * DAYS;3536	pub const TransactionByteFee: Balance = 501 * MICROUNIQUE; // Targeting 0.1 Unique per NFT transfer37}
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -389,11 +389,6 @@
 	type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;
 }
 
-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;
-
 pub const fn deposit(items: u32, bytes: u32) -> Balance {
 	items as Balance * 15 * CENTIUNIQUE + (bytes as Balance) * 6 * CENTIUNIQUE
 }
@@ -449,7 +444,6 @@
 */
 
 parameter_types! {
-	pub const TransactionByteFee: Balance = 501 * MICROUNIQUE; // Targeting 0.1 Unique per NFT transfer
 	/// This value increases the priority of `Operational` transactions by adding
 	/// a "virtual tip" that's equal to the `OperationalFeeMultiplier * final_fee`.
 	pub const OperationalFeeMultiplier: u8 = 5;
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -389,11 +389,6 @@
 	type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;
 }
 
-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;
-
 pub const fn deposit(items: u32, bytes: u32) -> Balance {
 	items as Balance * 15 * CENTIUNIQUE + (bytes as Balance) * 6 * CENTIUNIQUE
 }
@@ -449,7 +444,6 @@
 */
 
 parameter_types! {
-	pub const TransactionByteFee: Balance = 501 * MICROUNIQUE; // Targeting 0.1 Unique per NFT transfer
 	/// This value increases the priority of `Operational` transactions by adding
 	/// a "virtual tip" that's equal to the `OperationalFeeMultiplier * final_fee`.
 	pub const OperationalFeeMultiplier: u8 = 5;
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -388,11 +388,6 @@
 	type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;
 }
 
-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;
-
 pub const fn deposit(items: u32, bytes: u32) -> Balance {
 	items as Balance * 15 * CENTIUNIQUE + (bytes as Balance) * 6 * CENTIUNIQUE
 }
@@ -448,7 +443,6 @@
 */
 
 parameter_types! {
-	pub const TransactionByteFee: Balance = 501 * MICROUNIQUE; // Targeting 0.1 Unique per NFT transfer
 	/// This value increases the priority of `Operational` transactions by adding
 	/// a "virtual tip" that's equal to the `OperationalFeeMultiplier * final_fee`.
 	pub const OperationalFeeMultiplier: u8 = 5;