chore: add rust fmt

Author: 0xOsiris

crates/flashblocks/builder/src/executor.rs

@@ -1,36 +1,35 @@
 use alloy_consensus::{Block, Transaction, TxReceipt};
-use alloy_eips::eip2718::WithEncoded;
-use alloy_eips::eip4895::Withdrawals;
-use alloy_eips::{Decodable2718, Encodable2718};
-use alloy_op_evm::block::receipt_builder::OpReceiptBuilder;
-use alloy_op_evm::block::OpTxEnv;
-use alloy_op_evm::{OpBlockExecutionCtx, OpBlockExecutor, OpBlockExecutorFactory, OpEvmFactory};
+use alloy_eips::{eip2718::WithEncoded, eip4895::Withdrawals, Decodable2718, Encodable2718};
+use alloy_op_evm::{
+    block::{receipt_builder::OpReceiptBuilder, OpTxEnv},
+    OpBlockExecutionCtx, OpBlockExecutor, OpBlockExecutorFactory, OpEvmFactory,
+};
 use alloy_rpc_types_engine::PayloadId;
 use eyre::eyre::OptionExt as _;
 use flashblocks_p2p::protocol::handler::FlashblocksHandle;
-use flashblocks_primitives::p2p::AuthorizedPayload;
-use flashblocks_primitives::primitives::FlashblocksPayloadV1;
+use flashblocks_primitives::{p2p::AuthorizedPayload, primitives::FlashblocksPayloadV1};
 use futures::StreamExt as _;
 use op_alloy_consensus::{encode_holocene_extra_data, OpTxEnvelope};
 use parking_lot::RwLock;
-use reth::core::primitives::Receipt;
-use reth::payload::EthPayloadBuilderAttributes;
-use reth::revm::cancelled::CancelOnDrop;
-use reth::revm::database::StateProviderDatabase;
-use reth::revm::State;
+use reth::{
+    core::primitives::Receipt,
+    payload::EthPayloadBuilderAttributes,
+    revm::{cancelled::CancelOnDrop, database::StateProviderDatabase, State},
+};
 use reth_basic_payload_builder::{BuildOutcomeKind, PayloadConfig};
 use reth_chain_state::ExecutedBlock;
-use reth_evm::block::{BlockExecutorFactory, BlockExecutorFor};
-use reth_evm::execute::{
-    BasicBlockBuilder, BlockAssembler, BlockAssemblerInput, BlockBuilder, BlockBuilderOutcome,
-    ExecutorTx,
-};
-use reth_evm::op_revm::{OpHaltReason, OpSpecId};
 use reth_evm::{
-    block::{BlockExecutionError, BlockExecutor, CommitChanges, ExecutableTx},
-    Database, FromRecoveredTx, FromTxWithEncoded, OnStateHook,
+    block::{
+        BlockExecutionError, BlockExecutor, BlockExecutorFactory, BlockExecutorFor, CommitChanges,
+        ExecutableTx,
+    },
+    execute::{
+        BasicBlockBuilder, BlockAssembler, BlockAssemblerInput, BlockBuilder, BlockBuilderOutcome,
+        ExecutorTx,
+    },
+    op_revm::{OpHaltReason, OpSpecId},
+    Database, Evm, EvmFactory, FromRecoveredTx, FromTxWithEncoded, OnStateHook,
 };
-use reth_evm::{Evm, EvmFactory};
 use reth_node_api::{BuiltPayload as _, Events, FullNodeTypes, NodeTypes};
 use reth_node_builder::BuilderContext;
 use reth_optimism_chainspec::OpChainSpec;
@@ -41,17 +40,22 @@ use reth_optimism_node::{
 };
 use reth_optimism_primitives::{DepositReceipt, OpPrimitives, OpReceipt, OpTransactionSigned};
 use reth_payload_util::BestPayloadTransactions;
-use reth_primitives::{transaction::SignedTransaction, SealedHeader};
-use reth_primitives::{NodePrimitives, Recovered, RecoveredBlock};
+use reth_primitives::{
+    transaction::SignedTransaction, NodePrimitives, Recovered, RecoveredBlock, SealedHeader,
+};
 use reth_provider::{BlockExecutionResult, HeaderProvider, StateProvider, StateProviderFactory};
 use reth_transaction_pool::TransactionPool;
-use revm::context::result::{ExecutionResult, ResultAndState};
-use revm::context::BlockEnv;
-use revm::database::states::bundle_state::BundleRetention;
-use revm::database::states::reverts::Reverts;
-use revm::database::BundleState;
-use std::collections::HashSet;
-use std::sync::Arc;
+use revm::{
+    context::{
+        result::{ExecutionResult, ResultAndState},
+        BlockEnv,
+    },
+    database::{
+        states::{bundle_state::BundleRetention, reverts::Reverts},
+        BundleState,
+    },
+};
+use std::{collections::HashSet, sync::Arc};
 use tokio::sync::broadcast;
 use tracing::{error, trace};
 

crates/flashblocks/builder/src/lib.rs

@@ -7,8 +7,7 @@ use crate::{
     },
 };
 
-use alloy_consensus::Transaction;
-use alloy_consensus::{BlockHeader, Header};
+use alloy_consensus::{BlockHeader, Header, Transaction};
 use alloy_op_evm::OpEvm;
 use alloy_primitives::U256;
 use alloy_rlp::Encodable;
@@ -19,16 +18,17 @@ use reth::{
     chainspec::EthChainSpec,
     revm::{database::StateProviderDatabase, State},
 };
-use reth_basic_payload_builder::{BuildArguments, BuildOutcome, BuildOutcomeKind};
-use reth_basic_payload_builder::{MissingPayloadBehaviour, PayloadBuilder, PayloadConfig};
+use reth_basic_payload_builder::{
+    BuildArguments, BuildOutcome, BuildOutcomeKind, MissingPayloadBehaviour, PayloadBuilder,
+    PayloadConfig,
+};
 use reth_chain_state::ExecutedBlock;
 use reth_evm::{
     execute::{BlockBuilder, BlockBuilderOutcome},
     precompiles::PrecompilesMap,
     ConfigureEvm, Database,
 };
-use reth_primitives::transaction::SignedTransaction;
-use reth_primitives::{NodePrimitives, Recovered};
+use reth_primitives::{transaction::SignedTransaction, NodePrimitives, Recovered};
 use tracing::error;
 
 use reth_optimism_chainspec::OpChainSpec;
@@ -37,11 +37,10 @@ use reth_optimism_node::{
     txpool::OpPooledTx, OpEvmConfig, OpNextBlockEnvAttributes, OpRethReceiptBuilder,
 };
 use reth_optimism_payload_builder::{
-    builder::ExecutionInfo, config::OpBuilderConfig, OpAttributes,
-};
-use reth_optimism_payload_builder::{
-    builder::OpPayloadTransactions,
+    builder::{ExecutionInfo, OpPayloadTransactions},
+    config::OpBuilderConfig,
     payload::{OpBuiltPayload, OpPayloadBuilderAttributes},
+    OpAttributes,
 };
 use reth_optimism_primitives::{OpReceipt, OpTransactionSigned};
 use reth_payload_util::{NoopPayloadTransactions, PayloadTransactions};

crates/flashblocks/builder/src/traits/context.rs

@@ -1,20 +1,21 @@
 use alloy_eips::eip4895::Withdrawals;
 use alloy_primitives::U256;
 use op_alloy_consensus::EIP1559ParamError;
-use reth::builder::PayloadBuilderError;
-use reth::payload::PayloadId;
-use reth::revm::State;
+use reth::{builder::PayloadBuilderError, payload::PayloadId, revm::State};
 use reth_chainspec::EthereumHardforks;
-use reth_evm::block::BlockExecutor;
-use reth_evm::op_revm::OpSpecId;
-use reth_evm::{execute::BlockBuilder, ConfigureEvm};
-use reth_evm::{Evm, EvmEnv};
+use reth_evm::{
+    block::BlockExecutor, execute::BlockBuilder, op_revm::OpSpecId, ConfigureEvm, Evm, EvmEnv,
+};
 use reth_optimism_chainspec::OpChainSpec;
 use reth_optimism_forks::OpHardforks;
-use reth_optimism_node::txpool::{OpPooledTransaction, OpPooledTx};
-use reth_optimism_node::OpEvmConfig;
-use reth_optimism_payload_builder::builder::{ExecutionInfo, OpPayloadBuilderCtx};
-use reth_optimism_payload_builder::payload::OpPayloadBuilderAttributes;
+use reth_optimism_node::{
+    txpool::{OpPooledTransaction, OpPooledTx},
+    OpEvmConfig,
+};
+use reth_optimism_payload_builder::{
+    builder::{ExecutionInfo, OpPayloadBuilderCtx},
+    payload::OpPayloadBuilderAttributes,
+};
 use reth_payload_primitives::BuildNextEnv;
 use reth_payload_util::PayloadTransactions;
 use reth_primitives::{SealedHeader, TxTy};

crates/flashblocks/node/src/engine.rs

@@ -4,8 +4,10 @@ use flashblocks_p2p::protocol::handler::FlashblocksHandle;
 use flashblocks_primitives::p2p::Authorization;
 use flashblocks_rpc::engine::OpEngineApiExt;
 use op_alloy_rpc_types_engine::OpExecutionData;
-use reth::version::version_metadata;
-use reth::{payload::PayloadStore, version::CLIENT_CODE};
+use reth::{
+    payload::PayloadStore,
+    version::{version_metadata, CLIENT_CODE},
+};
 use reth_node_api::{
     AddOnsContext, EngineApiValidator, EngineTypes, FullNodeComponents, NodeTypes,
 };

crates/flashblocks/node/src/payload.rs

@@ -1,14 +1,15 @@
-use flashblocks_builder::executor::FlashblocksStateExecutor;
-use flashblocks_builder::traits::context::PayloadBuilderCtx;
-use flashblocks_builder::traits::context_builder::PayloadBuilderCtxBuilder;
-use flashblocks_builder::FlashblocksPayloadBuilder;
+use flashblocks_builder::{
+    executor::FlashblocksStateExecutor,
+    traits::{context::PayloadBuilderCtx, context_builder::PayloadBuilderCtxBuilder},
+    FlashblocksPayloadBuilder,
+};
 use op_alloy_consensus::OpTxEnvelope;
-use reth::builder::components::PayloadBuilderBuilder;
-use reth::builder::{BuilderContext, FullNodeTypes};
+use reth::builder::{components::PayloadBuilderBuilder, BuilderContext, FullNodeTypes};
 use reth_node_api::{NodeTypes, PayloadTypes};
 use reth_optimism_chainspec::OpChainSpec;
-use reth_optimism_node::txpool::OpPooledTx;
-use reth_optimism_node::{OpBuiltPayload, OpEvmConfig, OpPayloadBuilderAttributes};
+use reth_optimism_node::{
+    txpool::OpPooledTx, OpBuiltPayload, OpEvmConfig, OpPayloadBuilderAttributes,
+};
 use reth_optimism_payload_builder::config::{OpBuilderConfig, OpDAConfig};
 use reth_provider::{
     ChainSpecProvider, DatabaseProviderFactory, HeaderProvider, StateProviderFactory,

crates/flashblocks/node/src/payload_service.rs

@@ -1,12 +1,13 @@
 use std::time::Duration;
 
-use flashblocks_builder::executor::FlashblocksStateExecutor;
-use flashblocks_builder::traits::payload_builder::FlashblockPayloadBuilder;
+use flashblocks_builder::{
+    executor::FlashblocksStateExecutor, traits::payload_builder::FlashblockPayloadBuilder,
+};
 use flashblocks_p2p::protocol::handler::FlashblocksHandle;
-use flashblocks_payload::generator::{
-    FlashblocksJobGeneratorConfig, FlashblocksPayloadJobGenerator,
+use flashblocks_payload::{
+    generator::{FlashblocksJobGeneratorConfig, FlashblocksPayloadJobGenerator},
+    metrics::PayloadBuilderMetrics,
 };
-use flashblocks_payload::metrics::PayloadBuilderMetrics;
 use flashblocks_primitives::p2p::Authorization;
 use reth::payload::{PayloadBuilderHandle, PayloadBuilderService};
 use reth_node_api::{FullNodeTypes, NodeTypes, PayloadTypes};

crates/flashblocks/p2p/src/monitor/mod.rs

@@ -2,11 +2,15 @@
 use futures::StreamExt;
 use parking_lot::Mutex;
 use reth_ethereum::network::api::PeerId;
-use reth_network::events::{NetworkPeersEvents, PeerEvent};
-use reth_network::{Peers, PeersInfo};
+use reth_network::{
+    events::{NetworkPeersEvents, PeerEvent},
+    Peers, PeersInfo,
+};
 use reth_tasks::TaskExecutor;
-use std::collections::{HashMap, HashSet};
-use std::time::{Duration, Instant};
+use std::{
+    collections::{HashMap, HashSet},
+    time::{Duration, Instant},
+};
 use tokio::time::interval;
 use tokio_util::sync::CancellationToken;
 

crates/flashblocks/p2p/src/protocol/handler.rs

@@ -16,8 +16,7 @@ use reth::payload::PayloadId;
 use reth_eth_wire::Capability;
 use reth_ethereum::network::{api::PeerId, protocol::ProtocolHandler};
 use reth_network::Peers;
-use std::net::SocketAddr;
-use std::sync::Arc;
+use std::{net::SocketAddr, sync::Arc};
 use tokio::sync::{broadcast, watch};
 use tracing::{debug, info};
 

crates/flashblocks/payload/src/generator.rs

@@ -25,8 +25,7 @@ use reth_provider::{BlockReaderIdExt, CanonStateNotification, StateProviderFacto
 use tokio::runtime::Handle;
 use tracing::debug;
 
-use crate::job::FlashblocksPayloadJob;
-use crate::metrics::PayloadBuilderMetrics;
+use crate::{job::FlashblocksPayloadJob, metrics::PayloadBuilderMetrics};
 use flashblocks_builder::{
     executor::FlashblocksStateExecutor, traits::payload_builder::FlashblockPayloadBuilder,
 };

crates/flashblocks/payload/src/job.rs

@@ -9,17 +9,17 @@ use flashblocks_builder::{
     executor::FlashblocksStateExecutor, traits::payload_builder::FlashblockPayloadBuilder,
 };
 use flashblocks_p2p::protocol::{error::FlashblocksP2PError, handler::FlashblocksHandle};
-use flashblocks_primitives::flashblocks::Flashblock;
 use flashblocks_primitives::{
+    flashblocks::Flashblock,
     p2p::{Authorization, AuthorizedPayload},
     primitives::FlashblocksPayloadV1,
 };
 
 use futures::FutureExt;
 use op_alloy_consensus::OpTxEnvelope;
-use reth::network::types::Encodable2718;
 use reth::{
     api::{PayloadBuilderError, PayloadKind},
+    network::types::Encodable2718,
     payload::{KeepPayloadJobAlive, PayloadJob},
     revm::{cached::CachedReads, cancelled::CancelOnDrop},
     tasks::TaskSpawner,