Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor governance param adjustment #1296

Merged
merged 1 commit into from
Jul 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions runtime/local/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -978,10 +978,10 @@ impl pallet_collective::Config<CommunityCouncilCollectiveInst> 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 }>;
Expand Down
19 changes: 9 additions & 10 deletions runtime/shibuya/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1175,12 +1175,11 @@ impl orml_oracle::Config for Runtime {

impl pallet_membership::Config<OracleMembershipInst> for Runtime {
type RuntimeEvent = RuntimeEvent;
type AddOrigin = EnsureRoot<AccountId>;
type RemoveOrigin = EnsureRoot<AccountId>;
type SwapOrigin = EnsureRoot<AccountId>;
type ResetOrigin = EnsureRoot<AccountId>;
type PrimeOrigin = EnsureRoot<AccountId>;

type AddOrigin = EnsureRootOrTwoThirdsMainCouncil;
type RemoveOrigin = EnsureRootOrTwoThirdsMainCouncil;
type SwapOrigin = EnsureRootOrTwoThirdsMainCouncil;
type ResetOrigin = EnsureRootOrTwoThirdsMainCouncil;
type PrimeOrigin = EnsureRootOrTwoThirdsMainCouncil;
type MembershipInitialized = ();
type MembershipChanged = ();
type MaxMembers = ConstU32<16>;
Expand Down Expand Up @@ -1307,10 +1306,10 @@ impl pallet_collective::Config<CommunityCouncilCollectiveInst> 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 }>;
Expand Down
Loading