From 8f77dc2402c417ce07746fc1abf234e7b69b9dcd Mon Sep 17 00:00:00 2001 From: Daniel Shiposha Date: Mon, 14 Mar 2022 12:58:00 +0000 Subject: [PATCH] Move TransactionByteFee to common --- --- 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 } --- a/runtime/opal/src/lib.rs +++ b/runtime/opal/src/lib.rs @@ -389,11 +389,6 @@ type WeightInfo = pallet_balances::weights::SubstrateWeight; } -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; --- a/runtime/quartz/src/lib.rs +++ b/runtime/quartz/src/lib.rs @@ -389,11 +389,6 @@ type WeightInfo = pallet_balances::weights::SubstrateWeight; } -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; --- a/runtime/unique/src/lib.rs +++ b/runtime/unique/src/lib.rs @@ -388,11 +388,6 @@ type WeightInfo = pallet_balances::weights::SubstrateWeight; } -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; -- gitstuff