Merge branch 'release1.2.1'

Author: kami1983

node/res/chain-data-ares-aura-raw.json

@@ -3,7 +3,8 @@
   "id": "gladios",
   "chainType": "Live",
   "bootNodes": [
-    "/ip4/45.77.243.246/tcp/30334/ws/p2p/12D3KooWMqDofvvwRtP7AYSAyJ2udNYrj698wnYJbpjomNTHHK9E"
+    "/ip4/45.77.243.246/tcp/30334/p2p/12D3KooWMqDofvvwRtP7AYSAyJ2udNYrj698wnYJbpjomNTHHK9E",
+    "/ip4/202.182.100.187/tcp/30333/p2p/12D3KooWJnx6f4TLtgHcjwALcKZ8KGho1Qx7jrSowBmfPbBhr82m"
   ],
   "telemetryEndpoints": null,
   "protocolId": "ares",

node/src/chain_spec/ares_genesis.rs

@@ -44,8 +44,9 @@ pub fn authority_keys_from_seed(seed: &str) -> (AccountId, AccountId, AuraId, Gr
     )
 }
 
-fn session_keys(aura: AuraId, grandpa: GrandpaId, ares: AresId) -> SessionKeys {
-    SessionKeys { aura, grandpa, ares }
+fn session_keys(aura: AuraId, grandpa: GrandpaId, ares: AresId, im_online: ImOnlineId) -> SessionKeys {
+    SessionKeys { aura, grandpa, ares, im_online }
+    // SessionKeys { aura, grandpa, ares }
 }
 
 /// Configure initial storage state for FRAME modules.
@@ -95,7 +96,7 @@ pub fn make_ares_genesis(
         session: SessionConfig {
             keys: initial_authorities
                 .iter()
-                .map(|x| (x.0.clone(), x.0.clone(), session_keys(x.2.clone(), x.3.clone(), x.4.clone())))
+                .map(|x| (x.0.clone(), x.0.clone(), session_keys(x.2.clone(), x.3.clone(), x.4.clone(), x.5.clone())))
                 .collect::<Vec<_>>(),
         },
         grandpa: GrandpaConfig {

node/src/cli.rs

@@ -1,5 +1,11 @@
-use sc_cli::RunCmd;
+use sc_cli::{GenericNumber, RunCmd};
 use structopt::StructOpt;
+use std::{fmt::Debug, str::FromStr, sync::Arc};
+use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
+use sc_client_api::{Backend, UsageProvider};
+use sc_cli::{Result, CliConfiguration};
+use sc_cli::{SharedParams, PruningParams};
+use sp_runtime::traits::Zero;
 
 #[derive(Debug, StructOpt)]
 pub struct Cli {
@@ -9,12 +15,6 @@ pub struct Cli {
 	#[structopt(flatten)]
 	pub run: RunCmd,
 
-	// #[structopt(long = "request-base")]
-	// pub request_base: Option<String>,
-	//
-	// #[structopt(long = "ares-keys-file")]
-	// pub ares_keys_file: Option<String>,
-
 	#[structopt(long = "warehouse")]
 	pub warehouse: Option<String>,
 
@@ -47,7 +47,62 @@ pub enum Subcommand {
 	/// Revert the chain to a previous state.
 	Revert(sc_cli::RevertCmd),
 
+	/// Revert the chain to a previous state.
+	ForceRevert(ForceRevertCmd),
+
 	/// The custom benchmark subcommmand benchmarking runtime pallets.
 	#[structopt(name = "benchmark", about = "Benchmark runtime pallets.")]
 	Benchmark(frame_benchmarking_cli::BenchmarkCmd),
 }
+
+
+/// The `revert` command used revert the chain to a previous state.
+#[derive(Debug, StructOpt)]
+pub struct ForceRevertCmd {
+
+	/// Number of blocks to revert.
+	#[structopt(default_value = "256")]
+	pub num: GenericNumber,
+
+	#[allow(missing_docs)]
+	#[structopt(flatten)]
+	pub shared_params: SharedParams,
+
+	#[allow(missing_docs)]
+	#[structopt(flatten)]
+	pub pruning_params: PruningParams,
+}
+
+impl ForceRevertCmd {
+	/// Run the revert command
+	pub async fn run<B, BA, C>(&self, client: Arc<C>, backend: Arc<BA>) -> Result<()>
+		where
+			B: BlockT,
+			BA: Backend<B>,
+			C: UsageProvider<B>,
+			<<<B as BlockT>::Header as HeaderT>::Number as FromStr>::Err: Debug,
+	{
+		let blocks = self.num.parse()?;
+		// let force = self.force.parse().unwrap_or(false);
+		// revert_chain(client, backend, blocks)?;
+		let reverted = backend.revert(blocks, true)?;
+		let info = client.usage_info().chain;
+
+		if reverted.0.is_zero() {
+			log::info!("There aren't any non-finalized blocks to force revert.");
+		} else {
+			log::info!("Force reverted {} blocks. Best: #{} ({})", reverted.0, info.best_number, info.best_hash);
+		}
+		Ok(())
+	}
+}
+
+impl CliConfiguration for ForceRevertCmd {
+	fn shared_params(&self) -> &SharedParams {
+		&self.shared_params
+	}
+
+	fn pruning_params(&self) -> Option<&PruningParams> {
+		Some(&self.pruning_params)
+	}
+}

node/src/command.rs

@@ -214,6 +214,21 @@ pub fn run() -> sc_cli::Result<()> {
 				Ok((cmd.run(client, backend), task_manager))
 			})
 		},
+		Some(Subcommand::ForceRevert(cmd)) => {
+			let runner = cli.create_runner(cmd)?;
+			if runner.config().chain_spec.is_pioneer() {
+				return runner.async_run(|config| {
+					let PartialComponents { client, task_manager, backend, .. } =
+						services::new_partial::<PRuntimeApi, PExecutorDispatch>(&config)?;
+					Ok((cmd.run(client, backend), task_manager))
+				})
+			}
+			runner.async_run(|config| {
+				let PartialComponents { client, task_manager, backend, .. } =
+					services::new_partial::<GRuntimeApi, GExecutorDispatch>(&config)?;
+				Ok((cmd.run(client, backend), task_manager))
+			})
+		},
 		Some(Subcommand::Benchmark(cmd)) =>
 			if cfg!(feature = "runtime-benchmarks") {
 				let runner = cli.create_runner(cmd)?;

runtime/gladios/src/network/part_session.rs

@@ -14,7 +14,7 @@ impl_opaque_keys! {
 		pub aura: Aura,
 		pub grandpa: Grandpa,
 		pub ares: AresOracle,
-		// pub im_online: ImOnline,
+		pub im_online: ImOnline,
 	}
 }