Update substrate polkadot-master branch (#268)

* update substrate

* update lock
This commit is contained in:
thiolliere
2019-05-24 12:49:07 +02:00
committed by Gavin Wood
parent 4ed5fd128a
commit 7a123fe8e9
4 changed files with 210 additions and 190 deletions
+2 -2
View File
@@ -105,8 +105,8 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
}),
staking: Some(StakingConfig {
current_era: 0,
offline_slash: Perbill::from_billionths(1_000_000),
session_reward: Perbill::from_billionths(2_065),
offline_slash: Perbill::from_parts(1_000_000),
session_reward: Perbill::from_parts(2_065),
current_session_reward: 0,
validator_count: 7,
sessions_per_era: 12,