Update to Substrate master (paritytech#886)

* Bump Substrate and some fixes * Bump runtime * version bump
lamafab · Mar 6, 2020 · ab76ea7 · ab76ea7
1 parent bd875ae
commit ab76ea7
Show file tree

Hide file tree

Showing 21 changed files with 192 additions and 200 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ path = "src/main.rs"
 
 [package]
 name = "polkadot"
-version = "0.7.21"
+version = "0.7.22-dev"
 authors = ["Parity Technologies <[email protected]>"]
 build = "build.rs"
 edition = "2018"

diff --git a/availability-store/Cargo.toml b/availability-store/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "polkadot-availability-store"
 description = "Persistent database for parachain data"
-version = "0.7.21"
+version = "0.7.22-dev"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-cli"
-version = "0.7.21"
+version = "0.7.22-dev"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Polkadot node implementation in Rust."
 edition = "2018"

diff --git a/collator/Cargo.toml b/collator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-collator"
-version = "0.7.21"
+version = "0.7.22-dev"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Collator node implementation"
 edition = "2018"

diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-erasure-coding"
-version = "0.7.21"
+version = "0.7.22-dev"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/network/Cargo.toml b/network/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-network"
-version = "0.7.21"
+version = "0.7.22-dev"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Polkadot-specific networking protocol"
 edition = "2018"

diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-parachain"
-version = "0.7.21"
+version = "0.7.22-dev"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Types and utilities for creating and working with parachains"
 edition = "2018"

diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-primitives"
-version = "0.7.21"
+version = "0.7.22-dev"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-rpc"
-version = "0.7.21"
+version = "0.7.22-dev"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-runtime-common"
-version = "0.7.21"
+version = "0.7.22-dev"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "kusama-runtime"
-version = "0.7.21"
+version = "0.7.22-dev"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 build = "build.rs"

diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
@@ -76,7 +76,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("kusama"),
 	impl_name: create_runtime_str!("parity-kusama"),
 	authoring_version: 2,
-	spec_version: 1049,
+	spec_version: 1050,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 };
@@ -738,10 +738,6 @@ sp_api::impl_runtime_apis! {
 			Executive::apply_extrinsic(extrinsic)
 		}
 
-		fn apply_trusted_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {
-			Executive::apply_extrinsic(extrinsic)
-		}
-
 		fn finalize_block() -> <Block as BlockT>::Header {
 			Executive::finalize_block()
 		}

diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-runtime"
-version = "0.7.21"
+version = "0.7.22-dev"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 build = "build.rs"

diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs
@@ -660,10 +660,6 @@ sp_api::impl_runtime_apis! {
 			Executive::apply_extrinsic(extrinsic)
 		}
 
-		fn apply_trusted_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {
-			Executive::apply_extrinsic(extrinsic)
-		}
-
 		fn finalize_block() -> <Block as BlockT>::Header {
 			Executive::finalize_block()
 		}

diff --git a/service/Cargo.toml b/service/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-service"
-version = "0.7.21"
+version = "0.7.22-dev"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/statement-table/Cargo.toml b/statement-table/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-statement-table"
-version = "0.7.21"
+version = "0.7.22-dev"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/test-parachains/adder/Cargo.toml b/test-parachains/adder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "adder"
-version = "0.7.21"
+version = "0.7.22-dev"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Test parachain which adds to a number as its state transition"
 edition = "2018"

diff --git a/test-parachains/halt/Cargo.toml b/test-parachains/halt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "halt"
-version = "0.7.21"
+version = "0.7.22-dev"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Test parachain which executes forever"
 edition = "2018"

diff --git a/validation/Cargo.toml b/validation/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-validation"
-version = "0.7.21"
+version = "0.7.22-dev"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

diff --git a/validation/src/block_production.rs b/validation/src/block_production.rs
@@ -296,7 +296,7 @@ impl<Client, TxPool, Backend> CreateProposalData<Client, TxPool, Backend> where
 					break;
 				}
 
-				match block_builder.push_trusted(ready.data().clone()) {
+				match block_builder.push(ready.data().clone()) {
 					Ok(()) => {
 						debug!("[{:?}] Pushed to the block.", ready.hash());
 						pending_size += encoded_size;