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

Governance v2 (Kusama only) #5205

Merged
merged 95 commits into from
Oct 3, 2022
Merged
Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
b93210a
First bits
gavofyork Mar 24, 2022
f1301da
Create new origins
gavofyork Mar 25, 2022
621cbb0
Repot governance configs
gavofyork Mar 28, 2022
886cb28
Tests for treasury spends
gavofyork Apr 3, 2022
233c060
Integrate treasury spend threshold origins
gavofyork Apr 3, 2022
d3ef683
Merge remote-tracking branch 'origin/master' into gav-gov2
gavofyork Apr 4, 2022
29d8e58
Bump deps
gavofyork Apr 4, 2022
c23a74c
Add whitelist, configure treasury spend origins
gavofyork Apr 4, 2022
f9f698f
Add governance curves
gavofyork Apr 13, 2022
daca1f5
Merge remote-tracking branch 'origin/master' into gav-gov2
gavofyork Apr 13, 2022
1da3190
Enable curve's ceil to be configured
gavofyork Apr 13, 2022
ea5d2f9
Make compile
gavofyork Apr 13, 2022
70295cb
Rest of new governance params
gavofyork Apr 14, 2022
92e5983
Build fixes
gavofyork May 12, 2022
78d1121
Merge remote-tracking branch 'origin/master' into gav-gov2
gavofyork May 12, 2022
b77d4ae
Fixes
gavofyork May 12, 2022
f9ce234
Merge remote-tracking branch 'origin/master' into gav-gov2
gavofyork May 17, 2022
74cdef0
Merge remote-tracking branch 'origin/master' into gav-gov2
gavofyork May 31, 2022
6319628
Fix warning
gavofyork May 31, 2022
f09f28b
Use new EnsureOrigin::try_successful_origin
gavofyork May 31, 2022
27ca518
Some repotting
gavofyork May 31, 2022
06ac45a
Add files
gavofyork May 31, 2022
e05e734
Ready for initial review
gavofyork Jun 1, 2022
6d544f2
Fixes
gavofyork Jun 1, 2022
6b5e964
Merge remote-tracking branch 'origin/master' into gav-gov2
gavofyork Jun 1, 2022
a960891
Formatting
gavofyork Jun 1, 2022
9fdc38e
Bump
gavofyork Jun 2, 2022
f36f949
rename
gavofyork Jun 10, 2022
0b5e80a
Merge remote-tracking branch 'origin/master' into gav-gov2
ggwpez Jul 22, 2022
0a76cdc
Derive MEL for Origin enum
ggwpez Jul 22, 2022
eced020
Add benchmarks
ggwpez Jul 22, 2022
a726110
".git/.scripts/bench-bot.sh" runtime kusama-dev pallet_conviction_voting
Jul 22, 2022
3239f02
Merge branch 'master' into gav-gov2
shawntabrizi Aug 12, 2022
579d2ee
Update Cargo.lock
shawntabrizi Aug 12, 2022
e294017
Update runtime/kusama/src/governance/origins.rs
shawntabrizi Aug 12, 2022
798460b
allow root to demote and promote, fixing benchmarks
shawntabrizi Aug 13, 2022
ea4281b
fix whitelist origin benchmarks
shawntabrizi Aug 13, 2022
509b749
typo
shawntabrizi Aug 13, 2022
eec752a
cargo update -p sp-io
shawntabrizi Aug 13, 2022
a6d70b6
add second referenda instance to benchmarks
shawntabrizi Aug 13, 2022
ac8de2e
allow root to act as a 9th dan in track
shawntabrizi Aug 13, 2022
1336668
feature flag it
shawntabrizi Aug 13, 2022
7c65495
cargo update -p sp-io
shawntabrizi Aug 14, 2022
3d632a8
Merge branch 'master' into gav-gov2
shawntabrizi Aug 14, 2022
bf04972
Merge branch 'master' into gav-gov2
shawntabrizi Aug 14, 2022
d78aa9b
fix merge
shawntabrizi Aug 14, 2022
4a17d77
".git/.scripts/bench-bot.sh" runtime kusama-dev pallet_referenda
Aug 14, 2022
3d3b811
".git/.scripts/bench-bot.sh" runtime kusama-dev pallet_conviction_voting
Aug 14, 2022
1c89770
allow root to create auction
shawntabrizi Aug 15, 2022
5998391
Update mod.rs
shawntabrizi Aug 15, 2022
3c128d2
more origin fixes
shawntabrizi Aug 15, 2022
511173f
root isnt needed actually
shawntabrizi Aug 15, 2022
afd5606
Merge branch 'master' into gav-gov2
shawntabrizi Aug 16, 2022
e6d68f3
cargo update -p sp-io
shawntabrizi Aug 16, 2022
c4296f0
allow root to cancel slash
shawntabrizi Aug 16, 2022
91beed9
initial stuff
shawntabrizi Aug 16, 2022
7d858cc
make copy data from kusama
shawntabrizi Aug 16, 2022
15179a9
Merge branch 'shawntabrizi-gov2-part1' into gav-gov2
shawntabrizi Aug 16, 2022
05e4c2d
".git/.scripts/bench-bot.sh" runtime kusama-dev pallet_referenda
Aug 16, 2022
e4ed772
Merge branch 'master' into gav-gov2
shawntabrizi Aug 16, 2022
f94042e
Merge branch 'master' into gav-gov2
shawntabrizi Aug 19, 2022
a1303c7
Update Cargo.lock
shawntabrizi Aug 19, 2022
ccd33b6
commit new weight files
shawntabrizi Aug 19, 2022
c79799a
more files
shawntabrizi Aug 19, 2022
4a3481c
use weight files
shawntabrizi Aug 19, 2022
cc539bc
".git/.scripts/bench-bot.sh" runtime kusama-dev pallet_referenda
Aug 20, 2022
c6f8f5e
Merge branch 'master' into gav-gov2
shawntabrizi Aug 27, 2022
d6cc58d
Update Cargo.lock
shawntabrizi Aug 27, 2022
0590d56
Merge remote-tracking branch 'origin/master' into gav-gov2
gavofyork Sep 16, 2022
03896dd
Update to latest master
gavofyork Sep 16, 2022
2846b1c
Formatting
gavofyork Sep 16, 2022
c475009
".git/.scripts/bench-bot.sh" runtime kusama-dev pallet_ranked_collective
Sep 16, 2022
afd3913
".git/.scripts/bench-bot.sh" runtime kusama-dev pallet_conviction_voting
Sep 16, 2022
bf52f20
".git/.scripts/bench-bot.sh" runtime kusama-dev pallet_conviction_voting
Sep 16, 2022
e1177ae
".git/.scripts/bench-bot.sh" runtime kusama-dev pallet_whitelist
Sep 18, 2022
fe65488
Merge branch 'master' into gav-gov2
KiChjang Sep 19, 2022
e3aaa66
Merge remote-tracking branch 'origin/master' into gav-gov2
ggwpez Sep 23, 2022
27dd292
Rename Origin -> RuntimeOrigin
ggwpez Sep 23, 2022
cddc9cc
cargo update -p sp-io
ggwpez Sep 23, 2022
42141ea
Tech Committee can promote to VI Dan
gavofyork Sep 26, 2022
7d76fb9
Merge branch 'gav-gov2' of github.com:paritytech/polkadot into gav-gov2
gavofyork Sep 26, 2022
cc63206
Update runtime/kusama/src/governance/mod.rs
gavofyork Sep 26, 2022
60f870c
Merge remote-tracking branch 'origin/master' into gav-gov2
gavofyork Sep 26, 2022
18152ec
Formatting
gavofyork Sep 26, 2022
c9c460f
Update runtime/kusama/src/governance/fellowship.rs
gavofyork Sep 26, 2022
2b79788
Merge remote-tracking branch 'origin/master' into gav-gov2
gavofyork Sep 30, 2022
ea1cb5e
Fixes
gavofyork Sep 30, 2022
2b10804
Avoid updating extraneous deps
gavofyork Sep 30, 2022
efe91f3
Fix broken stuff
gavofyork Sep 30, 2022
d18f6c5
".git/.scripts/bench-bot.sh" runtime kusama-dev pallet_referenda
Sep 30, 2022
1d357a4
Merge remote-tracking branch 'origin/master' into gav-gov2
gavofyork Oct 2, 2022
ef88bba
Update runtime/kusama/src/governance/fellowship.rs
gavofyork Oct 2, 2022
93138b7
Reorder EitherOf origins
ggwpez Oct 2, 2022
2c39c20
Revert param change and update doc
gavofyork Oct 3, 2022
b5b0b7c
Merge branch 'gav-gov2' of github.com:paritytech/polkadot into gav-gov2
gavofyork Oct 3, 2022
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
414 changes: 243 additions & 171 deletions Cargo.lock

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions runtime/kusama/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ pallet-child-bounties = { git = "https://github.com/paritytech/substrate", branc
pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-conviction-voting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
Expand All @@ -61,7 +62,9 @@ pallet-nomination-pools = { git = "https://github.com/paritytech/substrate", bra
pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-ranked-collective = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-recovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-referenda = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-scheduler = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-society = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
Expand All @@ -75,6 +78,7 @@ pallet-tips = { git = "https://github.com/paritytech/substrate", branch = "maste
pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-whitelist = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-xcm = { path = "../../xcm/pallet-xcm", default-features = false }
pallet-xcm-benchmarks = { path = "../../xcm/pallet-xcm-benchmarks", default-features = false, optional = true }
frame-election-provider-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
Expand Down Expand Up @@ -137,6 +141,7 @@ std = [
"pallet-transaction-payment/std",
"pallet-transaction-payment-rpc-runtime-api/std",
"pallet-collective/std",
"pallet-conviction-voting/std",
"pallet-elections-phragmen/std",
"pallet-election-provider-multi-phase/std",
"pallet-democracy/std",
Expand All @@ -151,7 +156,9 @@ std = [
"pallet-offences/std",
"pallet-preimage/std",
"pallet-proxy/std",
"pallet-ranked-collective/std",
"pallet-recovery/std",
"pallet-referenda/std",
"pallet-scheduler/std",
"pallet-session/std",
"pallet-society/std",
Expand All @@ -162,6 +169,7 @@ std = [
"pallet-treasury/std",
"pallet-utility/std",
"pallet-vesting/std",
"pallet-whitelist/std",
"pallet-babe/std",
"pallet-xcm/std",
"sp-mmr-primitives/std",
Expand Down Expand Up @@ -197,6 +205,7 @@ runtime-benchmarks = [
"pallet-bounties/runtime-benchmarks",
"pallet-child-bounties/runtime-benchmarks",
"pallet-collective/runtime-benchmarks",
"pallet-conviction-voting/runtime-benchmarks",
"pallet-democracy/runtime-benchmarks",
"pallet-elections-phragmen/runtime-benchmarks",
"pallet-election-provider-multi-phase/runtime-benchmarks",
Expand All @@ -212,6 +221,8 @@ runtime-benchmarks = [
"pallet-nomination-pools-benchmarking",
"pallet-preimage/runtime-benchmarks",
"pallet-proxy/runtime-benchmarks",
"pallet-ranked-collective/runtime-benchmarks",
"pallet-referenda/runtime-benchmarks",
"pallet-scheduler/runtime-benchmarks",
"pallet-society/runtime-benchmarks",
"pallet-recovery/runtime-benchmarks",
Expand All @@ -223,6 +234,7 @@ runtime-benchmarks = [
"pallet-vesting/runtime-benchmarks",
"pallet-offences-benchmarking",
"pallet-session-benchmarking",
"pallet-whitelist/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
"frame-system-benchmarking",
"hex-literal",
Expand All @@ -244,6 +256,7 @@ try-runtime = [
"pallet-child-bounties/try-runtime",
"pallet-transaction-payment/try-runtime",
"pallet-collective/try-runtime",
"pallet-conviction-voting/try-runtime",
"pallet-elections-phragmen/try-runtime",
"pallet-election-provider-multi-phase/try-runtime",
"pallet-democracy/try-runtime",
Expand All @@ -257,7 +270,9 @@ try-runtime = [
"pallet-offences/try-runtime",
"pallet-preimage/try-runtime",
"pallet-proxy/try-runtime",
"pallet-ranked-collective/try-runtime",
"pallet-recovery/try-runtime",
"pallet-referenda/try-runtime",
"pallet-scheduler/try-runtime",
"pallet-session/try-runtime",
"pallet-society/try-runtime",
Expand All @@ -267,6 +282,7 @@ try-runtime = [
"pallet-treasury/try-runtime",
"pallet-utility/try-runtime",
"pallet-vesting/try-runtime",
"pallet-whitelist/try-runtime",
"pallet-babe/try-runtime",
"runtime-common/try-runtime",
]
Expand Down
3 changes: 2 additions & 1 deletion runtime/kusama/constants/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ pub mod currency {

pub const UNITS: Balance = 1_000_000_000_000;
pub const CENTS: Balance = UNITS / 30_000;
pub const GRAND: Balance = CENTS * 100_000;
pub const QUID: Balance = CENTS * 100;
ggwpez marked this conversation as resolved.
Show resolved Hide resolved
pub const GRAND: Balance = QUID * 1_000;
pub const MILLICENTS: Balance = CENTS / 1_000;

pub const fn deposit(items: u32, bytes: u32) -> Balance {
Expand Down
Loading