Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Add OpenGov to Rococo and Westend runtimes #7272

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open

Add OpenGov to Rococo and Westend runtimes #7272

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
6ed0f84
Rococo bounties SpendOrigin to root
al3mart May 23, 2023
6500cf8
Merge branch 'master' into al3mart/rococo-spendorigin
al3mart Jun 26, 2023
0bf252d
opengov in Rococo
al3mart Jun 26, 2023
86e050e
opengov in Westend
al3mart Jul 6, 2023
34be311
sp-keystore wout serde feature
al3mart Jul 6, 2023
74e2d4f
QueuePausedQuery & bump recursion limit
al3mart Jul 6, 2023
450e6ee
merge master
al3mart Jul 6, 2023
8a21492
trasury in westend chainspec
al3mart Jun 26, 2023
0d51017
removing QUID
al3mart Jul 7, 2023
734b309
Update runtime/rococo/src/governance/mod.rs
al3mart Jul 7, 2023
5dc0332
rename fellowships
al3mart Jul 7, 2023
14ed4da
remove QUID from Rococo
al3mart Jul 7, 2023
fb1df64
add benches
al3mart Jul 10, 2023
ac39528
remove custom_origins from benches
al3mart Jul 10, 2023
352a239
Merge branch 'master' of https://github.com/paritytech/polkadot into …
Jul 10, 2023
0f0ed3b
".git/.scripts/commands/bench/bench.sh" runtime westend pallet_convic…
Jul 10, 2023
3356add
Merge branch 'master' of https://github.com/paritytech/polkadot into …
Jul 11, 2023
8d79770
".git/.scripts/commands/bench/bench.sh" runtime rococo pallet_referenda
Jul 11, 2023
44f4ea0
".git/.scripts/commands/bench/bench.sh" runtime rococo pallet_ranked_…
Jul 11, 2023
f8cc76e
merge changes
al3mart Jul 12, 2023
0c33f7f
add generic in Treasury Config
al3mart Jul 12, 2023
c82f27e
add generic for wested Treasury Config
al3mart Jul 12, 2023
41fff79
".git/.scripts/commands/bench/bench.sh" runtime westend pallet_whitelist
Jul 12, 2023
02b8de7
".git/.scripts/commands/bench/bench.sh" runtime westend pallet_treasury
Jul 13, 2023
97f33ff
remove gov1 from rococo runtime lib
al3mart Aug 3, 2023
4ad2c13
remove gov1 from rococo xcm_config
al3mart Aug 3, 2023
158bd40
remove gov1 rococo deps
al3mart Aug 3, 2023
46f6e54
remove unused weights
al3mart Aug 3, 2023
094107a
rococo chain_spec
al3mart Aug 4, 2023
7083b8e
cargo update
al3mart Aug 4, 2023
cf7d0d8
merge conflicts
al3mart Aug 4, 2023
47c3847
cargo update
al3mart Aug 4, 2023
8477d48
merge master
al3mart Aug 25, 2023
9e2dbe4
take CheckedReduceBy from sp_runtime
al3mart Aug 25, 2023
cc5cccc
westend to follow polkadot
al3mart Aug 25, 2023
9692495
".git/.scripts/commands/bench/bench.sh" --subcommand=runtime --runtim…
Aug 25, 2023
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
Prev Previous commit
Next Next commit
remove QUID from Rococo
  • Loading branch information
@al3mart
al3mart committed Jul 7, 2023
commit 14ed4da88f870bf8b0123d795a51c078bc322c16
1 change: 0 additions & 1 deletion runtime/rococo/constants/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ pub mod currency {
pub const EXISTENTIAL_DEPOSIT: Balance = 1 * CENTS;

pub const UNITS: Balance = 1_000_000_000_000;
pub const QUID: Balance = UNITS / 30;
pub const CENTS: Balance = UNITS / 30_000;
pub const GRAND: Balance = CENTS * 100_000;
pub const MILLICENTS: Balance = CENTS / 1_000;
Expand Down
22 changes: 11 additions & 11 deletions runtime/rococo/src/governance/fellowship.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use sp_runtime::{
};

use super::*;
use crate::{DAYS, QUID};
use crate::{DAYS, CENTS};

parameter_types! {
pub const AlarmInterval: BlockNumber = 1;
Expand All @@ -43,7 +43,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
pallet_referenda::TrackInfo {
name: "candidates",
max_deciding: 10,
decision_deposit: 100 * QUID,
decision_deposit: 100 * 3 * CENTS,
prepare_period: 30 * MINUTES,
decision_period: 7 * DAYS,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure if we want the exact same configs, or we want to relax all constraints, to have shorter periods, approve and support curves, etc

confirm_period: 30 * MINUTES,
Expand All @@ -65,7 +65,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
pallet_referenda::TrackInfo {
name: "members",
max_deciding: 10,
decision_deposit: 10 * QUID,
decision_deposit: 10 * 3 * CENTS,
prepare_period: 30 * MINUTES,
decision_period: 7 * DAYS,
confirm_period: 30 * MINUTES,
Expand All @@ -87,7 +87,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
pallet_referenda::TrackInfo {
name: "proficients",
max_deciding: 10,
decision_deposit: 10 * QUID,
decision_deposit: 10 * 3 * CENTS,
prepare_period: 30 * MINUTES,
decision_period: 7 * DAYS,
confirm_period: 30 * MINUTES,
Expand All @@ -109,7 +109,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
pallet_referenda::TrackInfo {
name: "fellows",
max_deciding: 10,
decision_deposit: 10 * QUID,
decision_deposit: 10 * 3 * CENTS,
prepare_period: 30 * MINUTES,
decision_period: 7 * DAYS,
confirm_period: 30 * MINUTES,
Expand All @@ -131,7 +131,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
pallet_referenda::TrackInfo {
name: "senior fellows",
max_deciding: 10,
decision_deposit: 10 * QUID,
decision_deposit: 10 * 3 * CENTS,
prepare_period: 30 * MINUTES,
decision_period: 7 * DAYS,
confirm_period: 30 * MINUTES,
Expand All @@ -153,7 +153,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
pallet_referenda::TrackInfo {
name: "experts",
max_deciding: 10,
decision_deposit: 1 * QUID,
decision_deposit: 1 * 3 * CENTS,
prepare_period: 30 * MINUTES,
decision_period: 7 * DAYS,
confirm_period: 30 * MINUTES,
Expand All @@ -175,7 +175,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
pallet_referenda::TrackInfo {
name: "senior experts",
max_deciding: 10,
decision_deposit: 1 * QUID,
decision_deposit: 1 * 3 * CENTS,
prepare_period: 30 * MINUTES,
decision_period: 7 * DAYS,
confirm_period: 30 * MINUTES,
Expand All @@ -197,7 +197,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
pallet_referenda::TrackInfo {
name: "masters",
max_deciding: 10,
decision_deposit: 1 * QUID,
decision_deposit: 1 * 3 * CENTS,
prepare_period: 30 * MINUTES,
decision_period: 7 * DAYS,
confirm_period: 30 * MINUTES,
Expand All @@ -219,7 +219,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
pallet_referenda::TrackInfo {
name: "senior masters",
max_deciding: 10,
decision_deposit: 1 * QUID,
decision_deposit: 1 * 3 * CENTS,
prepare_period: 30 * MINUTES,
decision_period: 7 * DAYS,
confirm_period: 30 * MINUTES,
Expand All @@ -241,7 +241,7 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
pallet_referenda::TrackInfo {
name: "grand masters",
max_deciding: 10,
decision_deposit: 1 * QUID,
decision_deposit: 1 * 3 * CENTS,
prepare_period: 30 * MINUTES,
decision_period: 7 * DAYS,
confirm_period: 30 * MINUTES,
Expand Down
2 changes: 1 addition & 1 deletion runtime/rococo/src/governance/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ impl pallet_conviction_voting::Config for Runtime {

parameter_types! {
pub const AlarmInterval: BlockNumber = 1;
pub const SubmissionDeposit: Balance = 1 * QUID;
pub const SubmissionDeposit: Balance = 1 * 3 * CENTS;
pub const UndecidingTimeout: BlockNumber = 14 * DAYS;
}

Expand Down
4 changes: 2 additions & 2 deletions runtime/rococo/src/governance/origins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pub use pallet_custom_origins::*;

#[frame_support::pallet]
pub mod pallet_custom_origins {
use crate::{Balance, GRAND, QUID};
use crate::{Balance, GRAND, CENTS};
use frame_support::pallet_prelude::*;

#[pallet::config]
Expand Down Expand Up @@ -169,7 +169,7 @@ pub mod pallet_custom_origins {

decl_ensure! {
pub type Spender: EnsureOrigin<Success = Balance> {
SmallTipper = 250 * QUID,
SmallTipper = 250 * 3 * CENTS,
BigTipper = 1 * GRAND,
SmallSpender = 10 * GRAND,
MediumSpender = 100 * GRAND,
Expand Down
10 changes: 5 additions & 5 deletions runtime/rococo/src/governance/tracks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
pallet_referenda::TrackInfo {
name: "small_tipper",
max_deciding: 200,
decision_deposit: 1 * QUID,
decision_deposit: 1 * 3 * CENTS,
prepare_period: 1 * MINUTES,
decision_period: 7 * DAYS,
confirm_period: 10 * MINUTES,
Expand All @@ -225,7 +225,7 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
pallet_referenda::TrackInfo {
name: "big_tipper",
max_deciding: 100,
decision_deposit: 10 * QUID,
decision_deposit: 10 * 3 * CENTS,
prepare_period: 10 * MINUTES,
decision_period: 7 * DAYS,
confirm_period: 1 * HOURS,
Expand All @@ -239,7 +239,7 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
pallet_referenda::TrackInfo {
name: "small_spender",
max_deciding: 50,
decision_deposit: 100 * QUID,
decision_deposit: 100 * 3 * CENTS,
prepare_period: 4 * HOURS,
decision_period: 14 * DAYS,
confirm_period: 12 * HOURS,
Expand All @@ -253,7 +253,7 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
pallet_referenda::TrackInfo {
name: "medium_spender",
max_deciding: 50,
decision_deposit: 200 * QUID,
decision_deposit: 200 * 3 * CENTS,
prepare_period: 4 * HOURS,
decision_period: 14 * DAYS,
confirm_period: 24 * HOURS,
Expand All @@ -267,7 +267,7 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 15
pallet_referenda::TrackInfo {
name: "big_spender",
max_deciding: 50,
decision_deposit: 400 * QUID,
decision_deposit: 400 * 3 * CENTS,
prepare_period: 4 * HOURS,
decision_period: 14 * DAYS,
confirm_period: 48 * HOURS,
Expand Down