Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Port boojum eth-sender changes #293

Merged
merged 10 commits into from
Oct 31, 2023
Merged

feat: Port boojum eth-sender changes #293

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fbb1d5a
Port boojum eth-sender changes
perekopskiy Oct 23, 2023
0feafb8
Fix test
perekopskiy Oct 24, 2023
be494b7
Use `is_pre_boojum` in consistency checker
perekopskiy Oct 25, 2023
002fdab
Make names more explicit
perekopskiy Oct 25, 2023
d69e9fd
Resolve conficts
perekopskiy Oct 26, 2023
b3c59d7
post-boojum l1_commit_data
perekopskiy Oct 26, 2023
588ceae
Fix for upgrade-test
perekopskiy Oct 26, 2023
472d770
Revert "Fix for upgrade-test"
perekopskiy Oct 30, 2023
38e9f18
Update is_pre_boojum
perekopskiy Oct 30, 2023
42d817a
Merge branch 'main' into boojum-eth-sender-changes
perekopskiy Oct 30, 2023
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
4 changes: 3 additions & 1 deletion core/bin/external_node/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,9 @@ async fn init_tasks(

let metadata_calculator = MetadataCalculator::new(&MetadataCalculatorConfig {
db_path: &config.required.merkle_tree_path,
mode: MetadataCalculatorModeConfig::Lightweight,
mode: MetadataCalculatorModeConfig::Full {
store_factory: None,
},
delay_interval: config.optional.metadata_calculator_delay(),
max_l1_batches_per_iter: config.optional.max_l1_batches_per_tree_iter,
multi_get_chunk_size: config.optional.merkle_tree_multi_get_chunk_size,
Expand Down
158 changes: 0 additions & 158 deletions core/lib/circuit_breaker/src/facet_selectors.rs
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions core/lib/circuit_breaker/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,14 @@ use tokio::sync::watch;

use zksync_config::configs::chain::CircuitBreakerConfig;

use crate::facet_selectors::MismatchedFacetSelectorsError;

pub mod facet_selectors;
pub mod l1_txs;
pub mod replication_lag;
pub mod utils;

#[cfg(test)]
mod tests;

#[derive(Debug, Error)]
pub enum CircuitBreakerError {
#[error("System has failed L1 transaction")]
FailedL1Transaction,
#[error("Mismatched facet selectors: {0}")]
MismatchedFacetSelectors(MismatchedFacetSelectorsError),
#[error("Replication lag ({0:?}) is above the threshold ({1:?})")]
ReplicationLag(u32, u32),
}
Expand Down
Loading