Merge pull request #19 from mangata-finance/feature/charleth

Charleth support

substrate/client/basic-authorship-ver/src/basic_authorship.rs

@@ -520,7 +520,8 @@ where
 		// there might be some txs comming in that time - so its better to sleep than
 		// shortening remaining time
 		debug!(target: LOG_TARGET, "sleeping by the end of the slot");
-		first_slot_limit.await;
+		//TODO: figure out better fix
+		// first_slot_limit.await;
 
 		// artificially simulate that block is half filled
 		// also include header & proof cost for the second part to make sure

substrate/client/cli/src/commands/run_cmd.rs

@@ -149,44 +149,48 @@ pub struct RunCmd {
 	pub keystore_params: KeystoreParams,
 
 	/// Shortcut for `--name Alice --validator` with session keys for `Alice` added to keystore.
-	#[arg(long, conflicts_with_all = &["alice", "bob", "charlie", "dave", "eve", "ferdie", "one", "two"])]
+	#[arg(long, conflicts_with_all = &["alice", "bob", "charlie", "dave", "eve", "ferdie", "one", "two", "baltathar", "charleth"])]
 	pub alith: bool,
 
 	/// Shortcut for `--name Bob --validator` with session keys for `Bob` added to keystore.
-	#[arg(long, conflicts_with_all = &["alice", "bob", "charlie", "dave", "eve", "ferdie", "one", "two"])]
+	#[arg(long, conflicts_with_all = &["alice", "bob", "charlie", "dave", "eve", "ferdie", "one", "two", "alith", "charleth"])]
+	pub baltathar: bool,
+
+	/// Shortcut for `--name Bob --validator` with session keys for `Bob` added to keystore.
+	#[arg(long, conflicts_with_all = &["alice", "bob", "charlie", "dave", "eve", "ferdie", "one", "two", "alith", "charleth"])]
 	pub baltathar: bool,
 
 	/// Shortcut for `--name Alice --validator` with session keys for `Alice` added to keystore.
-	#[arg(long, conflicts_with_all = &["bob", "charlie", "dave", "eve", "ferdie", "one", "two", "alith", "baltathar"])]
+	#[arg(long, conflicts_with_all = &["bob", "charlie", "dave", "eve", "ferdie", "one", "two", "alith", "baltathar", "charleth"])]
 	pub alice: bool,
 
 	/// Shortcut for `--name Bob --validator` with session keys for `Bob` added to keystore.
-	#[arg(long, conflicts_with_all = &["alice", "charlie", "dave", "eve", "ferdie", "one", "two", "alith", "baltathar"])]
+	#[arg(long, conflicts_with_all = &["alice", "charlie", "dave", "eve", "ferdie", "one", "two", "alith", "baltathar", "charleth"])]
 	pub bob: bool,
 
 	/// Shortcut for `--name Charlie --validator` with session keys for `Charlie` added to
 	/// keystore.
-	#[arg(long, conflicts_with_all = &["alice", "bob", "dave", "eve", "ferdie", "one", "two", "alith", "baltathar"])]
+	#[arg(long, conflicts_with_all = &["alice", "bob", "dave", "eve", "ferdie", "one", "two", "alith", "baltathar", "charleth"])]
 	pub charlie: bool,
 
 	/// Shortcut for `--name Dave --validator` with session keys for `Dave` added to keystore.
-	#[arg(long, conflicts_with_all = &["alice", "bob", "charlie", "eve", "ferdie", "one", "two", "alith", "baltathar"])]
+	#[arg(long, conflicts_with_all = &["alice", "bob", "charlie", "eve", "ferdie", "one", "two", "alith", "baltathar", "charleth"])]
 	pub dave: bool,
 
 	/// Shortcut for `--name Eve --validator` with session keys for `Eve` added to keystore.
-	#[arg(long, conflicts_with_all = &["alice", "bob", "charlie", "dave", "ferdie", "one", "two", "alith", "baltathar"])]
+	#[arg(long, conflicts_with_all = &["alice", "bob", "charlie", "dave", "ferdie", "one", "two", "alith", "baltathar", "charleth"])]
 	pub eve: bool,
 
 	/// Shortcut for `--name Ferdie --validator` with session keys for `Ferdie` added to keystore.
-	#[arg(long, conflicts_with_all = &["alice", "bob", "charlie", "dave", "eve", "one", "two", "alith", "baltathar"])]
+	#[arg(long, conflicts_with_all = &["alice", "bob", "charlie", "dave", "eve", "one", "two", "alith", "baltathar", "charleth"])]
 	pub ferdie: bool,
 
 	/// Shortcut for `--name One --validator` with session keys for `One` added to keystore.
-	#[arg(long, conflicts_with_all = &["alice", "bob", "charlie", "dave", "eve", "ferdie", "two", "alith", "baltathar"])]
+	#[arg(long, conflicts_with_all = &["alice", "bob", "charlie", "dave", "eve", "ferdie", "two", "alith", "baltathar", "charleth"])]
 	pub one: bool,
 
 	/// Shortcut for `--name Two --validator` with session keys for `Two` added to keystore.
-	#[arg(long, conflicts_with_all = &["alice", "bob", "charlie", "dave", "eve", "ferdie", "one", "alith", "baltathar"])]
+	#[arg(long, conflicts_with_all = &["alice", "bob", "charlie", "dave", "eve", "ferdie", "one", "alith", "baltathar", "charleth"])]
 	pub two: bool,
 
 	/// Enable authoring even when offline.
@@ -212,6 +216,8 @@ impl RunCmd {
 			Some(Alith)
 		} else if self.baltathar {
 			Some(Baltathar)
+		} else if self.charleth {
+			Some(Charleth)
 		} else if self.alice {
 			Some(Alice)
 		} else if self.bob {

substrate/primitives/keyring/src/ed25519.rs

@@ -39,6 +39,7 @@ pub enum Keyring {
 	Two,
 	Alith,
 	Baltathar,
+	Charleth,
 }
 
 impl Keyring {
@@ -110,6 +111,7 @@ impl From<Keyring> for &'static str {
 			Keyring::Two => "Two",
 			Keyring::Alith => "Alith",
 			Keyring::Baltathar => "Baltathar",
+			Keyring::Charleth => "Charleth,
 		}
 	}
 }

substrate/primitives/keyring/src/sr25519.rs

@@ -39,6 +39,7 @@ pub enum Keyring {
 	Two,
 	Alith,
 	Baltathar,
+	Charleth,
 }
 
 impl Keyring {
@@ -120,6 +121,7 @@ impl From<Keyring> for &'static str {
 			Keyring::Two => "Two",
 			Keyring::Alith => "Alith",
 			Keyring::Baltathar => "Baltathar",
+			Keyring::Charleth => "Charleth",
 		}
 	}
 }
@@ -154,6 +156,7 @@ impl std::str::FromStr for Keyring {
 			"two" => Ok(Keyring::Two),
 			"Alith" => Ok(Keyring::Alith),
 			"Baltathar" => Ok(Keyring::Baltathar),
+			"Charleth" => Ok(Keyring::Charleth),
 			_ => Err(ParseKeyringError),
 		}
 	}