Skip to content
GitLab
Unverified Commit 500d90c4 authored by Bastian Köcher's avatar Bastian Köcher Committed by GitHub
Browse files

Substrate companion #8275 (#2575) 

* Substrate companion #8275

https://github.com/paritytech/substrate/pull/8275

* "Update Substrate"

Co-authored-by: parity-processbot <>
parent dde26544
Pipeline #127152 passed with stages
in 32 minutes and 59 seconds
Expand all Hide whitespace changes
Inline Side-by-side
Cargo.lock
View file @ 500d90c4
This diff is collapsed.
node/service/src/chain_spec.rs
View file @ 500d90c4
......@@ -200,19 +200,19 @@ fn polkadot_staging_testnet_config_genesis(wasm_binary: &[u8]) -> polkadot::Gene
const STASH: u128 = 100 * DOTS;
polkadot::GenesisConfig {
frame_system: Some(polkadot::SystemConfig {
frame_system: polkadot::SystemConfig {
code: wasm_binary.to_vec(),
changes_trie_config: Default::default(),
}),
pallet_balances: Some(polkadot::BalancesConfig {
},
pallet_balances: polkadot::BalancesConfig {
balances: endowed_accounts
.iter()
.map(|k: &AccountId| (k.clone(), ENDOWMENT))
.chain(initial_authorities.iter().map(|x| (x.0.clone(), STASH)))
.collect(),
}),
pallet_indices: Some(polkadot::IndicesConfig { indices: vec![] }),
pallet_session: Some(polkadot::SessionConfig {
},
pallet_indices: polkadot::IndicesConfig { indices: vec![] },
pallet_session: polkadot::SessionConfig {
keys: initial_authorities
.iter()
.map(|x| {
......@@ -230,8 +230,8 @@ fn polkadot_staging_testnet_config_genesis(wasm_binary: &[u8]) -> polkadot::Gene
)
})
.collect::<Vec<_>>(),
}),
pallet_staking: Some(polkadot::StakingConfig {
},
pallet_staking: polkadot::StakingConfig {
validator_count: 50,
minimum_validator_count: 4,
stakers: initial_authorities
......@@ -249,28 +249,28 @@ fn polkadot_staging_testnet_config_genesis(wasm_binary: &[u8]) -> polkadot::Gene
force_era: Forcing::ForceNone,
slash_reward_fraction: Perbill::from_percent(10),
..Default::default()
}),
pallet_elections_phragmen: Some(Default::default()),
pallet_democracy: Some(Default::default()),
pallet_collective_Instance1: Some(polkadot::CouncilConfig {
},
pallet_elections_phragmen: Default::default(),
pallet_democracy: Default::default(),
pallet_collective_Instance1: polkadot::CouncilConfig {
members: vec![],
phantom: Default::default(),
}),
pallet_collective_Instance2: Some(polkadot::TechnicalCommitteeConfig {
},
pallet_collective_Instance2: polkadot::TechnicalCommitteeConfig {
members: vec![],
phantom: Default::default(),
}),
pallet_membership_Instance1: Some(Default::default()),
pallet_babe: Some(Default::default()),
pallet_grandpa: Some(Default::default()),
pallet_im_online: Some(Default::default()),
pallet_authority_discovery: Some(polkadot::AuthorityDiscoveryConfig { keys: vec![] }),
claims: Some(polkadot::ClaimsConfig {
},
pallet_membership_Instance1: Default::default(),
pallet_babe: Default::default(),
pallet_grandpa: Default::default(),
pallet_im_online: Default::default(),
pallet_authority_discovery: polkadot::AuthorityDiscoveryConfig { keys: vec![] },
claims: polkadot::ClaimsConfig {
claims: vec![],
vesting: vec![],
}),
pallet_vesting: Some(polkadot::VestingConfig { vesting: vec![] }),
pallet_treasury: Some(Default::default()),
},
pallet_vesting: polkadot::VestingConfig { vesting: vec![] },
pallet_treasury: Default::default(),
}
}
......@@ -398,19 +398,19 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Genesi
const STASH: u128 = 100 * WND;
westend::GenesisConfig {
frame_system: Some(westend::SystemConfig {
frame_system: westend::SystemConfig {
code: wasm_binary.to_vec(),
changes_trie_config: Default::default(),
}),
pallet_balances: Some(westend::BalancesConfig {
},
pallet_balances: westend::BalancesConfig {
balances: endowed_accounts
.iter()
.map(|k: &AccountId| (k.clone(), ENDOWMENT))
.chain(initial_authorities.iter().map(|x| (x.0.clone(), STASH)))
.collect(),
}),
pallet_indices: Some(westend::IndicesConfig { indices: vec![] }),
pallet_session: Some(westend::SessionConfig {
},
pallet_indices: westend::IndicesConfig { indices: vec![] },
pallet_session: westend::SessionConfig {
keys: initial_authorities
.iter()
.map(|x| {
......@@ -428,8 +428,8 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Genesi
)
})
.collect::<Vec<_>>(),
}),
pallet_staking: Some(westend::StakingConfig {
},
pallet_staking: westend::StakingConfig {
validator_count: 50,
minimum_validator_count: 4,
stakers: initial_authorities
......@@ -447,15 +447,15 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Genesi
force_era: Forcing::ForceNone,
slash_reward_fraction: Perbill::from_percent(10),
..Default::default()
}),
pallet_babe: Some(Default::default()),
pallet_grandpa: Some(Default::default()),
pallet_im_online: Some(Default::default()),
pallet_authority_discovery: Some(westend::AuthorityDiscoveryConfig { keys: vec![] }),
pallet_vesting: Some(westend::VestingConfig { vesting: vec![] }),
pallet_sudo: Some(westend::SudoConfig {
},
pallet_babe: Default::default(),
pallet_grandpa: Default::default(),
pallet_im_online: Default::default(),
pallet_authority_discovery: westend::AuthorityDiscoveryConfig { keys: vec![] },
pallet_vesting: westend::VestingConfig { vesting: vec![] },
pallet_sudo: westend::SudoConfig {
key: endowed_accounts[0].clone(),
}),
},
}
}
......@@ -583,19 +583,19 @@ fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisC
const STASH: u128 = 100 * KSM;
kusama::GenesisConfig {
frame_system: Some(kusama::SystemConfig {
frame_system: kusama::SystemConfig {
code: wasm_binary.to_vec(),
changes_trie_config: Default::default(),
}),
pallet_balances: Some(kusama::BalancesConfig {
},
pallet_balances: kusama::BalancesConfig {
balances: endowed_accounts
.iter()
.map(|k: &AccountId| (k.clone(), ENDOWMENT))
.chain(initial_authorities.iter().map(|x| (x.0.clone(), STASH)))
.collect(),
}),
pallet_indices: Some(kusama::IndicesConfig { indices: vec![] }),
pallet_session: Some(kusama::SessionConfig {
},
pallet_indices: kusama::IndicesConfig { indices: vec![] },
pallet_session: kusama::SessionConfig {
keys: initial_authorities
.iter()
.map(|x| {
......@@ -613,8 +613,8 @@ fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisC
)
})
.collect::<Vec<_>>(),
}),
pallet_staking: Some(kusama::StakingConfig {
},
pallet_staking: kusama::StakingConfig {
validator_count: 50,
minimum_validator_count: 4,
stakers: initial_authorities
......@@ -632,28 +632,28 @@ fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisC
force_era: Forcing::ForceNone,
slash_reward_fraction: Perbill::from_percent(10),
..Default::default()
}),
pallet_elections_phragmen: Some(Default::default()),
pallet_democracy: Some(Default::default()),
pallet_collective_Instance1: Some(kusama::CouncilConfig {
},
pallet_elections_phragmen: Default::default(),
pallet_democracy: Default::default(),
pallet_collective_Instance1: kusama::CouncilConfig {
members: vec![],
phantom: Default::default(),
}),
pallet_collective_Instance2: Some(kusama::TechnicalCommitteeConfig {
},
pallet_collective_Instance2: kusama::TechnicalCommitteeConfig {
members: vec![],
phantom: Default::default(),
}),
pallet_membership_Instance1: Some(Default::default()),
pallet_babe: Some(Default::default()),
pallet_grandpa: Some(Default::default()),
pallet_im_online: Some(Default::default()),
pallet_authority_discovery: Some(kusama::AuthorityDiscoveryConfig { keys: vec![] }),
claims: Some(kusama::ClaimsConfig {
},
pallet_membership_Instance1: Default::default(),
pallet_babe: Default::default(),
pallet_grandpa: Default::default(),
pallet_im_online: Default::default(),
pallet_authority_discovery: kusama::AuthorityDiscoveryConfig { keys: vec![] },
claims: kusama::ClaimsConfig {
claims: vec![],
vesting: vec![],
}),
pallet_vesting: Some(kusama::VestingConfig { vesting: vec![] }),
pallet_treasury: Some(Default::default()),
},
pallet_vesting: kusama::VestingConfig { vesting: vec![] },
pallet_treasury: Default::default(),
}
}
......@@ -823,20 +823,20 @@ fn rococo_staging_testnet_config_genesis(wasm_binary: &[u8]) -> rococo_runtime::
const STASH: u128 = 100 * ROC;
rococo_runtime::GenesisConfig {
frame_system: Some(rococo_runtime::SystemConfig {
frame_system: rococo_runtime::SystemConfig {
code: wasm_binary.to_vec(),
changes_trie_config: Default::default(),
}),
pallet_balances: Some(rococo_runtime::BalancesConfig {
},
pallet_balances: rococo_runtime::BalancesConfig {
balances: endowed_accounts.iter()
.map(|k: &AccountId| (k.clone(), ENDOWMENT))
.chain(initial_authorities.iter().map(|x| (x.0.clone(), STASH)))
.collect(),
}),
pallet_indices: Some(rococo_runtime::IndicesConfig {
},
pallet_indices: rococo_runtime::IndicesConfig {
indices: vec![],
}),
pallet_session: Some(rococo_runtime::SessionConfig {
},
pallet_session: rococo_runtime::SessionConfig {
keys: initial_authorities.iter().map(|x| (
x.0.clone(),
x.0.clone(),
......@@ -849,17 +849,17 @@ fn rococo_staging_testnet_config_genesis(wasm_binary: &[u8]) -> rococo_runtime::
x.7.clone(),
),
)).collect::<Vec<_>>(),
}),
pallet_babe: Some(Default::default()),
pallet_grandpa: Some(Default::default()),
pallet_im_online: Some(Default::default()),
pallet_authority_discovery: Some(rococo_runtime::AuthorityDiscoveryConfig {
},
pallet_babe: Default::default(),
pallet_grandpa: Default::default(),
pallet_im_online: Default::default(),
pallet_authority_discovery: rococo_runtime::AuthorityDiscoveryConfig {
keys: vec![],
}),
pallet_sudo: Some(rococo_runtime::SudoConfig {
},
pallet_sudo: rococo_runtime::SudoConfig {
key: endowed_accounts[0].clone(),
}),
parachains_configuration: Some(rococo_runtime::ParachainsConfigurationConfig {
},
parachains_configuration: rococo_runtime::ParachainsConfigurationConfig {
config: polkadot_runtime_parachains::configuration::HostConfiguration {
validation_upgrade_frequency: 600u32,
validation_upgrade_delay: 300,
......@@ -900,7 +900,7 @@ fn rococo_staging_testnet_config_genesis(wasm_binary: &[u8]) -> rococo_runtime::
zeroth_delay_tranche_width: 0,
..Default::default()
},
}),
},
}
}
......@@ -1070,18 +1070,18 @@ pub fn polkadot_testnet_genesis(
const STASH: u128 = 100 * DOTS;
polkadot::GenesisConfig {
frame_system: Some(polkadot::SystemConfig {
frame_system: polkadot::SystemConfig {
code: wasm_binary.to_vec(),
changes_trie_config: Default::default(),
}),
pallet_indices: Some(polkadot::IndicesConfig { indices: vec![] }),
pallet_balances: Some(polkadot::BalancesConfig {
},
pallet_indices: polkadot::IndicesConfig { indices: vec![] },
pallet_balances: polkadot::BalancesConfig {
balances: endowed_accounts
.iter()
.map(|k| (k.clone(), ENDOWMENT))
.collect(),
}),
pallet_session: Some(polkadot::SessionConfig {
},
pallet_session: polkadot::SessionConfig {
keys: initial_authorities
.iter()
.map(|x| {
......@@ -1099,8 +1099,8 @@ pub fn polkadot_testnet_genesis(
)
})
.collect::<Vec<_>>(),
}),
pallet_staking: Some(polkadot::StakingConfig {
},
pallet_staking: polkadot::StakingConfig {
minimum_validator_count: 1,
validator_count: 2,
stakers: initial_authorities
......@@ -1118,28 +1118,28 @@ pub fn polkadot_testnet_genesis(
force_era: Forcing::NotForcing,
slash_reward_fraction: Perbill::from_percent(10),
..Default::default()
}),
pallet_elections_phragmen: Some(Default::default()),
pallet_democracy: Some(polkadot::DemocracyConfig::default()),
pallet_collective_Instance1: Some(polkadot::CouncilConfig {
},
pallet_elections_phragmen: Default::default(),
pallet_democracy: polkadot::DemocracyConfig::default(),
pallet_collective_Instance1: polkadot::CouncilConfig {
members: vec![],
phantom: Default::default(),
}),
pallet_collective_Instance2: Some(polkadot::TechnicalCommitteeConfig {
},
pallet_collective_Instance2: polkadot::TechnicalCommitteeConfig {
members: vec![],
phantom: Default::default(),
}),
pallet_membership_Instance1: Some(Default::default()),
pallet_babe: Some(Default::default()),
pallet_grandpa: Some(Default::default()),
pallet_im_online: Some(Default::default()),
pallet_authority_discovery: Some(polkadot::AuthorityDiscoveryConfig { keys: vec![] }),
claims: Some(polkadot::ClaimsConfig {
},
pallet_membership_Instance1: Default::default(),
pallet_babe: Default::default(),
pallet_grandpa: Default::default(),
pallet_im_online: Default::default(),
pallet_authority_discovery: polkadot::AuthorityDiscoveryConfig { keys: vec![] },
claims: polkadot::ClaimsConfig {
claims: vec![],
vesting: vec![],
}),
pallet_vesting: Some(polkadot::VestingConfig { vesting: vec![] }),
pallet_treasury: Some(Default::default()),
},
pallet_vesting: polkadot::VestingConfig { vesting: vec![] },
pallet_treasury: Default::default(),
}
}
......@@ -1165,18 +1165,18 @@ pub fn kusama_testnet_genesis(
const STASH: u128 = 100 * KSM;
kusama::GenesisConfig {
frame_system: Some(kusama::SystemConfig {
frame_system: kusama::SystemConfig {
code: wasm_binary.to_vec(),
changes_trie_config: Default::default(),
}),
pallet_indices: Some(kusama::IndicesConfig { indices: vec![] }),
pallet_balances: Some(kusama::BalancesConfig {
},
pallet_indices: kusama::IndicesConfig { indices: vec![] },
pallet_balances: kusama::BalancesConfig {
balances: endowed_accounts
.iter()
.map(|k| (k.clone(), ENDOWMENT))
.collect(),
}),
pallet_session: Some(kusama::SessionConfig {
},
pallet_session: kusama::SessionConfig {
keys: initial_authorities
.iter()
.map(|x| {
......@@ -1194,8 +1194,8 @@ pub fn kusama_testnet_genesis(
)
})
.collect::<Vec<_>>(),
}),
pallet_staking: Some(kusama::StakingConfig {
},
pallet_staking: kusama::StakingConfig {
minimum_validator_count: 1,
validator_count: 2,
stakers: initial_authorities
......@@ -1213,28 +1213,28 @@ pub fn kusama_testnet_genesis(
force_era: Forcing::NotForcing,
slash_reward_fraction: Perbill::from_percent(10),
..Default::default()
}),
pallet_elections_phragmen: Some(Default::default()),
pallet_democracy: Some(kusama::DemocracyConfig::default()),
pallet_collective_Instance1: Some(kusama::CouncilConfig {
},
pallet_elections_phragmen: Default::default(),
pallet_democracy: kusama::DemocracyConfig::default(),
pallet_collective_Instance1: kusama::CouncilConfig {
members: vec![],
phantom: Default::default(),
}),
pallet_collective_Instance2: Some(kusama::TechnicalCommitteeConfig {
},
pallet_collective_Instance2: kusama::TechnicalCommitteeConfig {
members: vec![],
phantom: Default::default(),
}),
pallet_membership_Instance1: Some(Default::default()),
pallet_babe: Some(Default::default()),
pallet_grandpa: Some(Default::default()),
pallet_im_online: Some(Default::default()),
pallet_authority_discovery: Some(kusama::AuthorityDiscoveryConfig { keys: vec![] }),
claims: Some(kusama::ClaimsConfig {
},
pallet_membership_Instance1: Default::default(),
pallet_babe: Default::default(),
pallet_grandpa: Default::default(),
pallet_im_online: Default::default(),
pallet_authority_discovery: kusama::AuthorityDiscoveryConfig { keys: vec![] },
claims: kusama::ClaimsConfig {
claims: vec![],
vesting: vec![],
}),
pallet_vesting: Some(kusama::VestingConfig { vesting: vec![] }),
pallet_treasury: Some(Default::default()),
},
pallet_vesting: kusama::VestingConfig { vesting: vec![] },
pallet_treasury: Default::default(),
}
}
......@@ -1260,18 +1260,18 @@ pub fn westend_testnet_genesis(
const STASH: u128 = 100 * DOTS;
westend::GenesisConfig {
frame_system: Some(westend::SystemConfig {
frame_system: westend::SystemConfig {
code: wasm_binary.to_vec(),
changes_trie_config: Default::default(),
}),
pallet_indices: Some(westend::IndicesConfig { indices: vec![] }),
pallet_balances: Some(westend::BalancesConfig {
},
pallet_indices: westend::IndicesConfig { indices: vec![] },
pallet_balances: westend::BalancesConfig {
balances: endowed_accounts
.iter()
.map(|k| (k.clone(), ENDOWMENT))
.collect(),
}),
pallet_session: Some(westend::SessionConfig {
},
pallet_session: westend::SessionConfig {
keys: initial_authorities
.iter()
.map(|x| {
......@@ -1289,8 +1289,8 @@ pub fn westend_testnet_genesis(
)
})
.collect::<Vec<_>>(),
}),
pallet_staking: Some(westend::StakingConfig {
},
pallet_staking: westend::StakingConfig {
minimum_validator_count: 1,
validator_count: 2,
stakers: initial_authorities
......@@ -1308,13 +1308,13 @@ pub fn westend_testnet_genesis(
force_era: Forcing::NotForcing,
slash_reward_fraction: Perbill::from_percent(10),
..Default::default()
}),
pallet_babe: Some(Default::default()),
pallet_grandpa: Some(Default::default()),
pallet_im_online: Some(Default::default()),
pallet_authority_discovery: Some(westend::AuthorityDiscoveryConfig { keys: vec![] }),
pallet_vesting: Some(westend::VestingConfig { vesting: vec![] }),
pallet_sudo: Some(westend::SudoConfig { key: root_key }),
},
pallet_babe: Default::default(),
pallet_grandpa: Default::default(),
pallet_im_online: Default::default(),
pallet_authority_discovery: westend::AuthorityDiscoveryConfig { keys: vec![] },
pallet_vesting: westend::VestingConfig { vesting: vec![] },
pallet_sudo: westend::SudoConfig { key: root_key },
}
}
......@@ -1339,17 +1339,17 @@ pub fn rococo_testnet_genesis(
const ENDOWMENT: u128 = 1_000_000 * DOTS;
rococo_runtime::GenesisConfig {
frame_system: Some(rococo_runtime::SystemConfig {
frame_system: rococo_runtime::SystemConfig {
code: wasm_binary.to_vec(),
changes_trie_config: Default::default(),
}),
pallet_indices: Some(rococo_runtime::IndicesConfig {
},
pallet_indices: rococo_runtime::IndicesConfig {
indices: vec![],
}),
pallet_balances: Some(rococo_runtime::BalancesConfig {
},
pallet_balances: rococo_runtime::BalancesConfig {
balances: endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect(),
}),
pallet_session: Some(rococo_runtime::SessionConfig {
},
pallet_session: rococo_runtime::SessionConfig {
keys: initial_authorities.iter().map(|x| (
x.0.clone(),
x.0.clone(),
......@@ -1362,15 +1362,15 @@ pub fn rococo_testnet_genesis(
x.7.clone(),
),
)).collect::<Vec<_>>(),
}),
pallet_babe: Some(Default::default()),
pallet_grandpa: Some(Default::default()),
pallet_im_online: Some(Default::default()),
pallet_authority_discovery: Some(rococo_runtime::AuthorityDiscoveryConfig {
},
pallet_babe: Default::default(),
pallet_grandpa: Default::default(),
pallet_im_online: Default::default(),
pallet_authority_discovery: rococo_runtime::AuthorityDiscoveryConfig {
keys: vec![],
}),
pallet_sudo: Some(rococo_runtime::SudoConfig { key: root_key }),
parachains_configuration: Some(rococo_runtime::ParachainsConfigurationConfig {
},
pallet_sudo: rococo_runtime::SudoConfig { key: root_key },
parachains_configuration: rococo_runtime::ParachainsConfigurationConfig {
config: polkadot_runtime_parachains::configuration::HostConfiguration {
validation_upgrade_frequency: 600u32,
validation_upgrade_delay: 300,
......@@ -1411,7 +1411,7 @@ pub fn rococo_testnet_genesis(
zeroth_delay_tranche_width: 0,
..Default::default()
},
}),
},
}
}
......
node/test/service/src/chain_spec.rs
View file @ 500d90c4
......@@ -114,18 +114,18 @@ fn polkadot_testnet_genesis(
const STASH: u128 = 100 * DOTS;
runtime::GenesisConfig {
frame_system: Some(runtime::SystemConfig {
frame_system: runtime::SystemConfig {
code: runtime::WASM_BINARY.expect("Wasm binary must be built for testing").to_vec(),
..Default::default()
}),
pallet_indices: Some(runtime::IndicesConfig { indices: vec![] }),
pallet_balances: Some(runtime::BalancesConfig {
},
pallet_indices: runtime::IndicesConfig { indices: vec![] },
pallet_balances: runtime::BalancesConfig {
balances: endowed_accounts
.iter()
.map(|k| (k.clone(), ENDOWMENT))
.collect(),
}),
pallet_session: Some(runtime::SessionConfig {
},
pallet_session: runtime::SessionConfig {
keys: initial_authorities
.iter()
.map(|x| {
......@@ -142,8 +142,8 @@ fn polkadot_testnet_genesis(
)
})
.collect::<Vec<_>>(),
}),
pallet_staking: Some(runtime::StakingConfig {
},
pallet_staking: runtime::StakingConfig {
minimum_validator_count: 1,
validator_count: 2,
stakers: initial_authorities
......@@ -161,17 +161,17 @@ fn polkadot_testnet_genesis(
force_era: Forcing::NotForcing,
slash_reward_fraction: Perbill::from_percent(10),
..Default::default()
}),
pallet_babe: Some(Default::default()),
pallet_grandpa: Some(Default::default()),
pallet_authority_discovery: Some(runtime::AuthorityDiscoveryConfig { keys: vec![] }),