Unverified Commit 119f0829 authored by Ashley's avatar Ashley
Browse files

Merge remote-tracking branch 'parity/master' into ashley-compile-to-wasm

parents 93fb6428 5422684f
This diff is collapsed.
......@@ -4,7 +4,7 @@ path = "src/main.rs"
[package]
name = "polkadot"
version = "0.7.0"
version = "0.7.1"
authors = ["Parity Technologies <admin@parity.io>"]
build = "build.rs"
edition = "2018"
......
[package]
name = "polkadot-availability-store"
description = "Persistent database for parachain data"
version = "0.7.0"
version = "0.7.1"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
......
[package]
name = "polkadot-cli"
version = "0.7.0"
version = "0.7.1"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Polkadot node implementation in Rust."
edition = "2018"
[dependencies]
log = "0.4.8"
tokio = "0.1.22"
tokio = "0.2.1"
futures = { version = "0.3.1", features = ["compat"] }
futures01 = { package = "futures", version = "0.1.29" }
structopt = "0.3.4"
......
[package]
name = "polkadot-collator"
version = "0.7.0"
version = "0.7.1"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Collator node implementation"
edition = "2018"
......
[package]
name = "polkadot-erasure-coding"
version = "0.7.0"
version = "0.7.1"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
......
[package]
name = "polkadot-executor"
version = "0.7.0"
version = "0.7.1"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Polkadot node implementation in Rust."
edition = "2018"
......
[package]
name = "polkadot-network"
version = "0.7.0"
version = "0.7.1"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Polkadot-specific networking protocol"
edition = "2018"
......
[package]
name = "polkadot-parachain"
version = "0.7.0"
version = "0.7.1"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Types and utilities for creating and working with parachains"
edition = "2018"
......
[package]
name = "polkadot-primitives"
version = "0.7.0"
version = "0.7.1"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
......
[package]
name = "polkadot-rpc"
version = "0.7.0"
version = "0.7.1"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
......
[package]
name = "polkadot-runtime"
version = "0.7.0"
version = "0.7.1"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
build = "build.rs"
......
......@@ -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: 1020,
spec_version: 1022,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
};
......@@ -334,6 +334,8 @@ parameter_types! {
pub const MinimumDeposit: Balance = 100 * DOLLARS;
pub const EnactmentPeriod: BlockNumber = 8 * DAYS;
pub const CooloffPeriod: BlockNumber = 7 * DAYS;
// One cent: $10,000 / MB
pub const PreimageByteDeposit: Balance = 1 * CENTS;
}
impl democracy::Trait for Runtime {
......@@ -362,6 +364,8 @@ impl democracy::Trait for Runtime {
// only do it once and it lasts only for the cooloff period.
type VetoOrigin = collective::EnsureMember<AccountId, TechnicalCollective>;
type CooloffPeriod = CooloffPeriod;
type PreimageByteDeposit = PreimageByteDeposit;
type Slash = Treasury;
}
type CouncilCollective = collective::Instance1;
......@@ -505,7 +509,7 @@ impl registrar::Trait for Runtime {
type MaxRetries = MaxRetries;
}
parameter_types!{
parameter_types! {
pub const LeasePeriod: BlockNumber = 100_000;
pub const EndingPeriod: BlockNumber = 1000;
}
......@@ -519,7 +523,7 @@ impl slots::Trait for Runtime {
type Randomness = RandomnessCollectiveFlip;
}
parameter_types!{
parameter_types! {
// KUSAMA: for mainnet this should be removed.
pub const Prefix: &'static [u8] = b"Pay KSMs to the Kusama account:";
// KUSAMA: for mainnet this should be uncommented.
......@@ -540,7 +544,7 @@ impl sudo::Trait for Runtime {
parameter_types! {
pub const ReservationFee: Balance = 1 * DOLLARS;
pub const MinLength: usize = 3;
pub const MaxLength: usize = 16;
pub const MaxLength: usize = 32;
}
impl nicks::Trait for Runtime {
......@@ -553,7 +557,7 @@ impl nicks::Trait for Runtime {
type MaxLength = MaxLength;
}
construct_runtime!(
construct_runtime! {
pub enum Runtime where
Block = Block,
NodeBlock = primitives::Block,
......@@ -606,7 +610,7 @@ construct_runtime!(
// Simple nicknames module.
Nicks: nicks::{Module, Call, Storage, Event<T>},
}
);
}
/// The address format for describing accounts.
pub type Address = <Indices as StaticLookup>::Source;
......
[package]
name = "polkadot-service"
version = "0.7.0"
version = "0.7.1"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
......
[package]
name = "polkadot-statement-table"
version = "0.7.0"
version = "0.7.1"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
......
[package]
name = "adder"
version = "0.7.0"
version = "0.7.1"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Test parachain which adds to a number as its state transition"
edition = "2018"
......
[package]
name = "halt"
version = "0.7.0"
version = "0.7.1"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Test parachain which executes forever"
edition = "2018"
......
[package]
name = "polkadot-validation"
version = "0.7.0"
version = "0.7.1"
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