Merge branch 'master' into fix_flaming_fir_light_sync

core/consensus/babe/src/lib.rs

@@ -802,7 +802,7 @@ fn epoch_from_cache<B, C>(client: &C, at: &BlockId<B>) -> Option<MaybeSpanEpoch>
 	client.cache()
 		.and_then(|cache| cache
 			.get_at(&well_known_cache_keys::EPOCH, at)
-			.and_then(|v| Decode::decode(&mut &v[..])))
+			.and_then(|v| Decode::decode(&mut &v[..]).ok()))
 }
 
 /// Extract current epoch from runtime.

core/consensus/babe/src/tests.rs

@@ -341,8 +341,8 @@ fn authorities_call_works() {
 
 	assert_eq!(client.info().chain.best_number, 0);
 	assert_eq!(epoch(&client, &BlockId::Number(0)).unwrap().into_regular().unwrap().authorities, vec![
-		(Keyring::Alice.into(), 1),
-		(Keyring::Bob.into(), 1),
-		(Keyring::Charlie.into(), 1),
+		(Keyring::Alice.public().into(), 1),
+		(Keyring::Bob.public().into(), 1),
+		(Keyring::Charlie.public().into(), 1),
 	]);
 }

core/primitives/src/crypto.rs

@@ -18,7 +18,9 @@
 //! Cryptographic utilities.
 // end::description[]
 
-use rstd::convert::{TryFrom, TryInto};
+use rstd::convert::TryFrom;
+#[cfg(feature = "std")]
+use rstd::convert::TryInto;
 #[cfg(feature = "std")]
 use parking_lot::Mutex;
 #[cfg(feature = "std")]

core/test-runtime/src/lib.rs

@@ -25,7 +25,7 @@ pub mod system;
 use rstd::{prelude::*, marker::PhantomData};
 use codec::{Encode, Decode, Input, Error};
 
-use primitives::{Blake2Hasher, OpaqueMetadata};
+use primitives::{Blake2Hasher, OpaqueMetadata, crypto::KeyTypeId};
 use app_crypto::{ed25519, sr25519, RuntimeAppPublic};
 pub use app_crypto;
 use trie_db::{TrieMut, Trie};
@@ -396,11 +396,11 @@ impl srml_babe::Trait for Runtime {
 pub struct DummyKeys;
 
 impl OpaqueKeys for DummyKeys {
-	type KeyTypeIds = ::rstd::iter::Empty<u32>;
+	type KeyTypeIds = ::rstd::iter::Empty<KeyTypeId>;
 
 	fn key_ids() -> Self::KeyTypeIds { ::rstd::iter::empty() }
-	fn get_raw(&self, _: u32) -> &[u8] { unreachable!("never used") }
-	fn get<T: Decode>(&self, _: u32) -> Option<T> { None }
+	fn get_raw(&self, _: KeyTypeId) -> &[u8] { unreachable!("never used") }
+	fn get<T: Decode>(&self, _: KeyTypeId) -> Option<T> { None }
 }
 
 /// Adds one to the given input and returns the final result.

node/executor/src/lib.rs

@@ -331,9 +331,9 @@ mod tests {
 		let mut ext = TestExternalities::new_with_code_with_children(code, GenesisConfig {
 			babe: Some(BabeConfig {
 				authorities: vec![
-					(Sr25519Keyring::Dave.into(), 0),
-					(Sr25519Keyring::Eve.into(), 0),
-					(Sr25519Keyring::Ferdie.into(), 0),
+					(Sr25519Keyring::Dave.public().into(), 0),
+					(Sr25519Keyring::Eve.public().into(), 0),
+					(Sr25519Keyring::Ferdie.public().into(), 0),
 				]
 			}),
 			system: Some(SystemConfig {
@@ -390,7 +390,6 @@ mod tests {
 				current_schedule: Default::default(),
 				gas_price: 1 * MILLICENTS,
 			}),
-			babe: Some(Default::default()),
 			grandpa: Some(GrandpaConfig {
 				authorities: vec![],
 			}),

node/runtime/src/lib.rs

@@ -80,8 +80,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// and set impl_version to equal spec_version. If only runtime
 	// implementation changes and behavior does not, then leave spec_version as
 	// is and increment impl_version.
-	spec_version: 130,
-	impl_version: 129,
+	spec_version: 136,
+	impl_version: 136,
 	apis: RUNTIME_API_VERSIONS,
 };
 

srml/babe/Cargo.toml

@@ -17,12 +17,12 @@ system = { package = "srml-system", path = "../system", default-features = false
 timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false }
 session = { package = "srml-session", path = "../session", default-features = false }
 babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../core/consensus/babe/primitives", default-features = false }
-runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
+runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false, features = [ "wasm-nice-panic-message" ] }
 primitives = { package = "substrate-primitives",  path = "../../core/primitives", default-features = false }
 
 [dev-dependencies]
 lazy_static = "1.3.0"
-parking_lot = "0.8.0"
+parking_lot = "0.9.0"
 
 [features]
 default = ["std"]

srml/babe/src/lib.rs

@@ -183,7 +183,7 @@ decl_storage! {
 			config: &GenesisConfig,
 		| {
 			use primitives::storage::well_known_keys;
-			use sr_primitives::traits::TypedKey;
+			use sr_primitives::AppKey;
 
 			runtime_io::with_storage(storage, || {
 				let mut authorities = config.authorities.clone();
@@ -209,7 +209,7 @@ decl_storage! {
 
 					let session_validators_keys_len = session_validators_keys.len();
 					for (idx, session_validator_keys) in session_validators_keys.into_iter().enumerate() {
-						let session_validator_key = session_validator_keys.1.get(AuthorityId::KEY_TYPE)
+						let session_validator_key = session_validator_keys.1.get(AuthorityId::ID)
 							.expect("Unable to get required key for BABE authority at genesis block");
 						let authority_position = authorities.iter().position(|(a, _)| *a == session_validator_key);
 						match authority_position {
@@ -346,7 +346,7 @@ impl<T: Trait> Module<T> {
 			.iter()
 			.filter_map(|s| s.as_pre_runtime())
 			.filter_map(|(id, mut data)| if id == BABE_ENGINE_ID {
-				RawBabePreDigest::decode(&mut data)
+				RawBabePreDigest::decode(&mut data).ok()
 			} else {
 				None
 			})

srml/membership/src/lib.rs

@@ -66,6 +66,7 @@ decl_storage! {
 		build(|
 			storage: &mut sr_primitives::StorageOverlay,
 			_: &mut sr_primitives::ChildrenStorageOverlay,
+			_: &mut sr_primitives::StorageOverlay,
 			config: &GenesisConfig<T, I>
 		| {
 			sr_io::with_storage(storage, || {

srml/session/src/lib.rs

@@ -325,7 +325,7 @@ decl_storage! {
 			temp_storage: &mut sr_primitives::StorageOverlay,
 			config: &GenesisConfig<T>
 		| {
-			use parity_codec::Encode;
+			use codec::Encode;
 			use primitives::storage::well_known_keys;
 
 			runtime_io::with_storage(storage, || {

srml/support/test/tests/genesisconfig.rs

@@ -15,7 +15,7 @@
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
 pub trait Trait {
-	type BlockNumber: parity_codec::Codec + Default;
+	type BlockNumber: codec::Codec + Default;
 	type Origin;
 }