Fmt

flashbots · Mar 10, 2025 · fc954a8 · fc954a8
1 parent 6dc8e99
commit fc954a8
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 12 deletions.
diff --git a/crates/op-rbuilder/src/main.rs b/crates/op-rbuilder/src/main.rs
@@ -21,10 +21,10 @@ mod monitoring;
 pub mod payload_builder;
 #[cfg(not(feature = "flashblocks"))]
 mod payload_builder_vanilla;
+mod primitives;
 #[cfg(test)]
 mod tester;
 mod tx_signer;
-mod primitives;
 
 fn main() {
     Cli::<OpChainSpecParser, args::OpRbuilderArgs>::parse()

diff --git a/crates/op-rbuilder/src/payload_builder.rs b/crates/op-rbuilder/src/payload_builder.rs
@@ -1,9 +1,9 @@
 use std::{fmt::Display, sync::Arc, sync::Mutex};
 
 use crate::{
-    generator::{BlockPayloadJobGenerator, BlockCell, BuildArguments, PayloadBuilder},
+    generator::{BlockCell, BlockPayloadJobGenerator, BuildArguments, PayloadBuilder},
+    primitives::reth::{ExecutedPayload, ExecutionInfo},
     tx_signer::Signer,
-    primitives::reth::{ExecutedPayload, ExecutionInfo}
 };
 use alloy_consensus::{Eip658Value, Header, Transaction, Typed2718, EMPTY_OMMER_ROOT_HASH};
 use alloy_eips::merge::BEACON_NONCE;

diff --git a/crates/op-rbuilder/src/payload_builder_vanilla.rs b/crates/op-rbuilder/src/payload_builder_vanilla.rs
@@ -3,8 +3,8 @@ use crate::generator::BuildArguments;
 use crate::{
     generator::{BlockCell, PayloadBuilder},
     metrics::OpRBuilderMetrics,
+    primitives::reth::{ExecutedPayload, ExecutionInfo},
     tx_signer::Signer,
-    primitives::reth::{ExecutionInfo, ExecutedPayload}
 };
 use alloy_consensus::constants::EMPTY_WITHDRAWALS;
 use alloy_consensus::transaction::Recovered;

diff --git a/crates/op-rbuilder/src/primitives/mod.rs b/crates/op-rbuilder/src/primitives/mod.rs
@@ -1 +1 @@
-pub mod reth;
+pub mod reth;
diff --git a/crates/op-rbuilder/src/primitives/reth/execution.rs b/crates/op-rbuilder/src/primitives/reth/execution.rs
@@ -1,9 +1,9 @@
-//! [Source]()
-use reth_node_api::NodePrimitives;
-use alloy_primitives::{Address, TxHash, B256, U256};
-use std::collections::HashSet;
+//! Heavily influenced by [reth](https://github.com/paradigmxyz/reth/blob/1e965caf5fa176f244a31c0d2662ba1b590938db/crates/optimism/payload/src/builder.rs#L570)
 use alloy_consensus::Transaction;
 use alloy_primitives::private::alloy_rlp::Encodable;
+use alloy_primitives::{Address, TxHash, B256, U256};
+use reth_node_api::NodePrimitives;
+use std::collections::HashSet;
 
 /// Holds the state after execution
 #[derive(Debug)]
@@ -35,7 +35,6 @@ pub struct ExecutionInfo<N: NodePrimitives> {
     pub last_flashblock_index: usize,
 }
 
-
 impl<N: NodePrimitives> ExecutionInfo<N> {
     /// Create a new instance with allocated slots.
     pub fn with_capacity(capacity: usize) -> Self {

diff --git a/crates/op-rbuilder/src/primitives/reth/mod.rs b/crates/op-rbuilder/src/primitives/reth/mod.rs
@@ -1,2 +1,2 @@
 mod execution;
-pub use execution::{ExecutedPayload, ExecutionInfo};
+pub use execution::{ExecutedPayload, ExecutionInfo};
diff --git a/crates/op-rbuilder/src/tester/mod.rs b/crates/op-rbuilder/src/tester/mod.rs
@@ -26,7 +26,6 @@ use reth_payload_builder::PayloadId;
 use reth_rpc_layer::{AuthClientLayer, AuthClientService, JwtSecret};
 use rollup_boost::flashblocks::FlashblocksService;
 use rollup_boost::Flashblocks;
-use serde_json;
 use serde_json::Value;
 use std::str::FromStr;
 use std::time::SystemTime;