paritytech · gavofyork · Oct 31, 2019 · Oct 30, 2019 · Oct 31, 2019 · Oct 31, 2019
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -38,6 +38,12 @@ variables:
     name: parity-build
 
 .docker-env:                       &docker-env
+  retry:
+    max: 2
+    when: 
+      - runner_system_failure
+      - unknown_failure
+      - api_failure
   tags:
     - linux-docker
 

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.6.5"
+version = "0.6.6"
 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.6.5"
+version = "0.6.6"
 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.6.5"
+version = "0.6.6"
 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.6.5"
+version = "0.6.6"
 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.6.5"
+version = "0.6.6"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

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

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

diff --git a/network/src/tests/validation.rs b/network/src/tests/validation.rs
@@ -34,7 +34,7 @@ use polkadot_primitives::parachain::{
 };
 use parking_lot::Mutex;
 use substrate_client::error::Result as ClientResult;
-use substrate_client::runtime_api::{Core, RuntimeVersion, ApiExt};
+use substrate_client::runtime_api::{Core, RuntimeVersion, StorageProof, ApiExt};
 use sr_primitives::traits::{ApiRef, ProvideRuntimeApi};
 
 use std::collections::HashMap;
@@ -244,7 +244,7 @@ impl ApiExt<Block> for RuntimeApi {
 
 	fn record_proof(&mut self) { }
 
-	fn extract_proof(&mut self) -> Option<Vec<Vec<u8>>> {
+	fn extract_proof(&mut self) -> Option<StorageProof> {
 		None
 	}
 }

diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-parachain"
-version = "0.6.5"
+version = "0.6.6"
 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.6.5"
+version = "0.6.6"
 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.6.5"
+version = "0.6.6"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"
 

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

diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -99,7 +99,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("kusama"),
 	impl_name: create_runtime_str!("parity-kusama"),
 	authoring_version: 1,
-	spec_version: 1008,
+	spec_version: 1010,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 };
@@ -247,7 +247,7 @@ impl authorship::Trait for Runtime {
 	type FindAuthor = session::FindAccountFromAuthorIndex<Self, Babe>;
 	type UncleGenerations = UncleGenerations;
 	type FilterUncle = ();
-	type EventHandler = Staking;
+	type EventHandler = (Staking, ImOnline);
 }
 
 parameter_types! {

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

diff --git a/service/src/lib.rs b/service/src/lib.rs
@@ -32,7 +32,7 @@ use inherents::InherentDataProviders;
 use log::info;
 pub use service::{AbstractService, Roles, PruningMode, TransactionPoolOptions, Error};
 pub use service::{ServiceBuilderExport, ServiceBuilderImport, ServiceBuilderRevert};
-pub use service::config::full_version_from_strs;
+pub use service::config::{DatabaseConfig, full_version_from_strs};
 pub use client::{backend::Backend, runtime_api::{Core as CoreApi, ConstructRuntimeApi}, ExecutionStrategy, CallExecutor};
 pub use consensus_common::SelectChain;
 pub use polkadot_network::{PolkadotProtocol};
@@ -146,7 +146,11 @@ pub fn new_full(config: Configuration<CustomConfiguration, GenesisConfig>)
 	let is_authority = config.roles.is_authority() && !is_collator;
 	let force_authoring = config.force_authoring;
 	let max_block_data_size = config.custom.max_block_data_size;
-	let db_path = config.database_path.clone();
+	let db_path = if let DatabaseConfig::Path { ref path, .. } = config.database {
+		path.clone()
+	} else {
+		return Err("Starting a Polkadot service with a custom database isn't supported".to_string().into());
+	};
 	let disable_grandpa = config.disable_grandpa;
 	let name = config.name.clone();
 

diff --git a/statement-table/Cargo.toml b/statement-table/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadot-statement-table"
-version = "0.6.5"
+version = "0.6.6"
 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.6.5"
+version = "0.6.6"
 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.6.5"
+version = "0.6.6"
 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.6.5"
+version = "0.6.6"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2018"