fix curated-grandpa and rebuild wasm (#162)

paritytech · Feb 26, 2019 · 2dd861f · 2dd861f
1 parent c03d1cd
commit 2dd861f
Show file tree

Hide file tree

Showing 7 changed files with 349 additions and 334 deletions.
diff --git a/runtime/src/curated_grandpa.rs b/runtime/src/curated_grandpa.rs
@@ -21,13 +21,14 @@ use codec::Decode;
 use sr_primitives::traits::{As, Hash as HashT, BlakeTwo256, Zero};
 use rstd::prelude::*;
 
-
 pub trait Trait: grandpa::Trait {}
 
 decl_storage! {
 	trait Store for Module<T: Trait> as CuratedGrandpa {
 		/// How often to shuffle the GRANDPA sets.
-		pub ShufflePeriod get(shuffle_period) build(|_| T::BlockNumber::sa(1024u64)): T::BlockNumber;
+		///
+		/// 0 means never.
+		pub ShufflePeriod get(shuffle_period) config(shuffle_period): T::BlockNumber;
 	}
 }
 
@@ -43,6 +44,8 @@ decl_module! {
 		fn on_finalise(block_number: T::BlockNumber) {
 			// every so often shuffle the voters and issue a change.
 			let shuffle_period: u64 = Self::shuffle_period().as_();
+			if shuffle_period == 0 { return }
+
 			if block_number.as_() % shuffle_period == 0 {
 				let mut seed = system::Module::<T>::random_seed().as_ref().to_vec();
 				seed.extend(b"grandpa_shuffling");

diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -252,7 +252,7 @@ construct_runtime!(
 		Staking: staking,
 		Democracy: democracy,
 		Grandpa: grandpa::{Module, Call, Storage, Config<T>, Log(), Event<T>},
-		CuratedGrandpa: curated_grandpa::{Module, Call, Storage},
+		CuratedGrandpa: curated_grandpa::{Module, Call, Config<T>, Storage},
 		Council: council::{Module, Call, Storage, Event<T>},
 		CouncilVoting: council_voting,
 		CouncilMotions: council_motions::{Module, Call, Storage, Event<T>, Origin},

diff --git a/runtime/wasm/Cargo.lock b/runtime/wasm/Cargo.lock
diff --git a/runtime/wasm/Cargo.toml b/runtime/wasm/Cargo.toml
@@ -11,11 +11,12 @@ bitvec = { version = "0.8", default-features = false, features = ["alloc"] }
 integer-sqrt = { git = "https://github.com/paritytech/integer-sqrt-rs.git", branch = "master" }
 polkadot-primitives = { path = "../../primitives", default-features = false }
 safe-mix = { version = "1.0", default-features = false }
- parity-codec = { version = "3.0", default-features = false }
- parity-codec-derive = { version = "3.0", default-features = false }
+parity-codec = { version = "3.0", default-features = false }
+parity-codec-derive = { version = "3.0", default-features = false }
 substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
 substrate-client = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
 substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
+substrate-inherents = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
 sr-std = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
 sr-io = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }
 srml-support = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false }

diff --git a/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm b/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm
diff --git a/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm b/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm
diff --git a/service/src/chain_spec.rs b/service/src/chain_spec.rs
@@ -21,7 +21,7 @@ use polkadot_runtime::{
 	GenesisConfig, ConsensusConfig, CouncilSeatsConfig, DemocracyConfig, TreasuryConfig,
 	SessionConfig, StakingConfig, TimestampConfig, BalancesConfig, Perbill,
 	CouncilVotingConfig, GrandpaConfig, UpgradeKeyConfig, SudoConfig, IndicesConfig,
-	Permill
+	CuratedGrandpaConfig, Permill
 };
 
 const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
@@ -131,6 +131,9 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
 		grandpa: Some(GrandpaConfig {
 			authorities: initial_authorities.clone().into_iter().map(|k| (k, 1)).collect(),
 		}),
+		curated_grandpa: Some(CuratedGrandpaConfig {
+			shuffle_period: 1024,
+		}),
 	}
 }
 
@@ -232,6 +235,9 @@ fn testnet_genesis(initial_authorities: Vec<AuthorityId>, upgrade_key: H256) ->
 		sudo: Some(SudoConfig {
 			key: upgrade_key,
 		}),
+		curated_grandpa: Some(CuratedGrandpaConfig {
+			shuffle_period: 1024,
+		}),
 	}
 }