companion for staking/election: prolonged era and emergency mode for governance submission. (#3201)

* companion

* update Substrate

Co-authored-by: parity-processbot <>
This commit is contained in:
Guillaume Thiolliere
2021-06-14 16:33:55 +02:00
committed by GitHub
parent e05bd988ed
commit 0ca6ee45b5
8 changed files with 182 additions and 155 deletions
+3
View File
@@ -72,6 +72,7 @@ pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "m
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-xcm = { path = "../../xcm/pallet-xcm", default-features = false }
frame-election-provider-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }
@@ -176,6 +177,7 @@ std = [
"xcm-executor/std",
"xcm-builder/std",
"max-encoded-len/std",
"frame-election-provider-support/std",
]
runtime-benchmarks = [
"runtime-common/runtime-benchmarks",
@@ -212,6 +214,7 @@ runtime-benchmarks = [
"frame-system-benchmarking",
"hex-literal",
"xcm-builder/runtime-benchmarks",
"frame-election-provider-support/runtime-benchmarks",
]
try-runtime = [
"frame-executive/try-runtime",
+4
View File
@@ -475,6 +475,10 @@ impl pallet_staking::Config for Runtime {
type UnixTime = Timestamp;
type CurrencyToVote = CurrencyToVote;
type ElectionProvider = ElectionProviderMultiPhase;
type GenesisElectionProvider =
frame_election_provider_support::onchain::OnChainSequentialPhragmen<
pallet_election_provider_multi_phase::OnChainConfig<Self>
>;
type RewardRemainder = Treasury;
type Event = Event;
type Slash = Treasury;