[pull] main from bluealloy:main

crates/revm/Cargo.toml

@@ -53,11 +53,18 @@ serde = [
     "primitives/serde",
     "handler/serde",
     "context-interface/serde",
+    "inspector/serde",
 ]
 arbitrary = ["primitives/arbitrary"]
 asm-keccak = ["primitives/asm-keccak"]
 portable = ["precompile/portable"]
 
+# Enables alloydb inside database crate
+alloydb = ["database/alloydb"]
+
+# Enables serde-json inside inspector crate
+serde-json = ["serde", "inspector/serde-json"]
+
 test-utils = []
 
 dev = [

examples/block_traces/Cargo.toml

@@ -22,9 +22,8 @@ rust_2018_idioms = "deny"
 all = "warn"
 
 [dependencies]
-revm.workspace = true
-database = { workspace = true, features = ["std", "alloydb"] }
-inspector = { workspace = true, features = ["std", "serde-json"] }
+# revm
+revm = { workspace = true, features = ["std", "alloydb", "serde-json"] }
 
 # tokio
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }

examples/block_traces/src/main.rs

@@ -7,11 +7,13 @@ use alloy_provider::{
     network::primitives::{BlockTransactions, BlockTransactionsKind},
     Provider, ProviderBuilder,
 };
-use database::{AlloyDB, CacheDB, StateBuilder};
 use indicatif::ProgressBar;
-use inspector::{inspectors::TracerEip3155, InspectEvm};
 use revm::{
-    database_interface::WrapDatabaseAsync, primitives::TxKind, Context, MainBuilder, MainContext,
+    database::{AlloyDB, CacheDB, StateBuilder},
+    database_interface::WrapDatabaseAsync,
+    inspector::{inspectors::TracerEip3155, InspectEvm},
+    primitives::TxKind,
+    Context, MainBuilder, MainContext,
 };
 use std::fs::OpenOptions;
 use std::io::BufWriter;

examples/cheatcode_inspector/Cargo.toml

@@ -22,9 +22,8 @@ rust_2018_idioms = "deny"
 all = "warn"
 
 [dependencies]
-revm = {workspace = true, features = ["std"] }
-database = { workspace = true, features = ["std"] }
-inspector = { workspace = true, features = ["std", "serde-json"] }
+# revms
+revm = { workspace = true, features = ["std", "serde-json"] }
 
 # misc
 anyhow = "1.0.89"

examples/cheatcode_inspector/src/main.rs

@@ -7,14 +7,6 @@
 
 use std::{convert::Infallible, fmt::Debug};
 
-use database::InMemoryDB;
-use inspector::{
-    exec::{inspect_main, InspectEvm},
-    inspector_context::InspectorContext,
-    inspectors::TracerEip3155,
-    journal::JournalExt,
-    GetInspector, Inspector,
-};
 use revm::{
     bytecode::Bytecode,
     context::{BlockEnv, Cfg, CfgEnv, TxEnv},
@@ -31,6 +23,14 @@ use revm::{
     specification::hardfork::SpecId,
     state::{Account, EvmState, TransientStorage},
     Context, Database, DatabaseCommit, JournalEntry, JournaledState, MainBuilder,
+     database::InMemoryDB,
+inspector::{
+    exec::{inspect_main, InspectEvm},
+    inspector_context::InspectorContext,
+    inspectors::TracerEip3155,
+    journal::JournalExt,
+    GetInspector, Inspector,
+},
 };
 
 /// Backend for cheatcodes.

examples/contract_deployment/Cargo.toml

@@ -23,7 +23,6 @@ all = "warn"
 
 [dependencies]
 revm = { workspace = true, features = ["std"] }
-database.workspace = true
 
 # misc
 anyhow = "1.0.89"

examples/contract_deployment/src/main.rs

@@ -2,11 +2,11 @@
 #![cfg_attr(not(test), warn(unused_crate_dependencies))]
 
 use anyhow::{anyhow, bail};
-use database::CacheDB;
 use revm::{
     bytecode::opcode,
     context::Context,
     context_interface::result::{ExecutionResult, Output},
+    database::CacheDB,
     database_interface::EmptyDB,
     handler::handler::EvmTr,
     primitives::{hex, Bytes, TxKind, U256},

examples/erc20_gas/Cargo.toml

@@ -22,8 +22,7 @@ rust_2018_idioms = "deny"
 all = "warn"
 
 [dependencies]
-revm.workspace = true
-database = { workspace = true, features = ["std", "alloydb"] }
+revm = { workspace = true, features = ["std", "alloydb"] }
 
 # tokio
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }

examples/erc20_gas/src/main.rs

@@ -7,13 +7,13 @@
 use alloy_provider::{network::Ethereum, DynProvider, Provider, ProviderBuilder};
 use alloy_sol_types::SolValue;
 use anyhow::Result;
-use database::{AlloyDB, BlockId, CacheDB};
 use exec::transact_erc20evm_commit;
 use revm::{
     context_interface::{
         result::{InvalidHeader, InvalidTransaction},
         ContextTr, Journal,
     },
+    database::{AlloyDB, BlockId, CacheDB},
     database_interface::WrapDatabaseAsync,
     precompile::PrecompileError,
     primitives::{address, keccak256, Address, Bytes, TxKind, U256},

examples/uniswap_get_reserves/Cargo.toml

@@ -23,8 +23,7 @@ all = "warn"
 
 [dependencies]
 # revm
-revm.workspace = true
-database = { workspace = true, features = ["std", "alloydb"] }
+revm = { workspace = true, features = ["std", "alloydb"] }
 
 # tokio
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }

examples/uniswap_get_reserves/src/main.rs

@@ -4,9 +4,9 @@
 use alloy_eips::BlockId;
 use alloy_provider::ProviderBuilder;
 use alloy_sol_types::{sol, SolCall};
-use database::{AlloyDB, CacheDB};
 use revm::{
     context_interface::result::{ExecutionResult, Output},
+    database::{AlloyDB, CacheDB},
     database_interface::{DatabaseRef, EmptyDB, WrapDatabaseAsync},
     primitives::{address, TxKind, U256},
     Context, ExecuteEvm, MainBuilder, MainContext,

examples/uniswap_v2_usdc_swap/Cargo.toml

@@ -22,8 +22,7 @@ rust_2018_idioms = "deny"
 all = "warn"
 
 [dependencies]
-revm.workspace = true
-database = { workspace = true, features = ["std", "alloydb"] }
+revm = { workspace = true, features = ["std", "alloydb"] }
 
 # tokio
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }

examples/uniswap_v2_usdc_swap/src/main.rs

@@ -5,9 +5,9 @@ use alloy_eips::BlockId;
 use alloy_provider::{network::Ethereum, DynProvider, Provider, ProviderBuilder};
 use alloy_sol_types::{sol, SolCall, SolValue};
 use anyhow::{anyhow, Result};
-use database::{AlloyDB, CacheDB};
 use revm::{
     context_interface::result::{ExecutionResult, Output},
+    database::{AlloyDB, CacheDB},
     database_interface::WrapDatabaseAsync,
     primitives::{address, keccak256, Address, Bytes, TxKind, U256},
     state::AccountInfo,