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
@@ -94,7 +94,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
impl_version: 1,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
state_version: 1,
state_version: 0,
};
#[cfg(feature = "increment-spec-version")]
@@ -108,7 +108,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
impl_version: 1,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
state_version: 1,
state_version: 0,
};
pub const MILLISECS_PER_BLOCK: u64 = 12000;