Unverified Commit d4f0a74b authored by Gavin Wood's avatar Gavin Wood Committed by GitHub
Browse files

Companion for #5412 (#942)

* Fixes for democracy using Scheduler

* Revert branch change
parent 5e0170c2
Pipeline #85855 canceled with stages
This diff is collapsed.
...@@ -4,7 +4,7 @@ path = "src/main.rs" ...@@ -4,7 +4,7 @@ path = "src/main.rs"
[package] [package]
name = "polkadot" name = "polkadot"
version = "0.7.28" version = "0.7.29-pre1"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
build = "build.rs" build = "build.rs"
edition = "2018" edition = "2018"
......
[package] [package]
name = "polkadot-availability-store" name = "polkadot-availability-store"
description = "Persistent database for parachain data" description = "Persistent database for parachain data"
version = "0.7.28" version = "0.7.29-pre1"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
......
[package] [package]
name = "polkadot-cli" name = "polkadot-cli"
version = "0.7.28" version = "0.7.29-pre1"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
description = "Polkadot node implementation in Rust." description = "Polkadot node implementation in Rust."
edition = "2018" edition = "2018"
......
[package] [package]
name = "polkadot-collator" name = "polkadot-collator"
version = "0.7.28" version = "0.7.29-pre1"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
description = "Collator node implementation" description = "Collator node implementation"
edition = "2018" edition = "2018"
......
[package] [package]
name = "polkadot-erasure-coding" name = "polkadot-erasure-coding"
version = "0.7.28" version = "0.7.29-pre1"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
......
[package] [package]
name = "polkadot-network" name = "polkadot-network"
version = "0.7.28" version = "0.7.29-pre1"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
description = "Polkadot-specific networking protocol" description = "Polkadot-specific networking protocol"
edition = "2018" edition = "2018"
......
[package] [package]
name = "polkadot-parachain" name = "polkadot-parachain"
version = "0.7.28" version = "0.7.29-pre1"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
description = "Types and utilities for creating and working with parachains" description = "Types and utilities for creating and working with parachains"
edition = "2018" edition = "2018"
......
...@@ -28,6 +28,7 @@ use sp_externalities::ExternalitiesExt; ...@@ -28,6 +28,7 @@ use sp_externalities::ExternalitiesExt;
#[runtime_interface] #[runtime_interface]
pub trait Parachain { pub trait Parachain {
/// Post a message to this parachain's relay chain. /// Post a message to this parachain's relay chain.
#[allow(dead_code)]
fn post_upward_message(&mut self, msg: UpwardMessage) { fn post_upward_message(&mut self, msg: UpwardMessage) {
self.extension::<crate::wasm_executor::ParachainExt>() self.extension::<crate::wasm_executor::ParachainExt>()
.expect("No `ParachainExt` associated with the current context.") .expect("No `ParachainExt` associated with the current context.")
......
[package] [package]
name = "polkadot-primitives" name = "polkadot-primitives"
version = "0.7.28" version = "0.7.29-pre1"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
......
[package] [package]
name = "polkadot-rpc" name = "polkadot-rpc"
version = "0.7.28" version = "0.7.29-pre1"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
......
[package] [package]
name = "polkadot-runtime-common" name = "polkadot-runtime-common"
version = "0.7.28" version = "0.7.29-pre1"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
......
[package] [package]
name = "kusama-runtime" name = "kusama-runtime"
version = "0.7.28" version = "0.7.29-pre1"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
build = "build.rs" build = "build.rs"
...@@ -33,7 +33,7 @@ authorship = { package = "pallet-authorship", git = "https://github.com/parityte ...@@ -33,7 +33,7 @@ authorship = { package = "pallet-authorship", git = "https://github.com/parityte
babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
...@@ -48,11 +48,12 @@ nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substra ...@@ -48,11 +48,12 @@ nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substra
offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } recovery = { package = "pallet-recovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } society = { package = "pallet-society", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "master" } pallet-staking-reward-curve = { package = "pallet-staking-reward-curve", git = "https://github.com/paritytech/substrate", branch = "master" }
system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } system = { package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
...@@ -101,7 +102,7 @@ std = [ ...@@ -101,7 +102,7 @@ std = [
"authorship/std", "authorship/std",
"balances/std", "balances/std",
"transaction-payment/std", "transaction-payment/std",
"pallet-transaction-payment-rpc-runtime-api/std", "transaction-payment-rpc-runtime-api/std",
"collective/std", "collective/std",
"elections-phragmen/std", "elections-phragmen/std",
"democracy/std", "democracy/std",
...@@ -117,6 +118,7 @@ std = [ ...@@ -117,6 +118,7 @@ std = [
"recovery/std", "recovery/std",
"sp-runtime/std", "sp-runtime/std",
"sp-staking/std", "sp-staking/std",
"scheduler/std",
"session/std", "session/std",
"society/std", "society/std",
"staking/std", "staking/std",
......
...@@ -56,7 +56,7 @@ use frame_support::{ ...@@ -56,7 +56,7 @@ use frame_support::{
use im_online::sr25519::AuthorityId as ImOnlineId; use im_online::sr25519::AuthorityId as ImOnlineId;
use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId; use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
use system::offchain::TransactionSubmitter; use system::offchain::TransactionSubmitter;
use pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo; use transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
use session::{historical as session_historical}; use session::{historical as session_historical};
#[cfg(feature = "std")] #[cfg(feature = "std")]
...@@ -145,6 +145,13 @@ impl system::Trait for Runtime { ...@@ -145,6 +145,13 @@ impl system::Trait for Runtime {
type OnKilledAccount = (); type OnKilledAccount = ();
} }
impl scheduler::Trait for Runtime {
type Event = Event;
type Origin = Origin;
type Call = Call;
type MaximumWeight = MaximumBlockWeight;
}
parameter_types! { parameter_types! {
pub const EpochDuration: u64 = EPOCH_DURATION_IN_BLOCKS as u64; pub const EpochDuration: u64 = EPOCH_DURATION_IN_BLOCKS as u64;
pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK; pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK;
...@@ -349,6 +356,7 @@ impl democracy::Trait for Runtime { ...@@ -349,6 +356,7 @@ impl democracy::Trait for Runtime {
type CooloffPeriod = CooloffPeriod; type CooloffPeriod = CooloffPeriod;
type PreimageByteDeposit = PreimageByteDeposit; type PreimageByteDeposit = PreimageByteDeposit;
type Slash = Treasury; type Slash = Treasury;
type Scheduler = Scheduler;
} }
parameter_types! { parameter_types! {
...@@ -703,6 +711,9 @@ construct_runtime! { ...@@ -703,6 +711,9 @@ construct_runtime! {
// Vesting. Usable initially, but removed once all vesting is finished. // Vesting. Usable initially, but removed once all vesting is finished.
Vesting: vesting::{Module, Call, Storage, Event<T>, Config<T>}, Vesting: vesting::{Module, Call, Storage, Event<T>, Config<T>},
// System scheduler.
Scheduler: scheduler::{Module, Call, Storage, Event<T>},
} }
} }
...@@ -887,7 +898,7 @@ sp_api::impl_runtime_apis! { ...@@ -887,7 +898,7 @@ sp_api::impl_runtime_apis! {
} }
} }
impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi< impl transaction_payment_rpc_runtime_api::TransactionPaymentApi<
Block, Block,
Balance, Balance,
UncheckedExtrinsic, UncheckedExtrinsic,
......
[package] [package]
name = "polkadot-runtime" name = "polkadot-runtime"
version = "0.7.28" version = "0.7.29-pre1"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
build = "build.rs" build = "build.rs"
...@@ -32,7 +32,7 @@ authorship = { package = "pallet-authorship", git = "https://github.com/parityte ...@@ -32,7 +32,7 @@ authorship = { package = "pallet-authorship", git = "https://github.com/parityte
babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
...@@ -46,6 +46,7 @@ membership = { package = "pallet-membership", git = "https://github.com/parityte ...@@ -46,6 +46,7 @@ membership = { package = "pallet-membership", git = "https://github.com/parityte
nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
scheduler = { package = "pallet-scheduler", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
...@@ -97,7 +98,7 @@ std = [ ...@@ -97,7 +98,7 @@ std = [
"authorship/std", "authorship/std",
"balances/std", "balances/std",
"transaction-payment/std", "transaction-payment/std",
"pallet-transaction-payment-rpc-runtime-api/std", "transaction-payment-rpc-runtime-api/std",
"collective/std", "collective/std",
"elections-phragmen/std", "elections-phragmen/std",
"democracy/std", "democracy/std",
...@@ -112,6 +113,7 @@ std = [ ...@@ -112,6 +113,7 @@ std = [
"offences/std", "offences/std",
"sp-runtime/std", "sp-runtime/std",
"sp-staking/std", "sp-staking/std",
"scheduler/std",
"session/std", "session/std",
"staking/std", "staking/std",
"system/std", "system/std",
......
...@@ -60,7 +60,7 @@ use frame_support::{ ...@@ -60,7 +60,7 @@ use frame_support::{
use im_online::sr25519::AuthorityId as ImOnlineId; use im_online::sr25519::AuthorityId as ImOnlineId;
use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId; use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
use system::offchain::TransactionSubmitter; use system::offchain::TransactionSubmitter;
use pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo; use transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
use session::{historical as session_historical}; use session::{historical as session_historical};
#[cfg(feature = "std")] #[cfg(feature = "std")]
...@@ -153,6 +153,13 @@ impl system::Trait for Runtime { ...@@ -153,6 +153,13 @@ impl system::Trait for Runtime {
type OnKilledAccount = (); type OnKilledAccount = ();
} }
impl scheduler::Trait for Runtime {
type Event = Event;
type Origin = Origin;
type Call = Call;
type MaximumWeight = MaximumBlockWeight;
}
parameter_types! { parameter_types! {
pub const EpochDuration: u64 = EPOCH_DURATION_IN_BLOCKS as u64; pub const EpochDuration: u64 = EPOCH_DURATION_IN_BLOCKS as u64;
pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK; pub const ExpectedBlockTime: Moment = MILLISECS_PER_BLOCK;
...@@ -356,6 +363,7 @@ impl democracy::Trait for Runtime { ...@@ -356,6 +363,7 @@ impl democracy::Trait for Runtime {
type CooloffPeriod = CooloffPeriod; type CooloffPeriod = CooloffPeriod;
type PreimageByteDeposit = PreimageByteDeposit; type PreimageByteDeposit = PreimageByteDeposit;
type Slash = Treasury; type Slash = Treasury;
type Scheduler = Scheduler;
} }
parameter_types! { parameter_types! {
...@@ -582,6 +590,7 @@ construct_runtime! { ...@@ -582,6 +590,7 @@ construct_runtime! {
// Basic stuff; balances is uncallable initially. // Basic stuff; balances is uncallable initially.
System: system::{Module, Call, Storage, Config, Event<T>}, System: system::{Module, Call, Storage, Config, Event<T>},
RandomnessCollectiveFlip: randomness_collective_flip::{Module, Storage}, RandomnessCollectiveFlip: randomness_collective_flip::{Module, Storage},
Scheduler: scheduler::{Module, Call, Storage, Event<T>},
// Must be before session. // Must be before session.
Babe: babe::{Module, Call, Storage, Config, Inherent(Timestamp)}, Babe: babe::{Module, Call, Storage, Config, Inherent(Timestamp)},
...@@ -809,7 +818,7 @@ sp_api::impl_runtime_apis! { ...@@ -809,7 +818,7 @@ sp_api::impl_runtime_apis! {
} }
} }
impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi< impl transaction_payment_rpc_runtime_api::TransactionPaymentApi<
Block, Block,
Balance, Balance,
UncheckedExtrinsic, UncheckedExtrinsic,
......
[package] [package]
name = "polkadot-test-runtime" name = "polkadot-test-runtime"
version = "0.7.28" version = "0.7.29-pre1"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
build = "build.rs" build = "build.rs"
......
[package] [package]
name = "polkadot-service" name = "polkadot-service"
version = "0.7.28" version = "0.7.29-pre1"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
......
[package] [package]
name = "polkadot-statement-table" name = "polkadot-statement-table"
version = "0.7.28" version = "0.7.29-pre1"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018" edition = "2018"
......
[package] [package]
name = "adder" name = "adder"
version = "0.7.28" version = "0.7.29-pre1"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
description = "Test parachain which adds to a number as its state transition" description = "Test parachain which adds to a number as its state transition"
edition = "2018" edition = "2018"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment