git.delta.rocks / unique-network / refs/commits / 15ea50e38a6d

difftreelog

feat add financial council

Daniel Shiposha2024-03-26parent: #470ffd5.patch.diff
in: master

8 files changed

modifiedpallets/foreign-assets/src/lib.rsdiffbeforeafterboth
68 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>;
6969
70 /// 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>;
7272
73 /// 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())?;
158158
159 let asset_id: AssetId = versioned_asset_id159 let asset_id: AssetId = versioned_asset_id
160 .as_ref()160 .as_ref()
addedruntime/common/config/governance/financial_council.rsdiffbeforeafterboth

no changes

modifiedruntime/common/config/governance/mod.rsdiffbeforeafterboth
49pub mod technical_committee;49pub mod technical_committee;
50pub use technical_committee::*;50pub use technical_committee::*;
51
52pub mod financial_council;
53pub use financial_council::*;
5154
52pub mod fellowship;55pub mod fellowship;
53pub use fellowship::*;56pub use fellowship::*;
modifiedruntime/common/config/pallets/foreign_asset.rsdiffbeforeafterboth
40 type RuntimeEvent = RuntimeEvent;40 type RuntimeEvent = RuntimeEvent;
4141
42 #[cfg(feature = "governance")]42 #[cfg(feature = "governance")]
43 type ForceRegisterOrigin = governance::RootOrTechnicalCommitteeMember;43 type ManagerOrigin = governance::RootOrFinancialCouncilMember;
4444
45 #[cfg(not(feature = "governance"))]45 #[cfg(not(feature = "governance"))]
46 type ForceRegisterOrigin = EnsureRoot<Self::AccountId>;46 type ManagerOrigin = EnsureRoot<Self::AccountId>;
4747
48 type PalletId = ForeignAssetPalletId;48 type PalletId = ForeignAssetPalletId;
49 type SelfLocation = SelfLocation;49 type SelfLocation = SelfLocation;
modifiedruntime/common/construct_runtime.rsdiffbeforeafterboth
81 Scheduler: pallet_scheduler = 49,81 Scheduler: pallet_scheduler = 49,
8282
83 #[cfg(feature = "governance")]83 #[cfg(feature = "governance")]
84 FinancialCouncil: pallet_collective::<Instance3> = 97,
85
86 #[cfg(feature = "governance")]
87 FinancialCouncilMembership: pallet_membership::<Instance3> = 98,
88
89 #[cfg(feature = "governance")]
84 Origins: pallet_gov_origins = 99,90 Origins: pallet_gov_origins = 99,
8591
86 // XCM helpers.92 // XCM helpers.
modifiedruntime/opal/src/governance_timings.rsdiffbeforeafterboth
53 }53 }
54}54}
55
56pub mod financial_council {
57 use super::*;
58
59 parameter_types! {
60 pub FinancialCouncilMotionDuration: BlockNumber = 15 * MINUTES;
61 }
62}
5563
modifiedruntime/quartz/src/governance_timings.rsdiffbeforeafterboth
53 }53 }
54}54}
55
56pub mod financial_council {
57 use super::*;
58
59 parameter_types! {
60 pub FinancialCouncilMotionDuration: BlockNumber = 3 * DAYS;
61 }
62}
5563
modifiedruntime/unique/src/governance_timings.rsdiffbeforeafterboth
53 }53 }
54}54}
55
56pub mod financial_council {
57 use super::*;
58
59 parameter_types! {
60 pub FinancialCouncilMotionDuration: BlockNumber = 3 * DAYS;
61 }
62}
5563