Skip to content

GitLab

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

Tweak some Kusama params (#659) 

* Tweak some Kusama params

- Council elections daily
- No treasury burn
- Bonding/slash defer periods of 7 days

* Bump runtime

* Bump version
parent 78e828d8
Pipeline #70987 passed with stages
in 18 minutes and 47 seconds
Hide whitespace changes
Inline Side-by-side
Cargo.lock
View file @ 84ece424
......@@ -11,11 +11,11 @@ dependencies = [
[[package]]
name = "adder"
version = "0.7.7"
version = "0.7.8"
dependencies = [
"dlmalloc 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"polkadot-parachain 0.7.7",
"polkadot-parachain 0.7.8",
"sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"substrate-wasm-builder-runner 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -25,14 +25,14 @@ dependencies = [
name = "adder-collator"
version = "0.1.0"
dependencies = [
"adder 0.7.7",
"adder 0.7.8",
"ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"exit-future 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"polkadot-collator 0.7.7",
"polkadot-parachain 0.7.7",
"polkadot-primitives 0.7.7",
"polkadot-collator 0.7.8",
"polkadot-parachain 0.7.8",
"polkadot-primitives 0.7.8",
"sc-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
......@@ -1521,7 +1521,7 @@ dependencies = [
[[package]]
name = "halt"
version = "0.7.7"
version = "0.7.8"
dependencies = [
"substrate-wasm-builder-runner 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
......@@ -3455,18 +3455,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "polkadot"
version = "0.7.7"
version = "0.7.8"
dependencies = [
"ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"polkadot-cli 0.7.7",
"polkadot-service 0.7.7",
"polkadot-cli 0.7.8",
"polkadot-service 0.7.8",
"vergen 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "polkadot-availability-store"
version = "0.7.7"
version = "0.7.8"
dependencies = [
"derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)",
"exit-future 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3478,9 +3478,9 @@ dependencies = [
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"polkadot-erasure-coding 0.7.7",
"polkadot-primitives 0.7.7",
"polkadot-runtime 0.7.7",
"polkadot-erasure-coding 0.7.8",
"polkadot-primitives 0.7.8",
"polkadot-runtime 0.7.8",
"sc-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"sc-keystore 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
......@@ -3495,12 +3495,12 @@ dependencies = [
[[package]]
name = "polkadot-cli"
version = "0.7.7"
version = "0.7.8"
dependencies = [
"futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"polkadot-service 0.7.7",
"polkadot-service 0.7.8",
"sc-cli 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"structopt 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3508,18 +3508,18 @@ dependencies = [
[[package]]
name = "polkadot-collator"
version = "0.7.7"
version = "0.7.8"
dependencies = [
"futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"futures-timer 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"polkadot-cli 0.7.7",
"polkadot-network 0.7.7",
"polkadot-primitives 0.7.7",
"polkadot-runtime 0.7.7",
"polkadot-service 0.7.7",
"polkadot-validation 0.7.7",
"polkadot-cli 0.7.8",
"polkadot-network 0.7.8",
"polkadot-primitives 0.7.8",
"polkadot-runtime 0.7.8",
"polkadot-service 0.7.8",
"polkadot-validation 0.7.8",
"sc-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"sc-network 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
......@@ -3531,11 +3531,11 @@ dependencies = [
[[package]]
name = "polkadot-erasure-coding"
version = "0.7.7"
version = "0.7.8"
dependencies = [
"derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"polkadot-primitives 0.7.7",
"polkadot-primitives 0.7.8",
"reed-solomon-erasure 4.0.0 (git+https://github.com/paritytech/reed-solomon-erasure)",
"sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"sp-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
......@@ -3543,15 +3543,15 @@ dependencies = [
[[package]]
name = "polkadot-executor"
version = "0.7.7"
version = "0.7.8"
dependencies = [
"polkadot-runtime 0.7.7",
"polkadot-runtime 0.7.8",
"sc-executor 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
]
[[package]]
name = "polkadot-network"
version = "0.7.7"
version = "0.7.8"
dependencies = [
"arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
"exit-future 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3560,10 +3560,10 @@ dependencies = [
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"polkadot-availability-store 0.7.7",
"polkadot-erasure-coding 0.7.7",
"polkadot-primitives 0.7.7",
"polkadot-validation 0.7.7",
"polkadot-availability-store 0.7.8",
"polkadot-erasure-coding 0.7.8",
"polkadot-primitives 0.7.8",
"polkadot-validation 0.7.8",
"sc-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"sc-network 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
......@@ -3575,11 +3575,11 @@ dependencies = [
[[package]]
name = "polkadot-parachain"
version = "0.7.7"
version = "0.7.8"
dependencies = [
"adder 0.7.7",
"adder 0.7.8",
"derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
"halt 0.7.7",
"halt 0.7.8",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3594,12 +3594,12 @@ dependencies = [
[[package]]
name = "polkadot-primitives"
version = "0.7.7"
version = "0.7.8"
dependencies = [
"bitvec 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
"pallet-babe 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"polkadot-parachain 0.7.7",
"polkadot-parachain 0.7.8",
"pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"sc-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3614,12 +3614,12 @@ dependencies = [
[[package]]
name = "polkadot-rpc"
version = "0.7.7"
version = "0.7.8"
dependencies = [
"jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"pallet-transaction-payment-rpc 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"polkadot-primitives 0.7.7",
"polkadot-runtime 0.7.7",
"polkadot-primitives 0.7.8",
"polkadot-runtime 0.7.8",
"sc-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"sc-rpc 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
......@@ -3629,7 +3629,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime"
version = "0.7.7"
version = "0.7.8"
dependencies = [
"bitvec 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
"frame-executive 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
......@@ -3662,8 +3662,8 @@ dependencies = [
"pallet-transaction-payment-rpc-runtime-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"pallet-treasury 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"polkadot-parachain 0.7.7",
"polkadot-primitives 0.7.7",
"polkadot-parachain 0.7.8",
"polkadot-primitives 0.7.8",
"rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3693,7 +3693,7 @@ dependencies = [
[[package]]
name = "polkadot-service"
version = "0.7.7"
version = "0.7.8"
dependencies = [
"exit-future 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3705,13 +3705,13 @@ dependencies = [
"pallet-im-online 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"pallet-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"polkadot-availability-store 0.7.7",
"polkadot-executor 0.7.7",
"polkadot-network 0.7.7",
"polkadot-primitives 0.7.7",
"polkadot-rpc 0.7.7",
"polkadot-runtime 0.7.7",
"polkadot-validation 0.7.7",
"polkadot-availability-store 0.7.8",
"polkadot-executor 0.7.8",
"polkadot-network 0.7.8",
"polkadot-primitives 0.7.8",
"polkadot-rpc 0.7.8",
"polkadot-runtime 0.7.8",
"polkadot-validation 0.7.8",
"sc-authority-discovery 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"sc-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
......@@ -3739,16 +3739,16 @@ dependencies = [
[[package]]
name = "polkadot-statement-table"
version = "0.7.7"
version = "0.7.8"
dependencies = [
"parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"polkadot-primitives 0.7.7",
"polkadot-primitives 0.7.8",
"sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
]
[[package]]
name = "polkadot-validation"
version = "0.7.7"
version = "0.7.8"
dependencies = [
"async-std 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bitvec 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3761,12 +3761,12 @@ dependencies = [
"pallet-babe 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"polkadot-availability-store 0.7.7",
"polkadot-erasure-coding 0.7.7",
"polkadot-parachain 0.7.7",
"polkadot-primitives 0.7.7",
"polkadot-runtime 0.7.7",
"polkadot-statement-table 0.7.7",
"polkadot-availability-store 0.7.8",
"polkadot-erasure-coding 0.7.8",
"polkadot-parachain 0.7.8",
"polkadot-primitives 0.7.8",
"polkadot-runtime 0.7.8",
"polkadot-statement-table 0.7.8",
"sc-block-builder 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"sc-finality-grandpa 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
......
Cargo.toml
View file @ 84ece424
......@@ -4,7 +4,7 @@ path = "src/main.rs"
[package]
name = "polkadot"
version = "0.7.7"
version = "0.7.8"
authors = ["Parity Technologies <admin@parity.io>"]
build = "build.rs"
edition = "2018"
......
availability-store/Cargo.toml
View file @ 84ece424
[package]
name = "polkadot-availability-store"
description = "Persistent database for parachain data"
version = "0.7.7"
version = "0.7.8"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
......
cli/Cargo.toml
View file @ 84ece424
[package]
name = "polkadot-cli"
version = "0.7.7"
version = "0.7.8"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Polkadot node implementation in Rust."
edition = "2018"
......
collator/Cargo.toml
View file @ 84ece424
[package]
name = "polkadot-collator"
version = "0.7.7"
version = "0.7.8"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Collator node implementation"
edition = "2018"
......
erasure-coding/Cargo.toml
View file @ 84ece424
[package]
name = "polkadot-erasure-coding"
version = "0.7.7"
version = "0.7.8"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
......
executor/Cargo.toml
View file @ 84ece424
[package]
name = "polkadot-executor"
version = "0.7.7"
version = "0.7.8"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Polkadot node implementation in Rust."
edition = "2018"
......
network/Cargo.toml
View file @ 84ece424
[package]
name = "polkadot-network"
version = "0.7.7"
version = "0.7.8"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Polkadot-specific networking protocol"
edition = "2018"
......
parachain/Cargo.toml
View file @ 84ece424
[package]
name = "polkadot-parachain"
version = "0.7.7"
version = "0.7.8"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Types and utilities for creating and working with parachains"
edition = "2018"
......
primitives/Cargo.toml
View file @ 84ece424
[package]
name = "polkadot-primitives"
version = "0.7.7"
version = "0.7.8"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
......
rpc/Cargo.toml
View file @ 84ece424
[package]
name = "polkadot-rpc"
version = "0.7.7"
version = "0.7.8"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
......
runtime/Cargo.toml
View file @ 84ece424
[package]
name = "polkadot-runtime"
version = "0.7.7"
version = "0.7.8"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
build = "build.rs"
......
runtime/src/lib.rs
View file @ 84ece424
......@@ -97,7 +97,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("kusama"),
impl_name: create_runtime_str!("parity-kusama"),
authoring_version: 2,
spec_version: 1027,
spec_version: 1028,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
};
......@@ -297,12 +297,13 @@ pallet_staking_reward_curve::build! {
parameter_types! {
// Six sessions in an era (24 hours).
// pub const SessionsPerEra: SessionIndex = 6;
pub const SessionsPerEra: SessionIndex = 6;
// 28 eras for unbonding (28 days).
// KUSAMA: This value is 1/4 of what we expect for the mainnet.
// KUSAMA-launch: 0 for managing the spooning injection.
pub const BondingDuration: staking::EraIndex = 0;
pub const SlashDeferDuration: staking::EraIndex = 7;
// KUSAMA: This value is 1/4 of what we expect for the mainnet, however session length is also
// a quarter, so the figure remains the same.
pub const BondingDuration: staking::EraIndex = 28;
pub const SlashDeferDuration: staking::EraIndex = 28;
pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE;
}
......@@ -317,9 +318,7 @@ impl staking::Trait for Runtime {
type BondingDuration = BondingDuration;
type SlashDeferDuration = SlashDeferDuration;
// A super-majority of the council can cancel the slash.
// KUSAMA-launch: Any council member can remove a slash.
// type SlashCancelOrigin = collective::EnsureProportionAtLeast<_3, _4, AccountId, CouncilCollective>;
type SlashCancelOrigin = collective::EnsureMember<AccountId, CouncilCollective>;
type SlashCancelOrigin = collective::EnsureProportionAtLeast<_3, _4, AccountId, CouncilCollective>;
type SessionInterface = Self;
type Time = Timestamp;
type RewardCurve = RewardCurve;
......@@ -329,8 +328,7 @@ parameter_types! {
// KUSAMA: These values are 1/4 of what we expect for the mainnet.
pub const LaunchPeriod: BlockNumber = 7 * DAYS;
pub const VotingPeriod: BlockNumber = 7 * DAYS;
// KUSAMA: This is a bit short; should be increased to 3 hours.
pub const EmergencyVotingPeriod: BlockNumber = 1 * HOURS;
pub const EmergencyVotingPeriod: BlockNumber = 3 * HOURS;
pub const MinimumDeposit: Balance = 100 * DOLLARS;
pub const EnactmentPeriod: BlockNumber = 8 * DAYS;
pub const CooloffPeriod: BlockNumber = 7 * DAYS;
......@@ -378,7 +376,8 @@ impl collective::Trait<CouncilCollective> for Runtime {
parameter_types! {
pub const CandidacyBond: Balance = 100 * DOLLARS;
pub const VotingBond: Balance = 5 * DOLLARS;
pub const TermDuration: BlockNumber = 2 * HOURS;
/// Daily council elections.
pub const TermDuration: BlockNumber = 24 * HOURS;
pub const DesiredMembers: u32 = 13;
pub const DesiredRunnersUp: u32 = 7;
}
......@@ -420,8 +419,8 @@ parameter_types! {
pub const ProposalBondMinimum: Balance = 100 * DOLLARS;
// KUSAMA: This value is 1/4 of that expected for mainnet
pub const SpendPeriod: BlockNumber = 6 * DAYS;
// KUSAMA: This value is 1/5 of that expected for mainnet
pub const Burn: Permill = Permill::from_percent(1);
// KUSAMA: No burn - let's try to put it to use!
pub const Burn: Permill = Permill::from_percent(0);
}
impl treasury::Trait for Runtime {
......
service/Cargo.toml
View file @ 84ece424
[package]
name = "polkadot-service"
version = "0.7.7"
version = "0.7.8"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
......
statement-table/Cargo.toml
View file @ 84ece424
[package]
name = "polkadot-statement-table"
version = "0.7.7"
version = "0.7.8"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
......
test-parachains/adder/Cargo.toml
View file @ 84ece424
[package]
name = "adder"
version = "0.7.7"
version = "0.7.8"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Test parachain which adds to a number as its state transition"
edition = "2018"
......
test-parachains/halt/Cargo.toml
View file @ 84ece424
[package]
name = "halt"
version = "0.7.7"
version = "0.7.8"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Test parachain which executes forever"
edition = "2018"
......
validation/Cargo.toml
View file @ 84ece424
[package]
name = "polkadot-validation"
version = "0.7.7"
version = "0.7.8"
authors = ["Parity Technologies <admin@parity.io>"]
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