From 0799557e0931fe35d141c7da8db3e9620f7311e6 Mon Sep 17 00:00:00 2001 From: Gav Date: Fri, 9 Dec 2022 10:14:43 +0000 Subject: [PATCH 1/2] Tweak parameters further --- runtime/kusama/src/governance/tracks.rs | 50 ++++++++++++------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/runtime/kusama/src/governance/tracks.rs b/runtime/kusama/src/governance/tracks.rs index b802d21c04f5..3b7fcdd94e15 100644 --- a/runtime/kusama/src/governance/tracks.rs +++ b/runtime/kusama/src/governance/tracks.rs @@ -72,10 +72,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 15 name: "root", max_deciding: 1, decision_deposit: 100 * GRAND, - prepare_period: 4 * HOURS, + prepare_period: 2 * HOURS, decision_period: 14 * DAYS, - confirm_period: 3 * HOURS, - min_enactment_period: 3 * HOURS, + confirm_period: 24 * HOURS, + min_enactment_period: 24 * HOURS, min_approval: APP_ROOT, min_support: SUP_ROOT, }, @@ -86,10 +86,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 15 name: "whitelisted_caller", max_deciding: 30, decision_deposit: 100 * GRAND, - prepare_period: 4 * HOURS, + prepare_period: 30 * MINUTES, decision_period: 14 * DAYS, confirm_period: 10 * MINUTES, - min_enactment_period: 30 * MINUTES, + min_enactment_period: 10 * MINUTES, min_approval: APP_WHITELISTED_CALLER, min_support: SUP_WHITELISTED_CALLER, }, @@ -100,10 +100,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 15 name: "staking_admin", max_deciding: 10, decision_deposit: 5 * GRAND, - prepare_period: 4 * HOURS, + prepare_period: 2 * HOURS, decision_period: 14 * DAYS, confirm_period: 3 * HOURS, - min_enactment_period: 2 * DAYS, + min_enactment_period: 10 * MINUTES, min_approval: APP_STAKING_ADMIN, min_support: SUP_STAKING_ADMIN, }, @@ -114,10 +114,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 15 name: "treasurer", max_deciding: 10, decision_deposit: 5 * GRAND, - prepare_period: 4 * HOURS, + prepare_period: 2 * HOURS, decision_period: 14 * DAYS, confirm_period: 3 * HOURS, - min_enactment_period: 2 * DAYS, + min_enactment_period: 24 * HOURS, min_approval: APP_TREASURER, min_support: SUP_TREASURER, }, @@ -128,10 +128,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 15 name: "lease_admin", max_deciding: 10, decision_deposit: 5 * GRAND, - prepare_period: 4 * HOURS, + prepare_period: 2 * HOURS, decision_period: 14 * DAYS, confirm_period: 3 * HOURS, - min_enactment_period: 2 * DAYS, + min_enactment_period: 10 * MINUTES, min_approval: APP_LEASE_ADMIN, min_support: SUP_LEASE_ADMIN, }, @@ -142,10 +142,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 15 name: "fellowship_admin", max_deciding: 10, decision_deposit: 5 * GRAND, - prepare_period: 4 * HOURS, + prepare_period: 2 * HOURS, decision_period: 14 * DAYS, confirm_period: 3 * HOURS, - min_enactment_period: 2 * DAYS, + min_enactment_period: 10 * MINUTES, min_approval: APP_FELLOWSHIP_ADMIN, min_support: SUP_FELLOWSHIP_ADMIN, }, @@ -156,10 +156,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 15 name: "general_admin", max_deciding: 10, decision_deposit: 5 * GRAND, - prepare_period: 4 * HOURS, + prepare_period: 2 * HOURS, decision_period: 14 * DAYS, confirm_period: 3 * HOURS, - min_enactment_period: 2 * DAYS, + min_enactment_period: 10 * MINUTES, min_approval: APP_GENERAL_ADMIN, min_support: SUP_GENERAL_ADMIN, }, @@ -170,10 +170,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 15 name: "auction_admin", max_deciding: 10, decision_deposit: 5 * GRAND, - prepare_period: 4 * HOURS, + prepare_period: 2 * HOURS, decision_period: 14 * DAYS, confirm_period: 3 * HOURS, - min_enactment_period: 2 * DAYS, + min_enactment_period: 10 * MINUTES, min_approval: APP_AUCTION_ADMIN, min_support: SUP_AUCTION_ADMIN, }, @@ -184,7 +184,7 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 15 name: "referendum_canceller", max_deciding: 1_000, decision_deposit: 50 * GRAND, - prepare_period: 4 * HOURS, + prepare_period: 2 * HOURS, decision_period: 7 * DAYS, confirm_period: 3 * HOURS, min_enactment_period: 10 * MINUTES, @@ -198,7 +198,7 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 15 name: "referendum_killer", max_deciding: 1_000, decision_deposit: 50 * GRAND, - prepare_period: 4 * HOURS, + prepare_period: 2 * HOURS, decision_period: 14 * DAYS, confirm_period: 3 * HOURS, min_enactment_period: 10 * MINUTES, @@ -212,10 +212,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 15 name: "small_tipper", max_deciding: 200, decision_deposit: 5 * QUID, - prepare_period: 4 * HOURS, + prepare_period: 1 * MINUTES, decision_period: 7 * DAYS, - confirm_period: 3 * HOURS, - min_enactment_period: 24 * HOURS, + confirm_period: 10 * MINUTES, + min_enactment_period: 1 * MINUTES, min_approval: APP_SMALL_TIPPER, min_support: SUP_SMALL_TIPPER, }, @@ -226,10 +226,10 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 15 name: "big_tipper", max_deciding: 100, decision_deposit: 50 * QUID, - prepare_period: 4 * HOURS, + prepare_period: 10 * MINUTES, decision_period: 7 * DAYS, - confirm_period: 6 * HOURS, - min_enactment_period: 24 * HOURS, + confirm_period: 1 * HOURS, + min_enactment_period: 10 * MINUTES, min_approval: APP_BIG_TIPPER, min_support: SUP_BIG_TIPPER, }, From 043c0d1a8d691556f5b41d1c1a97e5e496c8d6a7 Mon Sep 17 00:00:00 2001 From: Gav Date: Sat, 10 Dec 2022 11:49:47 +0000 Subject: [PATCH 2/2] Further tweaks to deposits --- runtime/kusama/src/governance/mod.rs | 2 +- runtime/kusama/src/governance/tracks.rs | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/runtime/kusama/src/governance/mod.rs b/runtime/kusama/src/governance/mod.rs index 460aaaed4b98..3dd4eba2b57e 100644 --- a/runtime/kusama/src/governance/mod.rs +++ b/runtime/kusama/src/governance/mod.rs @@ -55,7 +55,7 @@ impl pallet_conviction_voting::Config for Runtime { parameter_types! { pub const AlarmInterval: BlockNumber = 1; pub const SubmissionDeposit: Balance = 1 * QUID; - pub const UndecidingTimeout: BlockNumber = 28 * DAYS; + pub const UndecidingTimeout: BlockNumber = 14 * DAYS; } parameter_types! { diff --git a/runtime/kusama/src/governance/tracks.rs b/runtime/kusama/src/governance/tracks.rs index 3b7fcdd94e15..93b2312a76f8 100644 --- a/runtime/kusama/src/governance/tracks.rs +++ b/runtime/kusama/src/governance/tracks.rs @@ -84,8 +84,8 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 15 1, pallet_referenda::TrackInfo { name: "whitelisted_caller", - max_deciding: 30, - decision_deposit: 100 * GRAND, + max_deciding: 100, + decision_deposit: 10 * GRAND, prepare_period: 30 * MINUTES, decision_period: 14 * DAYS, confirm_period: 10 * MINUTES, @@ -113,7 +113,7 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 15 pallet_referenda::TrackInfo { name: "treasurer", max_deciding: 10, - decision_deposit: 5 * GRAND, + decision_deposit: 1 * GRAND, prepare_period: 2 * HOURS, decision_period: 14 * DAYS, confirm_period: 3 * HOURS, @@ -183,7 +183,7 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 15 pallet_referenda::TrackInfo { name: "referendum_canceller", max_deciding: 1_000, - decision_deposit: 50 * GRAND, + decision_deposit: 10 * GRAND, prepare_period: 2 * HOURS, decision_period: 7 * DAYS, confirm_period: 3 * HOURS, @@ -211,7 +211,7 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 15 pallet_referenda::TrackInfo { name: "small_tipper", max_deciding: 200, - decision_deposit: 5 * QUID, + decision_deposit: 1 * QUID, prepare_period: 1 * MINUTES, decision_period: 7 * DAYS, confirm_period: 10 * MINUTES, @@ -225,7 +225,7 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 15 pallet_referenda::TrackInfo { name: "big_tipper", max_deciding: 100, - decision_deposit: 50 * QUID, + decision_deposit: 10 * QUID, prepare_period: 10 * MINUTES, decision_period: 7 * DAYS, confirm_period: 1 * HOURS, @@ -239,7 +239,7 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 15 pallet_referenda::TrackInfo { name: "small_spender", max_deciding: 50, - decision_deposit: 500 * QUID, + decision_deposit: 100 * QUID, prepare_period: 4 * HOURS, decision_period: 14 * DAYS, confirm_period: 12 * HOURS, @@ -252,8 +252,8 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 15 33, pallet_referenda::TrackInfo { name: "medium_spender", - max_deciding: 20, - decision_deposit: 1_500 * QUID, + max_deciding: 50, + decision_deposit: 200 * QUID, prepare_period: 4 * HOURS, decision_period: 14 * DAYS, confirm_period: 24 * HOURS, @@ -266,8 +266,8 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo); 15 34, pallet_referenda::TrackInfo { name: "big_spender", - max_deciding: 10, - decision_deposit: 5 * GRAND, + max_deciding: 50, + decision_deposit: 400 * QUID, prepare_period: 4 * HOURS, decision_period: 14 * DAYS, confirm_period: 48 * HOURS,