From 3890eeb7a38f36785fc9a8dae41b47de6f3215e3 Mon Sep 17 00:00:00 2001 From: Roshan <48975233+pythonberg1997@users.noreply.github.com> Date: Mon, 11 Nov 2024 10:28:33 +0800 Subject: [PATCH 1/3] chore: update the default `MerkleConfig` (#182) --- crates/config/src/config.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/config/src/config.rs b/crates/config/src/config.rs index 3f87e1ef1..92b091f31 100644 --- a/crates/config/src/config.rs +++ b/crates/config/src/config.rs @@ -309,7 +309,7 @@ pub struct MerkleConfig { impl Default for MerkleConfig { fn default() -> Self { - Self { clean_threshold: 5_000 } + Self { clean_threshold: 50_000 } } } From 10ccf2b44759bd3716865fbb8c1bb7bcc46c173e Mon Sep 17 00:00:00 2001 From: dylanhuang Date: Wed, 13 Nov 2024 09:15:22 +0700 Subject: [PATCH 2/3] fix: reduce fcu sending in parlia task (#183) --- crates/bsc/engine/src/task.rs | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/crates/bsc/engine/src/task.rs b/crates/bsc/engine/src/task.rs index da4a0e0a6..babb46bcf 100644 --- a/crates/bsc/engine/src/task.rs +++ b/crates/bsc/engine/src/task.rs @@ -421,21 +421,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(), From 648b4e4056fbaa41b00d24db379ceb5f454f5fb9 Mon Sep 17 00:00:00 2001 From: yutianwu Date: Wed, 13 Nov 2024 10:15:56 +0800 Subject: [PATCH 3/3] chore: update version of revm (#184) --- Cargo.lock | 8 ++++---- Cargo.toml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b5b590e17..d1bd4b00f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10350,7 +10350,7 @@ dependencies = [ [[package]] name = "revm" version = "14.0.3" -source = "git+https://github.com/bnb-chain/revm?rev=0978bcb4189c547e7b71b2f11389ff2214fbe319#0978bcb4189c547e7b71b2f11389ff2214fbe319" +source = "git+https://github.com/bnb-chain/revm?rev=v1.0.5#a9752c97d2c742d25405a4a9a698f30f5007da6e" dependencies = [ "auto_impl", "cfg-if", @@ -10383,7 +10383,7 @@ dependencies = [ [[package]] name = "revm-interpreter" version = "10.0.3" -source = "git+https://github.com/bnb-chain/revm?rev=0978bcb4189c547e7b71b2f11389ff2214fbe319#0978bcb4189c547e7b71b2f11389ff2214fbe319" +source = "git+https://github.com/bnb-chain/revm?rev=v1.0.5#a9752c97d2c742d25405a4a9a698f30f5007da6e" dependencies = [ "revm-primitives", "serde", @@ -10392,7 +10392,7 @@ dependencies = [ [[package]] name = "revm-precompile" version = "11.0.3" -source = "git+https://github.com/bnb-chain/revm?rev=0978bcb4189c547e7b71b2f11389ff2214fbe319#0978bcb4189c547e7b71b2f11389ff2214fbe319" +source = "git+https://github.com/bnb-chain/revm?rev=v1.0.5#a9752c97d2c742d25405a4a9a698f30f5007da6e" dependencies = [ "alloy-rlp", "aurora-engine-modexp", @@ -10420,7 +10420,7 @@ dependencies = [ [[package]] name = "revm-primitives" version = "10.0.0" -source = "git+https://github.com/bnb-chain/revm?rev=0978bcb4189c547e7b71b2f11389ff2214fbe319#0978bcb4189c547e7b71b2f11389ff2214fbe319" +source = "git+https://github.com/bnb-chain/revm?rev=v1.0.5#a9752c97d2c742d25405a4a9a698f30f5007da6e" dependencies = [ "alloy-eip2930", "alloy-eip7702", diff --git a/Cargo.toml b/Cargo.toml index 772e6723b..b5cc42f44 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -615,9 +615,9 @@ tikv-jemallocator = "0.6" tracy-client = "0.17.3" [patch.crates-io] -revm = { git = "https://github.com/bnb-chain/revm", rev = "0978bcb4189c547e7b71b2f11389ff2214fbe319" } -revm-interpreter = { git = "https://github.com/bnb-chain/revm", rev = "0978bcb4189c547e7b71b2f11389ff2214fbe319" } -revm-primitives = { git = "https://github.com/bnb-chain/revm", rev = "0978bcb4189c547e7b71b2f11389ff2214fbe319" } +revm = { git = "https://github.com/bnb-chain/revm", rev = "v1.0.5" } +revm-interpreter = { git = "https://github.com/bnb-chain/revm", rev = "v1.0.5" } +revm-primitives = { git = "https://github.com/bnb-chain/revm", rev = "v1.0.5" } alloy-rpc-types-eth = { git = "https://github.com/bnb-chain/alloy", rev = "718060680134e6bb40d97d3c6fb56fd1950ced36" } alloy-consensus = { git = "https://github.com/bnb-chain/alloy", rev = "718060680134e6bb40d97d3c6fb56fd1950ced36" } alloy-eips = { git = "https://github.com/bnb-chain/alloy", rev = "718060680134e6bb40d97d3c6fb56fd1950ced36" }