slashing aggregator v2

Cargo.toml

@@ -84,6 +84,7 @@ members = [
 	"srml/staking",
 	"srml/sudo",
 	"srml/system",
+	"srml/rolling-window",
 	"srml/timestamp",
 	"srml/treasury",
 	"node/cli",

node/runtime/Cargo.toml

@@ -29,6 +29,7 @@ executive = { package = "srml-executive", path = "../../srml/executive", default
 finality-tracker = { package = "srml-finality-tracker", path = "../../srml/finality-tracker", default-features = false }
 grandpa = { package = "srml-grandpa", path = "../../srml/grandpa", default-features = false }
 indices = { package = "srml-indices", path = "../../srml/indices", default-features = false }
+rolling-window = { package = "srml-rolling-window", path = "../../srml/rolling-window", default-features = false }
 session = { package = "srml-session", path = "../../srml/session", default-features = false, features = ["historical"] }
 staking = { package = "srml-staking", path = "../../srml/staking", default-features = false }
 system = { package = "srml-system", path = "../../srml/system", default-features = false }
@@ -80,6 +81,7 @@ std = [
 	"safe-mix/std",
 	"client/std",
 	"rustc-hex",
+	"rolling-window/std",
 	"substrate-keyring",
 	"offchain-primitives/std",
 	"im-online/std",

node/runtime/src/lib.rs

@@ -187,7 +187,7 @@ impl authorship::Trait for Runtime {
 	type EventHandler = Staking;
 }
 
-type SessionHandlers = (Grandpa, Babe, ImOnline);
+type SessionHandlers = (Grandpa, Babe, ImOnline, RollingWindow);
 
 impl_opaque_keys! {
 	pub struct SessionKeys {
@@ -238,6 +238,10 @@ impl staking::Trait for Runtime {
 	type SessionInterface = Self;
 }
 
+impl staking::slash::Trait for Runtime {
+	type Currency = Balances;
+}
+
 parameter_types! {
 	pub const LaunchPeriod: BlockNumber = 28 * 24 * 60 * MINUTES;
 	pub const VotingPeriod: BlockNumber = 28 * 24 * 60 * MINUTES;
@@ -377,6 +381,10 @@ impl im_online::Trait for Runtime {
 	type IsValidAuthorityId = Babe;
 }
 
+impl rolling_window::Trait for Runtime {
+	type SessionKey = primitives::sr25519::Public;
+}
+
 impl grandpa::Trait for Runtime {
 	type Event = Event;
 }
@@ -416,6 +424,7 @@ construct_runtime!(
 		Contracts: contracts,
 		Sudo: sudo,
 		ImOnline: im_online::{default, ValidateUnsigned},
+		RollingWindow: rolling_window::{Module, Storage},
 	}
 );
 

srml/aura/src/lib.rs

@@ -66,6 +66,7 @@ use inherents::{InherentDataProviders, ProvideInherentData};
 use substrate_consensus_aura_primitives::{AURA_ENGINE_ID, ConsensusLog};
 #[cfg(feature = "std")]
 use parity_codec::Decode;
+use session::SessionIndex;
 
 mod mock;
 mod tests;
@@ -188,7 +189,7 @@ impl<T: Trait> Module<T> {
 impl<T: Trait> session::OneSessionHandler<T::AccountId> for Module<T> {
 	type Key = T::AuthorityId;
 
-	fn on_new_session<'a, I: 'a>(changed: bool, validators: I, _queued_validators: I)
+	fn on_new_session<'a, I: 'a>(_: (SessionIndex, SessionIndex), changed: bool, validators: I, _queued_validators: I)
 		where I: Iterator<Item=(&'a T::AccountId, T::AuthorityId)>
 	{
 		// instant changes

srml/babe/src/lib.rs

@@ -34,6 +34,7 @@ use inherents::{RuntimeString, InherentIdentifier, InherentData, ProvideInherent
 use inherents::{InherentDataProviders, ProvideInherentData};
 use babe_primitives::{BABE_ENGINE_ID, ConsensusLog, BabeWeight, Epoch, RawBabePreDigest};
 pub use babe_primitives::{AuthorityId, VRF_OUTPUT_LENGTH, PUBLIC_KEY_LENGTH};
+use session::SessionIndex;
 
 /// The BABE inherent identifier.
 pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"babeslot";
@@ -273,8 +274,14 @@ impl<T: Trait> OnTimestampSet<T::Moment> for Module<T> {
 
 impl<T: Trait + staking::Trait> session::OneSessionHandler<T::AccountId> for Module<T> {
 	type Key = AuthorityId;
-	fn on_new_session<'a, I: 'a>(_changed: bool, validators: I, queued_validators: I)
-		where I: Iterator<Item=(&'a T::AccountId, AuthorityId)>
+
+	fn on_new_session<'a, I: 'a>(
+		_: (SessionIndex, SessionIndex),
+		_changed: bool,
+		validators: I,
+		queued_validators: I,
+	) where
+		I: Iterator<Item=(&'a T::AccountId, AuthorityId)>
 	{
 		use staking::BalanceOf;
 		let to_votes = |b: BalanceOf<T>| {

srml/grandpa/src/lib.rs

@@ -41,6 +41,7 @@ use sr_primitives::{
 use fg_primitives::{ScheduledChange, ConsensusLog, GRANDPA_ENGINE_ID};
 pub use fg_primitives::{AuthorityId, AuthorityWeight};
 use system::{ensure_signed, DigestOf};
+use session::SessionIndex;
 
 mod mock;
 mod tests;
@@ -346,7 +347,7 @@ impl<T: Trait> Module<T> {
 impl<T: Trait> session::OneSessionHandler<T::AccountId> for Module<T> {
 	type Key = AuthorityId;
 
-	fn on_new_session<'a, I: 'a>(changed: bool, validators: I, _queued_validators: I)
+	fn on_new_session<'a, I: 'a>(_: (SessionIndex, SessionIndex), changed: bool, validators: I, _queued_validators: I)
 		where I: Iterator<Item=(&'a T::AccountId, AuthorityId)>
 	{
 		// instant changes

srml/im-online/src/lib.rs

@@ -391,7 +391,7 @@ impl<T: Trait> Module<T> {
 impl<T: Trait> session::OneSessionHandler<T::AccountId> for Module<T> {
 	type Key = <T as Trait>::AuthorityId;
 
-	fn on_new_session<'a, I: 'a>(_changed: bool, _validators: I, _next_validators: I) {
+	fn on_new_session<'a, I: 'a>(_: (SessionIndex, SessionIndex), _changed: bool, _validators: I, _next_validators: I) {
 		Self::new_session();
 	}
 

srml/rolling-window/Cargo.toml

@@ -0,0 +1,35 @@
+[package]
+name = "srml-rolling-window"
+version = "2.0.0"
+authors = ["Parity Technologies <[email protected]>"]
+edition = "2018"
+
+[dependencies]
+balances = { package = "srml-balances", path = "../balances", default-features = false }
+parity-codec = { version = "4.1.1", default-features = false }
+rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
+serde = { version = "1.0", optional = true }
+sr-primitives = { path = "../../core/sr-primitives", default-features = false }
+srml-support = { path = "../support", default-features = false }
+srml-session = { path = "../session", default-features = false }
+system = { package = "srml-system", path = "../system", default-features = false }
+
+[dev-dependencies]
+balances = { package = "srml-balances", path = "../balances" }
+runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
+substrate-primitives = { path = "../../core/primitives" }
+timestamp = { package = "srml-timestamp", path = "../timestamp" }
+srml-staking = { path = "../staking" }
+
+[features]
+default = ["std"]
+std = [
+	"balances/std",
+	"parity-codec/std",
+	"rstd/std",
+	"serde",
+	"sr-primitives/std",
+	"srml-session/std",
+	"srml-support/std",
+	"system/std",
+]