Unverified Commit 928cbb9c authored by Ashley's avatar Ashley
Browse files

Merge remote-tracking branch 'parity/master' into ashley-browser-utils

parents 7805886e 9268ae20
......@@ -119,6 +119,8 @@ alert-pending-release:
- /^v[0-9]+\.[0-9]+\.[0-9]+.*$/ # i.e. v1.0.1, v2.1.0rc1
script:
- ./scripts/gitlab/alert_pending_release.sh
interruptible: true
allow_failure: true
test-linux-stable: &test
stage: test
......
This diff is collapsed.
......@@ -4,7 +4,7 @@ path = "src/main.rs"
[package]
name = "polkadot"
version = "0.7.11"
version = "0.7.13"
authors = ["Parity Technologies <admin@parity.io>"]
build = "build.rs"
edition = "2018"
......
......@@ -9,13 +9,13 @@ Implementation of a https://polkadot.network node in Rust.
## NOTE
In 2017 we split our implementation of "Polkadot" from its platform-level component "Substrate". When we split them, we split the Polkadot code off into another repo (this repo), leaving the [**Substrate** repo][substrate-repo] to be what used to be Polkadot, along with its branches and releases.
In 2018 we split our implementation of "Polkadot" from its platform-level component "Substrate". When we split them, we split the Polkadot code off into another repo (this repo), leaving the [**Substrate** repo][substrate-repo] to be what used to be Polkadot, along with its branches and releases.
We are actively building both Substrate and Polkadot, but things will be a little odd for a while. If you see "substrate" and are wondering why you need it for Polkadot, now you know.
To connect on the "Kusama" canary network, you will want the `v0.7` code, which is in this **Polkadot** repo. To play on the ("Alexander") testnet, you'll want the PoC-4 code instead. Note that PoC-3 uses the Alexander testnet, but will not be able to sync to the latest block.
* **Kusama CC-3** is in this [**Polkadot**] repo `master` branch.
* **Kusama** (né Kusama CC-3) is in this [**Polkadot**] repo `master` branch.
* **Kusama CC-2** is in this [**Polkadot**][polkadot-v0.6] repo branch `v0.6`.
......
[package]
name = "polkadot-availability-store"
description = "Persistent database for parachain data"
version = "0.7.11"
version = "0.7.13"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
......
[package]
name = "polkadot-cli"
version = "0.7.11"
version = "0.7.13"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Polkadot node implementation in Rust."
edition = "2018"
......
......@@ -78,11 +78,14 @@ pub fn run<E: IntoExit>(exit: E, version: cli::VersionInfo) -> error::Result<()>
"parity-polkadot",
std::env::args(),
);
// TODO: Use `IsKusama` trait. #727
if cmd
.shared_params()
.and_then(|p| p.chain.as_ref())
.and_then(|c| ChainSpec::from(c))
.map_or(false, |c| c.is_kusama())
.map_or(true, |p| ChainSpec::from(&p)
.map_or(false, |c| c.is_kusama())
)
{
execute_cmd_with_runtime::<
service::kusama_runtime::RuntimeApi,
......@@ -123,7 +126,7 @@ where
info!("{}", version.name);
info!(" version {}", config.full_version());
info!(" by {}, 2017-2019", version.author);
info!("Chain specification: {}", config.chain_spec.name());
info!("Chain specification: {} (native: {})", config.chain_spec.name(), D::native_version().runtime_version);
if config.is_kusama() {
info!("----------------------------");
info!("This chain is not in any way");
......@@ -143,11 +146,15 @@ where
service::new_light::<R, D, E>(config).map_err(|e| format!("{:?}", e))?,
exit.into_exit(),
),
_ => run_until_exit(
runtime,
service::new_full::<R, D, E>(config).map_err(|e| format!("{:?}", e))?,
exit.into_exit(),
),
_ => {
service::kusama_chain_hotfix::<R, D>(&config);
run_until_exit(
runtime,
service::new_full::<R, D, E>(config).map_err(|e| format!("{:?}", e))?,
exit.into_exit(),
)
},
}.map_err(|e| format!("{:?}", e))
}),
cli::ParseAndPrepare::BuildSpec(cmd) => cmd.run::<NoCustom, _, _, _>(&load_spec),
......
[package]
name = "polkadot-collator"
version = "0.7.11"
version = "0.7.13"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Collator node implementation"
edition = "2018"
......
[package]
name = "polkadot-erasure-coding"
version = "0.7.11"
version = "0.7.13"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
......
[package]
name = "polkadot-network"
version = "0.7.11"
version = "0.7.13"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Polkadot-specific networking protocol"
edition = "2018"
......
[package]
name = "polkadot-parachain"
version = "0.7.11"
version = "0.7.13"
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.11"
version = "0.7.13"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
......
[package]
name = "polkadot-rpc"
version = "0.7.11"
version = "0.7.13"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
......
[package]
name = "polkadot-runtime-common"
version = "0.7.10"
version = "0.7.13"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
......@@ -41,7 +41,7 @@ babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate
randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "ashley-browser-utils" }
pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "ashley-browser-utils" }
treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "ashley-browser-utils" }
trie-db = "0.16.0"
trie-db = "0.18.0"
serde_json = "1.0.41"
[features]
......
[package]
name = "kusama-runtime"
version = "0.7.11"
version = "0.7.13"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
build = "build.rs"
......@@ -68,7 +68,7 @@ libsecp256k1 = "0.3.2"
tiny-keccak = "1.5.0"
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "ashley-browser-utils" }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "ashley-browser-utils" }
trie-db = "0.16.0"
trie-db = "0.18.0"
serde_json = "1.0.41"
[build-dependencies]
......
......@@ -79,7 +79,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
impl_name: create_runtime_str!("parity-kusama"),
authoring_version: 2,
spec_version: 1034,
impl_version: 0,
impl_version: 1,
apis: RUNTIME_API_VERSIONS,
};
......
[package]
name = "polkadot-runtime"
version = "0.7.11"
version = "0.7.13"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
build = "build.rs"
......@@ -66,7 +66,7 @@ libsecp256k1 = "0.3.2"
tiny-keccak = "1.5.0"
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "ashley-browser-utils" }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "ashley-browser-utils" }
trie-db = "0.16.0"
trie-db = "0.18.0"
serde_json = "1.0.41"
[build-dependencies]
......
......@@ -273,11 +273,8 @@ 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, 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;
......
......@@ -29,8 +29,8 @@ github_label () {
}
for VERSIONS_FILE in runtime/kusama/src/lib.rs runtime/polkadot/src/lib.rs
# Introduce runtime/polkadot/src/lib.rs once Polkadot mainnet is live.
for VERSIONS_FILE in runtime/kusama/src/lib.rs
do
# check if the wasm sources changed
if ! git diff --name-only origin/master...${CI_COMMIT_SHA} \
......
[package]
name = "polkadot-service"
version = "0.7.11"
version = "0.7.13"
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