chore: regenerate umbrella crate, fix feature propagation
This commit is contained in:
@@ -33,14 +33,16 @@ mod tracks;
|
||||
|
||||
use super::*;
|
||||
use crate::xcm_config::{FellowshipAdminBodyId, LocationToAccountId, WndAssetHub};
|
||||
use pezframe_support::traits::{EitherOf, MapSuccess, TryMapSuccess};
|
||||
use pezframe_system::EnsureRootWithSuccess;
|
||||
pub use origins::pezpallet_origins as pezpallet_ambassador_origins;
|
||||
use origins::pezpallet_origins::{
|
||||
EnsureAmbassadorsVoice, EnsureAmbassadorsVoiceFrom, EnsureHeadAmbassadorsVoice, Origin,
|
||||
};
|
||||
use pezframe_support::traits::{EitherOf, MapSuccess, TryMapSuccess};
|
||||
use pezframe_system::EnsureRootWithSuccess;
|
||||
use pezsp_core::ConstU128;
|
||||
use pezsp_runtime::traits::{CheckedReduceBy, ConstU16, ConvertToValue, Replace, ReplaceWithDefault};
|
||||
use pezsp_runtime::traits::{
|
||||
CheckedReduceBy, ConstU16, ConvertToValue, Replace, ReplaceWithDefault,
|
||||
};
|
||||
use xcm::prelude::*;
|
||||
use xcm_builder::{AliasesIntoAccountId32, PayOverXcm};
|
||||
|
||||
@@ -106,7 +108,8 @@ pub type PromoteOrigin = EitherOf<
|
||||
pub type ExchangeOrigin = EitherOf<EnsureRootWithSuccess<AccountId, ConstU16<65535>>, Fellows>;
|
||||
|
||||
impl pezpallet_ranked_collective::Config<AmbassadorCollectiveInstance> for Runtime {
|
||||
type WeightInfo = weights::pezpallet_ranked_collective_ambassador_collective::WeightInfo<Runtime>;
|
||||
type WeightInfo =
|
||||
weights::pezpallet_ranked_collective_ambassador_collective::WeightInfo<Runtime>;
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type AddOrigin = MapSuccess<Self::PromoteOrigin, ReplaceWithDefault<()>>;
|
||||
type PromoteOrigin = PromoteOrigin;
|
||||
|
||||
+10
-8
@@ -25,6 +25,10 @@ use crate::{
|
||||
Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, Scheduler, TeyrchainInfo,
|
||||
ZagrosTreasuryAccount, DAYS,
|
||||
};
|
||||
pub use origins::{
|
||||
pezpallet_origins as pezpallet_fellowship_origins, Architects, EnsureCanPromoteTo,
|
||||
EnsureCanRetainAt, EnsureFellowship, Fellows, Masters, Members, ToVoice,
|
||||
};
|
||||
use pezcumulus_primitives_core::ParaId;
|
||||
use pezframe_support::{
|
||||
parameter_types,
|
||||
@@ -35,15 +39,11 @@ use pezframe_support::{
|
||||
PalletId,
|
||||
};
|
||||
use pezframe_system::{EnsureRoot, EnsureRootWithSuccess};
|
||||
pub use origins::{
|
||||
pezpallet_origins as pezpallet_fellowship_origins, Architects, EnsureCanPromoteTo, EnsureCanRetainAt,
|
||||
EnsureFellowship, Fellows, Masters, Members, ToVoice,
|
||||
};
|
||||
use pezpallet_ranked_collective::EnsureOfRank;
|
||||
use pezpallet_xcm::{EnsureXcm, IsVoiceOfBody};
|
||||
use pezkuwi_runtime_common::impls::{
|
||||
ContainsParts, LocatableAssetConverter, VersionedLocatableAsset, VersionedLocationConverter,
|
||||
};
|
||||
use pezpallet_ranked_collective::EnsureOfRank;
|
||||
use pezpallet_xcm::{EnsureXcm, IsVoiceOfBody};
|
||||
use pezsp_arithmetic::Permill;
|
||||
use pezsp_core::{ConstU128, ConstU32, ConstU8};
|
||||
use pezsp_runtime::traits::{ConstU16, ConvertToValue, IdentityLookup, Replace, TakeFirst};
|
||||
@@ -112,10 +112,12 @@ impl pezpallet_referenda::Config<FellowshipReferendaInstance> for Runtime {
|
||||
pub type FellowshipCollectiveInstance = pezpallet_ranked_collective::Instance1;
|
||||
|
||||
impl pezpallet_ranked_collective::Config<FellowshipCollectiveInstance> for Runtime {
|
||||
type WeightInfo = weights::pezpallet_ranked_collective_fellowship_collective::WeightInfo<Runtime>;
|
||||
type WeightInfo =
|
||||
weights::pezpallet_ranked_collective_fellowship_collective::WeightInfo<Runtime>;
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
|
||||
// Promotions and the induction of new members are serviced by `FellowshipCore` pezpallet instance.
|
||||
// Promotions and the induction of new members are serviced by `FellowshipCore` pezpallet
|
||||
// instance.
|
||||
#[cfg(not(feature = "runtime-benchmarks"))]
|
||||
type AddOrigin = pezframe_system::EnsureNever<()>;
|
||||
#[cfg(feature = "runtime-benchmarks")]
|
||||
|
||||
+24
-20
@@ -83,16 +83,18 @@ const RETAIN_PREPARE_PERIOD: BlockNumber = 0;
|
||||
const RETAIN_DECISION_PERIOD: BlockNumber = 14 * DAYS;
|
||||
const RETAIN_CONFIRM_PERIOD: BlockNumber = 1 * HOURS;
|
||||
const RETAIN_MIN_ENACTMENT_PERIOD: BlockNumber = 0;
|
||||
const RETAIN_MIN_APPROVAL: pezpallet_referenda::Curve = pezpallet_referenda::Curve::LinearDecreasing {
|
||||
length: Perbill::from_percent(100),
|
||||
floor: Perbill::from_percent(60),
|
||||
ceil: Perbill::from_percent(100),
|
||||
};
|
||||
const RETAIN_MIN_SUPPORT: pezpallet_referenda::Curve = pezpallet_referenda::Curve::LinearDecreasing {
|
||||
length: Perbill::from_percent(100),
|
||||
floor: Perbill::from_percent(10),
|
||||
ceil: Perbill::from_percent(100),
|
||||
};
|
||||
const RETAIN_MIN_APPROVAL: pezpallet_referenda::Curve =
|
||||
pezpallet_referenda::Curve::LinearDecreasing {
|
||||
length: Perbill::from_percent(100),
|
||||
floor: Perbill::from_percent(60),
|
||||
ceil: Perbill::from_percent(100),
|
||||
};
|
||||
const RETAIN_MIN_SUPPORT: pezpallet_referenda::Curve =
|
||||
pezpallet_referenda::Curve::LinearDecreasing {
|
||||
length: Perbill::from_percent(100),
|
||||
floor: Perbill::from_percent(10),
|
||||
ceil: Perbill::from_percent(100),
|
||||
};
|
||||
|
||||
const PROMOTE_MAX_DECIDING: u32 = 10;
|
||||
const PROMOTE_DECISION_DEPOSIT: Balance = 5 * DOLLARS;
|
||||
@@ -100,16 +102,18 @@ const PROMOTE_PREPARE_PERIOD: BlockNumber = 0;
|
||||
const PROMOTE_DECISION_PERIOD: BlockNumber = 30 * DAYS;
|
||||
const PROMOTE_CONFIRM_PERIOD: BlockNumber = 1 * HOURS;
|
||||
const PROMOTE_MIN_ENACTMENT_PERIOD: BlockNumber = 0;
|
||||
const PROMOTE_MIN_APPROVAL: pezpallet_referenda::Curve = pezpallet_referenda::Curve::LinearDecreasing {
|
||||
length: Perbill::from_percent(100),
|
||||
floor: Perbill::from_percent(60),
|
||||
ceil: Perbill::from_percent(100),
|
||||
};
|
||||
const PROMOTE_MIN_SUPPORT: pezpallet_referenda::Curve = pezpallet_referenda::Curve::LinearDecreasing {
|
||||
length: Perbill::from_percent(100),
|
||||
floor: Perbill::from_percent(10),
|
||||
ceil: Perbill::from_percent(100),
|
||||
};
|
||||
const PROMOTE_MIN_APPROVAL: pezpallet_referenda::Curve =
|
||||
pezpallet_referenda::Curve::LinearDecreasing {
|
||||
length: Perbill::from_percent(100),
|
||||
floor: Perbill::from_percent(60),
|
||||
ceil: Perbill::from_percent(100),
|
||||
};
|
||||
const PROMOTE_MIN_SUPPORT: pezpallet_referenda::Curve =
|
||||
pezpallet_referenda::Curve::LinearDecreasing {
|
||||
length: Perbill::from_percent(100),
|
||||
floor: Perbill::from_percent(10),
|
||||
ceil: Perbill::from_percent(100),
|
||||
};
|
||||
|
||||
pub struct TracksInfo;
|
||||
impl pezpallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
|
||||
|
||||
@@ -31,8 +31,9 @@ type ProposalOf<T, I> = <T as pezpallet_collective::Config<I>>::Proposal;
|
||||
type HashOf<T> = <T as pezframe_system::Config>::Hash;
|
||||
|
||||
/// Type alias to conveniently refer to the `Currency::Balance` associated type.
|
||||
pub type BalanceOf<T> =
|
||||
<pezpallet_balances::Pezpallet<T> as Currency<<T as pezframe_system::Config>::AccountId>>::Balance;
|
||||
pub type BalanceOf<T> = <pezpallet_balances::Pezpallet<T> as Currency<
|
||||
<T as pezframe_system::Config>::AccountId,
|
||||
>>::Balance;
|
||||
|
||||
/// Proposal provider for alliance pezpallet.
|
||||
/// Adapter from collective pezpallet to alliance proposal provider trait.
|
||||
|
||||
@@ -53,9 +53,9 @@ pub use ambassador::pezpallet_ambassador_origins;
|
||||
|
||||
use alloc::{vec, vec::Vec};
|
||||
use ambassador::AmbassadorCoreInstance;
|
||||
use pezcumulus_pezpallet_teyrchain_system::RelayNumberMonotonicallyIncreases;
|
||||
use fellowship::{pezpallet_fellowship_origins, Fellows, FellowshipCoreInstance};
|
||||
use impls::{AllianceProposalProvider, EqualOrGreatestRootCmp};
|
||||
use pezcumulus_pezpallet_teyrchain_system::RelayNumberMonotonicallyIncreases;
|
||||
use pezsp_api::impl_runtime_apis;
|
||||
use pezsp_core::{crypto::KeyTypeId, OpaqueMetadata};
|
||||
use pezsp_runtime::{
|
||||
@@ -107,10 +107,10 @@ use xcm_config::{
|
||||
pub use pezsp_runtime::BuildStorage;
|
||||
|
||||
// Pezkuwi imports
|
||||
use pezpallet_xcm::{EnsureXcm, IsVoiceOfBody};
|
||||
use pezkuwi_runtime_common::{
|
||||
impls::VersionedLocatableAsset, BlockHashCount, SlowAdjustingFeeUpdate,
|
||||
};
|
||||
use pezpallet_xcm::{EnsureXcm, IsVoiceOfBody};
|
||||
use xcm::{prelude::*, Version as XcmVersion};
|
||||
use xcm_runtime_pezapis::{
|
||||
dry_run::{CallDryRunEffects, Error as XcmDryRunApiError, XcmDryRunEffects},
|
||||
@@ -512,7 +512,8 @@ impl pezpallet_session::Config for Runtime {
|
||||
// we don't have stash and controller, thus we don't need the convert as well.
|
||||
type ValidatorIdOf = pezpallet_collator_selection::IdentityCollator;
|
||||
type ShouldEndSession = pezpallet_session::PeriodicSessions<ConstU32<PERIOD>, ConstU32<OFFSET>>;
|
||||
type NextSessionRotation = pezpallet_session::PeriodicSessions<ConstU32<PERIOD>, ConstU32<OFFSET>>;
|
||||
type NextSessionRotation =
|
||||
pezpallet_session::PeriodicSessions<ConstU32<PERIOD>, ConstU32<OFFSET>>;
|
||||
type SessionManager = CollatorSelection;
|
||||
// Essentially just Aura, but let's be pedantic.
|
||||
type SessionHandler = <SessionKeys as pezsp_runtime::traits::OpaqueKeys>::KeyTypeIdProviders;
|
||||
|
||||
@@ -14,10 +14,11 @@
|
||||
// limitations under the License.
|
||||
|
||||
pub mod block_weights;
|
||||
pub mod extrinsic_weights;
|
||||
pub mod paritydb_weights;
|
||||
pub mod pezcumulus_pezpallet_teyrchain_system;
|
||||
pub mod pezcumulus_pezpallet_weight_reclaim;
|
||||
pub mod pezcumulus_pezpallet_xcmp_queue;
|
||||
pub mod extrinsic_weights;
|
||||
pub mod pezframe_system;
|
||||
pub mod pezframe_system_extensions;
|
||||
pub mod pezpallet_alliance;
|
||||
@@ -45,7 +46,6 @@ pub mod pezpallet_transaction_payment;
|
||||
pub mod pezpallet_treasury;
|
||||
pub mod pezpallet_utility;
|
||||
pub mod pezpallet_xcm;
|
||||
pub mod paritydb_weights;
|
||||
pub mod rocksdb_weights;
|
||||
pub mod xcm;
|
||||
|
||||
|
||||
@@ -27,10 +27,10 @@ use pezframe_support::{
|
||||
},
|
||||
};
|
||||
use pezframe_system::EnsureRoot;
|
||||
use pezpallet_collator_selection::StakingPotAccountId;
|
||||
use pezpallet_xcm::{AuthorizedAliasers, XcmPassthrough};
|
||||
use pezkuwi_runtime_common::xcm_sender::ExponentialPrice;
|
||||
use pezkuwi_teyrchain_primitives::primitives::Sibling;
|
||||
use pezpallet_collator_selection::StakingPotAccountId;
|
||||
use pezpallet_xcm::{AuthorizedAliasers, XcmPassthrough};
|
||||
use teyrchains_common::xcm_config::{
|
||||
AliasAccountId32FromSiblingSystemChain, AllSiblingSystemTeyrchains, ConcreteAssetFromSystem,
|
||||
ParentRelayOrSiblingTeyrchains, RelayOrOtherSystemTeyrchains,
|
||||
|
||||
Reference in New Issue
Block a user