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

Tweak Polkadot constants & bump Substrate (#739)

* Tweak Polkadot constants.

* Bump and remove warning

* Bump impl version

* Bump Substrate

* Bump Substrate again
parent 9a779125
Pipeline #73771 passed with stages
in 20 minutes and 16 seconds
This diff is collapsed.
...@@ -79,7 +79,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { ...@@ -79,7 +79,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
impl_name: create_runtime_str!("parity-kusama"), impl_name: create_runtime_str!("parity-kusama"),
authoring_version: 2, authoring_version: 2,
spec_version: 1035, spec_version: 1035,
impl_version: 1, impl_version: 2,
apis: RUNTIME_API_VERSIONS, apis: RUNTIME_API_VERSIONS,
}; };
......
...@@ -298,9 +298,8 @@ impl staking::Trait for Runtime { ...@@ -298,9 +298,8 @@ impl staking::Trait for Runtime {
} }
parameter_types! { parameter_types! {
// KUSAMA: These values are 1/4 of what we expect for the mainnet. pub const LaunchPeriod: BlockNumber = 28 * DAYS;
pub const LaunchPeriod: BlockNumber = 7 * DAYS; pub const VotingPeriod: BlockNumber = 28 * DAYS;
pub const VotingPeriod: BlockNumber = 7 * DAYS;
pub const EmergencyVotingPeriod: BlockNumber = 3 * HOURS; pub const EmergencyVotingPeriod: BlockNumber = 3 * HOURS;
pub const MinimumDeposit: Balance = 100 * DOLLARS; pub const MinimumDeposit: Balance = 100 * DOLLARS;
pub const EnactmentPeriod: BlockNumber = 8 * DAYS; pub const EnactmentPeriod: BlockNumber = 8 * DAYS;
...@@ -320,9 +319,8 @@ impl democracy::Trait for Runtime { ...@@ -320,9 +319,8 @@ impl democracy::Trait for Runtime {
type MinimumDeposit = MinimumDeposit; type MinimumDeposit = MinimumDeposit;
/// A straight majority of the council can decide what their next motion is. /// A straight majority of the council can decide what their next motion is.
type ExternalOrigin = collective::EnsureProportionAtLeast<_1, _2, AccountId, CouncilCollective>; type ExternalOrigin = collective::EnsureProportionAtLeast<_1, _2, AccountId, CouncilCollective>;
/// A super-majority can have the next scheduled referendum be a straight majority-carries vote. /// A 60% super-majority can have the next scheduled referendum be a straight majority-carries vote.
// KUSAMA: A majority can have the next scheduled legislation be majority-carries. type ExternalMajorityOrigin = collective::EnsureProportionAtLeast<_3, _5, AccountId, CouncilCollective>;
type ExternalMajorityOrigin = collective::EnsureProportionAtLeast<_1, _2, AccountId, CouncilCollective>;
/// A unanimous council can have the next scheduled referendum be a straight default-carries /// A unanimous council can have the next scheduled referendum be a straight default-carries
/// (NTB) vote. /// (NTB) vote.
type ExternalDefaultOrigin = collective::EnsureProportionAtLeast<_1, _1, AccountId, CouncilCollective>; type ExternalDefaultOrigin = collective::EnsureProportionAtLeast<_1, _1, AccountId, CouncilCollective>;
...@@ -349,10 +347,11 @@ impl collective::Trait<CouncilCollective> for Runtime { ...@@ -349,10 +347,11 @@ impl collective::Trait<CouncilCollective> for Runtime {
parameter_types! { parameter_types! {
pub const CandidacyBond: Balance = 100 * DOLLARS; pub const CandidacyBond: Balance = 100 * DOLLARS;
pub const VotingBond: Balance = 5 * DOLLARS; pub const VotingBond: Balance = 5 * DOLLARS;
/// Daily council elections. /// Weekly council elections initially, later monthly.
pub const TermDuration: BlockNumber = 24 * HOURS; pub const TermDuration: BlockNumber = 7 * DAYS;
/// 13 members initially, to be increased to 23 eventually.
pub const DesiredMembers: u32 = 13; pub const DesiredMembers: u32 = 13;
pub const DesiredRunnersUp: u32 = 7; pub const DesiredRunnersUp: u32 = 20;
} }
impl elections_phragmen::Trait for Runtime { impl elections_phragmen::Trait for Runtime {
...@@ -389,12 +388,9 @@ impl membership::Trait<membership::Instance1> for Runtime { ...@@ -389,12 +388,9 @@ impl membership::Trait<membership::Instance1> for Runtime {
parameter_types! { parameter_types! {
pub const ProposalBond: Permill = Permill::from_percent(5); pub const ProposalBond: Permill = Permill::from_percent(5);
// KUSAMA: This value is 20x of that expected for mainnet pub const ProposalBondMinimum: Balance = 100 * DOLLARS;
pub const ProposalBondMinimum: Balance = 2_000 * DOLLARS; pub const SpendPeriod: BlockNumber = 24 * DAYS;
// KUSAMA: This value is 1/4 of that expected for mainnet pub const Burn: Permill = Permill::from_percent(1);
pub const SpendPeriod: BlockNumber = 6 * DAYS;
// KUSAMA: No burn - let's try to put it to use!
pub const Burn: Permill = Permill::from_percent(0);
} }
impl treasury::Trait for Runtime { impl treasury::Trait for Runtime {
......
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