Add make command for op-rbuilder image

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

Author: SozinM

Diff for: 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

Diff for: 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;

Diff for: 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

Diff for: 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() {

Diff for: 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},
 };

Diff for: 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;

Diff for: 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)]

Diff for: 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 {

Diff for: crates/rbuilder/src/building/builders/mock_block_building_helper.rs

@@ -1,18 +1,15 @@
-use crate::live_builder::simulation::SimulatedOrderCommand;
-use crate::primitives::SimValue;
-use crate::provider::RootHasher;
-use crate::roothash::RootHashError;
 use crate::{
     building::{
         BlockBuildingContext, BuiltBlockTrace, CriticalCommitOrderError, ExecutionError,
         ExecutionResult,
     },
-    primitives::SimulatedOrder,
+    live_builder::simulation::SimulatedOrderCommand,
+    primitives::{SimValue, SimulatedOrder},
+    provider::RootHasher,
+    roothash::RootHashError,
 };
-use alloy_primitives::B256;
-use alloy_primitives::U256;
-use reth::providers::ExecutionOutcome;
-use reth::revm::cached::CachedReads;
+use alloy_primitives::{B256, U256};
+use reth::{providers::ExecutionOutcome, revm::cached::CachedReads};
 use reth_primitives::SealedBlock;
 use time::OffsetDateTime;
 use tokio::sync::broadcast;

Diff for: 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>>;
 

Diff for: 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);
             }
         }

Diff for: crates/rbuilder/src/live_builder/block_output/bidding/wallet_balance_watcher.rs

@@ -6,8 +6,10 @@ use time::{error, OffsetDateTime};
 use tracing::{error, info, warn};
 
 use super::interfaces::LandedBlockInfo;
-use crate::provider::StateProviderFactory;
-use crate::telemetry::{add_subsidy_value, inc_subsidized_blocks};
+use crate::{
+    provider::StateProviderFactory,
+    telemetry::{add_subsidy_value, inc_subsidized_blocks},
+};
 
 /// Allows to monitor the evolution of our wallet for the landed blocks.
 /// It's useful for bidders to detect profit and subsidies.

Diff for: crates/rbuilder/src/live_builder/config.rs

@@ -63,8 +63,8 @@ use reth_primitives::StaticFileSegment;
 use reth_provider::StaticFileProviderFactory;
 use serde::Deserialize;
 use serde_with::{serde_as, OneOrMany};
-use std::collections::HashMap;
 use std::{
+    collections::HashMap,
     fmt::Debug,
     path::{Path, PathBuf},
     str::FromStr,

Diff for: crates/rbuilder/src/live_builder/order_input/mod.rs

@@ -11,14 +11,20 @@ use self::{
     orderpool::{OrderPool, OrderPoolSubscriptionId},
     replaceable_order_sink::ReplaceableOrderSink,
 };
-use crate::primitives::{serialize::CancelShareBundle, BundleReplacementData, Order};
-use crate::provider::StateProviderFactory;
-use crate::telemetry::{set_current_block, set_ordepool_count};
+use crate::{
+    primitives::{serialize::CancelShareBundle, BundleReplacementData, Order},
+    provider::StateProviderFactory,
+    telemetry::{set_current_block, set_ordepool_count},
+};
 use alloy_consensus::Header;
 use jsonrpsee::RpcModule;
 use parking_lot::Mutex;
-use std::{net::Ipv4Addr, path::PathBuf, sync::Arc, time::Duration};
-use std::{path::Path, time::Instant};
+use std::{
+    net::Ipv4Addr,
+    path::{Path, PathBuf},
+    sync::Arc,
+    time::{Duration, Instant},
+};
 use tokio::{sync::mpsc, task::JoinHandle};
 use tokio_util::sync::CancellationToken;
 use tracing::{debug, error, info, trace, warn};

Diff for: crates/rbuilder/src/mev_boost/sign_payload.rs

@@ -3,13 +3,12 @@ use super::submission::{
     SubmitBlockRequest,
 };
 use crate::utils::u256decimal_serde_helper;
-use alloy_eips::eip7685::Requests;
-use alloy_eips::{eip2718::Encodable2718, eip4844::BlobTransactionSidecar};
+use alloy_eips::{eip2718::Encodable2718, eip4844::BlobTransactionSidecar, eip7685::Requests};
 use alloy_primitives::{Address, BlockHash, Bytes, FixedBytes, B256, U256};
-use alloy_rpc_types_beacon::requests::ExecutionRequestsV4;
 use alloy_rpc_types_beacon::{
     events::PayloadAttributesData,
     relay::{BidTrace, SignedBidSubmissionV2, SignedBidSubmissionV3, SignedBidSubmissionV4},
+    requests::ExecutionRequestsV4,
     BlsPublicKey,
 };
 use alloy_rpc_types_engine::{

Diff for: crates/rbuilder/src/provider/mod.rs

@@ -1,5 +1,4 @@
-use crate::live_builder::simulation::SimulatedOrderCommand;
-use crate::roothash::RootHashError;
+use crate::{live_builder::simulation::SimulatedOrderCommand, roothash::RootHashError};
 use alloy_consensus::Header;
 use alloy_eips::BlockNumHash;
 use alloy_primitives::{BlockHash, BlockNumber, B256};

Diff for: crates/rbuilder/src/provider/reth_prov.rs

@@ -1,11 +1,11 @@
-use crate::roothash::RootHashContext;
-use crate::utils::RootHasherImpl;
+use crate::{roothash::RootHashContext, utils::RootHasherImpl};
 use alloy_consensus::Header;
 use alloy_eips::BlockNumHash;
 use alloy_primitives::{BlockHash, BlockNumber, B256};
 use reth_errors::ProviderResult;
-use reth_provider::{BlockReader, DatabaseProviderFactory, HeaderProvider};
-use reth_provider::{StateCommitmentProvider, StateProviderBox};
+use reth_provider::{
+    BlockReader, DatabaseProviderFactory, HeaderProvider, StateCommitmentProvider, StateProviderBox,
+};
 use tracing::error;
 
 use super::{RootHasher, StateProviderFactory};

Diff for: crates/rbuilder/src/telemetry/metrics/mod.rs

@@ -6,8 +6,8 @@
 //! When metric server is spawned is serves prometheus metrics at: /debug/metrics/prometheus
 
 #![allow(unexpected_cfgs)]
-use crate::building::BuiltBlockTrace;
 use crate::{
+    building::BuiltBlockTrace,
     live_builder::block_list_provider::{blocklist_hash, BlockList},
     primitives::mev_boost::MevBoostRelayID,
     utils::build_info::Version,
@@ -21,9 +21,10 @@ use prometheus::{
     Counter, HistogramOpts, HistogramVec, IntCounter, IntCounterVec, IntGauge, IntGaugeVec, Opts,
     Registry,
 };
-use std::sync::{Arc, Mutex};
-use std::time::Duration;
-use std::time::Instant;
+use std::{
+    sync::{Arc, Mutex},
+    time::{Duration, Instant},
+};
 use time::OffsetDateTime;
 use tracing::error;
 

Diff for: crates/test-relay/src/relay.rs

@@ -20,15 +20,19 @@ use rbuilder::{
     primitives::mev_boost::MevBoostRelaySlotInfoProvider,
 };
 use serde::{Deserialize, Serialize};
-use std::time::Instant;
-use std::{collections::hash_map::Entry, sync::Arc, time::Duration};
-use std::{io::Read, net::SocketAddr};
+use std::{
+    collections::hash_map::Entry,
+    io::Read,
+    net::SocketAddr,
+    sync::Arc,
+    time::{Duration, Instant},
+};
 use time::OffsetDateTime;
 use tokio::sync::mpsc;
 use tokio_util::sync::CancellationToken;
 use tracing::{debug, error, info, warn};
-use warp::body;
 use warp::{
+    body,
     http::status::StatusCode,
     query,
     reply::{self, Reply},