Delegated staking

demo/cli/src/lib.rs

@@ -49,9 +49,9 @@ pub mod error;
 
 use std::sync::Arc;
 use demo_primitives::Hash;
-use demo_runtime::{GenesisConfig, ConsensusConfig, CouncilConfig, DemocracyConfig,
-	SessionConfig, StakingConfig};
-use demo_runtime::{Block, BlockId, UncheckedExtrinsic, BuildStorage};
+use demo_runtime::{Block, BlockId, UncheckedExtrinsic, BuildStorage, GenesisConfig,
+	ConsensusConfig, CouncilConfig, DemocracyConfig, SessionConfig, StakingConfig,
+	TimestampConfig};
 use futures::{Future, Sink, Stream};
 
 struct DummyPool;
@@ -107,10 +107,10 @@ pub fn run<I, T>(args: I) -> error::Result<()> where
 			authorities: vec![god_key.clone()],
 		}),
 		system: None,
-	//		block_time: 5,			// 5 second block time.
 		session: Some(SessionConfig {
 			validators: vec![god_key.clone().into()],
 			session_length: 720,	// that's 1 hour per session.
+			broken_percent_late: 30,
 		}),
 		staking: Some(StakingConfig {
 			current_era: 0,
@@ -126,6 +126,8 @@ pub fn run<I, T>(args: I) -> error::Result<()> where
 			validator_count: 12,
 			sessions_per_era: 24,	// 24 hours per era.
 			bonding_duration: 90,	// 90 days per bond.
+			early_era_slash: 10000,
+			session_reward: 100,
 		}),
 		democracy: Some(DemocracyConfig {
 			launch_period: 120 * 24 * 14,	// 2 weeks per public referendum
@@ -147,6 +149,9 @@ pub fn run<I, T>(args: I) -> error::Result<()> where
 			cooloff_period: 90 * 120 * 24, // 90 day cooling off period if council member vetoes a proposal.
 			voting_period: 7 * 120 * 24, // 7 day voting period for council members.
 		}),
+		timestamp: Some(TimestampConfig {
+			period: 5,					// 5 second block time.
+		}),
 	}.build_storage();
 
 	let client = Arc::new(client::new_in_mem::<_, Block, _>(executor, genesis_storage)?);

demo/executor/src/lib.rs

@@ -185,6 +185,7 @@ mod tests {
 			session: Some(SessionConfig {
 				session_length: 2,
 				validators: vec![One.to_raw_public().into(), Two.to_raw_public().into(), three],
+				broken_percent_late: 100,
 			}),
 			staking: Some(StakingConfig {
 				sessions_per_era: 2,
@@ -200,9 +201,12 @@ mod tests {
 				creation_fee: 0,
 				contract_fee: 0,
 				reclaim_rebate: 0,
+				early_era_slash: 0,
+				session_reward: 0,
 			}),
 			democracy: Some(Default::default()),
 			council: Some(Default::default()),
+			timestamp: Some(Default::default()),
 		}.build_storage()
 	}
 
@@ -238,7 +242,7 @@ mod tests {
 		construct_block(
 			1,
 			[69u8; 32].into(),
-			hex!("4f7a61bceecddc19d49fbee53f82402c2a8727c1b2aeb5e5070a59f0777a203b").into(),
+			hex!("786071057714fdd6ea4595eecd4a0f327908d65f462ff5bca0f700fafce588c9").into(),
 			vec![BareExtrinsic {
 				signed: alice(),
 				index: 0,
@@ -251,7 +255,7 @@ mod tests {
 		construct_block(
 			2,
 			block1().1,
-			hex!("67c588603dd727601263cf8d6138a2003ffc0df793c5ea34e7defc945da24bf0").into(),
+			hex!("a7f1259cc6b2fa758542f2996e737f8f0de9dec3a9d32641da348178f48b9fc2").into(),
 			vec![
 				BareExtrinsic {
 					signed: bob(),

demo/runtime/src/lib.rs

@@ -85,9 +85,9 @@ impl consensus::Trait for Concrete {
 pub type Consensus = consensus::Module<Concrete>;
 
 impl timestamp::Trait for Concrete {
-	const SET_POSITION: u32 = 0;
+	const TIMESTAMP_SET_POSITION: u32 = 0;
 
-	type Value = u64;
+	type Moment = u64;
 }
 
 /// Timestamp module for this concrete runtime.
@@ -103,6 +103,7 @@ impl Convert<AccountId, SessionKey> for SessionKeyConversion {
 
 impl session::Trait for Concrete {
 	type ConvertAccountIdToSessionKey = SessionKeyConversion;
+	type OnSessionChange = Staking;
 }
 
 /// Session module for this concrete runtime.
@@ -182,6 +183,7 @@ impl_outer_config! {
 		StakingConfig => staking,
 		DemocracyConfig => democracy,
 		CouncilConfig => council,
+		TimestampConfig => timestamp,
 	}
 }
 

polkadot/api/src/full.rs

@@ -112,7 +112,7 @@ impl<B: LocalBackend<Block>> PolkadotApi for Client<B, LocalCallExecutor<B, Nati
 	}
 
 	fn timestamp(&self, at: &CheckedId) -> Result<Timestamp> {
-		with_runtime!(self, at, ::runtime::Timestamp::now)
+		with_runtime!(self, at, ::runtime::Timestamp::get)
 	}
 
 	fn evaluate_block(&self, at: &CheckedId, block: Block) -> Result<bool> {
@@ -216,11 +216,13 @@ mod tests {
 			session: Some(SessionConfig {
 				validators: validators(),
 				session_length: 100,
+				broken_percent_late: 100,
 			}),
 			council: Some(Default::default()),
 			democracy: Some(Default::default()),
 			parachains: Some(Default::default()),
 			staking: Some(Default::default()),
+			timestamp: Some(Default::default()),
 		};
 
 		::client::new_in_mem(LocalDispatch::new(), genesis_config.build_storage()).unwrap()

polkadot/cli/src/preset_config.rs

@@ -22,7 +22,7 @@ use serde_json;
 use substrate_primitives::{AuthorityId, storage::{StorageKey, StorageData}};
 use runtime_primitives::{MakeStorage, BuildStorage, StorageMap};
 use polkadot_runtime::{GenesisConfig, ConsensusConfig, CouncilConfig, DemocracyConfig,
-	SessionConfig, StakingConfig};
+	SessionConfig, StakingConfig, TimestampConfig};
 use chain_spec::ChainSpec;
 
 enum Config {
@@ -98,7 +98,8 @@ impl PresetConfig {
 			system: None,
 			session: Some(SessionConfig {
 				validators: initial_authorities.iter().cloned().map(Into::into).collect(),
-				session_length: 720,	// that's 1 hour per session.
+				session_length: 60,	// that's 5 minutes per session.
+				broken_percent_late: 50,
 			}),
 			staking: Some(StakingConfig {
 				current_era: 0,
@@ -110,32 +111,37 @@ impl PresetConfig {
 				creation_fee: 0,
 				contract_fee: 0,
 				reclaim_rebate: 0,
+				early_era_slash: 10000,
+				session_reward: 100,
 				balances: endowed_accounts.iter().map(|&k|(k, 1u128 << 60)).collect(),
 				validator_count: 12,
-				sessions_per_era: 24,	// 24 hours per era.
-				bonding_duration: 90,	// 90 days per bond.
+				sessions_per_era: 12,	// 1 hour per era
+				bonding_duration: 24,	// 1 day per bond.
 			}),
 			democracy: Some(DemocracyConfig {
-				launch_period: 120 * 24 * 14,	// 2 weeks per public referendum
-				voting_period: 120 * 24 * 28,	// 4 weeks to discuss & vote on an active referendum
-				minimum_deposit: 1000,	// 1000 as the minimum deposit for a referendum
+				launch_period: 12 * 60 * 24,	// 1 day per public referendum
+				voting_period: 12 * 60 * 24 * 3,	// 3 days to discuss & vote on an active referendum
+				minimum_deposit: 5000,	// 12000 as the minimum deposit for a referendum
 			}),
 			council: Some(CouncilConfig {
 				active_council: vec![],
-				candidacy_bond: 1000,	// 1000 to become a council candidate
-				voter_bond: 100,		// 100 down to vote for a candidate
+				candidacy_bond: 5000,	// 5000 to become a council candidate
+				voter_bond: 1000,		// 1000 down to vote for a candidate
 				present_slash_per_voter: 1,	// slash by 1 per voter for an invalid presentation.
-				carry_count: 24,		// carry over the 24 runners-up to the next council election
-				presentation_duration: 120 * 24,	// one day for presenting winners.
-				approval_voting_period: 7 * 120 * 24,	// one week period between possible council elections.
-				term_duration: 180 * 120 * 24,	// 180 day term duration for the council.
+				carry_count: 6,		// carry over the 6 runners-up to the next council election
+				presentation_duration: 12 * 60 * 24,	// one day for presenting winners.
+				approval_voting_period: 12 * 60 * 24 * 2,	// two days period between possible council elections.
+				term_duration: 12 * 60 * 24 * 24,	// 24 day term duration for the council.
 				desired_seats: 0, // start with no council: we'll raise this once the stake has been dispersed a bit.
 				inactive_grace_period: 1,	// one addition vote should go by before an inactive voter can be reaped.
 
-				cooloff_period: 90 * 120 * 24, // 90 day cooling off period if council member vetoes a proposal.
-				voting_period: 7 * 120 * 24, // 7 day voting period for council members.
+				cooloff_period: 12 * 60 * 24 * 4, // 4 day cooling off period if council member vetoes a proposal.
+				voting_period: 12 * 60 * 24, // 1 day voting period for council members.
 			}),
 			parachains: Some(Default::default()),
+			timestamp: Some(TimestampConfig {
+				period: 5,					// 5 second block time.
+			}),
 		});
 		let boot_nodes = vec![
 			"enode://a93a29fa68d965452bf0ff8c1910f5992fe2273a72a1ee8d3a3482f68512a61974211ba32bb33f051ceb1530b8ba3527fc36224ba6b9910329025e6d9153cf50@104.211.54.233:30333".into(),
@@ -163,6 +169,7 @@ impl PresetConfig {
 			session: Some(SessionConfig {
 				validators: initial_authorities.iter().cloned().map(Into::into).collect(),
 				session_length: 10,
+				broken_percent_late: 30,
 			}),
 			staking: Some(StakingConfig {
 				current_era: 0,
@@ -178,6 +185,8 @@ impl PresetConfig {
 				validator_count: 2,
 				sessions_per_era: 5,
 				bonding_duration: 2,
+				early_era_slash: 0,
+				session_reward: 0,
 			}),
 			democracy: Some(DemocracyConfig {
 				launch_period: 9,
@@ -200,6 +209,9 @@ impl PresetConfig {
 				voting_period: 20,
 			}),
 			parachains: Some(Default::default()),
+			timestamp: Some(TimestampConfig {
+				period: 5,					// 5 second block time.
+			}),
 		});
 		let boot_nodes = Vec::new();
 		PresetConfig { genesis_config, boot_nodes }

polkadot/runtime/src/lib.rs

@@ -126,8 +126,8 @@ impl consensus::Trait for Concrete {
 pub type Consensus = consensus::Module<Concrete>;
 
 impl timestamp::Trait for Concrete {
-	const SET_POSITION: u32 = TIMESTAMP_SET_POSITION;
-	type Value = u64;
+	const TIMESTAMP_SET_POSITION: u32 = TIMESTAMP_SET_POSITION;
+	type Moment = u64;
 }
 /// Timestamp module for this concrete runtime.
 pub type Timestamp = timestamp::Module<Concrete>;
@@ -142,6 +142,7 @@ impl Convert<AccountId, SessionKey> for SessionKeyConversion {
 
 impl session::Trait for Concrete {
 	type ConvertAccountIdToSessionKey = SessionKeyConversion;
+	type OnSessionChange = Staking;
 }
 /// Session module for this concrete runtime.
 pub type Session = session::Module<Concrete>;
@@ -213,6 +214,7 @@ impl_outer_config! {
 		StakingConfig => staking,
 		DemocracyConfig => democracy,
 		CouncilConfig => council,
+		TimestampConfig => timestamp,
 		ParachainsConfig => parachains,
 	}
 }

polkadot/runtime/src/parachains.rs

@@ -33,7 +33,7 @@ use rstd::marker::PhantomData;
 #[cfg(any(feature = "std", test))]
 use {runtime_io, runtime_primitives};
 
-pub trait Trait: system::Trait<Hash = primitives::Hash> + session::Trait {
+pub trait Trait: session::Trait<Hash = primitives::Hash> {
 	/// The position of the set_heads call in the block.
 	const SET_POSITION: u32;
 
@@ -232,7 +232,7 @@ mod tests {
 	use runtime_primitives::BuildStorage;
 	use runtime_primitives::traits::{HasPublicAux, Identity, BlakeTwo256};
 	use runtime_primitives::testing::{Digest, Header};
-	use consensus;
+	use {consensus, timestamp};
 
 	#[derive(Clone, Eq, PartialEq)]
 	pub struct Test;
@@ -254,6 +254,11 @@ mod tests {
 	}
 	impl session::Trait for Test {
 		type ConvertAccountIdToSessionKey = Identity;
+		type OnSessionChange = ();
+	}
+	impl timestamp::Trait for Test {
+		const TIMESTAMP_SET_POSITION: u32 = 0;
+		type Moment = u64;
 	}
 	impl Trait for Test {
 		const SET_POSITION: u32 = 0;
@@ -272,6 +277,7 @@ mod tests {
 		t.extend(session::GenesisConfig::<Test>{
 			session_length: 1000,
 			validators: vec![1, 2, 3, 4, 5, 6, 7, 8],
+			broken_percent_late: 100,
 		}.build_storage());
 		t.extend(GenesisConfig::<Test>{
 			parachains: parachains,