Bump Substrate, versions. (#542)

* Bump Substrate, versions. Also revert the enabling of democracy * Build fix
paritytech · Nov 8, 2019 · 00651d6 · 00651d6
1 parent 0c820bf
commit 00651d6
Show file tree

Hide file tree

Showing 19 changed files with 352 additions and 493 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ path = "src/main.rs"
 
 [package]
 name = "polkadot"
-version = "0.6.9"
+version = "0.6.10"
 authors = ["Parity Technologies <[email protected]>"]
 build = "build.rs"
 edition = "2018"

diff --git a/availability-store/Cargo.toml b/availability-store/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "polkadot-availability-store"
 description = "Persistent database for parachain data"
-version = "0.6.9"
+version = "0.6.10"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-cli"
-version = "0.6.9"
+version = "0.6.10"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Polkadot node implementation in Rust."
 edition = "2018"

diff --git a/collator/Cargo.toml b/collator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-collator"
-version = "0.6.9"
+version = "0.6.10"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Collator node implementation"
 edition = "2018"

diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-erasure-coding"
-version = "0.6.9"
+version = "0.6.10"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/executor/Cargo.toml b/executor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-executor"
-version = "0.6.9"
+version = "0.6.10"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Polkadot node implementation in Rust."
 edition = "2018"

diff --git a/network/Cargo.toml b/network/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-network"
-version = "0.6.9"
+version = "0.6.10"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Polkadot-specific networking protocol"
 edition = "2018"

diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-parachain"
-version = "0.6.9"
+version = "0.6.10"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Types and utilities for creating and working with parachains"
 edition = "2018"

diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-primitives"
-version = "0.6.9"
+version = "0.6.10"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-rpc"
-version = "0.6.9"
+version = "0.6.10"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-runtime"
-version = "0.6.9"
+version = "0.6.10"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 build = "build.rs"

diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -99,7 +99,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("kusama"),
 	impl_name: create_runtime_str!("parity-kusama"),
 	authoring_version: 1,
-	spec_version: 1014,
+	spec_version: 1015,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 };
@@ -129,7 +129,7 @@ impl SignedExtension for OnlyStakingAndClaims {
 		-> TransactionValidity
 	{
 		match call {
-			Call::Balances(_) | Call::Slots(_) | Call::Registrar(_)
+			Call::Balances(_) | Call::Slots(_) | Call::Registrar(_) | Call::Democracy(_)
 				=> Err(InvalidTransaction::Custom(ValidityError::NoPermission.into()).into()),
 			_ => Ok(Default::default()),
 		}
@@ -285,7 +285,7 @@ impl session::historical::Trait for Runtime {
 srml_staking_reward_curve::build! {
 	const REWARD_CURVE: PiecewiseLinear<'static> = curve!(
 		min_inflation: 0_025_000,
-		max_inflation: 0_100_000,
+		max_inflation: 0_100_000,   // 10% - must be equal to MaxReward below.
 		ideal_stake: 0_500_000,
 		falloff: 0_050_000,
 		max_piece_count: 40,
@@ -300,10 +300,12 @@ parameter_types! {
 	// KUSAMA: This value is 1/4 of what we expect for the mainnet.
 	pub const BondingDuration: staking::EraIndex = 7;
 	pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE;
+	pub const MaxReward: Perbill = Perbill::from_percent(10);
+	// ^^^ 10% - must be equal to max_inflation, above.
 }
 
 impl staking::Trait for Runtime {
-	type OnRewardMinted = Treasury;
+	type RewardRemainder = Treasury;
 	type CurrencyToVote = CurrencyToVoteHandler;
 	type Event = Event;
 	type Currency = Balances;
@@ -314,6 +316,7 @@ impl staking::Trait for Runtime {
 	type SessionInterface = Self;
 	type Time = Timestamp;
 	type RewardCurve = RewardCurve;
+	type MaxPossibleReward = MaxReward;
 }
 
 parameter_types! {

diff --git a/runtime/src/parachains.rs b/runtime/src/parachains.rs
@@ -1043,10 +1043,11 @@ mod tests {
 		pub const BondingDuration: staking::EraIndex = 28;
 		pub const AttestationPeriod: BlockNumber = 100;
 		pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE;
+		pub const MaxReward: Perbill = Perbill::from_percent(10);
 	}
 
 	impl staking::Trait for Test {
-		type OnRewardMinted = ();
+		type RewardRemainder = ();
 		type CurrencyToVote = ();
 		type Event = ();
 		type Currency = balances::Module<Test>;
@@ -1057,6 +1058,7 @@ mod tests {
 		type SessionInterface = Self;
 		type Time = timestamp::Module<Test>;
 		type RewardCurve = RewardCurve;
+		type MaxPossibleReward = MaxReward;
 	}
 
 	impl attestations::Trait for Test {

diff --git a/service/Cargo.toml b/service/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-service"
-version = "0.6.9"
+version = "0.6.10"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/statement-table/Cargo.toml b/statement-table/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-statement-table"
-version = "0.6.9"
+version = "0.6.10"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/test-parachains/adder/Cargo.toml b/test-parachains/adder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "adder"
-version = "0.6.9"
+version = "0.6.10"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Test parachain which adds to a number as its state transition"
 edition = "2018"

diff --git a/test-parachains/halt/Cargo.toml b/test-parachains/halt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "halt"
-version = "0.6.9"
+version = "0.6.10"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Test parachain which executes forever"
 edition = "2018"

diff --git a/validation/Cargo.toml b/validation/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-validation"
-version = "0.6.9"
+version = "0.6.10"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"