diff --git a/runtime/crab/src/pallets/democracy.rs b/runtime/crab/src/pallets/democracy.rs index be256e81d..e8186e9c0 100644 --- a/runtime/crab/src/pallets/democracy.rs +++ b/runtime/crab/src/pallets/democracy.rs @@ -19,32 +19,24 @@ // darwinia use crate::*; -const ENACTMENT_PERIOD: u32 = 8 * DAYS; +const ENACTMENT_PERIOD: u32 = 28 * DAYS; impl pallet_democracy::Config for Runtime { type BlacklistOrigin = Root; - // To cancel a proposal before it has been passed, the technical committee must be unanimous or - // Root must agree. - type CancelProposalOrigin = RootOrAll; - // To cancel a proposal which has been passed, 2/3 of the council must agree to it. - type CancellationOrigin = RootOrAtLeastTwoThird; + type CancelProposalOrigin = RootOrAtLeastTwoThird; + type CancellationOrigin = RootOrAtLeastTwoThird; type CooloffPeriod = ConstU32<{ 7 * DAYS }>; type Currency = Balances; type EnactmentPeriod = ConstU32; - /// A unanimous council can have the next scheduled referendum be a straight default-carries - /// (NTB) vote. - type ExternalDefaultOrigin = RootOrAll; - /// A majority can have the next scheduled referendum be a straight majority-carries vote. + // There are no plans to use this yet. + type ExternalDefaultOrigin = Root; type ExternalMajorityOrigin = RootOrAtLeastHalf; - /// A straight majority of the council can decide what their next motion is. type ExternalOrigin = RootOrAtLeastHalf; - /// Two thirds of the technical committee can have an ExternalMajority/ExternalDefault vote - /// be tabled immediately and with a shorter voting/enactment period. type FastTrackOrigin = RootOrAtLeastTwoThird; type FastTrackVotingPeriod = ConstU32<{ 3 * HOURS }>; type InstantAllowed = ConstBool; type InstantOrigin = RootOrAll; - type LaunchPeriod = ConstU32<{ 7 * DAYS }>; + type LaunchPeriod = ConstU32<{ 28 * DAYS }>; type MaxBlacklisted = ConstU32<100>; type MaxDeposits = ConstU32<100>; type MaxProposals = ConstU32<100>; @@ -56,10 +48,8 @@ impl pallet_democracy::Config for Runtime { type Scheduler = Scheduler; type Slash = Treasury; type SubmitOrigin = frame_system::EnsureSigned; - // Any single technical committee member may veto a coming council proposal, however they can - // only do it once and it lasts only for the cool-off period. type VetoOrigin = pallet_collective::EnsureMember; type VoteLockingPeriod = ConstU32; - type VotingPeriod = ConstU32<{ 7 * DAYS }>; + type VotingPeriod = ConstU32<{ 28 * DAYS }>; type WeightInfo = weights::pallet_democracy::WeightInfo; } diff --git a/runtime/crab/src/pallets/elections_phragmen.rs b/runtime/crab/src/pallets/elections_phragmen.rs index 3082173fa..5087e770a 100644 --- a/runtime/crab/src/pallets/elections_phragmen.rs +++ b/runtime/crab/src/pallets/elections_phragmen.rs @@ -41,7 +41,7 @@ impl pallet_elections_phragmen::Config for Runtime { type PalletId = PhragmenElectionPalletId; type RuntimeEvent = RuntimeEvent; // Daily council elections. - type TermDuration = ConstU32<{ DAYS }>; + type TermDuration = ConstU32<{ 7 * DAYS }>; // 1 storage item created, key size is 32 bytes, value size is 16+16. type VotingBondBase = ConstU128<{ darwinia_deposit(1, 64) }>; // Additional data per vote is 32 bytes (account id). diff --git a/runtime/darwinia/src/pallets/democracy.rs b/runtime/darwinia/src/pallets/democracy.rs index 206137e13..e8186e9c0 100644 --- a/runtime/darwinia/src/pallets/democracy.rs +++ b/runtime/darwinia/src/pallets/democracy.rs @@ -23,23 +23,15 @@ const ENACTMENT_PERIOD: u32 = 28 * DAYS; impl pallet_democracy::Config for Runtime { type BlacklistOrigin = Root; - // To cancel a proposal before it has been passed, the technical committee must be unanimous or - // Root must agree. - type CancelProposalOrigin = RootOrAll; - // To cancel a proposal which has been passed, 2/3 of the council must agree to it. - type CancellationOrigin = RootOrAtLeastTwoThird; + type CancelProposalOrigin = RootOrAtLeastTwoThird; + type CancellationOrigin = RootOrAtLeastTwoThird; type CooloffPeriod = ConstU32<{ 7 * DAYS }>; type Currency = Balances; type EnactmentPeriod = ConstU32; - /// A unanimous council can have the next scheduled referendum be a straight default-carries - /// (NTB) vote. - type ExternalDefaultOrigin = RootOrAll; - /// A majority can have the next scheduled referendum be a straight majority-carries vote. + // There are no plans to use this yet. + type ExternalDefaultOrigin = Root; type ExternalMajorityOrigin = RootOrAtLeastHalf; - /// A straight majority of the council can decide what their next motion is. type ExternalOrigin = RootOrAtLeastHalf; - /// Two thirds of the technical committee can have an ExternalMajority/ExternalDefault vote - /// be tabled immediately and with a shorter voting/enactment period. type FastTrackOrigin = RootOrAtLeastTwoThird; type FastTrackVotingPeriod = ConstU32<{ 3 * HOURS }>; type InstantAllowed = ConstBool; @@ -56,8 +48,6 @@ impl pallet_democracy::Config for Runtime { type Scheduler = Scheduler; type Slash = Treasury; type SubmitOrigin = frame_system::EnsureSigned; - // Any single technical committee member may veto a coming council proposal, however they can - // only do it once and it lasts only for the cool-off period. type VetoOrigin = pallet_collective::EnsureMember; type VoteLockingPeriod = ConstU32; type VotingPeriod = ConstU32<{ 28 * DAYS }>;