Merge branch 'master' into bump-rust-nightly-2024-05-10

humanode-network · Jul 30, 2024 · b96678b · b96678b
2 parents 3363793 + 07e2da4
commit b96678b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/humanode-peer/src/service/mod.rs b/crates/humanode-peer/src/service/mod.rs
@@ -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()),

diff --git a/utils/checks/snapshots/features.yaml b/utils/checks/snapshots/features.yaml
@@ -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: []