diff --git a/crates/node/src/args.rs b/crates/node/src/args.rs index dc6d659..01552c5 100644 --- a/crates/node/src/args.rs +++ b/crates/node/src/args.rs @@ -320,6 +320,12 @@ pub struct NetworkArgs { /// A bool that represents if the scroll wire protocol should be enabled. #[arg(long = "network.scroll-wire", default_value_t = true)] pub enable_scroll_wire: bool, + /// A bool that represents if the transaction broadcast should be disabled. + #[arg(long = "network.disable-tx-broadcast", default_value_t = false)] + pub disable_tx_broadcast: bool, + /// A bool that represents if the transaction receiving should be disabled. + #[arg(long = "network.disable-tx-receive", default_value_t = false)] + pub disable_tx_receive: bool, } /// The arguments for the L1 provider. diff --git a/crates/node/src/node.rs b/crates/node/src/node.rs index ab39784..2ab21b7 100644 --- a/crates/node/src/node.rs +++ b/crates/node/src/node.rs @@ -57,6 +57,10 @@ where best_transactions: (), }, )) + .network(ScrollNetworkBuilder { + disable_txpool_broadcast: self.config.network_args.disable_tx_broadcast, + disable_txpool_receive: self.config.network_args.disable_tx_receive, + }) } fn add_ons(&self) -> Self::AddOns { diff --git a/crates/node/src/test_utils.rs b/crates/node/src/test_utils.rs index 6d7d43b..0b7883f 100644 --- a/crates/node/src/test_utils.rs +++ b/crates/node/src/test_utils.rs @@ -130,10 +130,7 @@ pub async fn generate_tx(wallet: Arc>) -> Bytes { pub fn default_test_scroll_rollup_node_config() -> ScrollRollupNodeConfig { ScrollRollupNodeConfig { test: true, - network_args: crate::args::NetworkArgs { - enable_eth_scroll_wire_bridge: true, - enable_scroll_wire: true, - }, + network_args: crate::args::NetworkArgs::default(), database_args: DatabaseArgs { path: Some(PathBuf::from("sqlite::memory:")) }, l1_provider_args: L1ProviderArgs::default(), engine_driver_args: EngineDriverArgs { en_sync_trigger: 100 }, @@ -147,10 +144,7 @@ pub fn default_test_scroll_rollup_node_config() -> ScrollRollupNodeConfig { pub fn default_sequencer_test_scroll_rollup_node_config() -> ScrollRollupNodeConfig { ScrollRollupNodeConfig { test: true, - network_args: crate::args::NetworkArgs { - enable_eth_scroll_wire_bridge: true, - enable_scroll_wire: true, - }, + network_args: crate::args::NetworkArgs::default(), database_args: DatabaseArgs { path: Some(PathBuf::from("sqlite::memory:")) }, l1_provider_args: L1ProviderArgs::default(), engine_driver_args: EngineDriverArgs { en_sync_trigger: 100 }, diff --git a/crates/node/tests/e2e.rs b/crates/node/tests/e2e.rs index 2cc4a96..918a6d4 100644 --- a/crates/node/tests/e2e.rs +++ b/crates/node/tests/e2e.rs @@ -35,10 +35,7 @@ async fn can_bridge_l1_messages() -> eyre::Result<()> { let chain_spec = (*SCROLL_DEV).clone(); let node_args = ScrollRollupNodeConfig { test: true, - network_args: ScrollNetworkArgs { - enable_eth_scroll_wire_bridge: true, - enable_scroll_wire: true, - }, + network_args: ScrollNetworkArgs::default(), database_args: DatabaseArgs { path: Some(PathBuf::from("sqlite::memory:")) }, l1_provider_args: L1ProviderArgs::default(), engine_driver_args: EngineDriverArgs::default(), @@ -99,10 +96,7 @@ async fn can_sequence_and_gossip_blocks() { let chain_spec = (*SCROLL_DEV).clone(); let rollup_manager_args = ScrollRollupNodeConfig { test: true, - network_args: ScrollNetworkArgs { - enable_eth_scroll_wire_bridge: true, - enable_scroll_wire: true, - }, + network_args: ScrollNetworkArgs::default(), database_args: DatabaseArgs { path: Some(PathBuf::from("sqlite::memory:")) }, l1_provider_args: L1ProviderArgs::default(), engine_driver_args: EngineDriverArgs::default(), diff --git a/crates/sequencer/tests/e2e.rs b/crates/sequencer/tests/e2e.rs index e79d29d..ff23517 100644 --- a/crates/sequencer/tests/e2e.rs +++ b/crates/sequencer/tests/e2e.rs @@ -430,7 +430,7 @@ async fn can_sequence_blocks_with_private_key_file() -> eyre::Result<()> { let chain_spec = (*SCROLL_DEV).clone(); let rollup_manager_args = ScrollRollupNodeConfig { test: false, // disable test mode to enable real signing - network_args: NetworkArgs { enable_eth_scroll_wire_bridge: true, enable_scroll_wire: true }, + network_args: NetworkArgs::default(), database_args: DatabaseArgs { path: Some(PathBuf::from("sqlite::memory:")) }, l1_provider_args: L1ProviderArgs::default(), engine_driver_args: EngineDriverArgs::default(), @@ -514,7 +514,7 @@ async fn can_sequence_blocks_with_hex_key_file_without_prefix() -> eyre::Result< let chain_spec = (*SCROLL_DEV).clone(); let rollup_manager_args = ScrollRollupNodeConfig { test: false, // disable test mode to enable real signing - network_args: NetworkArgs { enable_eth_scroll_wire_bridge: true, enable_scroll_wire: true }, + network_args: NetworkArgs::default(), database_args: DatabaseArgs { path: Some(PathBuf::from("sqlite::memory:")) }, l1_provider_args: L1ProviderArgs::default(), engine_driver_args: EngineDriverArgs::default(),