Add session key types for new consensus implementation to Dolphin and Calamari (Nimbus Stage 0)

.github/workflows/run_linters.yml

@@ -71,7 +71,7 @@ jobs:
           curl -s https://sh.rustup.rs -sSf | sh -s -- -y
           source ${HOME}/.cargo/env
           rustup toolchain install nightly
-          rustup default nightly
+          rustup default nightly-2022-07-10-x86_64-unknown-linux-gnu
           cargo install taplo-cli
       - name: Run yamllint
         uses: actionshub/yamllint@main

CHANGELOG.md

@@ -7,6 +7,7 @@
 
 ### Features
 - [\#576](https://github.com/Manta-Network/Manta/pull/576) Unfilter xtokens.transfer_multicurrencies and bump MaxAssetsForTransfer to 2.
+- [\#646](https://github.com/Manta-Network/Manta/pull/646) Add collator session keys for future nimbus consensus and a vrf placeholder
 
 ### Improvements
 - [\#449](https://github.com/Manta-Network/Manta/pull/449) Remove strip from CI, and add strip profile to production.

Cargo.toml

@@ -6,7 +6,8 @@ members = [
   'runtime/calamari',
   'runtime/dolphin',
   'runtime/common',
-  'primitives',
+  'primitives/manta',
+  'primitives/session-keys',
 ]
 resolver = "2"
 

node/Cargo.toml

@@ -46,7 +46,7 @@ sc-network = { git = "https://github.com/paritytech/substrate.git", branch = "po
 sc-rpc = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" }
 sc-rpc-api = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" }
 sc-service = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" }
-sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
+sc-sysinfo = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.22" }
 sc-telemetry = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" }
 sc-tracing = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" }
 sc-transaction-pool = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" }
@@ -91,9 +91,10 @@ xcm = { git = "https://github.com/paritytech/polkadot.git", branch = "release-v0
 # Self dependencies
 calamari-runtime = { path = '../runtime/calamari' }
 dolphin-runtime = { path = '../runtime/dolphin' }
-manta-primitives = { path = '../primitives' }
+manta-primitives = { path = '../primitives/manta' }
 manta-runtime = { path = '../runtime/manta' }
 pallet-manta-pay = { path = '../pallets/manta-pay', features = ["rpc", "runtime"] }
+session-key-primitives = { path = '../primitives/session-keys' }
 
 [build-dependencies]
 substrate-build-script-utils = { git = 'https://github.com/paritytech/substrate.git', branch = "polkadot-v0.9.22" }

node/src/chain_specs/calamari.rs

@@ -18,8 +18,10 @@
 
 use super::*;
 use crate::command::CALAMARI_PARACHAIN_ID;
-use calamari_runtime::{CouncilConfig, DemocracyConfig, GenesisConfig, TechnicalCommitteeConfig};
-use manta_primitives::helpers::{get_account_id_from_seed, get_collator_keys_from_seed};
+use calamari_runtime::{
+    opaque::SessionKeys, CouncilConfig, DemocracyConfig, GenesisConfig, TechnicalCommitteeConfig,
+};
+use session_key_primitives::helpers::{get_account_id_from_seed, get_collator_keys_from_seed};
 
 /// Calamari Protocol Identifier
 pub const CALAMARI_PROTOCOL_ID: &str = "calamari";
@@ -39,8 +41,12 @@ pub type CalamariChainSpec = sc_service::GenericChainSpec<GenesisConfig, Extensi
 /// Generate the calamari session keys from individual elements.
 ///
 /// The input must be a tuple of individual keys (a single arg for now since we have just one key).
-pub fn calamari_session_keys(keys: AuraId) -> calamari_runtime::opaque::SessionKeys {
-    calamari_runtime::opaque::SessionKeys { aura: keys }
+pub fn calamari_session_keys(keys: AuraId) -> SessionKeys {
+    SessionKeys {
+        aura: keys.clone(),
+        nimbus: session_key_primitives::nimbus::dummy_key_from(keys.clone()),
+        vrf: session_key_primitives::vrf::dummy_key_from(keys),
+    }
 }
 
 /// Returns the [`Properties`] for the Calamari parachain.
@@ -65,7 +71,7 @@ pub fn calamari_development_config() -> CalamariChainSpec {
             calamari_dev_genesis(
                 vec![(
                     get_account_id_from_seed::<sr25519::Public>("Alice"),
-                    get_collator_keys_from_seed("Alice"),
+                    SessionKeys::new(get_collator_keys_from_seed("Alice")).aura,
                 )],
                 vec![
                     get_account_id_from_seed::<sr25519::Public>("Alice"),
@@ -98,23 +104,23 @@ pub fn calamari_local_config() -> CalamariChainSpec {
                 vec![
                     (
                         get_account_id_from_seed::<sr25519::Public>("Alice"),
-                        get_collator_keys_from_seed("Alice"),
+                        SessionKeys::new(get_collator_keys_from_seed("Alice")).aura,
                     ),
                     (
                         get_account_id_from_seed::<sr25519::Public>("Bob"),
-                        get_collator_keys_from_seed("Bob"),
+                        SessionKeys::new(get_collator_keys_from_seed("Bob")).aura,
                     ),
                     (
                         get_account_id_from_seed::<sr25519::Public>("Charlie"),
-                        get_collator_keys_from_seed("Charlie"),
+                        SessionKeys::new(get_collator_keys_from_seed("Charlie")).aura,
                     ),
                     (
                         get_account_id_from_seed::<sr25519::Public>("Dave"),
-                        get_collator_keys_from_seed("Dave"),
+                        SessionKeys::new(get_collator_keys_from_seed("Dave")).aura,
                     ),
                     (
                         get_account_id_from_seed::<sr25519::Public>("Eve"),
-                        get_collator_keys_from_seed("Eve"),
+                        SessionKeys::new(get_collator_keys_from_seed("Eve")).aura,
                     ),
                 ],
                 vec![

node/src/chain_specs/dolphin.rs

@@ -18,8 +18,10 @@
 
 use super::*;
 use crate::command::DOLPHIN_PARACHAIN_ID;
-use dolphin_runtime::{CouncilConfig, DemocracyConfig, GenesisConfig, TechnicalCommitteeConfig};
-use manta_primitives::helpers::{get_account_id_from_seed, get_collator_keys_from_seed};
+use dolphin_runtime::{
+    opaque::SessionKeys, CouncilConfig, DemocracyConfig, GenesisConfig, TechnicalCommitteeConfig,
+};
+use session_key_primitives::helpers::{get_account_id_from_seed, get_collator_keys_from_seed};
 
 /// Dolphin Protocol Identifier
 pub const DOLPHIN_PROTOCOL_ID: &str = "dolphin";
@@ -39,8 +41,12 @@ pub type DolphinChainSpec = sc_service::GenericChainSpec<GenesisConfig, Extensio
 /// Generate the dolphin session keys from individual elements.
 ///
 /// The input must be a tuple of individual keys (a single arg for now since we have just one key).
-pub fn dolphin_session_keys(keys: AuraId) -> dolphin_runtime::opaque::SessionKeys {
-    dolphin_runtime::opaque::SessionKeys { aura: keys }
+pub fn dolphin_session_keys(keys: AuraId) -> SessionKeys {
+    SessionKeys {
+        aura: keys.clone(),
+        nimbus: session_key_primitives::nimbus::dummy_key_from(keys.clone()),
+        vrf: session_key_primitives::vrf::dummy_key_from(keys),
+    }
 }
 
 /// Returns the [`Properties`] for the Dolphin parachain.
@@ -62,7 +68,7 @@ pub fn dolphin_development_config() -> DolphinChainSpec {
             dolphin_dev_genesis(
                 vec![(
                     get_account_id_from_seed::<sr25519::Public>("Alice"),
-                    get_collator_keys_from_seed("Alice"),
+                    SessionKeys::new(get_collator_keys_from_seed("Alice")).aura,
                 )],
                 get_account_id_from_seed::<sr25519::Public>("Alice"),
                 vec![
@@ -96,23 +102,23 @@ pub fn dolphin_local_config() -> DolphinChainSpec {
                 vec![
                     (
                         get_account_id_from_seed::<sr25519::Public>("Alice"),
-                        get_collator_keys_from_seed("Alice"),
+                        SessionKeys::new(get_collator_keys_from_seed("Alice")).aura,
                     ),
                     (
                         get_account_id_from_seed::<sr25519::Public>("Bob"),
-                        get_collator_keys_from_seed("Bob"),
+                        SessionKeys::new(get_collator_keys_from_seed("Bob")).aura,
                     ),
                     (
                         get_account_id_from_seed::<sr25519::Public>("Charlie"),
-                        get_collator_keys_from_seed("Charlie"),
+                        SessionKeys::new(get_collator_keys_from_seed("Charlie")).aura,
                     ),
                     (
                         get_account_id_from_seed::<sr25519::Public>("Dave"),
-                        get_collator_keys_from_seed("Dave"),
+                        SessionKeys::new(get_collator_keys_from_seed("Dave")).aura,
                     ),
                     (
                         get_account_id_from_seed::<sr25519::Public>("Eve"),
-                        get_collator_keys_from_seed("Eve"),
+                        SessionKeys::new(get_collator_keys_from_seed("Eve")).aura,
                     ),
                 ],
                 get_account_id_from_seed::<sr25519::Public>("Alice"),

node/src/chain_specs/manta.rs

@@ -18,8 +18,8 @@
 
 use super::*;
 use crate::command::MANTA_PARACHAIN_ID;
-use manta_primitives::helpers::{get_account_id_from_seed, get_collator_keys_from_seed};
-
+use manta_runtime::opaque::SessionKeys;
+use session_key_primitives::helpers::{get_account_id_from_seed, get_collator_keys_from_seed};
 /// Manta Protocol Identifier
 pub const MANTA_PROTOCOL_ID: &str = "manta";
 
@@ -38,8 +38,8 @@ pub type MantaChainSpec = sc_service::GenericChainSpec<manta_runtime::GenesisCon
 /// Generate the manta session keys from individual elements.
 ///
 /// The input must be a tuple of individual keys (a single arg for now since we have just one key).
-pub fn manta_session_keys(keys: AuraId) -> manta_runtime::opaque::SessionKeys {
-    manta_runtime::opaque::SessionKeys { aura: keys }
+pub fn manta_session_keys(keys: AuraId) -> SessionKeys {
+    SessionKeys { aura: keys }
 }
 
 /// Returns the [`Properties`] for the Manta parachain.
@@ -61,7 +61,7 @@ pub fn manta_development_config() -> MantaChainSpec {
             manta_dev_genesis(
                 vec![(
                     get_account_id_from_seed::<sr25519::Public>("Alice"),
-                    get_collator_keys_from_seed("Alice"),
+                    get_collator_keys_from_seed("Alice").0,
                 )],
                 get_account_id_from_seed::<sr25519::Public>("Alice"),
                 vec![
@@ -95,11 +95,11 @@ pub fn manta_local_config() -> MantaChainSpec {
                 vec![
                     (
                         get_account_id_from_seed::<sr25519::Public>("Alice"),
-                        get_collator_keys_from_seed("Alice"),
+                        get_collator_keys_from_seed("Alice").0,
                     ),
                     (
                         get_account_id_from_seed::<sr25519::Public>("Bob"),
-                        get_collator_keys_from_seed("Bob"),
+                        get_collator_keys_from_seed("Bob").0,
                     ),
                 ],
                 get_account_id_from_seed::<sr25519::Public>("Alice"),

node/src/chain_specs/mod.rs

@@ -23,11 +23,12 @@
 
 use manta_primitives::{
     constants,
-    types::{AccountId, AuraId, Balance},
+    types::{AccountId, Balance},
 };
 use sc_chain_spec::{ChainSpecExtension, ChainSpecGroup};
 use sc_service::{ChainType, Properties};
 use serde::{Deserialize, Serialize};
+use session_key_primitives::AuraId;
 use sp_core::sr25519;
 
 pub mod calamari;

node/src/command.rs

@@ -25,16 +25,16 @@ use crate::{
 use codec::Encode;
 use cumulus_client_service::genesis::generate_genesis_block;
 use cumulus_primitives_core::ParaId;
-use log::info;
-
 use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE};
-use manta_primitives::types::{AuraId, Header};
+use log::info;
+use manta_primitives::types::Header;
 use polkadot_parachain::primitives::AccountIdConversion;
 use sc_cli::{
     ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,
     NetworkParams, RuntimeVersion, SharedParams, SubstrateCli,
 };
 use sc_service::config::{BasePath, PrometheusConfig};
+use session_key_primitives::AuraId;
 use sp_core::hexdisplay::HexDisplay;
 use sp_runtime::{generic, traits::Block as BlockT, OpaqueExtrinsic};
 use std::{io::Write, net::SocketAddr};