Skip to content

Commit

Permalink
Merge 2.0.1 backport branch into mainline master (paritytech#7842)
Browse files Browse the repository at this point in the history
* Backport paritytech#7381

* Bring back genesis storage build in aura/timestamp

To not change spec version, see
paritytech#7686 (comment)

* Backport paritytech#7238

* Backport paritytech#7395

* Bump impl_version

* Fix UI tests and bump trybuild dep

See rust-lang/rust#73996

Backports:
paritytech#7764
paritytech#7656

* Partially backport paritytech#7838

* Release frame-support with a dep compilation fix

* Bump patch level for remaining crates

This is done because at the time of writing cargo-unleash does not fully
support partial workspace publishing and mixes both local and crates.io
versions of the packages, leading to errors in the release check workflow.

* Backport paritytech#7854

...to fix compilation error when using futures-* v0.3.9.

* Adding Changelog  entry for patch release

Co-authored-by: Bastian Köcher <[email protected]>
Co-authored-by: Benjamin Kampmann <[email protected]>
  • Loading branch information
3 people authored and darkfriend77 committed Jan 11, 2021
1 parent de5f396 commit e63f5cf
Show file tree
Hide file tree
Showing 156 changed files with 322 additions and 310 deletions.
308 changes: 154 additions & 154 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bin/node/runtime/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "node-runtime"
version = "2.0.0"
version = "2.0.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
build = "build.rs"
Expand Down
2 changes: 1 addition & 1 deletion client/api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-client-api"
version = "2.0.0"
version = "2.0.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
2 changes: 1 addition & 1 deletion client/authority-discovery/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-authority-discovery"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
build = "build.rs"
Expand Down
2 changes: 1 addition & 1 deletion client/basic-authorship/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-basic-authorship"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
2 changes: 1 addition & 1 deletion client/block-builder/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-block-builder"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
2 changes: 1 addition & 1 deletion client/chain-spec/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-chain-spec"
version = "2.0.0"
version = "2.0.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
2 changes: 1 addition & 1 deletion client/chain-spec/derive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-chain-spec-derive"
version = "2.0.0"
version = "2.0.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
2 changes: 1 addition & 1 deletion client/cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-cli"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
description = "Substrate CLI interface."
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/aura/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-consensus-aura"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
description = "Aura consensus algorithm for substrate"
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/babe/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-consensus-babe"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
description = "BABE consensus algorithm for substrate"
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/babe/rpc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-consensus-babe-rpc"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
description = "RPC extensions for the BABE consensus algorithm"
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/common/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-consensus"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/epochs/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-consensus-epochs"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
description = "Generic epochs-based utilities for consensus"
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/manual-seal/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-consensus-manual-seal"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
description = "Manual sealing engine for Substrate"
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/pow/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-consensus-pow"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
description = "PoW consensus algorithm for substrate"
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/slots/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-consensus-slots"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
description = "Generic slots-based utilities for consensus"
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/uncles/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-consensus-uncles"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
description = "Generic uncle inclusion utilities for consensus"
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion client/db/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-client-db"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
2 changes: 1 addition & 1 deletion client/executor/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-executor"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
2 changes: 1 addition & 1 deletion client/executor/common/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-executor-common"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
2 changes: 1 addition & 1 deletion client/executor/wasmi/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-executor-wasmi"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
2 changes: 1 addition & 1 deletion client/executor/wasmtime/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-executor-wasmtime"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
2 changes: 1 addition & 1 deletion client/finality-grandpa/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-finality-grandpa"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
2 changes: 1 addition & 1 deletion client/finality-grandpa/rpc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-finality-grandpa-rpc"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
description = "RPC extensions for the GRANDPA finality gadget"
repository = "https://github.com/paritytech/substrate/"
Expand Down
2 changes: 1 addition & 1 deletion client/informant/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-informant"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
description = "Substrate informant."
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion client/keystore/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-keystore"
version = "2.0.0"
version = "2.0.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
2 changes: 1 addition & 1 deletion client/light/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
description = "components for a light client"
name = "sc-light"
version = "2.0.0"
version = "2.0.1"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion client/network-gossip/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
description = "Gossiping for the Substrate network protocol"
name = "sc-network-gossip"
version = "0.8.0"
version = "0.8.1"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion client/network/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
description = "Substrate network protocol"
name = "sc-network"
version = "0.8.0"
version = "0.8.1"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion client/offchain/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
description = "Substrate offchain workers"
name = "sc-offchain"
version = "2.0.0"
version = "2.0.1"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion client/peerset/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description = "Connectivity manager based on reputation"
homepage = "http://parity.io"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
name = "sc-peerset"
version = "2.0.0"
version = "2.0.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
repository = "https://github.com/paritytech/substrate/"
Expand Down
2 changes: 1 addition & 1 deletion client/proposer-metrics/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-proposer-metrics"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
2 changes: 1 addition & 1 deletion client/rpc-api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-rpc-api"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
2 changes: 1 addition & 1 deletion client/rpc-servers/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-rpc-server"
version = "2.0.0"
version = "2.0.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
2 changes: 1 addition & 1 deletion client/rpc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-rpc"
version = "2.0.0"
version = "2.0.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
2 changes: 1 addition & 1 deletion client/service/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-service"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
2 changes: 1 addition & 1 deletion client/state-db/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-state-db"
version = "0.8.0"
version = "0.8.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
2 changes: 1 addition & 1 deletion client/telemetry/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-telemetry"
version = "2.0.0"
version = "2.0.1"
authors = ["Parity Technologies <[email protected]>"]
description = "Telemetry utils"
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion client/tracing/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-tracing"
version = "2.0.0"
version = "2.0.1"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion client/transaction-pool/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-transaction-pool"
version = "2.0.0"
version = "2.0.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
2 changes: 1 addition & 1 deletion client/transaction-pool/graph/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sc-transaction-graph"
version = "2.0.0"
version = "2.0.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
Expand Down
12 changes: 12 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@ The format is based on [Keep a Changelog].

## Unreleased

## 2.0.0-> 2.0.1

Patch release with backports to fix broken nightly builds.
Namely contains backports of

* [#7381: Make Substrate compile with latest nightly](https://github.com/paritytech/substrate/pull/7381)
* [#7238: Fix compilation with environmental on latest nightly](https://github.com/paritytech/substrate/pull/7238)
* [#7395: Make benchmarks compile with latest nightly](https://github.com/paritytech/substrate/pull/7395)
* [#7838: Fix incorrect use of syn::exports](https://github.com/paritytech/substrate/pull/7838) (partially)
* [#7854: Update to futures 0.3.9](https://github.com/paritytech/substrate/pull/7854)


## 2.0.0-rc6 -> 2.0.0 – two dot 😮

Runtime
Expand Down
2 changes: 1 addition & 1 deletion frame/assets/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-assets"
version = "2.0.0"
version = "2.0.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion frame/atomic-swap/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-atomic-swap"
version = "2.0.0"
version = "2.0.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion frame/aura/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-aura"
version = "2.0.0"
version = "2.0.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion frame/authority-discovery/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-authority-discovery"
version = "2.0.0"
version = "2.0.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion frame/authorship/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-authorship"
version = "2.0.0"
version = "2.0.1"
description = "Block and Uncle Author tracking for the FRAME"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion frame/babe/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-babe"
version = "2.0.0"
version = "2.0.1"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand Down
Loading

0 comments on commit e63f5cf

Please sign in to comment.