Merge remote-tracking branch 'substrate/master' into chore/bt_127_merge_substrate

* substrate/master: (102 commits)
  Add storage root recalculation time to benchmarks (#5035)
  Lazy reaping (#4895)
  Cargo.toml fixups for the release (#4975)
  Update the documentation for `secp256k1_ecdsa_recover*` (#5019)
  Remove `NetworkSpecialization` (#4665)
  Add tests & Service's Configuration has optional fields that shouldn't be optional (#4842)
  Add gitlab job for publishing draft releases (#5009)
  Removes use of sc_client::Client from sc_consensus_babe (#5014)
  Wait for RPC server to cleanup on shutdown (#5004)
  Open one substream for each notifications protocol (#4909)
  node, node-template: disable GRANDPA observer (#5011)
  Make sure we use libp2p 0.16.1 (#5017)
  aura: remove unneeded SlotDuration struct and rename digest -> digests (#4958)
  babe: directly using append_u64 in transcript instead of to_le_bytes (#5005)
  Un-deprecate ValidateUnsigned (#5003)
  CI: Add example CI job template to .gitlab-ci.yml (#5012)
  Benchmark macro (#4962)
  Remove deprecated API (#4993)
  Unsigned transactions should also note weight (#4998)
  Offchain Workers: Example Pallet (#4989)
  ...

# Conflicts:
#	Cargo.lock
#	bin/node-template/node/src/service.rs
#	bin/node-template/pallets/template/src/mock.rs
#	bin/node-template/runtime/Cargo.toml
#	bin/node-template/runtime/src/lib.rs
#	bin/node/cli/Cargo.toml
#	bin/node/cli/bin/main.rs
#	bin/node/cli/src/service.rs
#	bin/node/cli/tests/common.rs
#	bin/node/cli/tests/purge_chain_works.rs
#	bin/node/cli/tests/running_the_node_and_interrupt.rs
#	bin/node/executor/src/lib.rs
#	bin/node/executor/tests/basic.rs
#	bin/node/executor/tests/fees.rs
#	bin/node/executor/tests/submit_transaction.rs
#	bin/node/runtime/Cargo.toml
#	bin/node/runtime/src/lib.rs
#	bin/node/transaction-factory/src/lib.rs
#	client/cli/src/lib.rs
#	client/cli/src/params.rs
#	client/transaction-pool/src/testing/pool.rs
#	frame/assets/src/lib.rs
#	frame/aura/src/mock.rs
#	frame/authority-discovery/src/lib.rs
#	frame/authorship/src/lib.rs
#	frame/babe/src/mock.rs
#	frame/balances/Cargo.toml
#	frame/balances/src/lib.rs
#	frame/balances/src/mock.rs
#	frame/balances/src/tests.rs
#	frame/balances/src/tests_composite.rs
#	frame/balances/src/tests_local.rs
#	frame/benchmarking/src/lib.rs
#	frame/benchmarking/src/utils.rs
#	frame/collective/src/lib.rs
#	frame/contracts/src/account_db.rs
#	frame/contracts/src/exec.rs
#	frame/contracts/src/lib.rs
#	frame/contracts/src/tests.rs
#	frame/democracy/src/lib.rs
#	frame/elections-phragmen/src/lib.rs
#	frame/elections/src/mock.rs
#	frame/example-offchain-worker/src/tests.rs
#	frame/example/src/lib.rs
#	frame/executive/Cargo.toml
#	frame/executive/src/lib.rs
#	frame/finality-tracker/src/lib.rs
#	frame/generic-asset/src/lib.rs
#	frame/generic-asset/src/mock.rs
#	frame/grandpa/src/mock.rs
#	frame/identity/src/lib.rs
#	frame/im-online/src/mock.rs
#	frame/indices/src/mock.rs
#	frame/membership/src/lib.rs
#	frame/nicks/src/lib.rs
#	frame/offences/src/mock.rs
#	frame/randomness-collective-flip/src/lib.rs
#	frame/recovery/src/lib.rs
#	frame/recovery/src/mock.rs
#	frame/scored-pool/src/mock.rs
#	frame/session/src/mock.rs
#	frame/society/src/mock.rs
#	frame/staking/Cargo.toml
#	frame/staking/src/lib.rs
#	frame/staking/src/mock.rs
#	frame/support/src/storage/migration.rs
#	frame/support/src/traits.rs
#	frame/system/benches/bench.rs
#	frame/system/src/lib.rs
#	frame/system/src/offchain.rs
#	frame/timestamp/src/lib.rs
#	frame/transaction-payment/src/lib.rs
#	frame/treasury/src/lib.rs
#	frame/utility/src/lib.rs
#	frame/vesting/src/lib.rs
#	primitives/runtime/Cargo.toml
#	primitives/runtime/src/testing.rs
#	test-utils/runtime/src/lib.rs
#	utils/frame/benchmarking-cli/src/lib.rs
#	utils/grafana-data-source/test/Cargo.toml

Author: roy-powerfinance

bin/node-template/node/src/service.rs

@@ -160,7 +160,6 @@ pub fn new_full(config: Configuration<GenesisConfig>)
 			on_exit: service.on_exit(),
 			telemetry_on_connect: Some(service.telemetry_on_connect_stream()),
 			voting_rule: grandpa::VotingRulesBuilder::default().build(),
-			executor: service.spawn_task_handle(),
 		};
 
 		// the GRANDPA voter task is considered infallible, i.e.

bin/node-template/pallets/template/src/mock.rs

@@ -39,11 +39,11 @@ impl system::Trait for Test {
 	type AvailableBlockRatio = AvailableBlockRatio;
 	type Version = ();
 	type ModuleToIndex = ();
-	type AccountData = ();
-	type OnNewAccount = ();
-	type OnReapAccount = ();
 	type Doughnut = ();
 	type DelegatedDispatchVerifier = ();
+	type AccountData = ();
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
 }
 impl Trait for Test {
 	type Event = ();

bin/node-template/runtime/src/lib.rs

@@ -171,7 +171,7 @@ impl system::Trait for Runtime {
 	/// What to do if a new account is created.
 	type OnNewAccount = ();
 	/// What to do if an account is fully reaped from the system.
-	type OnReapAccount = Balances;
+	type OnKilledAccount = ();
 	/// The data to be stored in an account.
 	type AccountData = balances::AccountData<Balance>;
 }

bin/node/cli/src/chain_spec.rs

@@ -239,7 +239,7 @@ pub fn testnet_genesis(
 		}),
 		pallet_session: Some(SessionConfig {
 			keys: initial_authorities.iter().map(|x| {
-				(x.0.clone(), session_keys(x.2.clone(), x.3.clone(), x.4.clone(), x.5.clone()))
+				(x.0.clone(), x.0.clone(), session_keys(x.2.clone(), x.3.clone(), x.4.clone(), x.5.clone()))
 			}).collect::<Vec<_>>(),
 		}),
 		pallet_staking: Some(StakingConfig {

bin/node/cli/src/service.rs

@@ -228,7 +228,6 @@ macro_rules! new_full {
 				on_exit: service.on_exit(),
 				telemetry_on_connect: Some(service.telemetry_on_connect_stream()),
 				voting_rule: grandpa::VotingRulesBuilder::default().build(),
-				executor: service.spawn_task_handle(),
 			};
 
 			// the GRANDPA voter task is considered infallible, i.e.

bin/node/cli/tests/common.rs

@@ -60,5 +60,5 @@ pub fn run_command_for_a_while(base_path: &Path, dev: bool) {
 
 	// Stop the process
 	kill(Pid::from_raw(cmd.id().try_into().unwrap()), SIGINT).unwrap();
-	assert!(wait_for(&mut cmd, 20).map(|x| x.success()).unwrap_or_default());
+	assert!(wait_for(&mut cmd, 40).map(|x| x.success()).unwrap_or_default());
 }

bin/node/cli/tests/purge_chain_works.rs

@@ -17,6 +17,7 @@
 use assert_cmd::cargo::cargo_bin;
 use std::process::Command;
 use tempfile::tempdir;
+use std::fs;
 
 mod common;
 

bin/node/cli/tests/running_the_node_and_interrupt.rs

@@ -28,7 +28,7 @@ fn running_the_node_works_and_can_be_interrupted() {
 
 	fn run_command_and_kill(signal: Signal) {
 		let base_path = tempdir().expect("could not create a temp dir");
-		let mut cmd = Command::new(cargo_bin("plug"))
+		let mut cmd = Command::new(cargo_bin("substrate"))
 			.args(&["--dev", "-d"])
 			.arg(base_path.path())
 			.spawn()
@@ -43,9 +43,8 @@ fn running_the_node_works_and_can_be_interrupted() {
 			"the process must exit gracefully after signal {}",
 			signal,
 		);
-		let _ = fs::remove_dir_all("interrupt_test");
 	}
 
 	run_command_and_kill(SIGINT);
 	run_command_and_kill(SIGTERM);
-}
+}

bin/node/executor/src/lib.rs

@@ -27,5 +27,4 @@ native_executor_instance!(
 	node_runtime::api::dispatch,
 	node_runtime::native_version,
 	frame_benchmarking::benchmarking::HostFunctions,
-	sp_io::benchmarking::HostFunctions,
 );

bin/node/executor/tests/basic.rs

@@ -166,7 +166,7 @@ fn panic_execution_with_foreign_code_gives_error() {
 	let mut t = TestExternalities::<Blake2Hasher>::new_with_code(BLOATY_CODE, Storage {
 		top: map![
 			<frame_system::Account<Runtime>>::hashed_key_for(alice()) => {
-				(69u128, 0u128, 0u128, 0u128).encode()
+				(69u128, 0u8, 0u128, 0u128, 0u128).encode()
 			},
 			<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec() => {
 				69_u128.encode()
@@ -202,7 +202,7 @@ fn bad_extrinsic_with_native_equivalent_code_gives_error() {
 	let mut t = TestExternalities::<Blake2Hasher>::new_with_code(COMPACT_CODE, Storage {
 		top: map![
 			<frame_system::Account<Runtime>>::hashed_key_for(alice()) => {
-				(0u32, 69u128, 0u128, 0u128, 0u128).encode()
+				(0u32, 0u8, 69u128, 0u128, 0u128, 0u128).encode()
 			},
 			<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec() => {
 				69_u128.encode()
@@ -238,7 +238,7 @@ fn successful_execution_with_native_equivalent_code_gives_ok() {
 	let mut t = TestExternalities::<Blake2Hasher>::new_with_code(COMPACT_CODE, Storage {
 		top: map![
 			<frame_system::Account<Runtime>>::hashed_key_for(alice()) => {
-				(0u32, 111 * DOLLARS, 0u128, 0u128, 0u128).encode()
+				(0u32, 0u8, 111 * DOLLARS, 0u128, 0u128, 0u128).encode()
 			},
 			<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec() => {
 				(111 * DOLLARS).encode()
@@ -280,7 +280,7 @@ fn successful_execution_with_foreign_code_gives_ok() {
 	let mut t = TestExternalities::<Blake2Hasher>::new_with_code(BLOATY_CODE, Storage {
 		top: map![
 			<frame_system::Account<Runtime>>::hashed_key_for(alice()) => {
-				(0u32, 111 * DOLLARS, 0u128, 0u128, 0u128).encode()
+				(0u32, 0u8, 111 * DOLLARS, 0u128, 0u128, 0u128).encode()
 			},
 			<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec() => {
 				(111 * DOLLARS).encode()
@@ -736,7 +736,7 @@ fn successful_execution_gives_ok() {
 	let mut t = TestExternalities::<Blake2Hasher>::new_with_code(COMPACT_CODE, Storage {
 		top: map![
 			<frame_system::Account<Runtime>>::hashed_key_for(alice()) => {
-				(0u32, 111 * DOLLARS, 0u128, 0u128, 0u128).encode()
+				(0u32, 0u8, 111 * DOLLARS, 0u128, 0u128, 0u128).encode()
 			},
 			<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec() => {
 				(111 * DOLLARS).encode()

bin/node/executor/tests/fees.rs

@@ -139,10 +139,10 @@ fn transaction_fee_is_correct_ultimate() {
 	let mut t = TestExternalities::<Blake2Hasher>::new_with_code(COMPACT_CODE, Storage {
 		top: map![
 			<frame_system::Account<Runtime>>::hashed_key_for(alice()) => {
-				(0u32, 100 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS).encode()
+				(0u32, 0u8, 100 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS).encode()
 			},
 			<frame_system::Account<Runtime>>::hashed_key_for(bob()) => {
-				(0u32, 10 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS).encode()
+				(0u32, 0u8, 10 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS, 0 * DOLLARS).encode()
 			},
 			<pallet_balances::TotalIssuance<Runtime>>::hashed_key().to_vec() => {
 				(110 * DOLLARS).encode()

bin/node/executor/tests/submit_transaction.rs

@@ -167,8 +167,9 @@ fn submitted_transaction_should_be_valid() {
 		// add balance to the account
 		let author = extrinsic.signature.clone().unwrap().0;
 		let address = Indices::lookup(author).unwrap();
-		let account = pallet_balances::AccountData { free: 5_000_000_000_000, ..Default::default() };
-		<frame_system::Account<Runtime>>::insert(&address, (0u32, account));
+		let data = pallet_balances::AccountData { free: 5_000_000_000_000, ..Default::default() };
+		let account = frame_system::AccountInfo { nonce: 0u32, refcount: 0u8, data };
+		<frame_system::Account<Runtime>>::insert(&address, account);
 
 		// check validity
 		let res = Executive::validate_transaction(extrinsic);

bin/node/runtime/src/lib.rs

@@ -31,8 +31,7 @@ pub use node_primitives::{AccountId, Signature};
 use node_primitives::{AccountIndex, Balance, BlockNumber, Hash, Index, Moment};
 use sp_api::impl_runtime_apis;
 use sp_runtime::{
-	Permill, Perbill, Percent, ApplyExtrinsicResult, BenchmarkResults,
-	impl_opaque_keys, generic, create_runtime_str,
+	Permill, Perbill, Percent, ApplyExtrinsicResult, impl_opaque_keys, generic, create_runtime_str,
 };
 use sp_runtime::curve::PiecewiseLinear;
 use sp_runtime::transaction_validity::TransactionValidity;
@@ -134,7 +133,7 @@ impl frame_system::Trait for Runtime {
 	type ModuleToIndex = ModuleToIndex;
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
-	type OnReapAccount = (Balances, Staking, Contracts, Session, Recovery);
+	type OnKilledAccount = ();
 }
 
 parameter_types! {
@@ -830,29 +829,26 @@ impl_runtime_apis! {
 			SessionKeys::decode_into_raw_public_keys(&encoded)
 		}
 	}
-	impl crate::Benchmark<Block> for Runtime {
-		fn dispatch_benchmark(module: Vec<u8>, extrinsic: Vec<u8>, steps: u32, repeat: u32)
-			-> Option<Vec<frame_benchmarking::BenchmarkResults>>
-		{
+
+	impl frame_benchmarking::Benchmark<Block> for Runtime {
+		fn dispatch_benchmark(
+			module: Vec<u8>,
+			extrinsic: Vec<u8>,
+			steps: u32,
+			repeat: u32,
+		) -> Option<Vec<frame_benchmarking::BenchmarkResults>> {
 			use frame_benchmarking::Benchmarking;
+
 			match module.as_slice() {
 				b"pallet-balances" | b"balances" => Balances::run_benchmark(extrinsic, steps, repeat).ok(),
 				b"pallet-identity" | b"identity" => Identity::run_benchmark(extrinsic, steps, repeat).ok(),
 				b"pallet-timestamp" | b"timestamp" => Timestamp::run_benchmark(extrinsic, steps, repeat).ok(),
-				_ => return None,
+				_ => None,
 			}
 		}
 	}
 }
 
-sp_api::decl_runtime_apis! {
-	pub trait Benchmark
-	{
-		fn dispatch_benchmark(module: Vec<u8>, extrinsic: Vec<u8>, steps: u32, repeat: u32)
-			-> Option<Vec<BenchmarkResults>>;
-	}
-}
-
 #[cfg(test)]
 mod tests {
 	use super::*;

bin/node/testing/src/genesis.rs

@@ -69,15 +69,15 @@ pub fn config_endowed(
 		}),
 		pallet_session: Some(SessionConfig {
 			keys: vec![
-				(alice(), to_session_keys(
+				(dave(), alice(), to_session_keys(
 					&Ed25519Keyring::Alice,
 					&Sr25519Keyring::Alice,
 				)),
-				(bob(), to_session_keys(
+				(eve(), bob(), to_session_keys(
 					&Ed25519Keyring::Bob,
 					&Sr25519Keyring::Bob,
 				)),
-				(charlie(), to_session_keys(
+				(ferdie(), charlie(), to_session_keys(
 					&Ed25519Keyring::Charlie,
 					&Sr25519Keyring::Charlie,
 				)),

bin/node/transaction-factory/src/lib.rs

@@ -156,20 +156,7 @@ where
 		best_hash = block.header().hash();
 		best_block_id = BlockId::<Block>::hash(best_hash);
 
-		let mut import = BlockImportParams {
-			origin: BlockOrigin::File,
-			header: block.header().clone(),
-			post_digests: Vec::new(),
-			body: Some(block.extrinsics().to_vec()),
-			storage_changes: None,
-			finalized: false,
-			justification: None,
-			auxiliary: Vec::new(),
-			intermediates: Default::default(),
-			fork_choice: Some(ForkChoiceStrategy::LongestChain),
-			allow_missing_state: false,
-			import_existing: false,
-		};
+		let mut import = BlockImportParams::new(BlockOrigin::File, block.header().clone());
 		import.body = Some(block.extrinsics().to_vec());
 		import.fork_choice = Some(ForkChoiceStrategy::LongestChain);
 		client.clone().import_block(import, HashMap::new()).expect("Failed to import block");

client/cli/src/lib.rs

@@ -20,9 +20,8 @@
 #![warn(unused_extern_crates)]
 
 mod params;
-mod execution_strategy;
-pub mod error;
 mod arg_enums;
+mod error;
 mod runtime;
 mod commands;