pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 09:21:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update substrate polkadot-master branch (#268)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/Cargo.lock
Generated
+199 -178
View File
File diff suppressed because it is too large Load Diff
polkadot/runtime/src/curated_grandpa.rs
+6 -5
View File
@@ -18,7 +18,7 @@
use {grandpa, system}; use {grandpa, system};
use codec::Decode; use codec::Decode;
use sr_primitives::traits::{As, Hash as HashT, BlakeTwo256, Zero}; use sr_primitives::traits::{Hash as HashT, BlakeTwo256, Zero};
use rstd::prelude::*; use rstd::prelude::*;
pub trait Trait: grandpa::Trait {} pub trait Trait: grandpa::Trait {}
@@ -42,11 +42,12 @@ decl_module! {
} }
fn on_finalize(block_number: T::BlockNumber) { fn on_finalize(block_number: T::BlockNumber) {
// every so often shuffle the voters and issue a change. let shuffle_period = Self::shuffle_period();
let shuffle_period: u64 = Self::shuffle_period().as_();
if shuffle_period == 0 { return }
if block_number.as_() % shuffle_period == 0 { // every so often shuffle the voters and issue a change.
if shuffle_period.is_zero() { return }
if (block_number % shuffle_period).is_zero() {
let mut voters = grandpa::Module::<T>::grandpa_authorities(); let mut voters = grandpa::Module::<T>::grandpa_authorities();
let voter_count = voters.len(); let voter_count = voters.len();
polkadot/runtime/src/parachains.rs
+3 -5
View File
@@ -64,20 +64,18 @@ decl_storage! {
config(parachains): Vec<(ParaId, Vec<u8>, Vec<u8>)>; config(parachains): Vec<(ParaId, Vec<u8>, Vec<u8>)>;
config(_phdata): PhantomData<T>; config(_phdata): PhantomData<T>;
build(|storage: &mut StorageOverlay, _: &mut ChildrenStorageOverlay, config: &GenesisConfig<T>| { build(|storage: &mut StorageOverlay, _: &mut ChildrenStorageOverlay, config: &GenesisConfig<T>| {
let storage = std::cell::RefCell::new(storage);
let mut p = config.parachains.clone(); let mut p = config.parachains.clone();
p.sort_unstable_by_key(|&(ref id, _, _)| id.clone()); p.sort_unstable_by_key(|&(ref id, _, _)| id.clone());
p.dedup_by_key(|&mut (ref id, _, _)| id.clone()); p.dedup_by_key(|&mut (ref id, _, _)| id.clone());
let only_ids: Vec<_> = p.iter().map(|&(ref id, _, _)| id).cloned().collect(); let only_ids: Vec<_> = p.iter().map(|&(ref id, _, _)| id).cloned().collect();
<Parachains<T> as generator::StorageValue<_>>::put(&only_ids, &storage); <Parachains<T> as generator::StorageValue<_>>::put(&only_ids, storage);
for (id, code, genesis) in p { for (id, code, genesis) in p {
// no ingress -- a chain cannot be routed to until it is live. // no ingress -- a chain cannot be routed to until it is live.
<Code<T> as generator::StorageMap<_, _>>::insert(&id, &code, &storage); <Code<T> as generator::StorageMap<_, _>>::insert(&id, &code, storage);
<Heads<T> as generator::StorageMap<_, _>>::insert(&id, &genesis, &storage); <Heads<T> as generator::StorageMap<_, _>>::insert(&id, &genesis, storage);
} }
}); });
} }
polkadot/service/src/chain_spec.rs
+2 -2
View File
@@ -105,8 +105,8 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
}), }),
staking: Some(StakingConfig { staking: Some(StakingConfig {
current_era: 0, current_era: 0,
offline_slash: Perbill::from_billionths(1_000_000), offline_slash: Perbill::from_parts(1_000_000),
session_reward: Perbill::from_billionths(2_065), session_reward: Perbill::from_parts(2_065),
current_session_reward: 0, current_session_reward: 0,
validator_count: 7, validator_count: 7,
sessions_per_era: 12, sessions_per_era: 12,