Unverified Commit 702fc938 authored by André Silva's avatar André Silva Committed by GitHub
Browse files

runtime: remove finality-tracker (#1762)

* runtime: remove finality-tracker

* runtime: bump spec_version

* update substrate
parent 5dd3bd8f
Pipeline #110738 passed with stages
in 21 minutes and 51 seconds
This diff is collapsed.
...@@ -516,7 +516,6 @@ pub fn new_full<RuntimeApi, Executor>( ...@@ -516,7 +516,6 @@ pub fn new_full<RuntimeApi, Executor>(
config, config,
link: link_half, link: link_half,
network: network.clone(), network: network.clone(),
inherent_data_providers: inherent_data_providers.clone(),
telemetry_on_connect: Some(telemetry_connection_sinks.on_connect_stream()), telemetry_on_connect: Some(telemetry_connection_sinks.on_connect_stream()),
voting_rule, voting_rule,
prometheus_registry: prometheus_registry.clone(), prometheus_registry: prometheus_registry.clone(),
...@@ -528,11 +527,7 @@ pub fn new_full<RuntimeApi, Executor>( ...@@ -528,11 +527,7 @@ pub fn new_full<RuntimeApi, Executor>(
grandpa::run_grandpa_voter(grandpa_config)? grandpa::run_grandpa_voter(grandpa_config)?
); );
} else { } else {
grandpa::setup_disabled_grandpa( grandpa::setup_disabled_grandpa(network.clone())?;
client.clone(),
&inherent_data_providers,
network.clone(),
)?;
} }
if matches!(role, Role::Authority{..} | Role::Sentry{..}) { if matches!(role, Role::Authority{..} | Role::Sentry{..}) {
......
...@@ -40,7 +40,6 @@ pallet-collective = { git = "https://github.com/paritytech/substrate", branch = ...@@ -40,7 +40,6 @@ pallet-collective = { git = "https://github.com/paritytech/substrate", branch =
pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-finality-tracker = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
...@@ -113,7 +112,6 @@ std = [ ...@@ -113,7 +112,6 @@ std = [
"pallet-elections-phragmen/std", "pallet-elections-phragmen/std",
"pallet-democracy/std", "pallet-democracy/std",
"frame-executive/std", "frame-executive/std",
"pallet-finality-tracker/std",
"pallet-grandpa/std", "pallet-grandpa/std",
"pallet-identity/std", "pallet-identity/std",
"pallet-im-online/std", "pallet-im-online/std",
......
...@@ -88,7 +88,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { ...@@ -88,7 +88,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: 2, authoring_version: 2,
spec_version: 2025, spec_version: 2026,
impl_version: 0, impl_version: 0,
#[cfg(not(feature = "disable-runtime-api"))] #[cfg(not(feature = "disable-runtime-api"))]
apis: RUNTIME_API_VERSIONS, apis: RUNTIME_API_VERSIONS,
...@@ -613,17 +613,6 @@ impl pallet_grandpa::Trait for Runtime { ...@@ -613,17 +613,6 @@ impl pallet_grandpa::Trait for Runtime {
type WeightInfo = (); type WeightInfo = ();
} }
parameter_types! {
pub WindowSize: BlockNumber = pallet_finality_tracker::DEFAULT_WINDOW_SIZE.into();
pub ReportLatency: BlockNumber = pallet_finality_tracker::DEFAULT_REPORT_LATENCY.into();
}
impl pallet_finality_tracker::Trait for Runtime {
type OnFinalizationStalled = ();
type WindowSize = WindowSize;
type ReportLatency = ReportLatency;
}
/// Submits transaction with the node's public and signature type. Adheres to the signed extension /// Submits transaction with the node's public and signature type. Adheres to the signed extension
/// format of the chain. /// format of the chain.
impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for Runtime where impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for Runtime where
...@@ -834,7 +823,6 @@ impl InstanceFilter<Call> for ProxyType { ...@@ -834,7 +823,6 @@ impl InstanceFilter<Call> for ProxyType {
Call::Staking(..) | Call::Staking(..) |
Call::Offences(..) | Call::Offences(..) |
Call::Session(..) | Call::Session(..) |
Call::FinalityTracker(..) |
Call::Grandpa(..) | Call::Grandpa(..) |
Call::ImOnline(..) | Call::ImOnline(..) |
Call::AuthorityDiscovery(..) | Call::AuthorityDiscovery(..) |
...@@ -959,7 +947,6 @@ construct_runtime! { ...@@ -959,7 +947,6 @@ construct_runtime! {
Offences: pallet_offences::{Module, Call, Storage, Event} = 7, Offences: pallet_offences::{Module, Call, Storage, Event} = 7,
Historical: session_historical::{Module} = 34, Historical: session_historical::{Module} = 34,
Session: pallet_session::{Module, Call, Storage, Event, Config<T>} = 8, Session: pallet_session::{Module, Call, Storage, Event, Config<T>} = 8,
FinalityTracker: pallet_finality_tracker::{Module, Call, Storage, Inherent} = 9,
Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned} = 10, Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned} = 10,
ImOnline: pallet_im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>} = 11, ImOnline: pallet_im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>} = 11,
AuthorityDiscovery: pallet_authority_discovery::{Module, Call, Config} = 12, AuthorityDiscovery: pallet_authority_discovery::{Module, Call, Config} = 12,
......
...@@ -40,7 +40,6 @@ pallet-collective = { git = "https://github.com/paritytech/substrate", branch = ...@@ -40,7 +40,6 @@ pallet-collective = { git = "https://github.com/paritytech/substrate", branch =
pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-finality-tracker = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
...@@ -111,7 +110,6 @@ std = [ ...@@ -111,7 +110,6 @@ std = [
"pallet-elections-phragmen/std", "pallet-elections-phragmen/std",
"pallet-democracy/std", "pallet-democracy/std",
"frame-executive/std", "frame-executive/std",
"pallet-finality-tracker/std",
"pallet-grandpa/std", "pallet-grandpa/std",
"pallet-identity/std", "pallet-identity/std",
"pallet-im-online/std", "pallet-im-online/std",
......
...@@ -90,7 +90,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { ...@@ -90,7 +90,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("polkadot"), spec_name: create_runtime_str!("polkadot"),
impl_name: create_runtime_str!("parity-polkadot"), impl_name: create_runtime_str!("parity-polkadot"),
authoring_version: 0, authoring_version: 0,
spec_version: 25, spec_version: 26,
impl_version: 0, impl_version: 0,
#[cfg(not(feature = "disable-runtime-api"))] #[cfg(not(feature = "disable-runtime-api"))]
apis: RUNTIME_API_VERSIONS, apis: RUNTIME_API_VERSIONS,
...@@ -118,7 +118,7 @@ impl Filter<Call> for BaseFilter { ...@@ -118,7 +118,7 @@ impl Filter<Call> for BaseFilter {
Call::System(_) | Call::Scheduler(_) | Call::Indices(_) | Call::System(_) | Call::Scheduler(_) | Call::Indices(_) |
Call::Babe(_) | Call::Timestamp(_) | Call::Balances(_) | Call::Babe(_) | Call::Timestamp(_) | Call::Balances(_) |
Call::Authorship(_) | Call::Staking(_) | Call::Offences(_) | Call::Authorship(_) | Call::Staking(_) | Call::Offences(_) |
Call::Session(_) | Call::FinalityTracker(_) | Call::Grandpa(_) | Call::ImOnline(_) | Call::Session(_) | Call::Grandpa(_) | Call::ImOnline(_) |
Call::AuthorityDiscovery(_) | Call::AuthorityDiscovery(_) |
Call::Utility(_) | Call::Claims(_) | Call::Vesting(_) | Call::Utility(_) | Call::Claims(_) | Call::Vesting(_) |
Call::Identity(_) | Call::Proxy(_) | Call::Multisig(_) Call::Identity(_) | Call::Proxy(_) | Call::Multisig(_)
...@@ -659,17 +659,6 @@ impl pallet_grandpa::Trait for Runtime { ...@@ -659,17 +659,6 @@ impl pallet_grandpa::Trait for Runtime {
type WeightInfo = (); type WeightInfo = ();
} }
parameter_types! {
pub WindowSize: BlockNumber = pallet_finality_tracker::DEFAULT_WINDOW_SIZE.into();
pub ReportLatency: BlockNumber = pallet_finality_tracker::DEFAULT_REPORT_LATENCY.into();
}
impl pallet_finality_tracker::Trait for Runtime {
type OnFinalizationStalled = ();
type WindowSize = WindowSize;
type ReportLatency = ReportLatency;
}
/// Submits a transaction with the node's public and signature type. Adheres to the signed extension /// Submits a transaction with the node's public and signature type. Adheres to the signed extension
/// format of the chain. /// format of the chain.
impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for Runtime where impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for Runtime where
...@@ -848,7 +837,6 @@ impl InstanceFilter<Call> for ProxyType { ...@@ -848,7 +837,6 @@ impl InstanceFilter<Call> for ProxyType {
Call::Staking(..) | Call::Staking(..) |
Call::Offences(..) | Call::Offences(..) |
Call::Session(..) | Call::Session(..) |
Call::FinalityTracker(..) |
Call::Grandpa(..) | Call::Grandpa(..) |
Call::ImOnline(..) | Call::ImOnline(..) |
Call::AuthorityDiscovery(..) | Call::AuthorityDiscovery(..) |
...@@ -965,7 +953,6 @@ construct_runtime! { ...@@ -965,7 +953,6 @@ construct_runtime! {
Offences: pallet_offences::{Module, Call, Storage, Event} = 8, Offences: pallet_offences::{Module, Call, Storage, Event} = 8,
Historical: session_historical::{Module} = 33, Historical: session_historical::{Module} = 33,
Session: pallet_session::{Module, Call, Storage, Event, Config<T>} = 9, Session: pallet_session::{Module, Call, Storage, Event, Config<T>} = 9,
FinalityTracker: pallet_finality_tracker::{Module, Call, Storage, Inherent} = 10,
Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned} = 11, Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned} = 11,
ImOnline: pallet_im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>} = 12, ImOnline: pallet_im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>} = 12,
AuthorityDiscovery: pallet_authority_discovery::{Module, Call, Config} = 13, AuthorityDiscovery: pallet_authority_discovery::{Module, Call, Config} = 13,
......
...@@ -36,7 +36,6 @@ pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "m ...@@ -36,7 +36,6 @@ pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "m
pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-finality-tracker = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-nicks = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-nicks = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
...@@ -94,7 +93,6 @@ std = [ ...@@ -94,7 +93,6 @@ std = [
"pallet-transaction-payment/std", "pallet-transaction-payment/std",
"pallet-transaction-payment-rpc-runtime-api/std", "pallet-transaction-payment-rpc-runtime-api/std",
"frame-executive/std", "frame-executive/std",
"pallet-finality-tracker/std",
"pallet-grandpa/std", "pallet-grandpa/std",
"pallet-indices/std", "pallet-indices/std",
"pallet-nicks/std", "pallet-nicks/std",
......
...@@ -40,7 +40,6 @@ pallet-collective = { git = "https://github.com/paritytech/substrate", branch = ...@@ -40,7 +40,6 @@ pallet-collective = { git = "https://github.com/paritytech/substrate", branch =
pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-finality-tracker = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
...@@ -116,7 +115,6 @@ std = [ ...@@ -116,7 +115,6 @@ std = [
"pallet-elections-phragmen/std", "pallet-elections-phragmen/std",
"pallet-democracy/std", "pallet-democracy/std",
"frame-executive/std", "frame-executive/std",
"pallet-finality-tracker/std",
"pallet-grandpa/std", "pallet-grandpa/std",
"pallet-identity/std", "pallet-identity/std",
"pallet-im-online/std", "pallet-im-online/std",
......
...@@ -85,8 +85,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { ...@@ -85,8 +85,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("westend"), spec_name: create_runtime_str!("westend"),
impl_name: create_runtime_str!("parity-westend"), impl_name: create_runtime_str!("parity-westend"),
authoring_version: 2, authoring_version: 2,
spec_version: 45, spec_version: 46,
impl_version: 1, impl_version: 0,
#[cfg(not(feature = "disable-runtime-api"))] #[cfg(not(feature = "disable-runtime-api"))]
apis: RUNTIME_API_VERSIONS, apis: RUNTIME_API_VERSIONS,
#[cfg(feature = "disable-runtime-api")] #[cfg(feature = "disable-runtime-api")]
...@@ -403,17 +403,6 @@ impl pallet_grandpa::Trait for Runtime { ...@@ -403,17 +403,6 @@ impl pallet_grandpa::Trait for Runtime {
type WeightInfo = (); type WeightInfo = ();
} }
parameter_types! {
pub WindowSize: BlockNumber = pallet_finality_tracker::DEFAULT_WINDOW_SIZE.into();
pub ReportLatency: BlockNumber = pallet_finality_tracker::DEFAULT_REPORT_LATENCY.into();
}
impl pallet_finality_tracker::Trait for Runtime {
type OnFinalizationStalled = ();
type WindowSize = WindowSize;
type ReportLatency = ReportLatency;
}
/// Submits a transaction with the node's public and signature type. Adheres to the signed extension /// Submits a transaction with the node's public and signature type. Adheres to the signed extension
/// format of the chain. /// format of the chain.
impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for Runtime where impl<LocalCall> frame_system::offchain::CreateSignedTransaction<LocalCall> for Runtime where
...@@ -590,7 +579,6 @@ impl InstanceFilter<Call> for ProxyType { ...@@ -590,7 +579,6 @@ impl InstanceFilter<Call> for ProxyType {
Call::Staking(..) | Call::Staking(..) |
Call::Offences(..) | Call::Offences(..) |
Call::Session(..) | Call::Session(..) |
Call::FinalityTracker(..) |
Call::Grandpa(..) | Call::Grandpa(..) |
Call::ImOnline(..) | Call::ImOnline(..) |
Call::AuthorityDiscovery(..) | Call::AuthorityDiscovery(..) |
...@@ -675,7 +663,6 @@ construct_runtime! { ...@@ -675,7 +663,6 @@ construct_runtime! {
Offences: pallet_offences::{Module, Call, Storage, Event} = 7, Offences: pallet_offences::{Module, Call, Storage, Event} = 7,
Historical: session_historical::{Module} = 27, Historical: session_historical::{Module} = 27,
Session: pallet_session::{Module, Call, Storage, Event, Config<T>} = 8, Session: pallet_session::{Module, Call, Storage, Event, Config<T>} = 8,
FinalityTracker: pallet_finality_tracker::{Module, Call, Storage, Inherent} = 9,
Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned} = 10, Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event, ValidateUnsigned} = 10,
ImOnline: pallet_im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>} = 11, ImOnline: pallet_im_online::{Module, Call, Storage, Event<T>, ValidateUnsigned, Config<T>} = 11,
AuthorityDiscovery: pallet_authority_discovery::{Module, Call, Config} = 12, AuthorityDiscovery: pallet_authority_discovery::{Module, Call, Config} = 12,
......
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