release v1.3.0 - rc1 (#973)

* restore role key

* cleanup

* clippy

* cleanup

* bump versions

* clippy

* clippy

Author: 1xstj

Cargo.lock

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "1.2.19"
+version = "1.3.0"
 authors = ["Tangle Foundation."]
 edition = "2021"
 license = "Unlicense"

Cargo.toml

@@ -36,8 +36,8 @@ use sp_runtime::{
 };
 use tangle_primitives::types::{BlockNumber, Signature};
 use tangle_runtime::{
-	AccountId, Balance, MaxVestingSchedules, Perbill, Precompiles, StakerStatus, TreasuryPalletId,
-	UNIT, WASM_BINARY,
+	AccountId, Balance, MaxVestingSchedules, Perbill, Precompiles, RoleKeyId, StakerStatus,
+	TreasuryPalletId, UNIT, WASM_BINARY,
 };
 
 /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type.
@@ -61,12 +61,15 @@ where
 }
 
 /// Generate an babe authority key.
-pub fn authority_keys_from_seed(stash: &str) -> (AccountId, BabeId, GrandpaId, ImOnlineId) {
+pub fn authority_keys_from_seed(
+	stash: &str,
+) -> (AccountId, BabeId, GrandpaId, ImOnlineId, RoleKeyId) {
 	(
 		get_account_id_from_seed::<sr25519::Public>(stash),
 		get_from_seed::<BabeId>(stash),
 		get_from_seed::<GrandpaId>(stash),
 		get_from_seed::<ImOnlineId>(stash),
+		get_from_seed::<RoleKeyId>(stash),
 	)
 }
 
@@ -78,8 +81,9 @@ fn generate_session_keys(
 	babe: BabeId,
 	grandpa: GrandpaId,
 	im_online: ImOnlineId,
+	role: RoleKeyId,
 ) -> tangle_runtime::opaque::SessionKeys {
-	tangle_runtime::opaque::SessionKeys { babe, grandpa, im_online }
+	tangle_runtime::opaque::SessionKeys { babe, grandpa, im_online, role }
 }
 
 pub fn local_mainnet_config(chain_id: u64) -> Result<ChainSpec, String> {
@@ -170,7 +174,7 @@ pub fn tangle_mainnet_config(chain_id: u64) -> Result<ChainSpec, String> {
 
 #[allow(clippy::too_many_arguments)]
 fn mainnet_genesis(
-	initial_authorities: Vec<(AccountId, BabeId, GrandpaId, ImOnlineId)>,
+	initial_authorities: Vec<(AccountId, BabeId, GrandpaId, ImOnlineId, RoleKeyId)>,
 	endowed_accounts: Vec<(AccountId, Balance)>,
 	root_key: AccountId,
 	chain_id: u64,
@@ -249,7 +253,7 @@ fn mainnet_genesis(
 			(
 				x.0.clone(),
 				x.0.clone(),
-				generate_session_keys(x.1.clone(), x.2.clone(), x.3.clone()),
+				generate_session_keys(x.1.clone(), x.2.clone(), x.3.clone(), x.4.clone()),
 			)
 				})
 				.collect::<Vec<_>>()

node/src/chainspec/mainnet.rs

@@ -272,6 +272,13 @@ pub fn get_initial_endowed_accounts(
 	endowed_accounts.push((root_account, 5000 * UNIT)); // root key gets 5000 tokens for transactions
 
 	let initial_authorities = get_initial_authorities();
+
+	#[cfg(not(feature = "testnet"))]
+	for (acco, _, _, _, _) in initial_authorities.iter() {
+		endowed_accounts.push((acco.clone(), 100 * UNIT));
+	}
+
+	#[cfg(feature = "testnet")]
 	for (acco, _, _, _) in initial_authorities.iter() {
 		endowed_accounts.push((acco.clone(), 100 * UNIT));
 	}

node/src/distributions/mainnet.rs

@@ -20,6 +20,7 @@ use sc_consensus_grandpa::AuthorityId as GrandpaId;
 use sc_network::config::MultiaddrWithPeerId;
 use sp_consensus_babe::AuthorityId as BabeId;
 use sp_core::crypto::UncheckedInto;
+use tangle_crypto_primitives::crypto::AuthorityId as RoleKeyId;
 use tangle_runtime::AccountId;
 
 /// Mainnet root key
@@ -52,7 +53,7 @@ pub fn get_bootnodes() -> Vec<MultiaddrWithPeerId> {
 }
 
 /// Tangle runtime initial authorities
-pub fn get_initial_authorities() -> Vec<(AccountId, BabeId, GrandpaId, ImOnlineId)> {
+pub fn get_initial_authorities() -> Vec<(AccountId, BabeId, GrandpaId, ImOnlineId, RoleKeyId)> {
 	vec![
 		// tangle 1
 		(
@@ -63,6 +64,8 @@ pub fn get_initial_authorities() -> Vec<(AccountId, BabeId, GrandpaId, ImOnlineI
 				.unchecked_into(),
 			hex!["1261548c9de1476e4e8e06e9dddd543ebbd7504ae502ac91a0eb8b6037334372"]
 				.unchecked_into(),
+			hex!["02320ab70b215ed1d37748d2aadae924ddb1e6042598ae9c2479684f0913cc15ae"]
+				.unchecked_into(),
 		),
 		// tangle 2
 		(
@@ -73,6 +76,8 @@ pub fn get_initial_authorities() -> Vec<(AccountId, BabeId, GrandpaId, ImOnlineI
 				.unchecked_into(),
 			hex!["7c04e33631ff7ae0a453827c82c4b69179e72612f982c4d9b45393f25b4f5f48"]
 				.unchecked_into(),
+			hex!["026fa903a87d7e0e262e5c70d6dffecca3f5262f05096a1c5bcd477e8ea63813ad"]
+				.unchecked_into(),
 		),
 		// tangle 3
 		(
@@ -83,6 +88,8 @@ pub fn get_initial_authorities() -> Vec<(AccountId, BabeId, GrandpaId, ImOnlineI
 				.unchecked_into(),
 			hex!["7842e1623d6a19cd267ad9b926ddb81a27c6aedc4cab58e99cd0ac3e2a53a762"]
 				.unchecked_into(),
+			hex!["02c876f99aa4361e7e81eb96ff325833452efb6eed6ae43abfbbed4106ac556829"]
+				.unchecked_into(),
 		),
 		// tangle 4
 		(
@@ -93,6 +100,8 @@ pub fn get_initial_authorities() -> Vec<(AccountId, BabeId, GrandpaId, ImOnlineI
 				.unchecked_into(),
 			hex!["c0fc962bcbc623e343d0dddf9915f9c269dced366283e76e6302612d5172281d"]
 				.unchecked_into(),
+			hex!["03d1198468f5ba4f67d155a576d5b2b2823265616b7669000eab08bca538d8c34c"]
+				.unchecked_into(),
 		),
 		// tangle 5
 		(
@@ -103,6 +112,8 @@ pub fn get_initial_authorities() -> Vec<(AccountId, BabeId, GrandpaId, ImOnlineI
 				.unchecked_into(),
 			hex!["cebebb5bf58a2a989bf8827d7360f04057835e42141162bfa17f3d12dde96a59"]
 				.unchecked_into(),
+			hex!["02596bcb7dfc93455d1e7bf93aa874d481590b37af0d43598506f9ed8609086ba0"]
+				.unchecked_into(),
 		),
 		// snowflake
 		(
@@ -113,6 +124,8 @@ pub fn get_initial_authorities() -> Vec<(AccountId, BabeId, GrandpaId, ImOnlineI
 				.unchecked_into(),
 			hex!["12fd766a9916d23c125c8b2f61b3fb9d68ecaa0dea2c4119aa5d1980dbe0c442"]
 				.unchecked_into(),
+			hex!["03ace29a9b62f4aee605b74a7b44624b9d96570cd70aa5d4d6f771d5824889038b"]
+				.unchecked_into(),
 		),
 		// trident
 		(
@@ -123,6 +136,8 @@ pub fn get_initial_authorities() -> Vec<(AccountId, BabeId, GrandpaId, ImOnlineI
 				.unchecked_into(),
 			hex!["7c623a93a6691ecc211ea709f8eb606e2c9af5ac413b2cab88e54c2d4391872a"]
 				.unchecked_into(),
+			hex!["020acb5833e9cace29f9f94feaff71ecd854bc79c0646ef7c2a46700313b9e83c7"]
+				.unchecked_into(),
 		),
 	]
 }

node/src/mainnet_fixtures.rs

@@ -69,7 +69,7 @@ pallet-evm-precompile-balances-erc20 = { workspace = true }
 pallet-evm-precompileset-assets-erc20 = { workspace = true }
 
 precompile-utils = { workspace = true }
-
+tangle-crypto-primitives = { workspace = true }
 pallet-session = { workspace = true }
 pallet-staking = { workspace = true }
 pallet-multi-asset-delegation = { workspace = true }
@@ -122,6 +122,7 @@ std = [
  "pallet-evm-precompile-ed25519/std",
  "precompile-utils/std",
  "serde/std",
+ "tangle-crypto-primitives/std",
 ]
 try-runtime = ["frame-support/try-runtime"]
 runtime-benchmarks = [

pallets/services/Cargo.toml

@@ -1,5 +1,6 @@
 use super::*;
 use crate::types::BalanceOf;
+use frame_support::traits::OneSessionHandler;
 use sp_std::{vec, vec::Vec};
 use tangle_primitives::{services::Constraints, traits::ServiceManager, BlueprintId};
 
@@ -127,3 +128,34 @@ impl<T: crate::Config, Balance: Default>
 		None
 	}
 }
+
+impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Pallet<T> {
+	type Public = T::RoleKeyId;
+}
+
+impl<T: Config> OneSessionHandler<T::AccountId> for Pallet<T> {
+	type Key = T::RoleKeyId;
+
+	#[allow(clippy::multiple_bound_locations)]
+	fn on_genesis_session<'a, I: 'a>(_validators: I)
+	where
+		I: Iterator<Item = (&'a T::AccountId, T::RoleKeyId)>,
+	{
+	}
+
+	#[allow(clippy::multiple_bound_locations)]
+	fn on_new_session<'a, I: 'a>(_changed: bool, _validators: I, _queued_validators: I)
+	where
+		I: Iterator<Item = (&'a T::AccountId, T::RoleKeyId)>,
+	{
+	}
+
+	fn on_disabled(_i: u32) {
+		// ignore
+	}
+
+	// Distribute the inflation rewards
+	fn on_before_session_ending() {
+		// ignore
+	}
+}