Merge remote-tracking branch 'origin/develop' into yutian/fix_merge_v…

…1.1.1
bnb-chain · Nov 14, 2024 · b484638 · b484638
2 parents f6c479b + 648b4e4
commit b484638
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/crates/bsc/engine/src/task.rs b/crates/bsc/engine/src/task.rs
@@ -423,21 +423,20 @@ impl<
                 }
                 for header in disconnected_headers {
                     storage.insert_new_header(header.clone());
-                    let result =
-                        fork_choice_tx.send(ForkChoiceMessage::NewHeader(NewHeaderEvent {
-                            header: header.clone(),
-                            // if the pipeline sync is true, the fork choice will not use the safe
-                            // and finalized hash.
-                            // this can make Block Sync Engine to use pipeline sync mode.
-                            pipeline_sync,
-                            local_header: latest_unsafe_header.clone(),
-                        }));
-                    if result.is_err() {
-                        error!(target: "consensus::parlia", "Failed to send new block event to
-                    fork choice");
-                    }
                 }
                 drop(storage);
+                let result = fork_choice_tx.send(ForkChoiceMessage::NewHeader(NewHeaderEvent {
+                    header: sealed_header.clone(),
+                    // if the pipeline sync is true, the fork choice will not use the safe
+                    // and finalized hash.
+                    // this can make Block Sync Engine to use pipeline sync mode.
+                    pipeline_sync,
+                    local_header: latest_unsafe_header.clone(),
+                }));
+                if result.is_err() {
+                    error!(target: "consensus::parlia", "Failed to send new block event to
+                fork choice");
+                }
 
                 let result = chain_tracker_tx.send(ForkChoiceMessage::NewHeader(NewHeaderEvent {
                     header: sealed_header.clone(),

diff --git a/crates/config/src/config.rs b/crates/config/src/config.rs
@@ -312,7 +312,7 @@ pub struct MerkleConfig {
 
 impl Default for MerkleConfig {
     fn default() -> Self {
-        Self { clean_threshold: 5_000 }
+        Self { clean_threshold: 50_000 }
     }
 }