diff --git a/runtime/local/src/lib.rs b/runtime/local/src/lib.rs index 9e4d4a520b..23558e9095 100644 --- a/runtime/local/src/lib.rs +++ b/runtime/local/src/lib.rs @@ -989,10 +989,10 @@ impl pallet_collective::Config for Runtime { impl pallet_democracy::Config for Runtime { type RuntimeEvent = RuntimeEvent; type Currency = Balances; - type EnactmentPeriod = ConstU32<{ 1 * MINUTES }>; - type LaunchPeriod = ConstU32<{ 1 * MINUTES }>; - type VotingPeriod = ConstU32<{ 3 * MINUTES }>; - type VoteLockingPeriod = ConstU32<{ 10 * MINUTES }>; + type EnactmentPeriod = ConstU32<{ 5 * MINUTES }>; + type LaunchPeriod = ConstU32<{ 5 * MINUTES }>; + type VotingPeriod = ConstU32<{ 5 * MINUTES }>; + type VoteLockingPeriod = ConstU32<{ 2 * MINUTES }>; type MinimumDeposit = ConstU128<{ 10 * AST }>; type FastTrackVotingPeriod = ConstU32<{ MINUTES / 2 }>; type CooloffPeriod = ConstU32<{ 2 * MINUTES }>; diff --git a/runtime/shibuya/src/lib.rs b/runtime/shibuya/src/lib.rs index 508529379d..e522648027 100644 --- a/runtime/shibuya/src/lib.rs +++ b/runtime/shibuya/src/lib.rs @@ -1239,12 +1239,11 @@ impl orml_oracle::Config for Runtime { impl pallet_membership::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type AddOrigin = EnsureRoot; - type RemoveOrigin = EnsureRoot; - type SwapOrigin = EnsureRoot; - type ResetOrigin = EnsureRoot; - type PrimeOrigin = EnsureRoot; - + type AddOrigin = EnsureRootOrTwoThirdsMainCouncil; + type RemoveOrigin = EnsureRootOrTwoThirdsMainCouncil; + type SwapOrigin = EnsureRootOrTwoThirdsMainCouncil; + type ResetOrigin = EnsureRootOrTwoThirdsMainCouncil; + type PrimeOrigin = EnsureRootOrTwoThirdsMainCouncil; type MembershipInitialized = (); type MembershipChanged = (); type MaxMembers = ConstU32<16>; @@ -1360,10 +1359,10 @@ impl pallet_collective::Config for Runtime { impl pallet_democracy::Config for Runtime { type RuntimeEvent = RuntimeEvent; type Currency = Balances; - type EnactmentPeriod = ConstU32<{ 1 * HOURS }>; - type LaunchPeriod = ConstU32<{ 1 * DAYS }>; - type VotingPeriod = ConstU32<{ 1 * DAYS }>; - type VoteLockingPeriod = ConstU32<{ 2 * DAYS }>; + type EnactmentPeriod = ConstU32<{ 2 * HOURS }>; + type LaunchPeriod = ConstU32<{ 3 * DAYS }>; + type VotingPeriod = ConstU32<{ 3 * DAYS }>; + type VoteLockingPeriod = ConstU32<{ 1 * DAYS }>; type MinimumDeposit = ConstU128<{ 10 * SBY }>; type FastTrackVotingPeriod = ConstU32<{ 1 * HOURS }>; type CooloffPeriod = ConstU32<{ 1 * DAYS }>;