chore: fmt and fix lints

Author: julio4

crates/op-rbuilder/src/args/mod.rs

@@ -69,10 +69,10 @@ impl CliExt for Cli {
     /// Returns the type of builder implementation that the node is started
     /// with. Currently supports `Standard` and `Flashblocks` modes.
     fn builder_mode(&self) -> BuilderMode {
-        if let Commands::Node(ref node_command) = self.command {
-            if node_command.ext.flashblocks.enabled {
-                return BuilderMode::Flashblocks;
-            }
+        if let Commands::Node(ref node_command) = self.command &&
+            node_command.ext.flashblocks.enabled
+        {
+            return BuilderMode::Flashblocks;
         }
         BuilderMode::Standard
     }

crates/op-rbuilder/src/args/playground.rs

@@ -80,10 +80,7 @@ impl PlaygroundOptions {
     /// Creates a new `PlaygroundOptions` instance with the specified genesis path.
     pub(super) fn new(path: &Path) -> Result<Self> {
         if !path.exists() {
-            return Err(eyre!(
-                "Playground data directory {} does not exist",
-                path.display()
-            ));
+            return Err(eyre!("Playground data directory {} does not exist", path.display()));
         }
 
         let chain = OpChainSpecParser::parse(&existing_path(path, "l2-genesis.json")?)?;
@@ -127,9 +124,8 @@ impl PlaygroundOptions {
         // either via the command line or an environment variable. Otherwise, don't
         // override the user provided values.
         let matches = Cli::command().get_matches();
-        let matches = matches
-            .subcommand_matches("node")
-            .expect("validated that we are in the node command");
+        let matches =
+            matches.subcommand_matches("node").expect("validated that we are in the node command");
 
         if matches.value_source("chain").is_default() {
             node.chain = self.chain;
@@ -223,9 +219,7 @@ fn extract_chain_block_time(basepath: &Path) -> Result<Duration> {
 
 fn extract_deterministic_p2p_key(basepath: &Path) -> Result<SecretKey> {
     let key = read_to_string(existing_path(basepath, "enode-key-1.txt")?)?;
-    Ok(SecretKey::from_slice(
-        &hex::decode(key).map_err(|e| eyre!("Invalid hex key: {e}"))?,
-    )?)
+    Ok(SecretKey::from_slice(&hex::decode(key).map_err(|e| eyre!("Invalid hex key: {e}"))?)?)
 }
 
 fn read_docker_compose(basepath: &Path) -> Result<serde_yaml::Value> {
@@ -238,9 +232,7 @@ fn extract_service_command_flag(basepath: &Path, service: &str, flag: &str) -> R
     let docker_compose = read_docker_compose(basepath)?;
     let args = docker_compose["services"][service]["command"]
         .as_sequence()
-        .ok_or(eyre!(
-            "docker-compose.yaml is missing command line arguments for {service}"
-        ))?
+        .ok_or(eyre!("docker-compose.yaml is missing command line arguments for {service}"))?
         .iter()
         .map(|s| {
             s.as_str().ok_or_else(|| {
@@ -254,9 +246,8 @@ fn extract_service_command_flag(basepath: &Path, service: &str, flag: &str) -> R
         .position(|arg| *arg == flag)
         .ok_or_else(|| eyre!("docker_compose: {flag} not found on {service} service"))?;
 
-    let value = args
-        .get(index + 1)
-        .ok_or_else(|| eyre!("docker_compose: {flag} value not found"))?;
+    let value =
+        args.get(index + 1).ok_or_else(|| eyre!("docker_compose: {flag} value not found"))?;
 
     Ok(value.to_string())
 }
@@ -274,9 +265,7 @@ fn extract_trusted_peer_port(basepath: &Path) -> Result<u16> {
     // command line arguments used to start the op-geth service
 
     let Some(opgeth_args) = docker_compose["services"]["op-geth"]["command"][1].as_str() else {
-        return Err(eyre!(
-            "docker-compose.yaml is missing command line arguments for op-geth"
-        ));
+        return Err(eyre!("docker-compose.yaml is missing command line arguments for op-geth"));
     };
 
     let opgeth_args = opgeth_args.split_whitespace().collect::<Vec<_>>();
@@ -289,16 +278,12 @@ fn extract_trusted_peer_port(basepath: &Path) -> Result<u16> {
         .get(port_param_position + 1)
         .ok_or_else(|| eyre!("docker_compose: --port value not found"))?;
 
-    let port_value = port_value
-        .parse::<u16>()
-        .map_err(|e| eyre!("Invalid port value: {e}"))?;
+    let port_value = port_value.parse::<u16>().map_err(|e| eyre!("Invalid port value: {e}"))?;
 
     // now we need to find the external port of the op-geth service from the docker-compose.yaml
     // ports mapping used to start the op-geth service
     let Some(opgeth_ports) = docker_compose["services"]["op-geth"]["ports"].as_sequence() else {
-        return Err(eyre!(
-            "docker-compose.yaml is missing ports mapping for op-geth"
-        ));
+        return Err(eyre!("docker-compose.yaml is missing ports mapping for op-geth"));
     };
     let ports_mapping = opgeth_ports
         .iter()

crates/op-rbuilder/src/builders/builder_tx.rs

@@ -85,9 +85,8 @@ pub trait BuilderTransactions<ExtraCtx: Debug + Default = ()>: Debug {
         db: &mut State<impl Database>,
     ) -> Result<Vec<BuilderTransactionCtx>, BuilderTransactionError> {
         {
-            let mut evm = builder_ctx
-                .evm_config
-                .evm_with_env(&mut *db, builder_ctx.evm_env.clone());
+            let mut evm =
+                builder_ctx.evm_config.evm_with_env(&mut *db, builder_ctx.evm_env.clone());
 
             let mut invalid: HashSet<Address> = HashSet::new();
 
@@ -109,7 +108,8 @@ pub trait BuilderTransactions<ExtraCtx: Debug + Default = ()>: Debug {
                     continue;
                 }
 
-                // Add gas used by the transaction to cumulative gas used, before creating the receipt
+                // Add gas used by the transaction to cumulative gas used, before creating the
+                // receipt
                 let gas_used = result.gas_used();
                 info.cumulative_gas_used += gas_used;
 
@@ -127,8 +127,7 @@ pub trait BuilderTransactions<ExtraCtx: Debug + Default = ()>: Debug {
 
                 // Append sender and transaction to the respective lists
                 info.executed_senders.push(builder_tx.signed_tx.signer());
-                info.executed_transactions
-                    .push(builder_tx.signed_tx.clone().into_inner());
+                info.executed_transactions.push(builder_tx.signed_tx.clone().into_inner());
             }
 
             // Release the db reference by dropping evm
@@ -151,9 +150,7 @@ pub trait BuilderTransactions<ExtraCtx: Debug + Default = ()>: Debug {
             .with_bundle_prestate(db.bundle_state.clone())
             .with_bundle_update()
             .build();
-        let mut evm = ctx
-            .evm_config
-            .evm_with_env(&mut simulation_state, ctx.evm_env.clone());
+        let mut evm = ctx.evm_config.evm_with_env(&mut simulation_state, ctx.evm_env.clone());
 
         for builder_tx in builder_txs {
             let ResultAndState { state, .. } = evm

crates/op-rbuilder/src/builders/context.rs

@@ -93,9 +93,7 @@ impl<ExtraCtx: Debug + Default> OpPayloadBuilderCtx<ExtraCtx> {
 
     /// Returns the block gas limit to target.
     pub(super) fn block_gas_limit(&self) -> u64 {
-        self.attributes()
-            .gas_limit
-            .unwrap_or(self.evm_env.block_env.gas_limit)
+        self.attributes().gas_limit.unwrap_or(self.evm_env.block_env.gas_limit)
     }
 
     /// Returns the block number for the block.
@@ -110,10 +108,7 @@ impl<ExtraCtx: Debug + Default> OpPayloadBuilderCtx<ExtraCtx> {
 
     /// Returns the current blob gas price.
     pub(super) fn get_blob_gasprice(&self) -> Option<u64> {
-        self.evm_env
-            .block_env
-            .blob_gasprice()
-            .map(|gasprice| gasprice as u64)
+        self.evm_env.block_env.blob_gasprice().map(|gasprice| gasprice as u64)
     }
 
     /// Returns the blob fields for the header.
@@ -123,11 +118,7 @@ impl<ExtraCtx: Debug + Default> OpPayloadBuilderCtx<ExtraCtx> {
         // OP doesn't support blobs/EIP-4844.
         // https://specs.optimism.io/protocol/exec-engine.html#ecotone-disable-blob-transactions
         // Need [Some] or [None] based on hardfork to match block hash.
-        if self.is_ecotone_active() {
-            (Some(0), Some(0))
-        } else {
-            (None, None)
-        }
+        if self.is_ecotone_active() { (Some(0), Some(0)) } else { (None, None) }
     }
 
     /// Returns the extra data for the block.
@@ -159,32 +150,27 @@ impl<ExtraCtx: Debug + Default> OpPayloadBuilderCtx<ExtraCtx> {
 
     /// Returns true if regolith is active for the payload.
     pub(super) fn is_regolith_active(&self) -> bool {
-        self.chain_spec
-            .is_regolith_active_at_timestamp(self.attributes().timestamp())
+        self.chain_spec.is_regolith_active_at_timestamp(self.attributes().timestamp())
     }
 
     /// Returns true if ecotone is active for the payload.
     pub(super) fn is_ecotone_active(&self) -> bool {
-        self.chain_spec
-            .is_ecotone_active_at_timestamp(self.attributes().timestamp())
+        self.chain_spec.is_ecotone_active_at_timestamp(self.attributes().timestamp())
     }
 
     /// Returns true if canyon is active for the payload.
     pub(super) fn is_canyon_active(&self) -> bool {
-        self.chain_spec
-            .is_canyon_active_at_timestamp(self.attributes().timestamp())
+        self.chain_spec.is_canyon_active_at_timestamp(self.attributes().timestamp())
     }
 
     /// Returns true if holocene is active for the payload.
     pub(super) fn is_holocene_active(&self) -> bool {
-        self.chain_spec
-            .is_holocene_active_at_timestamp(self.attributes().timestamp())
+        self.chain_spec.is_holocene_active_at_timestamp(self.attributes().timestamp())
     }
 
     /// Returns true if isthmus is active for the payload.
     pub(super) fn is_isthmus_active(&self) -> bool {
-        self.chain_spec
-            .is_isthmus_active_at_timestamp(self.attributes().timestamp())
+        self.chain_spec.is_isthmus_active_at_timestamp(self.attributes().timestamp())
     }
 
     /// Returns the chain id
@@ -247,12 +233,9 @@ impl<ExtraCtx: Debug + Default> OpPayloadBuilderCtx<ExtraCtx> {
             // purely for the purposes of utilizing the `evm_config.tx_env`` function.
             // Deposit transactions do not have signatures, so if the tx is a deposit, this
             // will just pull in its `from` address.
-            let sequencer_tx = sequencer_tx
-                .value()
-                .try_clone_into_recovered()
-                .map_err(|_| {
-                    PayloadBuilderError::other(OpPayloadBuilderError::TransactionEcRecoverFailed)
-                })?;
+            let sequencer_tx = sequencer_tx.value().try_clone_into_recovered().map_err(|_| {
+                PayloadBuilderError::other(OpPayloadBuilderError::TransactionEcRecoverFailed)
+            })?;
 
             // Cache the depositor account prior to the state transition for the deposit nonce.
             //
@@ -339,12 +322,8 @@ impl<ExtraCtx: Debug + Default> OpPayloadBuilderCtx<ExtraCtx> {
 
         // Remove once we merge Reth 1.4.4
         // Fixed in https://github.com/paradigmxyz/reth/pull/16514
-        self.metrics
-            .da_block_size_limit
-            .set(block_da_limit.map_or(-1.0, |v| v as f64));
-        self.metrics
-            .da_tx_size_limit
-            .set(tx_da_limit.map_or(-1.0, |v| v as f64));
+        self.metrics.da_block_size_limit.set(block_da_limit.map_or(-1.0, |v| v as f64));
+        self.metrics.da_tx_size_limit.set(tx_da_limit.map_or(-1.0, |v| v as f64));
 
         let block_attr = BlockConditionalAttributes {
             number: self.block_number(),
@@ -361,9 +340,11 @@ impl<ExtraCtx: Debug + Default> OpPayloadBuilderCtx<ExtraCtx> {
             let tx_hash = tx.tx_hash();
 
             // exclude reverting transaction if:
-            // - the transaction comes from a bundle (is_some) and the hash **is not** in reverted hashes
-            // Note that we need to use the Option to signal whether the transaction comes from a bundle,
-            // otherwise, we would exclude all transactions that are not in the reverted hashes.
+            // - the transaction comes from a bundle (is_some) and the hash **is not** in reverted
+            //   hashes
+            // Note that we need to use the Option to signal whether the transaction comes from a
+            // bundle, otherwise, we would exclude all transactions that are not in the
+            // reverted hashes.
             let is_bundle_tx = reverted_hashes.is_some();
             let exclude_reverting_txs =
                 is_bundle_tx && !reverted_hashes.unwrap().contains(&tx_hash);
@@ -382,19 +363,20 @@ impl<ExtraCtx: Debug + Default> OpPayloadBuilderCtx<ExtraCtx> {
             num_txs_considered += 1;
 
             // TODO: ideally we should get this from the txpool stream
-            if let Some(conditional) = conditional
-                && !conditional.matches_block_attributes(&block_attr)
+            if let Some(conditional) = conditional &&
+                !conditional.matches_block_attributes(&block_attr)
             {
                 best_txs.mark_invalid(tx.signer(), tx.nonce());
                 continue;
             }
 
-            // TODO: remove this condition and feature once we are comfortable enabling interop for everything
+            // TODO: remove this condition and feature once we are comfortable enabling interop for
+            // everything
             if cfg!(feature = "interop") {
-                // We skip invalid cross chain txs, they would be removed on the next block update in
-                // the maintenance job
-                if let Some(interop) = interop
-                    && !is_valid_interop(interop, self.config.attributes.timestamp())
+                // We skip invalid cross chain txs, they would be removed on the next block update
+                // in the maintenance job
+                if let Some(interop) = interop &&
+                    !is_valid_interop(interop, self.config.attributes.timestamp())
                 {
                     log_txn(TxnExecutionResult::InteropFailed);
                     best_txs.mark_invalid(tx.signer(), tx.nonce());
@@ -455,21 +437,15 @@ impl<ExtraCtx: Debug + Default> OpPayloadBuilderCtx<ExtraCtx> {
                 }
             };
 
-            self.metrics
-                .tx_simulation_duration
-                .record(tx_simulation_start_time.elapsed());
+            self.metrics.tx_simulation_duration.record(tx_simulation_start_time.elapsed());
             self.metrics.tx_byte_size.record(tx.inner().size() as f64);
             num_txs_simulated += 1;
 
             // Run the per-address gas limiting before checking if the tx has
             // reverted or not, as this is a check against maliciously searchers
             // sending txs that are expensive to compute but always revert.
             let gas_used = result.gas_used();
-            if self
-                .address_gas_limiter
-                .consume_gas(tx.signer(), gas_used)
-                .is_err()
-            {
+            if self.address_gas_limiter.consume_gas(tx.signer(), gas_used).is_err() {
                 log_txn(TxnExecutionResult::MaxGasUsageExceeded);
                 best_txs.mark_invalid(tx.signer(), tx.nonce());
                 continue;
@@ -495,12 +471,12 @@ impl<ExtraCtx: Debug + Default> OpPayloadBuilderCtx<ExtraCtx> {
 
             // add gas used by the transaction to cumulative gas used, before creating the
             // receipt
-            if let Some(max_gas_per_txn) = self.max_gas_per_txn {
-                if gas_used > max_gas_per_txn {
-                    log_txn(TxnExecutionResult::MaxGasUsageExceeded);
-                    best_txs.mark_invalid(tx.signer(), tx.nonce());
-                    continue;
-                }
+            if let Some(max_gas_per_txn) = self.max_gas_per_txn &&
+                gas_used > max_gas_per_txn
+            {
+                log_txn(TxnExecutionResult::MaxGasUsageExceeded);
+                best_txs.mark_invalid(tx.signer(), tx.nonce());
+                continue;
             }
 
             info.cumulative_gas_used += gas_used;