From 571be545f6bb800edabe2ee98bb49cc4441693c2 Mon Sep 17 00:00:00 2001 From: Daniel Shiposha Date: Fri, 25 Nov 2022 14:16:12 +0000 Subject: [PATCH] fix: use ConstFeeMultiplier --- --- a/runtime/common/config/substrate.rs +++ b/runtime/common/config/substrate.rs @@ -26,14 +26,14 @@ use sp_runtime::{ generic, traits::{BlakeTwo256, AccountIdLookup}, - Perquintill, Perbill, Permill, Percent, + Perbill, Permill, Percent, }; -use sp_arithmetic::traits::{Zero, One}; +use sp_arithmetic::traits::One; use frame_system::{ limits::{BlockLength, BlockWeights}, EnsureRoot, }; -use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment}; +use pallet_transaction_payment::{Multiplier, ConstFeeMultiplier}; use crate::{ runtime_common::DealWithFees, Runtime, RuntimeEvent, RuntimeCall, RuntimeOrigin, PalletInfo, System, Balances, Treasury, SS58Prefix, Version, @@ -154,16 +154,9 @@ /// 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; - - pub const TargetBlockFullness: Perquintill = Perquintill::zero(); - pub AdjustmentVariable: Multiplier = Multiplier::zero(); - - pub MinimumMultiplier: Multiplier = Multiplier::one(); + pub FeeMultiplier: Multiplier = Multiplier::one(); } - -pub type ConstFeeMultiplier = - TargetedFeeAdjustment; impl pallet_transaction_payment::Config for Runtime { type RuntimeEvent = RuntimeEvent; @@ -171,7 +164,7 @@ type LengthToFee = ConstantMultiplier; type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = pallet_configuration::WeightToFee; - type FeeMultiplierUpdate = ConstFeeMultiplier; + type FeeMultiplierUpdate = ConstFeeMultiplier; } parameter_types! { -- gitstuff