Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
63 changes: 36 additions & 27 deletions Cargo.lock

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

14 changes: 10 additions & 4 deletions bin/node/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
pub mod cli;

use base_client_node::BaseNodeRunner;
use base_flashblocks::FlashblocksExtension;
use base_metering::MeteringExtension;
use base_flashblocks::{FlashblocksConfig, FlashblocksExtension};
use base_metering::{MeteringConfig, MeteringExtension};
use base_txpool::TxPoolExtension;

#[global_allocator]
Expand All @@ -26,10 +26,16 @@ fn main() {
cli.run(|builder, args| async move {
let mut runner = BaseNodeRunner::new(args.rollup_args.clone());

// Create flashblocks config first so we can share its state with metering
let flashblocks_config: Option<FlashblocksConfig> = args.clone().into();

// Feature extensions (FlashblocksExtension must be last - uses replace_configured)
runner.install_ext::<TxPoolExtension>(args.clone().into());
runner.install_ext::<MeteringExtension>(args.enable_metering);
runner.install_ext::<FlashblocksExtension>(args.into());
runner.install_ext::<MeteringExtension>(MeteringConfig {
enabled: args.enable_metering,
flashblocks_config: flashblocks_config.clone(),
});
runner.install_ext::<FlashblocksExtension>(flashblocks_config);

let handle = runner.run(builder);
handle.await
Expand Down
2 changes: 1 addition & 1 deletion crates/client/flashblocks/src/extension.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use crate::{
};

/// Flashblocks-specific configuration knobs.
#[derive(Debug)]
#[derive(Debug, Clone)]
pub struct FlashblocksConfig {
/// The websocket endpoint that streams flashblock updates.
pub websocket_url: Url,
Expand Down
6 changes: 6 additions & 0 deletions crates/client/flashblocks/src/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@ impl FlashblocksReceiver for FlashblocksState {
}
}

impl Default for FlashblocksState {
fn default() -> Self {
Self::new(10)
}
}

impl FlashblocksAPI for FlashblocksState {
fn get_pending_blocks(&self) -> Guard<Option<Arc<PendingBlocks>>> {
self.pending_blocks.load()
Expand Down
Loading
Loading