feat(node): add aura authoring (#8)

Adds aura and grandpa support. Closes CHAIN-25.
renlabs-dev · Dec 11, 2024 · f227b68 · f227b68
1 parent a50a7fb
commit f227b68
Show file tree

Hide file tree

Showing 5 changed files with 286 additions and 47 deletions.
diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs
@@ -17,11 +17,10 @@
 
 use polkadot_sdk::{
     sc_service::{ChainType, Properties},
-    sp_keyring::AccountKeyring,
     *,
 };
 use serde_json::{json, Value};
-use torus_runtime::{BalancesConfig, SudoConfig, WASM_BINARY};
+use torus_runtime::WASM_BINARY;
 
 /// This is a specialization of the general Substrate ChainSpec type.
 pub type ChainSpec = sc_service::GenericChainSpec;
@@ -38,8 +37,8 @@ pub fn development_config() -> Result<ChainSpec, String> {
         WASM_BINARY.expect("Development wasm not available"),
         Default::default(),
     )
-    .with_name("Development")
-    .with_id("dev")
+    .with_name("Torus")
+    .with_id("torus")
     .with_chain_type(ChainType::Development)
     .with_genesis_config_patch(testnet_genesis())
     .with_properties(props())
@@ -48,14 +47,32 @@ pub fn development_config() -> Result<ChainSpec, String> {
 
 /// Configure initial storage state for FRAME pallets.
 fn testnet_genesis() -> Value {
-    use polkadot_sdk::polkadot_sdk_frame::traits::Get;
-    use torus_runtime::interface::{Balance, MinimumBalance};
+    use polkadot_sdk::{
+        polkadot_sdk_frame::traits::Get,
+        sp_keyring::{Ed25519Keyring, Sr25519Keyring},
+    };
+
+    use torus_runtime::{
+        interface::{Balance, MinimumBalance},
+        BalancesConfig, SudoConfig,
+    };
+
     let endowment = <MinimumBalance as Get<Balance>>::get().max(1) * 1000;
-    let balances = AccountKeyring::iter()
+    let balances = Sr25519Keyring::iter()
         .map(|a| (a.to_account_id(), endowment))
         .collect::<Vec<_>>();
+
+    let aura = [Sr25519Keyring::Alice, Sr25519Keyring::Bob];
+    let grandpa = [Ed25519Keyring::Alice, Ed25519Keyring::Bob];
+
     json!({
         "balances": BalancesConfig { balances },
-        "sudo": SudoConfig { key: Some(AccountKeyring::Alice.to_account_id()) },
+        "sudo": SudoConfig { key: Some(Sr25519Keyring::Alice.to_account_id()) },
+        "aura": {
+            "authorities": aura.iter().map(|x| (dbg!(x.public().to_string()))).collect::<Vec<_>>(),
+        },
+        "grandpa": {
+            "authorities": grandpa.iter().map(|x| (x.public().to_string(), 1)).collect::<Vec<_>>(),
+        },
     })
 }
diff --git a/node/src/cli.rs b/node/src/cli.rs
@@ -17,8 +17,10 @@
 
 use polkadot_sdk::{sc_cli::RunCmd, *};
 
-#[derive(Debug, Clone)]
+#[derive(Clone, Copy, Debug, Default)]
 pub enum Consensus {
+    #[default]
+    Aura,
     ManualSeal(u64),
     InstantSeal,
 }
@@ -27,7 +29,9 @@ impl std::str::FromStr for Consensus {
     type Err = String;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Ok(if s == "instant-seal" {
+        Ok(if s == "aura" {
+            Consensus::Aura
+        } else if s == "instant-seal" {
             Consensus::InstantSeal
         } else if let Some(block_time) = s.strip_prefix("manual-seal-") {
             Consensus::ManualSeal(block_time.parse().map_err(|_| "invalid block time")?)
@@ -42,7 +46,7 @@ pub struct Cli {
     #[command(subcommand)]
     pub subcommand: Option<Subcommand>,
 
-    #[clap(long, default_value = "manual-seal-3000")]
+    #[clap(long, default_value = "aura")]
     pub consensus: Consensus,
 
     #[clap(flatten)]

diff --git a/node/src/command.rs b/node/src/command.rs
@@ -75,7 +75,7 @@ pub fn run() -> sc_cli::Result<()> {
                     task_manager,
                     import_queue,
                     ..
-                } = service::new_partial(&config)?;
+                } = service::new_partial(&config, Default::default())?;
                 Ok((cmd.run(client, import_queue), task_manager))
             })
         }
@@ -86,7 +86,7 @@ pub fn run() -> sc_cli::Result<()> {
                     client,
                     task_manager,
                     ..
-                } = service::new_partial(&config)?;
+                } = service::new_partial(&config, Default::default())?;
                 Ok((cmd.run(client, config.database), task_manager))
             })
         }
@@ -97,7 +97,7 @@ pub fn run() -> sc_cli::Result<()> {
                     client,
                     task_manager,
                     ..
-                } = service::new_partial(&config)?;
+                } = service::new_partial(&config, Default::default())?;
                 Ok((cmd.run(client, config.chain_spec), task_manager))
             })
         }
@@ -109,7 +109,7 @@ pub fn run() -> sc_cli::Result<()> {
                     task_manager,
                     import_queue,
                     ..
-                } = service::new_partial(&config)?;
+                } = service::new_partial(&config, Default::default())?;
                 Ok((cmd.run(client, import_queue), task_manager))
             })
         }
@@ -125,7 +125,7 @@ pub fn run() -> sc_cli::Result<()> {
                     task_manager,
                     backend,
                     ..
-                } = service::new_partial(&config)?;
+                } = service::new_partial(&config, Default::default())?;
                 Ok((cmd.run(client, backend, None), task_manager))
             })
         }