feat: log config (#239)

* feat: log config

* feat: use ScrollChainConfig for num l1 messages per block

* fix: fmt

Author: greged93

crates/node/src/add_ons/rollup.rs

@@ -6,7 +6,7 @@ use reth_network_api::FullNetwork;
 use reth_node_api::{FullNodeTypes, NodeTypes};
 use reth_node_builder::{rpc::RpcHandle, AddOnsContext, FullNodeComponents};
 use reth_rpc_eth_api::EthApiTypes;
-use reth_scroll_chainspec::ScrollChainSpec;
+use reth_scroll_chainspec::{ChainConfig, ScrollChainConfig, ScrollChainSpec};
 use reth_scroll_node::ScrollNetworkPrimitives;
 use rollup_node_manager::RollupManagerHandle;
 use rollup_node_watcher::L1Notification;
@@ -52,7 +52,8 @@ impl RollupManagerAddOn {
         rpc: RpcHandle<N, EthApi>,
     ) -> eyre::Result<(RollupManagerHandle, Option<Sender<Arc<L1Notification>>>)>
     where
-        <<N as FullNodeTypes>::Types as NodeTypes>::ChainSpec: ScrollHardforks + IsDevChain,
+        <<N as FullNodeTypes>::Types as NodeTypes>::ChainSpec:
+            ChainConfig<Config = ScrollChainConfig> + ScrollHardforks + IsDevChain,
         N::Network: NetworkProtocols + FullNetwork<Primitives = ScrollNetworkPrimitives>,
     {
         let (rnm, handle, l1_notification_tx) = self

crates/node/src/args.rs

@@ -18,7 +18,7 @@ use reth_network::NetworkProtocols;
 use reth_network_api::FullNetwork;
 use reth_node_builder::rpc::RethRpcServerHandles;
 use reth_node_core::primitives::BlockHeader;
-use reth_scroll_chainspec::SCROLL_FEE_VAULT_ADDRESS;
+use reth_scroll_chainspec::{ChainConfig, ScrollChainConfig, SCROLL_FEE_VAULT_ADDRESS};
 use reth_scroll_node::ScrollNetworkPrimitives;
 use rollup_node_manager::{
     Consensus, NoopConsensus, RollupManagerHandle, RollupNodeManager, SystemContractConsensus,
@@ -129,7 +129,11 @@ impl ScrollRollupNodeConfig {
     )>
     where
         N: FullNetwork<Primitives = ScrollNetworkPrimitives> + NetworkProtocols,
-        CS: EthChainSpec<Header: BlockHeader> + ScrollHardforks + IsDevChain + 'static,
+        CS: EthChainSpec<Header: BlockHeader>
+            + ChainConfig<Config = ScrollChainConfig>
+            + ScrollHardforks
+            + IsDevChain
+            + 'static,
     {
         tracing::info!(target: "rollup_node::args",
             "Building rollup node with config:\n{:#?}",
@@ -267,13 +271,14 @@ impl ScrollRollupNodeConfig {
         let l1_provider = FullL1Provider::new(blob_provider, l1_messages_provider.clone()).await;
 
         // Construct the Sequencer.
+        let chain_config = chain_spec.chain_config();
         let (sequencer, block_time) = if self.sequencer_args.sequencer_enabled {
             let args = &self.sequencer_args;
             let sequencer = Sequencer::new(
                 Arc::new(l1_messages_provider),
                 args.fee_recipient,
                 ctx.block_gas_limit,
-                args.max_l1_messages_per_block,
+                chain_config.l1_config.num_l1_messages_per_block,
                 0,
                 self.sequencer_args.l1_message_inclusion_mode,
             );
@@ -479,9 +484,6 @@ pub struct SequencerArgs {
     /// The payload building duration for the sequencer (milliseconds)
     #[arg(long = "sequencer.payload-building-duration", id = "sequencer_payload_building_duration", value_name = "SEQUENCER_PAYLOAD_BUILDING_DURATION", default_value_t = constants::DEFAULT_PAYLOAD_BUILDING_DURATION)]
     pub payload_building_duration: u64,
-    /// The max L1 messages per block for the sequencer.
-    #[arg(long = "sequencer.max-l1-messages-per-block", id = "sequencer_max_l1_messages_per_block", value_name = "SEQUENCER_MAX_L1_MESSAGES_PER_BLOCK", default_value_t = constants::DEFAULT_MAX_L1_MESSAGES_PER_BLOCK)]
-    pub max_l1_messages_per_block: u64,
     /// The fee recipient for the sequencer.
     #[arg(long = "sequencer.fee-recipient", id = "sequencer_fee_recipient", value_name = "SEQUENCER_FEE_RECIPIENT", default_value_t = SCROLL_FEE_VAULT_ADDRESS)]
     pub fee_recipient: Address,

crates/node/src/constants.rs

@@ -18,9 +18,6 @@ pub(crate) const DEFAULT_PAYLOAD_BUILDING_DURATION: u64 = 800;
 /// The default payload size limit in bytes for the sequencer.
 pub(crate) const DEFAULT_PAYLOAD_SIZE_LIMIT: u64 = 122_880;
 
-/// The default max L1 messages per block for the sequencer.
-pub(crate) const DEFAULT_MAX_L1_MESSAGES_PER_BLOCK: u64 = 4;
-
 /// The gap in blocks between the P2P and EN which triggers sync.
 pub(crate) const BLOCK_GAP_TRIGGER: u64 = 500_000;
 

crates/node/src/main.rs

@@ -23,6 +23,8 @@ fn main() {
             let handle = builder
                 .node(ScrollRollupNode::new(args))
                 .launch_with_fn(|builder| {
+                    info!(target: "reth::cli", config = ?builder.config().chain.config, "Running with config");
+
                     // We must use `always_process_payload_attributes_on_canonical_head` in order to
                     // be able to build payloads with the forkchoice state API
                     // on top of heads part of the canonical state. Not

crates/node/src/test_utils.rs

@@ -168,7 +168,6 @@ pub fn default_sequencer_test_scroll_rollup_node_config() -> ScrollRollupNodeCon
             sequencer_enabled: true,
             block_time: 50,
             payload_building_duration: 40,
-            max_l1_messages_per_block: 0,
             fee_recipient: Default::default(),
             l1_message_inclusion_mode: L1MessageInclusionMode::BlockDepth(0),
         },

crates/node/tests/e2e.rs

@@ -49,7 +49,6 @@ async fn can_bridge_l1_messages() -> eyre::Result<()> {
         sequencer_args: SequencerArgs {
             sequencer_enabled: true,
             block_time: 0,
-            max_l1_messages_per_block: 4,
             l1_message_inclusion_mode: L1MessageInclusionMode::BlockDepth(0),
             ..SequencerArgs::default()
         },
@@ -119,7 +118,6 @@ async fn can_sequence_and_gossip_blocks() {
         sequencer_args: SequencerArgs {
             sequencer_enabled: true,
             block_time: 0,
-            max_l1_messages_per_block: 4,
             l1_message_inclusion_mode: L1MessageInclusionMode::BlockDepth(0),
             payload_building_duration: 1000,
             ..SequencerArgs::default()
@@ -831,7 +829,6 @@ async fn can_handle_reorgs_while_sequencing() -> eyre::Result<()> {
             .expect("valid url that will not be used as test batches use calldata"),
     );
     config.engine_driver_args.sync_at_startup = false;
-    config.sequencer_args.max_l1_messages_per_block = 1;
 
     let (_, events) = ScrollWireProtocolHandler::new(ScrollWireConfig::new(true));
     let (rnm, handle, l1_watcher_tx) = config

crates/sequencer/tests/e2e.rs

@@ -450,7 +450,6 @@ async fn can_sequence_blocks_with_private_key_file() -> eyre::Result<()> {
         sequencer_args: SequencerArgs {
             sequencer_enabled: true,
             block_time: 0,
-            max_l1_messages_per_block: 4,
             l1_message_inclusion_mode: L1MessageInclusionMode::BlockDepth(0),
             payload_building_duration: 1000,
             ..SequencerArgs::default()
@@ -541,7 +540,6 @@ async fn can_sequence_blocks_with_hex_key_file_without_prefix() -> eyre::Result<
         sequencer_args: SequencerArgs {
             sequencer_enabled: true,
             block_time: 0,
-            max_l1_messages_per_block: 4,
             l1_message_inclusion_mode: L1MessageInclusionMode::BlockDepth(0),
             payload_building_duration: 1000,
             ..SequencerArgs::default()