merge from cumulus release branch inc extra commit (#940)

* Revert "Companion for substrate#10632 (#895)"

This reverts commit fd145766d4.

* Revert "Companion for paritytech/polkadot#4712 (#901)"

This reverts commit 9c977d66a3.

* Prepare branch

* Make sure to use `state_version = 0` for now

* Fix lock file

* Minimising changes to cargo lock

* updating to include weights update.

Co-authored-by: Bastian Köcher <info@kchr.de>
This commit is contained in:
Squirrel
2022-02-01 11:01:18 +00:00
committed by GitHub
parent 7881fe6a16
commit 04c518de01
17 changed files with 181 additions and 239 deletions
+2 -2
View File
@@ -21,13 +21,13 @@ path = "src/main.rs"
[features]
runtime-benchmarks = ["parachain-template-runtime/runtime-benchmarks"]
try-runtime = ["parachain-template-runtime/try-runtime"]
try-runtime = [ "parachain-template-runtime/try-runtime" ]
[dependencies]
clap = { version = "3.0", features = ["derive"] }
derive_more = "0.99.2"
log = "0.4.14"
codec = { package = "parity-scale-codec", version = "2.0.0" }
structopt = "0.3.8"
serde = { version = "1.0.132", features = ["derive"] }
hex-literal = "0.3.1"