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
--- a/runtime/common/src/constants.rs
+++ b/runtime/common/src/constants.rs
@@ -3,7 +3,7 @@
 	parameter_types,
 	weights::{Weight, constants::WEIGHT_PER_SECOND},
 };
-use crate::types::BlockNumber;
+use crate::types::{BlockNumber, Balance};
 
 pub const MILLISECS_PER_BLOCK: u64 = 12000;
 
@@ -14,6 +14,11 @@
 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;
+
 pub const WEIGHT_TO_FEE_COEFF: u32 = 142_688_000;
 
 /// We assume that ~10% of the block weight is consumed by `on_initalize` handlers.
@@ -27,4 +32,6 @@
 
 parameter_types! {
 	pub const DefaultSponsoringRateLimit: BlockNumber = 1 * DAYS;
+
+	pub const TransactionByteFee: Balance = 501 * MICROUNIQUE; // Targeting 0.1 Unique per NFT transfer
 }
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
388 type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;388 type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;
389}389}
390
391pub const MICROUNIQUE: Balance = 1_000_000_000_000;
392pub const MILLIUNIQUE: Balance = 1_000 * MICROUNIQUE;
393pub const CENTIUNIQUE: Balance = 10 * MILLIUNIQUE;
394pub const UNIQUE: Balance = 100 * CENTIUNIQUE;
395390
396pub const fn deposit(items: u32, bytes: u32) -> Balance {391pub const fn deposit(items: u32, bytes: u32) -> Balance {
397 items as Balance * 15 * CENTIUNIQUE + (bytes as Balance) * 6 * CENTIUNIQUE392 items as Balance * 15 * CENTIUNIQUE + (bytes as Balance) * 6 * CENTIUNIQUE
448*/443*/
449444
450parameter_types! {445parameter_types! {
451 pub const TransactionByteFee: Balance = 501 * MICROUNIQUE; // Targeting 0.1 Unique per NFT transfer
452 /// This value increases the priority of `Operational` transactions by adding446 /// This value increases the priority of `Operational` transactions by adding
453 /// a "virtual tip" that's equal to the `OperationalFeeMultiplier * final_fee`.447 /// a "virtual tip" that's equal to the `OperationalFeeMultiplier * final_fee`.
454 pub const OperationalFeeMultiplier: u8 = 5;448 pub const OperationalFeeMultiplier: u8 = 5;