Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Commit cd2a578

Browse files
gavofyorkgavofyork
authored
Backports from master (#525)
* bump version to 0.6.6 (#516) * retry on gitlab system failures (#521) * retry on gitlab system failures * max is just 2 * Bump Substrate master (#522) * Bump substrate * Bump runtime version * Fix Configuration stuff * fix extract_proof return type * add ImOnline module as Authorship event handler
1 parent 39397ab commit cd2a578

File tree

21 files changed

+372
-361
lines changed

21 files changed

+372
-361
lines changed

‎.gitlab-ci.yml

+6
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ variables:
3838
name: parity-build
3939

4040
.docker-env: &docker-env
41+
retry:
42+
max: 2
43+
when:
44+
- runner_system_failure
45+
- unknown_failure
46+
- api_failure
4147
tags:
4248
- linux-docker
4349

‎Cargo.lock

+340-339
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ path = "src/main.rs"
44

55
[package]
66
name = "polkadot"
7-
version = "0.6.5"
7+
version = "0.6.6"
88
authors = ["Parity Technologies <[email protected]>"]
99
build = "build.rs"
1010
edition = "2018"

‎availability-store/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "polkadot-availability-store"
33
description = "Persistent database for parachain data"
4-
version = "0.6.5"
4+
version = "0.6.6"
55
authors = ["Parity Technologies <[email protected]>"]
66
edition = "2018"
77

‎cli/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-cli"
3-
version = "0.6.5"
3+
version = "0.6.6"
44
authors = ["Parity Technologies <[email protected]>"]
55
description = "Polkadot node implementation in Rust."
66
edition = "2018"

‎collator/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-collator"
3-
version = "0.6.5"
3+
version = "0.6.6"
44
authors = ["Parity Technologies <[email protected]>"]
55
description = "Collator node implementation"
66
edition = "2018"

‎erasure-coding/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-erasure-coding"
3-
version = "0.6.5"
3+
version = "0.6.6"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2018"
66

‎executor/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-executor"
3-
version = "0.6.5"
3+
version = "0.6.6"
44
authors = ["Parity Technologies <[email protected]>"]
55
description = "Polkadot node implementation in Rust."
66
edition = "2018"

‎network/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-network"
3-
version = "0.6.5"
3+
version = "0.6.6"
44
authors = ["Parity Technologies <[email protected]>"]
55
description = "Polkadot-specific networking protocol"
66
edition = "2018"

‎network/src/tests/validation.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use polkadot_primitives::parachain::{
3434
};
3535
use parking_lot::Mutex;
3636
use substrate_client::error::Result as ClientResult;
37-
use substrate_client::runtime_api::{Core, RuntimeVersion, ApiExt};
37+
use substrate_client::runtime_api::{Core, RuntimeVersion, StorageProof, ApiExt};
3838
use sr_primitives::traits::{ApiRef, ProvideRuntimeApi};
3939

4040
use std::collections::HashMap;
@@ -244,7 +244,7 @@ impl ApiExt<Block> for RuntimeApi {
244244

245245
fn record_proof(&mut self) { }
246246

247-
fn extract_proof(&mut self) -> Option<Vec<Vec<u8>>> {
247+
fn extract_proof(&mut self) -> Option<StorageProof> {
248248
None
249249
}
250250
}

‎parachain/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-parachain"
3-
version = "0.6.5"
3+
version = "0.6.6"
44
authors = ["Parity Technologies <[email protected]>"]
55
description = "Types and utilities for creating and working with parachains"
66
edition = "2018"

‎primitives/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-primitives"
3-
version = "0.6.5"
3+
version = "0.6.6"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2018"
66

‎rpc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-rpc"
3-
version = "0.6.5"
3+
version = "0.6.6"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2018"
66

‎runtime/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-runtime"
3-
version = "0.6.5"
3+
version = "0.6.6"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2018"
66
build = "build.rs"

‎runtime/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
9999
spec_name: create_runtime_str!("kusama"),
100100
impl_name: create_runtime_str!("parity-kusama"),
101101
authoring_version: 1,
102-
spec_version: 1008,
102+
spec_version: 1010,
103103
impl_version: 0,
104104
apis: RUNTIME_API_VERSIONS,
105105
};
@@ -247,7 +247,7 @@ impl authorship::Trait for Runtime {
247247
type FindAuthor = session::FindAccountFromAuthorIndex<Self, Babe>;
248248
type UncleGenerations = UncleGenerations;
249249
type FilterUncle = ();
250-
type EventHandler = Staking;
250+
type EventHandler = (Staking, ImOnline);
251251
}
252252

253253
parameter_types! {

‎service/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-service"
3-
version = "0.6.5"
3+
version = "0.6.6"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2018"
66

‎service/src/lib.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ use inherents::InherentDataProviders;
3232
use log::info;
3333
pub use service::{AbstractService, Roles, PruningMode, TransactionPoolOptions, Error};
3434
pub use service::{ServiceBuilderExport, ServiceBuilderImport, ServiceBuilderRevert};
35-
pub use service::config::full_version_from_strs;
35+
pub use service::config::{DatabaseConfig, full_version_from_strs};
3636
pub use client::{backend::Backend, runtime_api::{Core as CoreApi, ConstructRuntimeApi}, ExecutionStrategy, CallExecutor};
3737
pub use consensus_common::SelectChain;
3838
pub use polkadot_network::{PolkadotProtocol};
@@ -146,7 +146,11 @@ pub fn new_full(config: Configuration<CustomConfiguration, GenesisConfig>)
146146
let is_authority = config.roles.is_authority() && !is_collator;
147147
let force_authoring = config.force_authoring;
148148
let max_block_data_size = config.custom.max_block_data_size;
149-
let db_path = config.database_path.clone();
149+
let db_path = if let DatabaseConfig::Path { ref path, .. } = config.database {
150+
path.clone()
151+
} else {
152+
return Err("Starting a Polkadot service with a custom database isn't supported".to_string().into());
153+
};
150154
let disable_grandpa = config.disable_grandpa;
151155
let name = config.name.clone();
152156

‎statement-table/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-statement-table"
3-
version = "0.6.5"
3+
version = "0.6.6"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2018"
66

‎test-parachains/adder/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "adder"
3-
version = "0.6.5"
3+
version = "0.6.6"
44
authors = ["Parity Technologies <[email protected]>"]
55
description = "Test parachain which adds to a number as its state transition"
66
edition = "2018"

‎test-parachains/halt/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "halt"
3-
version = "0.6.5"
3+
version = "0.6.6"
44
authors = ["Parity Technologies <[email protected]>"]
55
description = "Test parachain which executes forever"
66
edition = "2018"

‎validation/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polkadot-validation"
3-
version = "0.6.5"
3+
version = "0.6.6"
44
authors = ["Parity Technologies <[email protected]>"]
55
edition = "2018"
66

0 commit comments

Comments
 (0)