Refactor key management (#3296)

* Add Call type to extensible transactions.

Cleanup some naming

* Merge Resource and BlockExhausted into just Exhausted

* Fix

* Another fix

* Call

* Some fixes

* Fix srml tests.

* Fix all tests.

* Refactor crypto so each application of it has its own type.

* Introduce new AuthorityProvider API into Aura

This will eventually allow for dynamic determination of authority
keys and avoid having to set them directly on CLI.

* Introduce authority determinator for Babe.

Experiment with modular consensus API.

* Work in progress to introduce KeyTypeId and avoid polluting API
with validator IDs

* Finish up drafting imonline

* Rework offchain workers API.

* Rework API implementation.

* Make it compile for wasm, simplify app_crypto.

* Fix compilation of im-online.

* Fix compilation of im-online.

* Fix more compilation errors.

* Make it compile.

* Fixing tests.

* Rewrite `keystore`

* Fix session tests

* Bring back `TryFrom`'s'

* Fix `srml-grandpa`

* Fix `srml-aura`

* Fix consensus babe

* More fixes

* Make service generate keys from dev_seed

* Build fixes

* Remove offchain tests

* More fixes and cleanups

* Fixes finality grandpa

* Fix `consensus-aura`

* Fix cli

* Fix `node-cli`

* Fix chain_spec builder

* Fix doc tests

* Add authority getter for grandpa.

* Test fix

* Fixes

* Make keystore accessible from the runtime

* Move app crypto to its own crate

* Update `Cargo.lock`

* Make the crypto stuff usable from the runtime

* Adds some runtime crypto tests

* Use last finalized block for grandpa authority

* Fix warning

* Adds `SessionKeys` runtime api

* Remove `FinalityPair` and `ConsensusPair`

* Minor governance tweaks to get it inline with docs.

* Make the governance be up to date with the docs.

* Build fixes.

* Generate the inital session keys

* Failing keystore is a hard error

* Make babe work again

* Fix grandpa

* Fix tests

* Disable `keystore` in consensus critical stuff

* Build fix.

* ImOnline supports multiple authorities at once.

* Update core/application-crypto/src/ed25519.rs

* Merge branch 'master' into gav-in-progress

* Remove unneeded code for now.

* Some `session` testing

* Support querying the public keys

* Cleanup offchain

* Remove warnings

* More cleanup

* Apply suggestions from code review

Co-Authored-By: Benjamin Kampmann <ben.kampmann@googlemail.com>

* More cleanups

* JSONRPC API for setting keys.

Also, rename traits::KeyStore* -> traits::BareCryptoStore*

* Bad merge

* Fix integration tests

* Fix test build

* Test fix

* Fixes

* Warnings

* Another warning

* Bump version.

substrate/core/consensus/babe/src/tests.rs

@@ -20,7 +20,9 @@
 // https://github.com/paritytech/substrate/issues/2532
 #![allow(deprecated)]
 use super::*;
+use super::generic::DigestItem;
 
+use babe_primitives::AuthorityPair;
 use client::{LongestChain, block_builder::BlockBuilder};
 use consensus_common::NoNetwork as DummyOracle;
 use network::test::*;
@@ -29,7 +31,6 @@ use sr_primitives::traits::{Block as BlockT, DigestFor};
 use network::config::ProtocolConfig;
 use tokio::runtime::current_thread;
 use keyring::sr25519::Keyring;
-use super::generic::DigestItem;
 use client::BlockchainEvents;
 use test_client;
 use log::debug;
@@ -183,15 +184,21 @@ fn run_one_test() {
 	let net = BabeTestNet::new(3);
 
 	let peers = &[
-		(0, Keyring::Alice),
-		(1, Keyring::Bob),
-		(2, Keyring::Charlie),
+		(0, "//Alice"),
+		(1, "//Bob"),
+		(2, "//Charlie"),
 	];
 
 	let net = Arc::new(Mutex::new(net));
 	let mut import_notifications = Vec::new();
 	let mut runtime = current_thread::Runtime::new().unwrap();
-	for (peer_id, key) in peers {
+	let mut keystore_paths = Vec::new();
+	for (peer_id, seed) in peers {
+		let keystore_path = tempfile::tempdir().expect("Creates keystore path");
+		let keystore = keystore::Store::open(keystore_path.path(), None).expect("Creates keystore");
+		keystore.write().insert_ephemeral_from_seed::<AuthorityPair>(seed).expect("Generates authority key");
+		keystore_paths.push(keystore_path);
+
 		let client = net.lock().peer(*peer_id).client().as_full().unwrap();
 		let environ = DummyFactory(client.clone());
 		import_notifications.push(
@@ -200,21 +207,18 @@ fn run_one_test() {
 				.for_each(move |_| future::ready(()))
 		);
 
-		let config = Config::get_or_compute(&*client)
-			.expect("slot duration available");
+		let config = Config::get_or_compute(&*client).expect("slot duration available");
 
 		let inherent_data_providers = InherentDataProviders::new();
 		register_babe_inherent_data_provider(
 			&inherent_data_providers, config.get()
 		).expect("Registers babe inherent data provider");
 
-
 		#[allow(deprecated)]
 		let select_chain = LongestChain::new(client.backend().clone());
 
 		runtime.spawn(start_babe(BabeParams {
 			config,
-			local_key: Arc::new(key.clone().into()),
 			block_import: client.clone(),
 			select_chain,
 			client,
@@ -223,6 +227,7 @@ fn run_one_test() {
 			inherent_data_providers,
 			force_authoring: false,
 			time_source: Default::default(),
+			keystore,
 		}).expect("Starts babe"));
 	}
 
@@ -230,7 +235,7 @@ fn run_one_test() {
 		net.lock().poll();
 		Ok::<_, ()>(futures01::Async::NotReady::<()>)
 	}));
-	
+
 	runtime.block_on(future::join_all(import_notifications)
 		.map(|_| Ok::<(), ()>(())).compat()).unwrap();
 }
@@ -280,8 +285,8 @@ fn rejects_missing_consensus_digests() {
 #[test]
 fn wrong_consensus_engine_id_rejected() {
 	let _ = env_logger::try_init();
-	let sig = sr25519::Pair::generate().0.sign(b"");
-	let bad_seal: Item = DigestItem::Seal([0; 4], sig.0.to_vec());
+	let sig = AuthorityPair::generate().0.sign(b"");
+	let bad_seal: Item = DigestItem::Seal([0; 4], sig.to_vec());
 	assert!(bad_seal.as_babe_pre_digest().is_none());
 	assert!(bad_seal.as_babe_seal().is_none())
 }
@@ -296,8 +301,8 @@ fn malformed_pre_digest_rejected() {
 #[test]
 fn sig_is_not_pre_digest() {
 	let _ = env_logger::try_init();
-	let sig = sr25519::Pair::generate().0.sign(b"");
-	let bad_seal: Item = DigestItem::Seal(BABE_ENGINE_ID, sig.0.to_vec());
+	let sig = AuthorityPair::generate().0.sign(b"");
+	let bad_seal: Item = DigestItem::Seal(BABE_ENGINE_ID, sig.to_vec());
 	assert!(bad_seal.as_babe_pre_digest().is_none());
 	assert!(bad_seal.as_babe_seal().is_some())
 }
@@ -305,7 +310,11 @@ fn sig_is_not_pre_digest() {
 #[test]
 fn can_author_block() {
 	let _ = env_logger::try_init();
-	let (pair, _) = sr25519::Pair::generate();
+	let keystore_path = tempfile::tempdir().expect("Creates keystore path");
+	let keystore = keystore::Store::open(keystore_path.path(), None).expect("Creates keystore");
+	let pair = keystore.write().insert_ephemeral_from_seed::<AuthorityPair>("//Alice")
+		.expect("Generates authority pair");
+
 	let mut i = 0;
 	let epoch = Epoch {
 		start_slot: 0,
@@ -315,10 +324,10 @@ fn can_author_block() {
 		duration: 100,
 	};
 	loop {
-		match claim_slot(i, epoch.clone(), &pair, (3, 10)) {
+		match claim_slot(i, epoch.clone(), (3, 10), &keystore) {
 			None => i += 1,
 			Some(s) => {
-				debug!(target: "babe", "Authored block {:?}", s);
+				debug!(target: "babe", "Authored block {:?}", s.0);
 				break
 			}
 		}
@@ -332,8 +341,8 @@ fn authorities_call_works() {
 
 	assert_eq!(client.info().chain.best_number, 0);
 	assert_eq!(epoch(&client, &BlockId::Number(0)).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),
 	]);
 }