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
7 changes: 3 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "trevm"
version = "0.34.2"
version = "0.34.3"
rust-version = "1.83.0"
edition = "2021"
authors = ["init4"]
Expand Down Expand Up @@ -48,7 +48,7 @@ revm = { version = "34", default-features = false }
revm-inspectors = { version = "0.34", optional = true }

dashmap = { version = "6.1.0", optional = true }
tracing = { version = "0.1.41", optional = true }
tracing = "0.1.41"
thiserror = "2.0.11"

tokio = { version = "1.44", optional = true }
Expand All @@ -74,7 +74,6 @@ default = [
"revm/std",
"revm/c-kzg",
"revm/blst",
"revm/portable",
"revm/secp256k1",
]

Expand All @@ -85,7 +84,7 @@ call = ["optional_eip3607", "optional_no_base_fee"]

concurrent-db = ["dep:dashmap"]

estimate_gas = ["optional_eip3607", "optional_no_base_fee", "dep:tracing"]
estimate_gas = ["optional_eip3607", "optional_no_base_fee"]

test-utils = ["revm/std", "revm/serde-json", "revm/alloydb", "alloy/signers", "alloy/signer-local"]

Expand Down
4 changes: 3 additions & 1 deletion src/evm/has_tx.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
use crate::{helpers::Ctx, EvmErrored, HasBlock, HasCfg, HasTx, Trevm, Tx};
use crate::{helpers::Ctx, EvmErrored, HasTx, Trevm, Tx};
#[cfg(feature = "call")]
use crate::{HasBlock, HasCfg};
use alloy::{
eips::eip7825::MAX_TX_GAS_LIMIT_OSAKA,
primitives::{Address, Bytes, U256},
Expand Down
7 changes: 3 additions & 4 deletions src/evm/need_tx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ use crate::{
EvmTransacted, Tx,
};
use alloy::rpc::types::BlockOverrides;
use revm::{
context::{result::ExecutionResult, ContextTr},
Database, DatabaseCommit, Inspector,
};
#[cfg(feature = "call")]
use revm::context::result::ExecutionResult;
use revm::{context::ContextTr, Database, DatabaseCommit, Inspector};

impl<Db, Insp> EvmNeedsTx<Db, Insp>
where
Expand Down
10 changes: 5 additions & 5 deletions src/evm/ready.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ use crate::{
helpers::Ctx, ErroredState, EvmErrored, EvmNeedsTx, EvmReady, EvmTransacted, TransactedState,
Trevm,
};
use revm::{
context::result::{EVMError, ExecutionResult},
interpreter::gas::calculate_initial_tx_gas_for_tx,
Database, InspectEvm, Inspector,
};
#[cfg(feature = "estimate_gas")]
use revm::context::result::EVMError;
#[cfg(feature = "call")]
use revm::context::result::ExecutionResult;
use revm::{interpreter::gas::calculate_initial_tx_gas_for_tx, Database, InspectEvm, Inspector};

impl<Db, Insp> EvmReady<Db, Insp>
where
Expand Down
6 changes: 3 additions & 3 deletions src/evm/transacted.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::{
helpers::Ctx, EvmErrored, EvmNeedsTx, EvmReady, EvmTransacted, NeedsTx, TransactedState, Trevm,
};
#[cfg(feature = "estimate_gas")]
use crate::EvmReady;
use crate::{helpers::Ctx, EvmErrored, EvmNeedsTx, EvmTransacted, NeedsTx, TransactedState, Trevm};
use alloy::primitives::Bytes;
use revm::{
context::{
Expand Down
10 changes: 8 additions & 2 deletions src/fill/fillers.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
use crate::fill::traits::{Cfg, Tx};
use revm::context::{BlockEnv, CfgEnv, TxEnv};
use crate::fill::traits::Cfg;
#[cfg(any(feature = "estimate_gas", feature = "call"))]
use crate::fill::traits::Tx;
#[cfg(feature = "call")]
use revm::context::BlockEnv;
use revm::context::CfgEnv;
#[cfg(any(feature = "estimate_gas", feature = "call"))]
use revm::context::TxEnv;

/// A [`Cfg`] that disables gas-related checks and payment of the
/// beneficiary reward, while leaving other cfg options unchanged.
Expand Down