diff --git a/Cargo.toml b/Cargo.toml index d4c44e0e..d868dad3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,10 +46,10 @@ signet-tx-cache = { path = "crates/tx-cache" } signet-zenith = { path = "crates/zenith" } # ajj -ajj = { version = "0.3.1" } +ajj = { version = "0.3.4" } # trevm -trevm = { version = "0.23.4", features = ["full_env_cfg"] } +trevm = { version = "=0.23.4", features = ["full_env_cfg"] } # Alloy periphery crates alloy = { version = "=1.0.5", features = [ @@ -58,6 +58,7 @@ alloy = { version = "=1.0.5", features = [ "genesis", "arbitrary", ] } +alloy-rpc-types-mev = { version = "=1.0.5" } alloy-contract = { version = "=1.0.5", features = ["pubsub"] } # Reth @@ -80,7 +81,7 @@ reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1 reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" } # Foundry periphery -foundry-blob-explorers = "0.10" +foundry-blob-explorers = "=0.10" # Async tokio = { version = "1.43.0", features = ["macros"] } @@ -114,4 +115,4 @@ hex = { package = "const-hex", version = "1.10", default-features = false, featu uuid = "1.16.0" # Test Utils -alloy-rlp = "0.3.11" +alloy-rlp = "=0.3.11" diff --git a/crates/bundle/src/send/bundle.rs b/crates/bundle/src/send/bundle.rs index 7b9e5419..a6be0ef1 100644 --- a/crates/bundle/src/send/bundle.rs +++ b/crates/bundle/src/send/bundle.rs @@ -148,6 +148,7 @@ mod test { max_timestamp: Some(3), reverting_tx_hashes: vec![B256::repeat_byte(4), B256::repeat_byte(5)], replacement_uuid: Some("uuid".to_owned()), + ..Default::default() }, host_fills: Some(SignedFill { permit: Permit2Batch { diff --git a/crates/rpc/examples/filler.rs b/crates/rpc/examples/filler.rs index ff36333e..05b4986f 100644 --- a/crates/rpc/examples/filler.rs +++ b/crates/rpc/examples/filler.rs @@ -135,6 +135,7 @@ where min_timestamp: None, // sufficiently covered by pinning to next block number max_timestamp: None, // sufficiently covered by pinning to next block number replacement_uuid: None, // optional if implementing strategies that replace or cancel bundles + ..Default::default() // all other options are not used. }, }; diff --git a/crates/rpc/src/eth/endpoints.rs b/crates/rpc/src/eth/endpoints.rs index 1bda6901..e5ad459b 100644 --- a/crates/rpc/src/eth/endpoints.rs +++ b/crates/rpc/src/eth/endpoints.rs @@ -527,10 +527,6 @@ where { let id = block.unwrap_or(BlockId::pending()); - // Stateless gas normalization. - let max_gas = ctx.signet().config().rpc_gas_cap; - normalize_gas_stateless(&mut request, max_gas); - // this span is verbose yo. let span = trace_span!( "estimate_gas", @@ -541,6 +537,12 @@ where block_cfg = tracing::field::Empty, ); + // Stateless gas normalization. + let max_gas = ctx.signet().config().rpc_gas_cap; + normalize_gas_stateless(&mut request, max_gas); + + tracing::span::Span::current().record("normalized_gas", format!("{:?}", request.gas)); + let task = async move { // Get the block cfg from backend, erroring if it fails let block_cfg = match ctx.signet().block_cfg(id).await { @@ -568,6 +570,8 @@ where let (estimate, _) = response_tri!(trevm.estimate_gas().map_err(EvmErrored::into_error)); + tracing::span::Span::current().record("estimate", format!("{:?}", &estimate)); + match estimate { trevm::EstimationResult::Success { estimation, .. } => { ResponsePayload::Success(U64::from(estimation))