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

Companion PR for Substrate #7186 #1816

Merged
10 commits merged into from
Nov 11, 2020
Merged

Companion PR for Substrate #7186 #1816

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
255ede5
babe: backoff authoring blocks when finality lags
octol Oct 14, 2020
093fab9
Merge branch 'master' into jon/incremental-backoff-on-finality
octol Oct 29, 2020
5ca031c
service: use default constructor for backoff authoring strat
octol Oct 29, 2020
bf557c0
Merge remote-tracking branch 'origin' into jon/incremental-backoff-on…
octol Nov 3, 2020
90bd706
Merge remote-tracking branch 'origin' into jon/incremental-backoff-on…
octol Nov 4, 2020
3a4ac88
Merge remote-tracking branch 'upstream' into jon/incremental-backoff-…
octol Nov 6, 2020
27f3b5b
Merge remote-tracking branch 'upstream/master' into jon/incremental-b…
octol Nov 10, 2020
ef4cd68
slots: update to use renamed backoff strategy name
octol Nov 10, 2020
abdaf79
Merge remote-tracking branch 'upstream/master' into jon/incremental-b…
octol Nov 11, 2020
fc7b60f
"Update Substrate"
Nov 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions node/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "mas
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
Expand Down
3 changes: 3 additions & 0 deletions node/service/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,8 @@ pub fn new_full<RuntimeApi, Executor>(
{
let role = config.role.clone();
let force_authoring = config.force_authoring;
let backoff_authoring_blocks =
Some(sc_consensus_slots::SimpleBackoffAuthoringBlocksStrategy::default());
let disable_grandpa = config.disable_grandpa;
let name = config.network.node_name.clone();

Expand Down Expand Up @@ -656,6 +658,7 @@ pub fn new_full<RuntimeApi, Executor>(
sync_oracle: network.clone(),
inherent_data_providers: inherent_data_providers.clone(),
force_authoring,
backoff_authoring_blocks,
babe_link,
can_author_with,
};
Expand Down