Unverified Commit ef2e9db7 authored by Martin Pugh's avatar Martin Pugh
Browse files

Merge branch 'master' of github.com:paritytech/polkadot into mp-v0.9.5-prep

parents 0a4204e6 abf779de
Pipeline #142222 passed with stages
in 36 minutes and 48 seconds
This diff is collapsed.
......@@ -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",
......
......@@ -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;
......
......@@ -67,6 +67,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-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "master", 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 }
......@@ -157,6 +158,7 @@ std = [
"beefy-primitives/std",
"pallet-mmr-primitives/std",
"max-encoded-len/std",
"frame-election-provider-support/std",
]
runtime-benchmarks = [
"runtime-common/runtime-benchmarks",
......@@ -189,6 +191,7 @@ runtime-benchmarks = [
"pallet-session-benchmarking",
"frame-system-benchmarking",
"hex-literal",
"frame-election-provider-support/runtime-benchmarks",
]
try-runtime = [
"frame-executive/try-runtime",
......
......@@ -423,6 +423,10 @@ impl pallet_staking::Config for Runtime {
type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
type NextNewSession = Session;
type ElectionProvider = ElectionProviderMultiPhase;
type GenesisElectionProvider =
frame_election_provider_support::onchain::OnChainSequentialPhragmen<
pallet_election_provider_multi_phase::OnChainConfig<Self>
>;
type WeightInfo = weights::pallet_staking::WeightInfo<Runtime>;
}
......
......@@ -341,6 +341,8 @@ impl pallet_staking::Config for Runtime {
type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
type NextNewSession = Session;
type ElectionProvider = frame_election_provider_support::onchain::OnChainSequentialPhragmen<Self>;
type GenesisElectionProvider =
frame_election_provider_support::onchain::OnChainSequentialPhragmen<Self>;
type WeightInfo = ();
}
......
......@@ -32,6 +32,7 @@ tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/parit
block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-election-provider-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
......@@ -171,6 +172,7 @@ std = [
"xcm-executor/std",
"xcm-builder/std",
"max-encoded-len/std",
"frame-election-provider-support/std",
]
runtime-benchmarks = [
"runtime-common/runtime-benchmarks",
......@@ -203,6 +205,7 @@ runtime-benchmarks = [
"frame-system-benchmarking",
"hex-literal",
"xcm-builder/runtime-benchmarks",
"frame-election-provider-support/runtime-benchmarks",
]
try-runtime = [
"frame-executive/try-runtime",
......
......@@ -420,6 +420,10 @@ impl pallet_staking::Config for Runtime {
type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
type NextNewSession = Session;
type ElectionProvider = ElectionProviderMultiPhase;
type GenesisElectionProvider =
frame_election_provider_support::onchain::OnChainSequentialPhragmen<
pallet_election_provider_multi_phase::OnChainConfig<Self>
>;
type WeightInfo = weights::pallet_staking::WeightInfo<Runtime>;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment