From b15a56972b4da5818c4ad83f64d222764520ec6a Mon Sep 17 00:00:00 2001
From: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com>
Date: Tue, 18 Jul 2023 12:58:08 +0200
Subject: [PATCH] `chain-spec`: `polkadot_staging_testnet` config removed
(#7509)
* chain-spec: polkadot_staging_testnet config removed
The config has empty initial authority test. It is unusable.
```
$ polkadot export-blocks --chain polkadot-staging --from=0 --to=0
...
Thread 'main' panicked at 'Empty validator set for session 0 in genesis block!',
/home/miszka/.cargo/git/checkouts/substrate-7e08433d4c370a21/c446786/frame/session/src/lib.rs:463
```
* warning fix
---
polkadot/cli/src/command.rs | 2 -
polkadot/node/service/src/chain_spec.rs | 117 ------------------------
2 files changed, 119 deletions(-)
diff --git a/polkadot/cli/src/command.rs b/polkadot/cli/src/command.rs
index 6184a834923..8697f999b54 100644
--- a/polkadot/cli/src/command.rs
+++ b/polkadot/cli/src/command.rs
@@ -105,8 +105,6 @@ impl SubstrateCli for Cli {
"polkadot-dev" | "dev" => Box::new(service::chain_spec::polkadot_development_config()?),
#[cfg(feature = "polkadot-native")]
"polkadot-local" => Box::new(service::chain_spec::polkadot_local_testnet_config()?),
- #[cfg(feature = "polkadot-native")]
- "polkadot-staging" => Box::new(service::chain_spec::polkadot_staging_testnet_config()?),
"rococo" => Box::new(service::chain_spec::rococo_config()?),
#[cfg(feature = "rococo-native")]
"rococo-dev" => Box::new(service::chain_spec::rococo_development_config()?),
diff --git a/polkadot/node/service/src/chain_spec.rs b/polkadot/node/service/src/chain_spec.rs
index 1253cd18226..3928b861865 100644
--- a/polkadot/node/service/src/chain_spec.rs
+++ b/polkadot/node/service/src/chain_spec.rs
@@ -70,8 +70,6 @@ use westend_runtime as westend;
#[cfg(feature = "westend-native")]
use westend_runtime_constants::currency::UNITS as WND;
-#[cfg(feature = "polkadot-native")]
-const POLKADOT_STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
#[cfg(feature = "kusama-native")]
const KUSAMA_STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
#[cfg(feature = "westend-native")]
@@ -330,98 +328,6 @@ fn rococo_session_keys(
}
}
-#[cfg(feature = "polkadot-native")]
-fn polkadot_staging_testnet_config_genesis(wasm_binary: &[u8]) -> polkadot::RuntimeGenesisConfig {
- // subkey inspect "$SECRET"
- let endowed_accounts = vec![];
-
- let initial_authorities: Vec<(
- AccountId,
- AccountId,
- BabeId,
- GrandpaId,
- ImOnlineId,
- ValidatorId,
- AssignmentId,
- AuthorityDiscoveryId,
- )> = vec![];
-
- const ENDOWMENT: u128 = 1_000_000 * DOT;
- const STASH: u128 = 100 * DOT;
-
- polkadot::RuntimeGenesisConfig {
- system: polkadot::SystemConfig { code: wasm_binary.to_vec(), ..Default::default() },
- balances: polkadot::BalancesConfig {
- balances: endowed_accounts
- .iter()
- .map(|k: &AccountId| (k.clone(), ENDOWMENT))
- .chain(initial_authorities.iter().map(|x| (x.0.clone(), STASH)))
- .collect(),
- },
- indices: polkadot::IndicesConfig { indices: vec![] },
- session: polkadot::SessionConfig {
- keys: initial_authorities
- .iter()
- .map(|x| {
- (
- x.0.clone(),
- x.0.clone(),
- polkadot_session_keys(
- x.2.clone(),
- x.3.clone(),
- x.4.clone(),
- x.5.clone(),
- x.6.clone(),
- x.7.clone(),
- ),
- )
- })
- .collect::<Vec<_>>(),
- },
- staking: polkadot::StakingConfig {
- validator_count: 50,
- minimum_validator_count: 4,
- stakers: initial_authorities
- .iter()
- .map(|x| (x.0.clone(), x.0.clone(), STASH, polkadot::StakerStatus::Validator))
- .collect(),
- invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(),
- force_era: Forcing::ForceNone,
- slash_reward_fraction: Perbill::from_percent(10),
- ..Default::default()
- },
- phragmen_election: Default::default(),
- democracy: Default::default(),
- council: polkadot::CouncilConfig { members: vec![], phantom: Default::default() },
- technical_committee: polkadot::TechnicalCommitteeConfig {
- members: vec![],
- phantom: Default::default(),
- },
- technical_membership: Default::default(),
- babe: polkadot::BabeConfig {
- authorities: Default::default(),
- epoch_config: Some(polkadot::BABE_GENESIS_EPOCH_CONFIG),
- ..Default::default()
- },
- grandpa: Default::default(),
- im_online: Default::default(),
- authority_discovery: polkadot::AuthorityDiscoveryConfig {
- keys: vec![],
- ..Default::default()
- },
- claims: polkadot::ClaimsConfig { claims: vec![], vesting: vec![] },
- vesting: polkadot::VestingConfig { vesting: vec![] },
- treasury: Default::default(),
- hrmp: Default::default(),
- configuration: polkadot::ConfigurationConfig {
- config: default_parachains_host_configuration(),
- },
- paras: Default::default(),
- xcm_pallet: Default::default(),
- nomination_pools: Default::default(),
- }
-}
-
#[cfg(feature = "westend-native")]
fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::RuntimeGenesisConfig {
use hex_literal::hex;
@@ -1129,29 +1035,6 @@ pub fn polkadot_chain_spec_properties() -> serde_json::map::Map<String, serde_js
.clone()
}
-/// Polkadot staging testnet config.
-#[cfg(feature = "polkadot-native")]
-pub fn polkadot_staging_testnet_config() -> Result<PolkadotChainSpec, String> {
- let wasm_binary = polkadot::WASM_BINARY.ok_or("Polkadot development wasm not available")?;
- let boot_nodes = vec![];
-
- Ok(PolkadotChainSpec::from_genesis(
- "Polkadot Staging Testnet",
- "polkadot_staging_testnet",
- ChainType::Live,
- move || polkadot_staging_testnet_config_genesis(wasm_binary),
- boot_nodes,
- Some(
- TelemetryEndpoints::new(vec![(POLKADOT_STAGING_TELEMETRY_URL.to_string(), 0)])
- .expect("Polkadot Staging telemetry url is valid; qed"),
- ),
- Some(DEFAULT_PROTOCOL_ID),
- None,
- Some(polkadot_chain_spec_properties()),
- Default::default(),
- ))
-}
-
/// Staging testnet config.
#[cfg(feature = "kusama-native")]
pub fn kusama_staging_testnet_config() -> Result<KusamaChainSpec, String> {
--
GitLab