Consenus fixes

demo/api/src/lib.rs

@@ -148,7 +148,8 @@ where
 	}
 
 	fn inherent_extrinsics(&self, at: &BlockId, inherent_data: InherentData) -> Result<Vec<UncheckedExtrinsic>> {
-		self.call_api(at, "inherent_extrinsics", &inherent_data)
+		let runtime_version = self.runtime_version_at(at)?;
+		self.call_api(at, "inherent_extrinsics", &(inherent_data, runtime_version.spec_version))
 	}
 }
 

demo/network/src/lib.rs

@@ -47,7 +47,7 @@ use substrate_network::specialization::Specialization;
 use substrate_network::StatusMessage as GenericFullStatus;
 
 /// Demo protocol id.
-pub const PROTOCOL_ID: ::substrate_network::ProtocolId = *b"sub";
+pub const PROTOCOL_ID: ::substrate_network::ProtocolId = *b"dot";
 
 type FullStatus = GenericFullStatus<Block>;
 

demo/runtime/src/lib.rs

@@ -39,6 +39,7 @@ extern crate substrate_codec as codec;
 #[macro_use]
 extern crate substrate_codec_derive;
 
+#[cfg_attr(not(feature = "std"), macro_use)]
 extern crate substrate_runtime_std as rstd;
 extern crate substrate_runtime_balances as balances;
 extern crate substrate_runtime_consensus as consensus;
@@ -57,7 +58,7 @@ extern crate demo_primitives;
 mod checked_block;
 
 use rstd::prelude::*;
-use demo_primitives::{AccountId, AccountIndex, Balance, BlockNumber, Hash, Index, SessionKey, Signature};
+use demo_primitives::{AccountId, AccountIndex, Balance, BlockNumber, Hash, Index, SessionKey, Signature, InherentData};
 use runtime_primitives::generic;
 use runtime_primitives::traits::{Convert, HasPublicAux, BlakeTwo256};
 use version::RuntimeVersion;
@@ -81,7 +82,7 @@ pub struct Concrete;
 /// Runtime version.
 pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: ver_str!("demo"),
-	impl_name: ver_str!("parity-demo"),
+	impl_name: ver_str!("substrate-demo"),
 	authoring_version: 1,
 	spec_version: 1,
 	impl_version: 0,
@@ -135,7 +136,6 @@ pub type Consensus = consensus::Module<Concrete>;
 
 impl timestamp::Trait for Concrete {
 	const TIMESTAMP_SET_POSITION: u32 = TIMESTAMP_SET_POSITION;
-
 	type Moment = u64;
 }
 
@@ -231,7 +231,7 @@ pub type Extrinsic = generic::Extrinsic<Address, Index, Call>;
 pub type BareExtrinsic = generic::Extrinsic<AccountId, Index, Call>;
 /// Executive: handles dispatch to the various modules.
 pub type Executive = executive::Executive<Concrete, Block, Balances, Balances,
-	(((((), Council), Democracy), Staking), Session)>;
+	((((((), Council), Democracy), Staking), Session), Timestamp)>;
 
 impl_outer_config! {
 	pub struct GenesisConfig for Concrete {
@@ -250,12 +250,40 @@ pub mod api {
 	impl_stubs!(
 		version => |()| super::Version::version(),
 		authorities => |()| super::Consensus::authorities(),
-		events => |()| super::System::events(),
 		initialise_block => |header| super::Executive::initialise_block(&header),
 		apply_extrinsic => |extrinsic| super::Executive::apply_extrinsic(extrinsic),
 		execute_block => |block| super::Executive::execute_block(block),
 		finalise_block => |()| super::Executive::finalise_block(),
+		inherent_extrinsics => |(inherent, spec_version)| super::inherent_extrinsics(inherent, spec_version),
 		validator_count => |()| super::Session::validator_count(),
-		validators => |()| super::Session::validators()
+		validators => |()| super::Session::validators(),
+		timestamp => |()| super::Timestamp::get(),
+		random_seed => |()| super::System::random_seed(),
+		account_nonce => |account| super::System::account_nonce(&account),
+		lookup_address => |address| super::Balances::lookup_address(address)
 	);
 }
+
+/// Produces the list of inherent extrinsics.
+fn inherent_extrinsics(data: InherentData, _spec_version: u32) -> Vec<UncheckedExtrinsic> {
+	let make_inherent = |function| UncheckedExtrinsic::new(
+		Extrinsic {
+			signed: Default::default(),
+			function,
+			index: 0,
+		},
+		Default::default(),
+		);
+
+	let mut inherent = vec![
+		make_inherent(Call::Timestamp(TimestampCall::set(data.timestamp))),
+	];
+
+	if !data.offline_indices.is_empty() {
+		inherent.push(make_inherent(
+				Call::Consensus(ConsensusCall::note_offline(data.offline_indices))
+		));
+	}
+
+	inherent
+}