Inherent digests

core/client/src/client.rs

@@ -705,14 +705,15 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			origin,
 			header,
 			justification,
+			pre_digests,
 			post_digests,
 			body,
 			finalized,
 			auxiliary,
 			fork_choice,
 		} = import_block;
 
-		assert!(justification.is_some() && finalized || justification.is_none());
+		assert!(justification.is_none() || finalized);
 
 		let parent_hash = header.parent_hash().clone();
 
@@ -740,6 +741,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			operation,
 			origin,
 			hash,
+			pre_digests.0,
 			import_headers,
 			justification,
 			body,
@@ -763,6 +765,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		operation: &mut ClientImportOperation<Block, Blake2Hasher, B>,
 		origin: BlockOrigin,
 		hash: Block::Hash,
+		pre_digests: Vec<u8>,
 		import_headers: PrePostHeader<Block::Header>,
 		justification: Option<Justification>,
 		body: Option<Vec<Block::Extrinsic>>,
@@ -801,7 +804,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		}
 
 		// FIXME #1232: correct path logic for when to execute this function
-		let (storage_update,changes_update,storage_changes) = self.block_execution(&operation.op, &import_headers, origin, hash, body.clone())?;
+		let (storage_update,changes_update,storage_changes) = self.block_execution(&operation.op, pre_digests, &import_headers, origin, hash, body.clone())?;
 
 		let is_new_best = finalized || match fork_choice {
 			ForkChoiceStrategy::LongestChain => import_headers.post().number() > &last_best_number,
@@ -851,6 +854,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 	fn block_execution(
 		&self,
 		transaction: &B::BlockImportOperation,
+		pre_digest: Vec<u8>,
 		import_headers: &PrePostHeader<Block::Header>,
 		origin: BlockOrigin,
 		hash: Block::Hash,
@@ -890,7 +894,11 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 					transaction_state,
 					&mut overlay,
 					"Core_execute_block",
-					&<Block as BlockT>::new(import_headers.pre().clone(), body.unwrap_or_default()).encode(),
+					&{
+						let mut the_block = <Block as BlockT>::new(import_headers.pre().clone(), body.unwrap_or_default());
+						the_block.set_pre_digest(pre_digest);
+						the_block.encode()
+					},
 					match origin {
 						BlockOrigin::NetworkInitialSync => get_execution_manager(self.execution_strategies().syncing),
 						_ => get_execution_manager(self.execution_strategies().importing),

core/consensus/aura/primitives/Cargo.toml

@@ -12,5 +12,6 @@ runtime_primitives = { package = "sr-primitives", path = "../../../sr-primitives
 [features]
 default = ["std"]
 std = [
+	"runtime_primitives/std",
 	"substrate-client/std",
 ]

core/consensus/aura/src/lib.rs

@@ -62,10 +62,10 @@ use srml_aura::{
 };
 use substrate_telemetry::{telemetry, CONSENSUS_TRACE, CONSENSUS_DEBUG, CONSENSUS_WARN, CONSENSUS_INFO};
 
-use slots::{CheckedHeader, SlotWorker, SlotInfo, SlotCompatible};
+use slots::{CheckedHeader, SlotWorker, SlotInfo, SlotCompatible, slot_now};
 
 pub use aura_primitives::*;
-pub use consensus_common::SyncOracle;
+pub use consensus_common::{SyncOracle, PreDigest};
 
 type AuthorityId<P> = <P as Pair>::Public;
 type Signature<P> = <P as Pair>::Signature;
@@ -120,20 +120,6 @@ fn slot_author<P: Pair>(slot_num: u64, authorities: &[AuthorityId<P>]) -> Option
 	Some(current_author)
 }
 
-fn duration_now() -> Option<Duration> {
-	use std::time::SystemTime;
-
-	let now = SystemTime::now();
-	now.duration_since(SystemTime::UNIX_EPOCH).map_err(|e| {
-			warn!("Current time {:?} is before unix epoch. Something is wrong: {:?}", now, e);
-	}).ok()
-}
-
-/// Get the slot for now.
-fn slot_now(slot_duration: u64) -> Option<u64> {
-	duration_now().map(|s| s.as_secs() / slot_duration)
-}
-
 fn inherent_to_common_error(err: RuntimeString) -> consensus_common::Error {
 	consensus_common::ErrorKind::InherentData(err.into()).into()
 }
@@ -429,6 +415,7 @@ impl<B: Block, C, E, I, P, Error, SO> SlotWorker<B> for AuraWorker<C, E, I, P, S
 					let import_block: ImportBlock<B> = ImportBlock {
 						origin: BlockOrigin::Own,
 						header,
+						pre_digests: PreDigest::new(),
 						justification: None,
 						post_digests: vec![item],
 						body: Some(body),
@@ -467,7 +454,6 @@ impl<B: Block, C, E, I, P, Error, SO> SlotWorker<B> for AuraWorker<C, E, I, P, S
 /// This digest item will always return `Some` when used with `as_aura_seal`.
 //
 // FIXME #1018 needs misbehavior types
-#[forbid(deprecated)]
 fn check_header<B: Block, P: Pair>(
 	slot_now: u64,
 	mut header: B::Header,
@@ -680,6 +666,7 @@ impl<B: Block, C, E, P> Verifier<B> for AuraVerifier<C, E, P> where
 
 				let import_block = ImportBlock {
 					origin,
+					pre_digests: PreDigest::new(),
 					header: pre_header,
 					post_digests: vec![seal],
 					body,
@@ -785,7 +772,8 @@ pub fn import_queue<B, C, E, P>(
 
 /// Start an import queue for the Aura consensus algorithm with backwards compatibility.
 #[deprecated(
-	note = "should not be used unless backwards compatibility with an older chain is needed."
+	since = "1.0.1",
+	note = "should not be used unless backwards compatibility with an older chain is needed.",
 )]
 pub fn import_queue_accept_old_seals<B, C, E, P>(
 	slot_duration: SlotDuration,
@@ -828,8 +816,8 @@ mod tests {
 	use network::config::ProtocolConfig;
 	use parking_lot::Mutex;
 	use tokio::runtime::current_thread;
-	use keyring::ed25519::Keyring;
-	use primitives::ed25519;
+	use keyring::sr25519::Keyring;
+	use primitives::sr25519;
 	use client::BlockchainEvents;
 	use test_client;
 
@@ -844,7 +832,7 @@ mod tests {
 		type Proposer = DummyProposer;
 		type Error = Error;
 
-		fn init(&self, parent_header: &<TestBlock as BlockT>::Header, _authorities: &[AuthorityId<ed25519::Pair>])
+		fn init(&self, parent_header: &<TestBlock as BlockT>::Header, _authorities: &[AuthorityId<sr25519::Pair>])
 			-> Result<DummyProposer, Error>
 		{
 			Ok(DummyProposer(parent_header.number + 1, self.0.clone()))
@@ -870,7 +858,7 @@ mod tests {
 
 	impl TestNetFactory for AuraTestNet {
 		type Specialization = DummySpecialization;
-		type Verifier = AuraVerifier<PeersClient, NothingExtra, ed25519::Pair>;
+		type Verifier = AuraVerifier<PeersClient, NothingExtra, sr25519::Pair>;
 		type PeerData = ();
 
 		/// Create new test network with peers and given config.
@@ -957,7 +945,7 @@ mod tests {
 				&inherent_data_providers, slot_duration.get()
 			).expect("Registers aura inherent data provider");
 
-			let aura = start_aura::<_, _, _, _, ed25519::Pair, _, _, _>(
+			let aura = start_aura::<_, _, _, _, sr25519::Pair, _, _, _>(
 				slot_duration,
 				Arc::new(key.clone().into()),
 				client.clone(),

core/consensus/babe/Cargo.toml

@@ -16,6 +16,7 @@ runtime_io = { package = "sr-io", path = "../../sr-io" }
 inherents = { package = "substrate-inherents", path = "../../inherents" }
 srml-consensus = { path = "../../../srml/consensus" }
 substrate-telemetry = { path = "../../telemetry" }
+srml-babe = { path = "../../../srml/babe" }
 client = { package = "substrate-client", path = "../../client" }
 consensus_common = { package = "substrate-consensus-common", path = "../common" }
 authorities = { package = "substrate-consensus-authorities", path = "../authorities" }
@@ -26,10 +27,9 @@ tokio = "0.1.18"
 parking_lot = "0.7.1"
 error-chain = "0.12.0"
 log = "0.4.6"
-
-[dependencies.schnorrkel]
-git = "https://github.com/paritytech/schnorrkel"
-branch = "master"
+schnorrkel = "0.1.1"
+rand = "0.6.5"
+merlin = "1.0.3"
 
 [dev-dependencies]
 keyring = { package = "substrate-keyring", path = "../../keyring" }

core/consensus/babe/primitives/Cargo.toml

@@ -9,11 +9,13 @@ edition = "2018"
 substrate-client = { path = "../../../client", default-features = false }
 runtime_primitives = { package = "sr-primitives", path = "../../../sr-primitives", default-features = false }
 slots = { package = "substrate-consensus-slots", path = "../../slots", optional = true }
-parity-codec = "^3.4.0"
+parity-codec = { version = "3.5.1", default-features = false }
 
 [features]
 default = ["std"]
 std = [
+	"runtime_primitives/std",
 	"substrate-client/std",
+	"parity-codec/std",
 	"slots",
 ]

core/consensus/babe/primitives/src/lib.rs

@@ -29,31 +29,28 @@ pub const BABE_ENGINE_ID: ConsensusEngineId = [b'b', b'a', b'b', b'e'];
 /// Configuration data used by the BABE consensus engine.
 #[derive(Copy, Clone, Hash, PartialEq, Eq, Debug, Encode, Decode)]
 pub struct BabeConfiguration {
-	slot_duration: u64,
-	expected_block_time: u64,
-}
+	/// The slot duration in milliseconds for BABE. Currently, only
+	/// the value provided by this type at genesis will be used.
+	///
+	/// Dynamic slot duration may be supported in the future.
+	pub slot_duration: u64,
 
-impl BabeConfiguration {
-	/// Return the expected block time in milliseconds for BABE.  Currently,
+	/// The expected block time in milliseconds for BABE. Currently,
 	/// only the value provided by this type at genesis will be used.
 	///
 	/// Dynamic expected block time may be supported in the future.
-	pub fn expected_block_time(&self) -> u64 {
-		self.expected_block_time
-	}
+	pub expected_block_time: u64,
 
-	/// Return the slot duration in milliseconds for BABE.  Currently, only
-	/// the value provided by this type at genesis will be used.
+	/// The maximum permitted VRF output, or *threshold*, for BABE. Currently,
+	/// only the value provided by this type at genesis will be used.
 	///
-	/// Dynamic slot duration may be supported in the future.
-	pub fn slot_duration(&self) -> u64 {
-		self.slot_duration
-	}
+	/// Dynamic thresholds may be supported in the future.
+	pub threshold: u64,
 }
 
 #[cfg(feature = "std")]
 impl slots::SlotData for BabeConfiguration {
-	/// Return the slot duration in milliseconds for BABE.  Currently, only
+	/// Return the slot duration in milliseconds for BABE. Currently, only
 	/// the value provided by this type at genesis will be used.
 	///
 	/// Dynamic slot duration may be supported in the future.
@@ -67,7 +64,7 @@ impl slots::SlotData for BabeConfiguration {
 decl_runtime_apis! {
 	/// API necessary for block authorship with BABE.
 	pub trait BabeApi {
-		/// Return the configuration for BABE.  Currently,
+		/// Return the configuration for BABE. Currently,
 		/// only the value provided by this type at genesis will be used.
 		///
 		/// Dynamic configuration may be supported in the future.