difftreelog
feat add financial council
in: master
8 files changed
pallets/foreign-assets/src/lib.rsdiffbeforeafterboth68 type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;68 type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;696970 /// Origin for force registering of a foreign asset.70 /// Origin for force registering of a foreign asset.71 type ForceRegisterOrigin: EnsureOrigin<Self::RuntimeOrigin>;71 type ManagerOrigin: EnsureOrigin<Self::RuntimeOrigin>;727273 /// The ID of the foreign assets pallet.73 /// The ID of the foreign assets pallet.74 type PalletId: Get<PalletId>;74 type PalletId: Get<PalletId>;154 token_prefix: CollectionTokenPrefix,154 token_prefix: CollectionTokenPrefix,155 mode: ForeignCollectionMode,155 mode: ForeignCollectionMode,156 ) -> DispatchResult {156 ) -> DispatchResult {157 T::ForceRegisterOrigin::ensure_origin(origin.clone())?;157 T::ManagerOrigin::ensure_origin(origin.clone())?;158158159 let asset_id: AssetId = versioned_asset_id159 let asset_id: AssetId = versioned_asset_id160 .as_ref()160 .as_ref()runtime/common/config/governance/financial_council.rsdiffbeforeafterbothno changes
runtime/common/config/governance/mod.rsdiffbeforeafterboth49pub mod technical_committee;49pub mod technical_committee;50pub use technical_committee::*;50pub use technical_committee::*;5152pub mod financial_council;53pub use financial_council::*;515452pub mod fellowship;55pub mod fellowship;53pub use fellowship::*;56pub use fellowship::*;runtime/common/config/pallets/foreign_asset.rsdiffbeforeafterboth40 type RuntimeEvent = RuntimeEvent;40 type RuntimeEvent = RuntimeEvent;414142 #[cfg(feature = "governance")]42 #[cfg(feature = "governance")]43 type ForceRegisterOrigin = governance::RootOrTechnicalCommitteeMember;43 type ManagerOrigin = governance::RootOrFinancialCouncilMember;444445 #[cfg(not(feature = "governance"))]45 #[cfg(not(feature = "governance"))]46 type ForceRegisterOrigin = EnsureRoot<Self::AccountId>;46 type ManagerOrigin = EnsureRoot<Self::AccountId>;474748 type PalletId = ForeignAssetPalletId;48 type PalletId = ForeignAssetPalletId;49 type SelfLocation = SelfLocation;49 type SelfLocation = SelfLocation;runtime/common/construct_runtime.rsdiffbeforeafterboth81 Scheduler: pallet_scheduler = 49,81 Scheduler: pallet_scheduler = 49,828283 #[cfg(feature = "governance")]83 #[cfg(feature = "governance")]84 FinancialCouncil: pallet_collective::<Instance3> = 97,8586 #[cfg(feature = "governance")]87 FinancialCouncilMembership: pallet_membership::<Instance3> = 98,8889 #[cfg(feature = "governance")]84 Origins: pallet_gov_origins = 99,90 Origins: pallet_gov_origins = 99,859186 // XCM helpers.92 // XCM helpers.runtime/opal/src/governance_timings.rsdiffbeforeafterboth53 }53 }54}54}5556pub mod financial_council {57 use super::*;5859 parameter_types! {60 pub FinancialCouncilMotionDuration: BlockNumber = 15 * MINUTES;61 }62}5563runtime/quartz/src/governance_timings.rsdiffbeforeafterboth53 }53 }54}54}5556pub mod financial_council {57 use super::*;5859 parameter_types! {60 pub FinancialCouncilMotionDuration: BlockNumber = 3 * DAYS;61 }62}5563runtime/unique/src/governance_timings.rsdiffbeforeafterboth53 }53 }54}54}5556pub mod financial_council {57 use super::*;5859 parameter_types! {60 pub FinancialCouncilMotionDuration: BlockNumber = 3 * DAYS;61 }62}5563