Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/cargo/syn-2.0.72
Browse files Browse the repository at this point in the history
  • Loading branch information
dmitrylavrenov authored Jul 30, 2024
2 parents 5d66453 + 07e2da4 commit 4fcbbf7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock

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

5 changes: 4 additions & 1 deletion crates/humanode-peer/src/service/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,10 @@ pub async fn new_full(config: Configuration) -> Result<TaskManager, ServiceError
link: grandpa_link,
network: Arc::clone(&network),
sync: Arc::clone(&sync_service),
voting_rule: sc_consensus_grandpa::VotingRulesBuilder::default().build(),
voting_rule: sc_consensus_grandpa::VotingRulesBuilder::new()
.add(sc_consensus_grandpa::BeforeBestBlockBy(7u32))
.add(sc_consensus_grandpa::ThreeQuartersOfTheUnfinalizedChain)
.build(),
prometheus_registry,
shared_voter_state: grandpa_shared_voter_state_cloned,
telemetry: telemetry.as_ref().map(|x| x.handle()),
Expand Down
4 changes: 2 additions & 2 deletions utils/checks/snapshots/features.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1886,14 +1886,14 @@
- std
- name: open-fastrlp-derive 0.1.1
features: []
- name: openssl 0.10.63
- name: openssl 0.10.66
features:
- default
- name: openssl-macros 0.1.1
features: []
- name: openssl-probe 0.1.5
features: []
- name: openssl-sys 0.9.99
- name: openssl-sys 0.9.103
features: []
- name: overload 0.1.1
features: []
Expand Down

0 comments on commit 4fcbbf7

Please sign in to comment.