Prepare stuff for Kusama (i.e. disable most things) (#362)

* Prepare stuff for Kusama (i.e. disable most things)

* Fix service (hopefully)

* Remove curated grandpa.

* Block unwanted transactions a cleaner way.

* Add feature for restricting tx types

* Cleanups

* Make blocktime 1/10th of normal

* Fix ordering in construct_runtime

* Restore original timing

* Revert name change
This commit is contained in:
Gavin Wood
2019-08-13 20:36:27 +02:00
committed by GitHub
parent 10fc88f6b1
commit 7bd46ffbcb
9 changed files with 151 additions and 197 deletions
+4 -7
View File
@@ -21,7 +21,7 @@ use polkadot_primitives::{AccountId, parachain::ValidatorId};
use polkadot_runtime::{
GenesisConfig, CouncilConfig, ElectionsConfig, DemocracyConfig, SystemConfig, BabeConfig,
SessionConfig, StakingConfig, BalancesConfig, Perbill, SessionKeys, TechnicalCommitteeConfig,
GrandpaConfig, SudoConfig, IndicesConfig, CuratedGrandpaConfig, StakerStatus, WASM_BINARY,
GrandpaConfig, SudoConfig, IndicesConfig, StakerStatus, WASM_BINARY,
ClaimsConfig, ImOnlineConfig, ParachainsConfig
};
use polkadot_runtime::constants::{currency::DOTS, time::*};
@@ -30,6 +30,7 @@ use hex_literal::hex;
use babe_primitives::AuthorityId as BabeId;
use grandpa::AuthorityId as GrandpaId;
use im_online::AuthorityId as ImOnlineId;
use srml_staking::Forcing;
const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
const DEFAULT_PROTOCOL_ID: &str = "dot";
@@ -125,6 +126,7 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
minimum_validator_count: 4,
stakers: initial_authorities.iter().map(|x| (x.0.clone(), x.1.clone(), STASH, StakerStatus::Validator)).collect(),
invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(),
force_era: Forcing::ForceNone,
}),
democracy: Some(Default::default()),
collective_Instance1: Some(CouncilConfig {
@@ -160,9 +162,6 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
sudo: Some(SudoConfig {
key: endowed_accounts[0].clone(),
}),
curated_grandpa: Some(CuratedGrandpaConfig {
shuffle_period: 1024,
}),
claims: Some(ClaimsConfig {
claims: vec![],
})
@@ -267,6 +266,7 @@ pub fn testnet_genesis(
.map(|x| (x.0.clone(), x.1.clone(), STASH, StakerStatus::Validator))
.collect(),
invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(),
force_era: Forcing::NotForcing,
}),
democracy: Some(DemocracyConfig::default()),
collective_Instance1: Some(CouncilConfig {
@@ -306,9 +306,6 @@ pub fn testnet_genesis(
sudo: Some(SudoConfig {
key: root_key,
}),
curated_grandpa: Some(CuratedGrandpaConfig {
shuffle_period: 1024,
}),
claims: Some(ClaimsConfig {
claims: vec![],
})