chore: bump spec versions for mainnet upgrade (RC 1_020_005, AH 1_020_005, People 1_020_008)
This commit is contained in:
@@ -68,12 +68,12 @@ use pezkuwi_runtime_teyrchains::{
|
||||
inclusion::{AggregateMessageOrigin, UmpQueueId},
|
||||
initializer as teyrchains_initializer, on_demand as teyrchains_on_demand,
|
||||
origin as teyrchains_origin, paras as teyrchains_paras,
|
||||
paras_inherent as teyrchains_paras_inherent,
|
||||
paras_inherent as teyrchains_paras_inherent, reward_points as teyrchains_reward_points,
|
||||
runtime_api_impl::{
|
||||
v13 as teyrchains_runtime_api_impl, vstaging as teyrchains_staging_runtime_api_impl,
|
||||
},
|
||||
scheduler as teyrchains_scheduler, session_info as teyrchains_session_info,
|
||||
reward_points as teyrchains_reward_points, shared as teyrchains_shared,
|
||||
shared as teyrchains_shared,
|
||||
};
|
||||
use pezkuwichain_runtime_constants::system_teyrchain::{
|
||||
coretime::TIMESLICE_PERIOD, ASSET_HUB_ID, BROKER_ID,
|
||||
@@ -174,7 +174,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
|
||||
spec_name: alloc::borrow::Cow::Borrowed("pezkuwichain"),
|
||||
impl_name: alloc::borrow::Cow::Borrowed("parity-pezkuwichain"),
|
||||
authoring_version: 0,
|
||||
spec_version: 1_020_008,
|
||||
spec_version: 1_020_005,
|
||||
impl_version: 0,
|
||||
apis: RUNTIME_API_VERSIONS,
|
||||
transaction_version: 26,
|
||||
@@ -461,12 +461,9 @@ pub struct ExposureOfOrDefault;
|
||||
impl pezsp_runtime::traits::Convert<AccountId, Option<pezsp_staking::Exposure<AccountId, Balance>>>
|
||||
for ExposureOfOrDefault
|
||||
{
|
||||
fn convert(
|
||||
validator: AccountId,
|
||||
) -> Option<pezsp_staking::Exposure<AccountId, Balance>> {
|
||||
fn convert(validator: AccountId) -> Option<pezsp_staking::Exposure<AccountId, Balance>> {
|
||||
Some(
|
||||
<pezpallet_staking::DefaultExposureOf<Runtime>>::convert(validator)
|
||||
.unwrap_or_default(),
|
||||
<pezpallet_staking::DefaultExposureOf<Runtime>>::convert(validator).unwrap_or_default(),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -148,11 +148,7 @@ fn governance_tracks_total_count() {
|
||||
fn governance_track_ids_are_unique() {
|
||||
let mut seen = HashSet::new();
|
||||
for track in <TracksInfo as TracksInfoTrait<Balance, BlockNumber>>::tracks() {
|
||||
assert!(
|
||||
seen.insert(track.id),
|
||||
"Duplicate track ID: {}",
|
||||
track.id
|
||||
);
|
||||
assert!(seen.insert(track.id), "Duplicate track ID: {}", track.id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -185,24 +181,24 @@ fn governance_no_test_periods_remain() {
|
||||
fn governance_production_periods_match_spec() {
|
||||
// Build expected values: (track_id, prepare, decision, confirm, enact)
|
||||
let expected: Vec<(u16, &str, BlockNumber, BlockNumber, BlockNumber, BlockNumber)> = vec![
|
||||
(0, "root", 2 * HOURS, 28 * DAYS, 24 * HOURS, 24 * HOURS),
|
||||
(1, "whitelisted_caller", 30 * MINUTES, 28 * DAYS, 10 * MINUTES, 10 * MINUTES),
|
||||
(10, "staking_admin", 2 * HOURS, 14 * DAYS, 3 * HOURS, 10 * MINUTES),
|
||||
(11, "treasurer", 2 * HOURS, 28 * DAYS, 3 * HOURS, 24 * HOURS),
|
||||
(12, "lease_admin", 2 * HOURS, 14 * DAYS, 3 * HOURS, 10 * MINUTES),
|
||||
(13, "fellowship_admin", 2 * HOURS, 14 * DAYS, 3 * HOURS, 10 * MINUTES),
|
||||
(14, "general_admin", 2 * HOURS, 14 * DAYS, 3 * HOURS, 10 * MINUTES),
|
||||
(15, "auction_admin", 2 * HOURS, 14 * DAYS, 3 * HOURS, 10 * MINUTES),
|
||||
(20, "referendum_canceller", 2 * HOURS, 7 * DAYS, 3 * HOURS, 10 * MINUTES),
|
||||
(21, "referendum_killer", 2 * HOURS, 14 * DAYS, 3 * HOURS, 10 * MINUTES),
|
||||
(30, "small_tipper", 1 * MINUTES, 7 * DAYS, 10 * MINUTES, 1 * MINUTES),
|
||||
(31, "big_tipper", 10 * MINUTES, 7 * DAYS, 1 * HOURS, 10 * MINUTES),
|
||||
(32, "small_spender", 4 * HOURS, 28 * DAYS, 12 * HOURS, 24 * HOURS),
|
||||
(33, "medium_spender", 4 * HOURS, 28 * DAYS, 24 * HOURS, 24 * HOURS),
|
||||
(34, "big_spender", 4 * HOURS, 28 * DAYS, 48 * HOURS, 24 * HOURS),
|
||||
(40, "welati_election", 2 * HOURS, 14 * DAYS, 12 * HOURS, 24 * HOURS),
|
||||
(41, "welati_admin", 2 * HOURS, 7 * DAYS, 3 * HOURS, 10 * MINUTES),
|
||||
(42, "citizenship_admin", 2 * HOURS, 14 * DAYS, 6 * HOURS, 24 * HOURS),
|
||||
(0, "root", 2 * HOURS, 28 * DAYS, 24 * HOURS, 24 * HOURS),
|
||||
(1, "whitelisted_caller", 30 * MINUTES, 28 * DAYS, 10 * MINUTES, 10 * MINUTES),
|
||||
(10, "staking_admin", 2 * HOURS, 14 * DAYS, 3 * HOURS, 10 * MINUTES),
|
||||
(11, "treasurer", 2 * HOURS, 28 * DAYS, 3 * HOURS, 24 * HOURS),
|
||||
(12, "lease_admin", 2 * HOURS, 14 * DAYS, 3 * HOURS, 10 * MINUTES),
|
||||
(13, "fellowship_admin", 2 * HOURS, 14 * DAYS, 3 * HOURS, 10 * MINUTES),
|
||||
(14, "general_admin", 2 * HOURS, 14 * DAYS, 3 * HOURS, 10 * MINUTES),
|
||||
(15, "auction_admin", 2 * HOURS, 14 * DAYS, 3 * HOURS, 10 * MINUTES),
|
||||
(20, "referendum_canceller", 2 * HOURS, 7 * DAYS, 3 * HOURS, 10 * MINUTES),
|
||||
(21, "referendum_killer", 2 * HOURS, 14 * DAYS, 3 * HOURS, 10 * MINUTES),
|
||||
(30, "small_tipper", 1 * MINUTES, 7 * DAYS, 10 * MINUTES, 1 * MINUTES),
|
||||
(31, "big_tipper", 10 * MINUTES, 7 * DAYS, 1 * HOURS, 10 * MINUTES),
|
||||
(32, "small_spender", 4 * HOURS, 28 * DAYS, 12 * HOURS, 24 * HOURS),
|
||||
(33, "medium_spender", 4 * HOURS, 28 * DAYS, 24 * HOURS, 24 * HOURS),
|
||||
(34, "big_spender", 4 * HOURS, 28 * DAYS, 48 * HOURS, 24 * HOURS),
|
||||
(40, "welati_election", 2 * HOURS, 14 * DAYS, 12 * HOURS, 24 * HOURS),
|
||||
(41, "welati_admin", 2 * HOURS, 7 * DAYS, 3 * HOURS, 10 * MINUTES),
|
||||
(42, "citizenship_admin", 2 * HOURS, 14 * DAYS, 6 * HOURS, 24 * HOURS),
|
||||
];
|
||||
|
||||
let tracks: HashMap<u16, _> = <TracksInfo as TracksInfoTrait<Balance, BlockNumber>>::tracks()
|
||||
@@ -303,7 +299,8 @@ fn governance_track_for_origin_mapping() {
|
||||
for (origin, expected_id) in origin_to_track {
|
||||
let pallet_origin: <RuntimeOrigin as pezframe_support::traits::OriginTrait>::PalletsOrigin =
|
||||
origin.clone().into();
|
||||
let result = <TracksInfo as TracksInfoTrait<Balance, BlockNumber>>::track_for(&pallet_origin);
|
||||
let result =
|
||||
<TracksInfo as TracksInfoTrait<Balance, BlockNumber>>::track_for(&pallet_origin);
|
||||
assert_eq!(
|
||||
result,
|
||||
Ok(expected_id),
|
||||
|
||||
@@ -146,7 +146,9 @@ impl<T: Config + pezpallet_session::historical::Config>
|
||||
pezpallet_session::historical::SessionManager<T::ValidatorId, T::FullIdentification>
|
||||
for Pezpallet<T>
|
||||
{
|
||||
fn new_session(new_index: SessionIndex) -> Option<Vec<(T::ValidatorId, T::FullIdentification)>> {
|
||||
fn new_session(
|
||||
new_index: SessionIndex,
|
||||
) -> Option<Vec<(T::ValidatorId, T::FullIdentification)>> {
|
||||
<Self as pezpallet_session::SessionManager<_>>::new_session(new_index).map(|r| {
|
||||
r.into_iter()
|
||||
.filter_map(|v| {
|
||||
|
||||
@@ -22,9 +22,7 @@ use super::{
|
||||
XcmPallet,
|
||||
};
|
||||
|
||||
use crate::governance::{
|
||||
CitizenshipAdmin, StakingAdmin, WelatiAdmin, WelatiElection,
|
||||
};
|
||||
use crate::governance::{CitizenshipAdmin, StakingAdmin, WelatiAdmin, WelatiElection};
|
||||
|
||||
use pezframe_support::{
|
||||
parameter_types,
|
||||
|
||||
Reference in New Issue
Block a user