Unverified Commit 6fd50490 authored by Gavin Wood's avatar Gavin Wood Committed by GitHub
Browse files

Bump Substrate master (#522)

* Bump substrate

* Bump runtime version

* Fix Configuration stuff

* fix extract_proof return type

* add ImOnline module as Authorship event handler
parent e8959493
Pipeline #55713 passed with stages
in 24 minutes and 22 seconds
This diff is collapsed.
...@@ -34,7 +34,7 @@ use polkadot_primitives::parachain::{ ...@@ -34,7 +34,7 @@ use polkadot_primitives::parachain::{
}; };
use parking_lot::Mutex; use parking_lot::Mutex;
use substrate_client::error::Result as ClientResult; 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 sr_primitives::traits::{ApiRef, ProvideRuntimeApi};
use std::collections::HashMap; use std::collections::HashMap;
...@@ -244,7 +244,7 @@ impl ApiExt<Block> for RuntimeApi { ...@@ -244,7 +244,7 @@ impl ApiExt<Block> for RuntimeApi {
fn record_proof(&mut self) { } fn record_proof(&mut self) { }
fn extract_proof(&mut self) -> Option<Vec<Vec<u8>>> { fn extract_proof(&mut self) -> Option<StorageProof> {
None None
} }
} }
......
...@@ -99,7 +99,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { ...@@ -99,7 +99,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("kusama"), spec_name: create_runtime_str!("kusama"),
impl_name: create_runtime_str!("parity-kusama"), impl_name: create_runtime_str!("parity-kusama"),
authoring_version: 1, authoring_version: 1,
spec_version: 1008, spec_version: 1010,
impl_version: 0, impl_version: 0,
apis: RUNTIME_API_VERSIONS, apis: RUNTIME_API_VERSIONS,
}; };
...@@ -247,7 +247,7 @@ impl authorship::Trait for Runtime { ...@@ -247,7 +247,7 @@ impl authorship::Trait for Runtime {
type FindAuthor = session::FindAccountFromAuthorIndex<Self, Babe>; type FindAuthor = session::FindAccountFromAuthorIndex<Self, Babe>;
type UncleGenerations = UncleGenerations; type UncleGenerations = UncleGenerations;
type FilterUncle = (); type FilterUncle = ();
type EventHandler = Staking; type EventHandler = (Staking, ImOnline);
} }
parameter_types! { parameter_types! {
......
...@@ -32,7 +32,7 @@ use inherents::InherentDataProviders; ...@@ -32,7 +32,7 @@ use inherents::InherentDataProviders;
use log::info; use log::info;
pub use service::{AbstractService, Roles, PruningMode, TransactionPoolOptions, Error}; pub use service::{AbstractService, Roles, PruningMode, TransactionPoolOptions, Error};
pub use service::{ServiceBuilderExport, ServiceBuilderImport, ServiceBuilderRevert}; 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 client::{backend::Backend, runtime_api::{Core as CoreApi, ConstructRuntimeApi}, ExecutionStrategy, CallExecutor};
pub use consensus_common::SelectChain; pub use consensus_common::SelectChain;
pub use polkadot_network::{PolkadotProtocol}; pub use polkadot_network::{PolkadotProtocol};
...@@ -146,7 +146,11 @@ pub fn new_full(config: Configuration<CustomConfiguration, GenesisConfig>) ...@@ -146,7 +146,11 @@ pub fn new_full(config: Configuration<CustomConfiguration, GenesisConfig>)
let is_authority = config.roles.is_authority() && !is_collator; let is_authority = config.roles.is_authority() && !is_collator;
let force_authoring = config.force_authoring; let force_authoring = config.force_authoring;
let max_block_data_size = config.custom.max_block_data_size; 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 disable_grandpa = config.disable_grandpa;
let name = config.name.clone(); let name = config.name.clone();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment