Add make command for op-rbuilder image

Add +nightly for cargo fmt, clippy and fix
Run make fmt

Author: Solar Mithril

Makefile

@@ -28,9 +28,13 @@ build: ## Build (debug version)
 	cargo build --features "$(FEATURES)"
 
 .PHONY: docker-image-rbuilder
-docker-image-rubilder: ## Build a rbuilder Docker image
+docker-image-rbuilder: ## Build a rbuilder Docker image
 	docker build --platform linux/amd64 --target rbuilder-runtime --build-arg FEATURES="$(FEATURES)"  . -t rbuilder
 
+.PHONY: docker-image-op-rbuilder
+docker-image-op-rbuilder: ## Build a rbuilder Docker image
+	docker build --platform linux/amd64 --target rbuilder-runtime --build-arg FEATURES="$(FEATURES)" --file Dockerfile.op-rbuilder . -t op-rbuilder
+
 .PHONY: docker-image-test-relay
 docker-image-test-relay: ## Build a test relay Docker image
 	docker build --platform linux/amd64 --target test-relay-runtime --build-arg FEATURES="$(FEATURES)" . -t test-relay
@@ -39,9 +43,9 @@ docker-image-test-relay: ## Build a test relay Docker image
 
 .PHONY: lint
 lint: ## Run the linters
-	cargo fmt -- --check
-	cargo clippy --features "$(FEATURES)" -- -D warnings
-	cargo clippy -p op-rbuilder --features "$(FEATURES)" -- -D warnings
+	cargo +nightly fmt -- --check
+	cargo +nightly clippy --features "$(FEATURES)" -- -D warnings
+	cargo +nightly clippy -p op-rbuilder --features "$(FEATURES)" -- -D warnings
 
 .PHONY: test
 test: ## Run the tests for rbuilder and op-rbuilder
@@ -54,10 +58,10 @@ lt: lint test ## Run "lint" and "test"
 
 .PHONY: fmt
 fmt: ## Format the code
-	cargo fmt
-	cargo fix --allow-staged
-	cargo clippy --features "$(FEATURES)" --fix --allow-staged
-	cargo clippy -p op-rbuilder --features "$(FEATURES)" --fix --allow-staged
+	cargo +nightly fmt
+	cargo +nightly fix --allow-staged
+	cargo +nightly clippy --features "$(FEATURES)" --fix --allow-staged
+	cargo +nightly clippy -p op-rbuilder --features "$(FEATURES)" --fix --allow-staged
 
 .PHONY: bench
 bench: ## Run benchmarks

crates/eth-sparse-mpt/src/reth_sparse_trie/mod.rs

@@ -6,8 +6,10 @@ use reth_provider::{
     providers::ConsistentDbView, BlockReader, DatabaseProviderFactory, ExecutionOutcome,
     StateCommitmentProvider,
 };
-use std::sync::Arc;
-use std::time::{Duration, Instant};
+use std::{
+    sync::Arc,
+    time::{Duration, Instant},
+};
 
 pub mod change_set;
 pub mod hash;

crates/eth-sparse-mpt/src/reth_sparse_trie/shared_cache.rs

@@ -5,8 +5,7 @@ use crate::{
     sparse_mpt::{AddNodeError, FixedTrie},
     utils::HashMap,
 };
-use alloy_primitives::Bytes;
-use alloy_primitives::B256;
+use alloy_primitives::{Bytes, B256};
 use alloy_trie::Nibbles;
 
 /// SparseTrieSharedCache is a storage for fetched parts of the ethereum tries

crates/op-rbuilder/src/generator.rs

@@ -1,23 +1,24 @@
-use futures_util::Future;
-use futures_util::FutureExt;
-use reth::providers::BlockReaderIdExt;
-use reth::{providers::StateProviderFactory, tasks::TaskSpawner};
-use reth_basic_payload_builder::HeaderForPayload;
-use reth_basic_payload_builder::{BasicPayloadJobGeneratorConfig, PayloadConfig};
-use reth_node_api::PayloadBuilderAttributes;
-use reth_node_api::PayloadKind;
-use reth_payload_builder::PayloadJobGenerator;
-use reth_payload_builder::{KeepPayloadJobAlive, PayloadBuilderError, PayloadJob};
+use futures_util::{Future, FutureExt};
+use reth::{
+    providers::{BlockReaderIdExt, StateProviderFactory},
+    tasks::TaskSpawner,
+};
+use reth_basic_payload_builder::{BasicPayloadJobGeneratorConfig, HeaderForPayload, PayloadConfig};
+use reth_node_api::{PayloadBuilderAttributes, PayloadKind};
+use reth_payload_builder::{
+    KeepPayloadJobAlive, PayloadBuilderError, PayloadJob, PayloadJobGenerator,
+};
 use reth_payload_primitives::BuiltPayload;
 use reth_primitives_traits::HeaderTy;
 use reth_revm::cached::CachedReads;
-use std::sync::{Arc, Mutex};
-use std::time::SystemTime;
-use std::time::UNIX_EPOCH;
-use tokio::sync::oneshot;
-use tokio::sync::Notify;
-use tokio::time::Duration;
-use tokio::time::Sleep;
+use std::{
+    sync::{Arc, Mutex},
+    time::{SystemTime, UNIX_EPOCH},
+};
+use tokio::{
+    sync::{oneshot, Notify},
+    time::{Duration, Sleep},
+};
 use tokio_util::sync::CancellationToken;
 use tracing::info;
 
@@ -424,14 +425,15 @@ mod tests {
     use reth::tasks::TokioTaskExecutor;
     use reth_chain_state::ExecutedBlockWithTrieUpdates;
     use reth_node_api::NodePrimitives;
-    use reth_optimism_payload_builder::payload::OpPayloadBuilderAttributes;
-    use reth_optimism_payload_builder::OpPayloadPrimitives;
+    use reth_optimism_payload_builder::{payload::OpPayloadBuilderAttributes, OpPayloadPrimitives};
     use reth_optimism_primitives::OpPrimitives;
     use reth_primitives::SealedBlock;
     use reth_provider::test_utils::MockEthProvider;
     use reth_testing_utils::generators::{random_block_range, BlockRangeParams};
-    use tokio::task;
-    use tokio::time::{sleep, Duration};
+    use tokio::{
+        task,
+        time::{sleep, Duration},
+    };
 
     #[tokio::test]
     async fn test_block_cell_wait_for_value() {

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

@@ -1,10 +1,9 @@
-use std::future::Future;
-use std::path::Path;
 use std::{
     fs::{File, OpenOptions},
+    future::Future,
     io,
     io::prelude::*,
-    path::PathBuf,
+    path::{Path, PathBuf},
     process::{Child, Command},
     time::{Duration, SystemTime},
 };

crates/op-rbuilder/src/main.rs

@@ -2,8 +2,7 @@ use clap::Parser;
 use monitoring::Monitoring;
 use reth::providers::CanonStateSubscriptions;
 use reth_optimism_cli::{chainspec::OpChainSpecParser, Cli};
-use reth_optimism_node::node::OpAddOnsBuilder;
-use reth_optimism_node::OpNode;
+use reth_optimism_node::{node::OpAddOnsBuilder, OpNode};
 
 #[cfg(feature = "flashblocks")]
 use payload_builder::CustomOpPayloadBuilder;

crates/op-rbuilder/src/metrics.rs

@@ -1,4 +1,7 @@
-use reth_metrics::{metrics::Counter, metrics::Gauge, metrics::Histogram, Metrics};
+use reth_metrics::{
+    metrics::{Counter, Gauge, Histogram},
+    Metrics,
+};
 
 /// op-rbuilder metrics
 #[derive(Metrics, Clone)]

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

@@ -1,35 +1,29 @@
 use crate::tx_signer::Signer;
-use alloy_eips::eip2718::Encodable2718;
-use alloy_eips::BlockNumberOrTag;
-use alloy_primitives::address;
-use alloy_primitives::Address;
-use alloy_primitives::Bytes;
-use alloy_primitives::TxKind;
-use alloy_primitives::B256;
-use alloy_primitives::{hex, U256};
-use alloy_rpc_types_engine::ExecutionPayloadV1;
-use alloy_rpc_types_engine::ExecutionPayloadV2;
-use alloy_rpc_types_engine::PayloadAttributes;
-use alloy_rpc_types_engine::PayloadStatusEnum;
-use alloy_rpc_types_engine::{ExecutionPayloadV3, ForkchoiceUpdated, PayloadStatus};
+use alloy_eips::{eip2718::Encodable2718, BlockNumberOrTag};
+use alloy_primitives::{address, hex, Address, Bytes, TxKind, B256, U256};
+use alloy_rpc_types_engine::{
+    ExecutionPayloadV1, ExecutionPayloadV2, ExecutionPayloadV3, ForkchoiceUpdated,
+    PayloadAttributes, PayloadStatus, PayloadStatusEnum,
+};
 use alloy_rpc_types_eth::Block;
-use jsonrpsee::core::RpcResult;
-use jsonrpsee::http_client::{transport::HttpBackend, HttpClient};
-use jsonrpsee::proc_macros::rpc;
-use op_alloy_consensus::OpTypedTransaction;
-use op_alloy_consensus::TxDeposit;
+use jsonrpsee::{
+    core::RpcResult,
+    http_client::{transport::HttpBackend, HttpClient},
+    proc_macros::rpc,
+};
+use op_alloy_consensus::{OpTypedTransaction, TxDeposit};
 use op_alloy_rpc_types_engine::OpPayloadAttributes;
 use reth::rpc::{api::EngineApiClient, types::engine::ForkchoiceState};
 use reth_node_api::{EngineTypes, PayloadTypes};
 use reth_optimism_node::OpEngineTypes;
 use reth_payload_builder::PayloadId;
 use reth_rpc_layer::{AuthClientLayer, AuthClientService, JwtSecret};
-use rollup_boost::flashblocks::FlashblocksService;
-use rollup_boost::Flashblocks;
+use rollup_boost::{flashblocks::FlashblocksService, Flashblocks};
 use serde_json::Value;
-use std::str::FromStr;
-use std::time::SystemTime;
-use std::time::UNIX_EPOCH;
+use std::{
+    str::FromStr,
+    time::{SystemTime, UNIX_EPOCH},
+};
 
 /// Helper for engine api operations
 pub struct EngineApi {

crates/rbuilder/src/building/builders/parallel_builder/conflict_resolving_pool.rs

@@ -15,8 +15,7 @@ use super::{
     simulation_cache::SharedSimulationCache, ConflictGroup, ConflictResolutionResultPerGroup,
     ConflictTask, GroupId, ResolutionResult, TaskPriority,
 };
-use crate::building::BlockBuildingContext;
-use crate::provider::StateProviderFactory;
+use crate::{building::BlockBuildingContext, provider::StateProviderFactory};
 
 pub type TaskQueue = Arc<SegQueue<ConflictTask>>;
 

crates/rbuilder/src/building/builders/parallel_builder/conflict_task_generator.rs

@@ -65,7 +65,7 @@ impl ConflictTaskGenerator {
             self.add_processed_groups(&new_group, &mut processed_groups);
 
             // Remove all subset groups
-            if new_group.conflicting_group_ids.len() > 0 {
+            if !new_group.conflicting_group_ids.is_empty() {
                 self.remove_conflicting_subset_groups(&new_group);
             }
         }