pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-15 19:41:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract Runtime Constants into Separate Crates (#4456)

Browse Source 
* kusama-runtime-constants created

* polkadot_runtime_constants added

* runtime constants extracted

* update node

* cargo +nightly fmt

* Delete constants.rs

* update Cargo.toml

* 2021

* runtime constants update

* utils

* utils

* node test service

* Update runtime/rococo/constants/Cargo.toml

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* runtime-native

* bridge messages

* re-export DOLLARS

* Update runtime/westend/Cargo.toml

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update runtime/test-runtime/Cargo.toml

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* std feature

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
This commit is contained in:
Doordashcon
2021-12-11 08:10:32 +01:00
committed by GitHub
parent 7c5249c951
commit 11d343e258
28 changed files with 238 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/runtime/rococo/src/bridge_messages.rs
+4 -2
View File
@@ -39,6 +39,8 @@ use frame_support::{
};
use sp_std::{convert::TryFrom, marker::PhantomData, ops::RangeInclusive};
use rococo_runtime_constants::fee::WeightToFee;
/// Maximal number of pending outbound messages.
const MAXIMAL_PENDING_MESSAGES_AT_OUTBOUND_LANE: MessageNonce =
bp_rococo::MAX_UNCONFIRMED_MESSAGES_AT_INBOUND_LANE;
@@ -138,7 +140,7 @@ impl<B, GI> ThisChainWithMessages for RococoLikeChain<B, GI> {
.base_extrinsic,
crate::TransactionByteFee::get(),
pallet_transaction_payment::Pallet::<crate::Runtime>::next_fee_multiplier(),
|weight| crate::constants::fee::WeightToFee::calc(&weight),
|weight| WeightToFee::calc(&weight),
transaction,
)
}
@@ -195,7 +197,7 @@ impl<B, GI> BridgedChainWithMessages for RococoLikeChain<B, GI> {
.base_extrinsic,
crate::TransactionByteFee::get(),
pallet_transaction_payment::Pallet::<crate::Runtime>::next_fee_multiplier(),
|weight| crate::constants::fee::WeightToFee::calc(&weight),
|weight| WeightToFee::calc(&weight),
transaction,
)
}
polkadot/runtime/rococo/src/constants.rs
-118
View File
@@ -1,118 +0,0 @@
// Copyright 2020 Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot 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.
// Polkadot 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 Polkadot. If not, see <http://www.gnu.org/licenses/>.
/// Money matters.
pub mod currency {
use primitives::v0::Balance;
pub const UNITS: Balance = 1_000_000_000_000;
pub const DOLLARS: Balance = UNITS;
pub const CENTS: Balance = DOLLARS / 100;
pub const MILLICENTS: Balance = CENTS / 1_000;
pub const fn deposit(items: u32, bytes: u32) -> Balance {
items as Balance * 1 * DOLLARS + (bytes as Balance) * 5 * MILLICENTS
}
}
/// Time and blocks.
pub mod time {
use primitives::v0::{BlockNumber, Moment};
pub const MILLISECS_PER_BLOCK: Moment = 6000;
pub const SLOT_DURATION: Moment = MILLISECS_PER_BLOCK;
frame_support::parameter_types! {
pub storage EpochDurationInBlocks: BlockNumber = 10 * MINUTES;
}
// 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;
// 1 in 4 blocks (on average, not counting collisions) will be primary babe blocks.
pub const PRIMARY_PROBABILITY: (u64, u64) = (1, 4);
}
/// Fee-related.
pub mod fee {
use frame_support::weights::{
WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial,
};
use primitives::v0::Balance;
use runtime_common::ExtrinsicBaseWeight;
use smallvec::smallvec;
pub use sp_runtime::Perbill;
/// The block saturation level. Fees will be updates based on this value.
pub const TARGET_BLOCK_FULLNESS: Perbill = Perbill::from_percent(25);
/// Handles converting a weight scalar to a fee value, based on the scale and granularity of the
/// node's balance type.
///
/// This should typically create a mapping between the following ranges:
/// - [0, `frame_system::MaximumBlockWeight`]
/// - [Balance::min, Balance::max]
///
/// Yet, it can be used for any other sort of change to weight-fee. Some examples being:
/// - Setting it to `0` will essentially disable the weight fee.
/// - Setting it to `1` will cause the literal `#[weight = x]` values to be charged.
pub struct WeightToFee;
impl WeightToFeePolynomial for WeightToFee {
type Balance = Balance;
fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
// in Westend, extrinsic base weight (smallest non-zero weight) is mapped to 1/10 CENT:
let p = super::currency::CENTS;
let q = 10 * Balance::from(ExtrinsicBaseWeight::get());
smallvec![WeightToFeeCoefficient {
degree: 1,
negative: false,
coeff_frac: Perbill::from_rational(p % q, q),
coeff_integer: p / q,
}]
}
}
}
#[cfg(test)]
mod tests {
use super::{
currency::{CENTS, DOLLARS, MILLICENTS},
fee::WeightToFee,
};
use frame_support::weights::{DispatchClass, WeightToFeePolynomial};
use runtime_common::BlockWeights;
#[test]
// This function tests that the fee for `MaximumBlockWeight` of weight is correct
fn full_block_fee_is_correct() {
// A full block should cost 16 DOLLARS
println!("Base: {}", BlockWeights::get().get(DispatchClass::Normal).base_extrinsic);
let x = WeightToFee::calc(&BlockWeights::get().max_block);
let y = 16 * DOLLARS;
assert!(x.max(y) - x.min(y) < MILLICENTS);
}
#[test]
// This function tests that the fee for `ExtrinsicBaseWeight` of weight is correct
fn extrinsic_base_fee_is_correct() {
// `ExtrinsicBaseWeight` should cost 1/10 of a CENT
let base_weight = BlockWeights::get().get(DispatchClass::Normal).base_extrinsic;
println!("Base: {}", base_weight);
let x = WeightToFee::calc(&base_weight);
let y = CENTS / 10;
assert!(x.max(y) - x.min(y) < MILLICENTS);
}
}
polkadot/runtime/rococo/src/lib.rs
+3 -3
View File
@@ -81,7 +81,9 @@ pub use pallet_balances::Call as BalancesCall;
use polkadot_parachain::primitives::Id as ParaId;
use constants::{currency::*, fee::*, time::*};
/// Constant values used within the runtime.
use rococo_runtime_constants::{currency::*, fee::*, time::*};
use frame_support::traits::{InstanceFilter, OnRuntimeUpgrade};
use xcm::latest::prelude::*;
use xcm_builder::{
@@ -93,8 +95,6 @@ use xcm_builder::{
use xcm_executor::XcmExecutor;
mod bridge_messages;
/// Constant values used within the runtime.
pub mod constants;
mod validator_manager;
mod weights;