Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert this


# Alloy periphery crates
alloy = { version = "=1.0.5", features = [
Expand All @@ -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
Expand All @@ -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"] }
Expand Down Expand Up @@ -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"
1 change: 1 addition & 0 deletions crates/bundle/src/send/bundle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions crates/rpc/examples/filler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
},
};

Expand Down
12 changes: 8 additions & 4 deletions crates/rpc/src/eth/endpoints.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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 {
Expand Down Expand Up @@ -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))
Expand Down