fmt + test fix

Author: Solar Mithril

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

@@ -122,7 +122,9 @@ impl Service for OpRbuilderConfig {
         if let Some(http_port) = self.http_port {
             cmd.arg("--http")
                 .arg("--http.port")
-                .arg(http_port.to_string());
+                .arg(http_port.to_string())
+                .arg("--http.api")
+                .arg("txpool,eth,debug,admin");
         }
 
         if let Some(flashblocks_ws_url) = &self.flashblocks_ws_url {

crates/rbuilder/benches/benchmarks/txpool_fetcher.rs

@@ -32,7 +32,7 @@ async fn txpool_receive_util(count: u32) {
 
     let provider = ProviderBuilder::new()
         .wallet(wallet)
-        .on_http(anvil.endpoint().parse().unwrap());
+        .connect_http(anvil.endpoint().parse().unwrap());
 
     let alice = anvil.addresses()[0];
     let eip1559_est = provider.estimate_eip1559_fees().await.unwrap();

crates/rbuilder/src/building/block_orders/prioritized_order_store.rs

@@ -16,11 +16,11 @@ use super::{OrderPriority, SimulatedOrderSink};
 /// Order must implement BlockOrdersOrder which has priority(). This priority is used to sort the simulated orders.
 /// Usage:
 /// - Add new order (a little bit complex):
-///     ALWAYS BE SURE THAT YOU CALLED update_onchain_nonces and updated the current state of all the needed nonces by the order
-///     call insert_order
+///   ALWAYS BE SURE THAT YOU CALLED update_onchain_nonces and updated the current state of all the needed nonces by the order
+///   call insert_order
 /// - Get best order to execute
-///     call pop_order to get the best order
-///     if the order is executed call update_onchain_nonces to update all the changed nonces.
+///   call pop_order to get the best order
+///   if the order is executed call update_onchain_nonces to update all the changed nonces.
 /// - Remove orders: remove_orders. This is useful if we think this orders are no really good (failed to execute to often)
 #[derive(Debug, Clone)]
 pub struct PrioritizedOrderStore<OrderPriorityType> {

crates/rbuilder/src/building/builders/block_building_helper.rs

@@ -59,7 +59,7 @@ pub trait BlockBuildingHelper: Send + Sync {
 
     /// Eats the BlockBuildingHelper since once it's finished you should not use it anymore.
     /// payout_tx_value: If Some, added at the end of the block from coinbase to the final fee recipient.
-    ///     This only works if can_add_payout_tx.
+    /// This only works if can_add_payout_tx.
     fn finalize_block(
         self: Box<Self>,
         local_ctx: &mut ThreadBlockBuildingContext,

crates/rbuilder/src/building/builders/ordering_builder.rs

@@ -222,7 +222,7 @@ impl OrderingBuilderContext {
     }
 
     /// use_suggested_fee_recipient_as_coinbase: all the mev profit goes directly to the slot suggested_fee_recipient so we avoid the payout tx.
-    ///     This mode disables mev-share orders since the builder has to receive the mev profit to give some portion back to the mev-share user.
+    /// This mode disables mev-share orders since the builder has to receive the mev profit to give some portion back to the mev-share user.
     /// !use_suggested_fee_recipient_as_coinbase: all the mev profit goes to the builder and at the end of the block we pay to the suggested_fee_recipient.
     pub fn build_block<OrderPriorityType: OrderPriority>(
         &mut self,

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

@@ -491,7 +491,7 @@ mod tests {
                 ..Default::default()
             };
             Recovered::new_unchecked(
-                TransactionSigned::new(
+                TransactionSigned::new_unchecked(
                     Transaction::Legacy(tx_legacy),
                     alloy_primitives::Signature::test_signature(),
                     self.create_hash(),

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

@@ -437,7 +437,7 @@ mod tests {
 
         pub fn create_tx(&mut self) -> Recovered<TransactionSigned> {
             Recovered::new_unchecked(
-                TransactionSigned::new(
+                TransactionSigned::new_unchecked(
                     Transaction::Legacy(TxLegacy::default()),
                     alloy_primitives::Signature::test_signature(),
                     self.create_hash(),

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

@@ -428,7 +428,7 @@ mod tests {
 
         pub fn create_tx(&mut self) -> Recovered<TransactionSigned> {
             Recovered::new_unchecked(
-                TransactionSigned::new(
+                TransactionSigned::new_unchecked(
                     Transaction::Legacy(TxLegacy::default()),
                     alloy_primitives::Signature::test_signature(),
                     self.create_hash(),

crates/rbuilder/src/building/mod.rs

@@ -536,8 +536,8 @@ impl<Tracer: SimulationTracer> PartialBlock<Tracer> {
     }
 
     /// result_filter: little hack to allow "cancel" the execution depending no the SimValue result. Ideally it would be nicer to split commit_order
-    ///     in 2 parts, one that executes but does not apply (returns state changes) and then another one that applies the changes.
-    ///     You can always pass &|_| Ok(()) if you don't need the filter.
+    /// in 2 parts, one that executes but does not apply (returns state changes) and then another one that applies the changes.
+    /// You can always pass &|_| Ok(()) if you don't need the filter.
     pub fn commit_order(
         &mut self,
         order: &SimulatedOrder,

crates/rbuilder/src/integration/simple.rs

@@ -19,11 +19,11 @@ mod tests {
         to: Option<alloy_primitives::Address>,
     ) -> eyre::Result<alloy_primitives::TxHash> {
         let rbuilder_provider =
-            ProviderBuilder::new().on_http(Url::parse(srv.rbuilder_rpc_url()).unwrap());
+            ProviderBuilder::new().connect_http(Url::parse(srv.rbuilder_rpc_url()).unwrap());
 
         let provider = ProviderBuilder::new()
             .wallet(private_key)
-            .on_http(Url::parse(srv.el_url()).unwrap());
+            .connect_http(Url::parse(srv.el_url()).unwrap());
 
         let gas_price = provider.get_gas_price().await?;
 
@@ -59,7 +59,7 @@ mod tests {
             .unwrap();
 
         // Wait for receipt
-        let binding = ProviderBuilder::new().on_http(Url::parse(srv.el_url()).unwrap());
+        let binding = ProviderBuilder::new().connect_http(Url::parse(srv.el_url()).unwrap());
         let pending_tx = PendingTransactionBuilder::new(binding.root().clone(), tx_hash)
             .with_timeout(Some(std::time::Duration::from_secs(60)));
 

crates/rbuilder/src/live_builder/order_input/txpool_fetcher.rs

@@ -31,11 +31,11 @@ pub async fn subscribe_to_txpool_with_blobs(
     let provider = match mempool {
         MempoolSource::Ipc(path) => {
             let ipc = IpcConnect::new(path);
-            ProviderBuilder::new().on_ipc(ipc).await?
+            ProviderBuilder::new().connect_ipc(ipc).await?
         }
         MempoolSource::Ws(url) => {
             let ws_conn = alloy_provider::WsConnect::new(url);
-            ProviderBuilder::new().on_ws(ws_conn).await?
+            ProviderBuilder::new().connect_ws(ws_conn).await?
         }
     };
 
@@ -150,7 +150,7 @@ mod test {
 
         let provider = ProviderBuilder::new()
             .wallet(wallet)
-            .on_http(anvil.endpoint().parse().unwrap());
+            .connect_http(anvil.endpoint().parse().unwrap());
 
         let alice = anvil.addresses()[0];
 

crates/rbuilder/src/primitives/mod.rs

@@ -702,10 +702,10 @@ impl TransactionSignedEcRecoveredWithBlobs {
         metadata: Option<Metadata>,
     ) -> Result<Self, TxWithBlobsCreateError> {
         // Check for an eip4844 tx passed without blobs
-        if tx.transaction().blob_versioned_hashes().is_some() && blob_sidecar.is_none() {
+        if tx.inner().blob_versioned_hashes().is_some() && blob_sidecar.is_none() {
             Err(TxWithBlobsCreateError::Eip4844MissingBlobSidecar)
         // Check for a non-eip4844 tx passed with blobs
-        } else if blob_sidecar.is_some() && tx.transaction().blob_versioned_hashes().is_none() {
+        } else if blob_sidecar.is_some() && tx.inner().blob_versioned_hashes().is_none() {
             Err(TxWithBlobsCreateError::BlobsMissingEip4844)
         // Groovy!
         } else {
@@ -812,8 +812,11 @@ impl TransactionSignedEcRecoveredWithBlobs {
             PooledTransaction::Eip4844(blob_tx) => {
                 let (blob_tx, signature, hash) = blob_tx.into_parts();
                 let (blob_tx, sidecar) = blob_tx.into_parts();
-                let tx_signed =
-                    TransactionSigned::new(Transaction::Eip4844(blob_tx), signature, hash);
+                let tx_signed = TransactionSigned::new_unchecked(
+                    Transaction::Eip4844(blob_tx),
+                    signature,
+                    hash,
+                );
                 Ok(TransactionSignedEcRecoveredWithBlobs {
                     tx: tx_signed.with_signer(signer),
                     blobs_sidecar: Arc::new(sidecar),
@@ -1239,7 +1242,7 @@ mod tests {
     fn can_execute_single_optional_tx() {
         let needed_base_gas: u128 = 100000;
         let tx = Recovered::new_unchecked(
-            TransactionSigned::new(
+            TransactionSigned::new_unchecked(
                 Transaction::Legacy(TxLegacy {
                     gas_price: needed_base_gas,
                     ..Default::default()

crates/rbuilder/src/primitives/test_data_generator.rs

@@ -22,7 +22,7 @@ impl TestDataGenerator {
 
     pub fn create_tx_nonce(&mut self, sender_nonce: AccountNonce) -> Recovered<TransactionSigned> {
         Recovered::new_unchecked(
-            TransactionSigned::new(
+            TransactionSigned::new_unchecked(
                 Transaction::Legacy(TxLegacy {
                     nonce: sender_nonce.nonce,
                     ..TxLegacy::default()

crates/rbuilder/src/utils/test_utils.rs

@@ -24,7 +24,7 @@ pub fn i256(i: i64) -> I256 {
 
 pub fn tx(tx_hash: u64) -> TransactionSignedEcRecoveredWithBlobs {
     TransactionSignedEcRecoveredWithBlobs::new_for_testing(Recovered::new_unchecked(
-        TransactionSigned::new(
+        TransactionSigned::new_unchecked(
             Transaction::Legacy(Default::default()),
             Signature::test_signature(),
             hash(tx_hash),