Companion to Proportional Slashing: Substrate #10982 (#5306)

* Companion to Proportional Slashing

* update lockfile for {"substrate"}

Co-authored-by: parity-processbot <>
This commit is contained in:
Zeke Mostov
2022-04-21 17:14:28 -07:00
committed by GitHub
parent 3f0e73d320
commit 42cbfba5d3
5 changed files with 174 additions and 166 deletions
+166 -166
View File
File diff suppressed because it is too large Load Diff
+2
View File
@@ -573,6 +573,7 @@ type SlashCancelOrigin = EnsureOneOf<
impl pallet_staking::Config for Runtime { impl pallet_staking::Config for Runtime {
type MaxNominations = MaxNominations; type MaxNominations = MaxNominations;
type Currency = Balances; type Currency = Balances;
type CurrencyBalance = Balance;
type UnixTime = Timestamp; type UnixTime = Timestamp;
type CurrencyToVote = CurrencyToVote; type CurrencyToVote = CurrencyToVote;
type ElectionProvider = ElectionProviderMultiPhase; type ElectionProvider = ElectionProviderMultiPhase;
@@ -594,6 +595,7 @@ impl pallet_staking::Config for Runtime {
type VoterList = BagsList; type VoterList = BagsList;
type MaxUnlockingChunks = frame_support::traits::ConstU32<32>; type MaxUnlockingChunks = frame_support::traits::ConstU32<32>;
type BenchmarkingConfig = runtime_common::StakingBenchmarkingConfig; type BenchmarkingConfig = runtime_common::StakingBenchmarkingConfig;
type OnStakerSlash = ();
type WeightInfo = weights::pallet_staking::WeightInfo<Runtime>; type WeightInfo = weights::pallet_staking::WeightInfo<Runtime>;
} }
+2
View File
@@ -568,6 +568,7 @@ type SlashCancelOrigin = EnsureOneOf<
impl pallet_staking::Config for Runtime { impl pallet_staking::Config for Runtime {
type MaxNominations = MaxNominations; type MaxNominations = MaxNominations;
type Currency = Balances; type Currency = Balances;
type CurrencyBalance = Balance;
type UnixTime = Timestamp; type UnixTime = Timestamp;
type CurrencyToVote = CurrencyToVote; type CurrencyToVote = CurrencyToVote;
type RewardRemainder = Treasury; type RewardRemainder = Treasury;
@@ -589,6 +590,7 @@ impl pallet_staking::Config for Runtime {
type VoterList = BagsList; type VoterList = BagsList;
type MaxUnlockingChunks = frame_support::traits::ConstU32<32>; type MaxUnlockingChunks = frame_support::traits::ConstU32<32>;
type BenchmarkingConfig = runtime_common::StakingBenchmarkingConfig; type BenchmarkingConfig = runtime_common::StakingBenchmarkingConfig;
type OnStakerSlash = ();
type WeightInfo = weights::pallet_staking::WeightInfo<Runtime>; type WeightInfo = weights::pallet_staking::WeightInfo<Runtime>;
} }
+2
View File
@@ -331,6 +331,7 @@ impl onchain::Config for OnChainSeqPhragmen {
impl pallet_staking::Config for Runtime { impl pallet_staking::Config for Runtime {
type MaxNominations = frame_support::pallet_prelude::ConstU32<16>; type MaxNominations = frame_support::pallet_prelude::ConstU32<16>;
type Currency = Balances; type Currency = Balances;
type CurrencyBalance = Balance;
type UnixTime = Timestamp; type UnixTime = Timestamp;
type CurrencyToVote = frame_support::traits::U128CurrencyToVote; type CurrencyToVote = frame_support::traits::U128CurrencyToVote;
type RewardRemainder = (); type RewardRemainder = ();
@@ -354,6 +355,7 @@ impl pallet_staking::Config for Runtime {
type VoterList = pallet_staking::UseNominatorsAndValidatorsMap<Runtime>; type VoterList = pallet_staking::UseNominatorsAndValidatorsMap<Runtime>;
type MaxUnlockingChunks = frame_support::traits::ConstU32<32>; type MaxUnlockingChunks = frame_support::traits::ConstU32<32>;
type BenchmarkingConfig = runtime_common::StakingBenchmarkingConfig; type BenchmarkingConfig = runtime_common::StakingBenchmarkingConfig;
type OnStakerSlash = ();
type WeightInfo = (); type WeightInfo = ();
} }
+2
View File
@@ -457,6 +457,7 @@ parameter_types! {
impl pallet_staking::Config for Runtime { impl pallet_staking::Config for Runtime {
type MaxNominations = MaxNominations; type MaxNominations = MaxNominations;
type Currency = Balances; type Currency = Balances;
type CurrencyBalance = Balance;
type UnixTime = Timestamp; type UnixTime = Timestamp;
type CurrencyToVote = CurrencyToVote; type CurrencyToVote = CurrencyToVote;
type RewardRemainder = (); type RewardRemainder = ();
@@ -478,6 +479,7 @@ impl pallet_staking::Config for Runtime {
type VoterList = BagsList; type VoterList = BagsList;
type MaxUnlockingChunks = frame_support::traits::ConstU32<32>; type MaxUnlockingChunks = frame_support::traits::ConstU32<32>;
type BenchmarkingConfig = runtime_common::StakingBenchmarkingConfig; type BenchmarkingConfig = runtime_common::StakingBenchmarkingConfig;
type OnStakerSlash = ();
type WeightInfo = weights::pallet_staking::WeightInfo<Runtime>; type WeightInfo = weights::pallet_staking::WeightInfo<Runtime>;
} }