From 756f95c4078f2ab93d6fe3950a72f76ddccfc419 Mon Sep 17 00:00:00 2001
From: Gavin Wood <gavin@parity.io>
Date: Wed, 29 Jul 2020 14:31:31 +0200
Subject: [PATCH] Update Substrate, bump versions, clean up sort (#1496)
* Sort cleanups
* Bump versions
---
polkadot/Cargo.lock | 40 +++++++++----------
polkadot/Cargo.toml | 2 +-
polkadot/availability-store/Cargo.toml | 2 +-
polkadot/cli/Cargo.toml | 2 +-
polkadot/collator/Cargo.toml | 2 +-
polkadot/erasure-coding/Cargo.toml | 2 +-
polkadot/network/Cargo.toml | 2 +-
polkadot/network/test/Cargo.toml | 2 +-
polkadot/parachain/Cargo.toml | 2 +-
.../test-parachains/adder/Cargo.toml | 2 +-
.../parachain/test-parachains/halt/Cargo.toml | 2 +-
polkadot/primitives/Cargo.toml | 2 +-
polkadot/rpc/Cargo.toml | 2 +-
polkadot/runtime/common/Cargo.toml | 2 +-
polkadot/runtime/common/src/registrar.rs | 2 +-
polkadot/runtime/kusama/Cargo.toml | 2 +-
polkadot/runtime/kusama/src/lib.rs | 2 +-
polkadot/runtime/parachains/src/paras.rs | 2 +-
polkadot/runtime/polkadot/Cargo.toml | 2 +-
polkadot/runtime/polkadot/src/lib.rs | 2 +-
polkadot/runtime/test-runtime/Cargo.toml | 2 +-
polkadot/runtime/westend/Cargo.toml | 2 +-
polkadot/runtime/westend/src/lib.rs | 2 +-
polkadot/service/Cargo.toml | 2 +-
polkadot/statement-table/Cargo.toml | 2 +-
polkadot/validation/Cargo.toml | 2 +-
26 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index ab0785e5731..b102622e157 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -2478,7 +2478,7 @@ dependencies = [
[[package]]
name = "kusama-runtime"
-version = "0.8.19"
+version = "0.8.22"
dependencies = [
"bitvec",
"frame-benchmarking",
@@ -4372,7 +4372,7 @@ checksum = "feb3b2b1033b8a60b4da6ee470325f887758c95d5320f52f9ce0df055a55940e"
[[package]]
name = "polkadot"
-version = "0.8.19"
+version = "0.8.22"
dependencies = [
"assert_cmd",
"futures 0.3.5",
@@ -4411,7 +4411,7 @@ dependencies = [
[[package]]
name = "polkadot-availability-store"
-version = "0.8.19"
+version = "0.8.22"
dependencies = [
"derive_more 0.99.9",
"exit-future",
@@ -4437,7 +4437,7 @@ dependencies = [
[[package]]
name = "polkadot-cli"
-version = "0.8.19"
+version = "0.8.22"
dependencies = [
"frame-benchmarking-cli",
"futures 0.3.5",
@@ -4462,7 +4462,7 @@ dependencies = [
[[package]]
name = "polkadot-collator"
-version = "0.8.19"
+version = "0.8.22"
dependencies = [
"futures 0.3.5",
"futures-timer 2.0.2",
@@ -4500,7 +4500,7 @@ dependencies = [
[[package]]
name = "polkadot-erasure-coding"
-version = "0.8.19"
+version = "0.8.22"
dependencies = [
"derive_more 0.15.0",
"parity-scale-codec",
@@ -4512,7 +4512,7 @@ dependencies = [
[[package]]
name = "polkadot-network"
-version = "0.8.19"
+version = "0.8.22"
dependencies = [
"arrayvec 0.4.12",
"bytes 0.5.5",
@@ -4560,7 +4560,7 @@ dependencies = [
[[package]]
name = "polkadot-network-test"
-version = "0.8.19"
+version = "0.8.22"
dependencies = [
"futures 0.3.5",
"log 0.4.8",
@@ -4715,7 +4715,7 @@ dependencies = [
[[package]]
name = "polkadot-parachain"
-version = "0.8.19"
+version = "0.8.22"
dependencies = [
"derive_more 0.99.9",
"futures 0.3.5",
@@ -4754,7 +4754,7 @@ dependencies = [
[[package]]
name = "polkadot-primitives"
-version = "0.8.19"
+version = "0.8.22"
dependencies = [
"bitvec",
"frame-system",
@@ -4778,7 +4778,7 @@ dependencies = [
[[package]]
name = "polkadot-rpc"
-version = "0.8.19"
+version = "0.8.22"
dependencies = [
"jsonrpc-core",
"pallet-transaction-payment-rpc",
@@ -4804,7 +4804,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime"
-version = "0.8.19"
+version = "0.8.22"
dependencies = [
"bitvec",
"frame-benchmarking",
@@ -4878,7 +4878,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime-common"
-version = "0.8.19"
+version = "0.8.22"
dependencies = [
"bitvec",
"frame-benchmarking",
@@ -4966,7 +4966,7 @@ dependencies = [
[[package]]
name = "polkadot-service"
-version = "0.8.19"
+version = "0.8.22"
dependencies = [
"env_logger",
"frame-benchmarking",
@@ -5109,7 +5109,7 @@ dependencies = [
[[package]]
name = "polkadot-statement-table"
-version = "0.8.19"
+version = "0.8.22"
dependencies = [
"parity-scale-codec",
"polkadot-primitives",
@@ -5118,7 +5118,7 @@ dependencies = [
[[package]]
name = "polkadot-test-runtime"
-version = "0.8.19"
+version = "0.8.22"
dependencies = [
"bitvec",
"frame-executive",
@@ -5249,7 +5249,7 @@ dependencies = [
[[package]]
name = "polkadot-validation"
-version = "0.8.19"
+version = "0.8.22"
dependencies = [
"ansi_term 0.12.1",
"bitvec",
@@ -8427,7 +8427,7 @@ dependencies = [
[[package]]
name = "test-parachain-adder"
-version = "0.8.19"
+version = "0.8.22"
dependencies = [
"dlmalloc",
"parity-scale-codec",
@@ -8468,7 +8468,7 @@ dependencies = [
[[package]]
name = "test-parachain-halt"
-version = "0.8.19"
+version = "0.8.22"
dependencies = [
"substrate-wasm-builder-runner 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -9499,7 +9499,7 @@ dependencies = [
[[package]]
name = "westend-runtime"
-version = "0.8.19"
+version = "0.8.22"
dependencies = [
"bitvec",
"frame-benchmarking",
diff --git a/polkadot/Cargo.toml b/polkadot/Cargo.toml
index f595fef8552..23079972a03 100644
--- a/polkadot/Cargo.toml
+++ b/polkadot/Cargo.toml
@@ -4,7 +4,7 @@ path = "src/main.rs"
[package]
name = "polkadot"
-version = "0.8.19"
+version = "0.8.22"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
diff --git a/polkadot/availability-store/Cargo.toml b/polkadot/availability-store/Cargo.toml
index 83bc002d908..82c630ac635 100644
--- a/polkadot/availability-store/Cargo.toml
+++ b/polkadot/availability-store/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "polkadot-availability-store"
description = "Persistent database for parachain data"
-version = "0.8.19"
+version = "0.8.22"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
diff --git a/polkadot/cli/Cargo.toml b/polkadot/cli/Cargo.toml
index fd0b0231e0e..bcff87462b6 100644
--- a/polkadot/cli/Cargo.toml
+++ b/polkadot/cli/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-cli"
-version = "0.8.19"
+version = "0.8.22"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Polkadot Relay-chain Client Node"
edition = "2018"
diff --git a/polkadot/collator/Cargo.toml b/polkadot/collator/Cargo.toml
index df0bbc94cdd..38cb3ee2e23 100644
--- a/polkadot/collator/Cargo.toml
+++ b/polkadot/collator/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-collator"
-version = "0.8.19"
+version = "0.8.22"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Collator node implementation"
edition = "2018"
diff --git a/polkadot/erasure-coding/Cargo.toml b/polkadot/erasure-coding/Cargo.toml
index e4215f8c90c..1965150ca67 100644
--- a/polkadot/erasure-coding/Cargo.toml
+++ b/polkadot/erasure-coding/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-erasure-coding"
-version = "0.8.19"
+version = "0.8.22"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
diff --git a/polkadot/network/Cargo.toml b/polkadot/network/Cargo.toml
index 34c377caf11..6685bbb3821 100644
--- a/polkadot/network/Cargo.toml
+++ b/polkadot/network/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-network"
-version = "0.8.19"
+version = "0.8.22"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Polkadot-specific networking protocol"
edition = "2018"
diff --git a/polkadot/network/test/Cargo.toml b/polkadot/network/test/Cargo.toml
index 69f5a96f3cd..d59123fad98 100644
--- a/polkadot/network/test/Cargo.toml
+++ b/polkadot/network/test/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-network-test"
-version = "0.8.19"
+version = "0.8.22"
license = "GPL-3.0"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
diff --git a/polkadot/parachain/Cargo.toml b/polkadot/parachain/Cargo.toml
index 56092f1046d..bb8a340ecae 100644
--- a/polkadot/parachain/Cargo.toml
+++ b/polkadot/parachain/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-parachain"
-version = "0.8.19"
+version = "0.8.22"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Types and utilities for creating and working with parachains"
edition = "2018"
diff --git a/polkadot/parachain/test-parachains/adder/Cargo.toml b/polkadot/parachain/test-parachains/adder/Cargo.toml
index 9bd6b67ba1c..5b2e79257f1 100644
--- a/polkadot/parachain/test-parachains/adder/Cargo.toml
+++ b/polkadot/parachain/test-parachains/adder/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "test-parachain-adder"
-version = "0.8.19"
+version = "0.8.22"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Test parachain which adds to a number as its state transition"
edition = "2018"
diff --git a/polkadot/parachain/test-parachains/halt/Cargo.toml b/polkadot/parachain/test-parachains/halt/Cargo.toml
index 892f82273d9..9d1af0e6462 100644
--- a/polkadot/parachain/test-parachains/halt/Cargo.toml
+++ b/polkadot/parachain/test-parachains/halt/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "test-parachain-halt"
-version = "0.8.19"
+version = "0.8.22"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Test parachain which executes forever"
edition = "2018"
diff --git a/polkadot/primitives/Cargo.toml b/polkadot/primitives/Cargo.toml
index 442169cbf28..797b21df120 100644
--- a/polkadot/primitives/Cargo.toml
+++ b/polkadot/primitives/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-primitives"
-version = "0.8.19"
+version = "0.8.22"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
diff --git a/polkadot/rpc/Cargo.toml b/polkadot/rpc/Cargo.toml
index 19295488816..04034f45eda 100644
--- a/polkadot/rpc/Cargo.toml
+++ b/polkadot/rpc/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-rpc"
-version = "0.8.19"
+version = "0.8.22"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
diff --git a/polkadot/runtime/common/Cargo.toml b/polkadot/runtime/common/Cargo.toml
index 66652c967cc..e00d904915d 100644
--- a/polkadot/runtime/common/Cargo.toml
+++ b/polkadot/runtime/common/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-runtime-common"
-version = "0.8.19"
+version = "0.8.22"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
diff --git a/polkadot/runtime/common/src/registrar.rs b/polkadot/runtime/common/src/registrar.rs
index 5493d20839f..bf56d733ca1 100644
--- a/polkadot/runtime/common/src/registrar.rs
+++ b/polkadot/runtime/common/src/registrar.rs
@@ -205,7 +205,7 @@ decl_storage! {
#[cfg(feature = "std")]
fn build<T: Trait>(config: &GenesisConfig<T>) {
let mut p = config.parachains.clone();
- p.sort_unstable_by_key(|&(ref id, _, _)| *id);
+ p.sort_by_key(|&(ref id, _, _)| *id);
p.dedup_by_key(|&mut (ref id, _, _)| *id);
let only_ids: Vec<ParaId> = p.iter().map(|&(ref id, _, _)| id).cloned().collect();
diff --git a/polkadot/runtime/kusama/Cargo.toml b/polkadot/runtime/kusama/Cargo.toml
index 2f3f04ae8a9..b8f2e5a248f 100644
--- a/polkadot/runtime/kusama/Cargo.toml
+++ b/polkadot/runtime/kusama/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "kusama-runtime"
-version = "0.8.19"
+version = "0.8.22"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
build = "build.rs"
diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs
index 29215aae368..70e15cbc5d2 100644
--- a/polkadot/runtime/kusama/src/lib.rs
+++ b/polkadot/runtime/kusama/src/lib.rs
@@ -87,7 +87,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("kusama"),
impl_name: create_runtime_str!("parity-kusama"),
authoring_version: 2,
- spec_version: 2021,
+ spec_version: 2022,
impl_version: 0,
#[cfg(not(feature = "disable-runtime-api"))]
apis: RUNTIME_API_VERSIONS,
diff --git a/polkadot/runtime/parachains/src/paras.rs b/polkadot/runtime/parachains/src/paras.rs
index 2eab9c05465..4c628818a6a 100644
--- a/polkadot/runtime/parachains/src/paras.rs
+++ b/polkadot/runtime/parachains/src/paras.rs
@@ -223,7 +223,7 @@ fn build<T: Trait>(config: &GenesisConfig<T>) {
.cloned()
.collect();
- parachains.sort_unstable();
+ parachains.sort();
parachains.dedup();
Parachains::put(¶chains);
diff --git a/polkadot/runtime/polkadot/Cargo.toml b/polkadot/runtime/polkadot/Cargo.toml
index d399d9304d7..cd1b5e14365 100644
--- a/polkadot/runtime/polkadot/Cargo.toml
+++ b/polkadot/runtime/polkadot/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-runtime"
-version = "0.8.19"
+version = "0.8.22"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
build = "build.rs"
diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs
index 195125d5787..328fd927bec 100644
--- a/polkadot/runtime/polkadot/src/lib.rs
+++ b/polkadot/runtime/polkadot/src/lib.rs
@@ -86,7 +86,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("polkadot"),
impl_name: create_runtime_str!("parity-polkadot"),
authoring_version: 0,
- spec_version: 21,
+ spec_version: 22,
impl_version: 0,
#[cfg(not(feature = "disable-runtime-api"))]
apis: RUNTIME_API_VERSIONS,
diff --git a/polkadot/runtime/test-runtime/Cargo.toml b/polkadot/runtime/test-runtime/Cargo.toml
index 60965effd75..100b373935f 100644
--- a/polkadot/runtime/test-runtime/Cargo.toml
+++ b/polkadot/runtime/test-runtime/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-test-runtime"
-version = "0.8.19"
+version = "0.8.22"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
build = "build.rs"
diff --git a/polkadot/runtime/westend/Cargo.toml b/polkadot/runtime/westend/Cargo.toml
index 2cfea3a4247..3e1d1001055 100644
--- a/polkadot/runtime/westend/Cargo.toml
+++ b/polkadot/runtime/westend/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "westend-runtime"
-version = "0.8.19"
+version = "0.8.22"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
build = "build.rs"
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index 84daa4d204b..49cc91c533c 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -83,7 +83,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("westend"),
impl_name: create_runtime_str!("parity-westend"),
authoring_version: 2,
- spec_version: 41,
+ spec_version: 42,
impl_version: 0,
#[cfg(not(feature = "disable-runtime-api"))]
apis: RUNTIME_API_VERSIONS,
diff --git a/polkadot/service/Cargo.toml b/polkadot/service/Cargo.toml
index 1f9af907b79..9c16f6372ba 100644
--- a/polkadot/service/Cargo.toml
+++ b/polkadot/service/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-service"
-version = "0.8.19"
+version = "0.8.22"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
diff --git a/polkadot/statement-table/Cargo.toml b/polkadot/statement-table/Cargo.toml
index 86dc46f7f32..358a9b37d7a 100644
--- a/polkadot/statement-table/Cargo.toml
+++ b/polkadot/statement-table/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-statement-table"
-version = "0.8.19"
+version = "0.8.22"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
diff --git a/polkadot/validation/Cargo.toml b/polkadot/validation/Cargo.toml
index eee53c69da7..95d4643ada0 100644
--- a/polkadot/validation/Cargo.toml
+++ b/polkadot/validation/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "polkadot-validation"
-version = "0.8.19"
+version = "0.8.22"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
--
GitLab