feat: restructure Part2 database crate (bluealloy#1784)

* feat: restructure database crate

* fix tests

* wip examples

* split examples to standalone crates

Author: rakita

Cargo.lock

@@ -1,32 +1,55 @@
 [workspace]
+resolver = "2"
+default-members = ["crates/revm"]
 members = [
+    # binary 
     "bins/revme",
+
+    # libraries
     "crates/revm",
     "crates/primitives",
     "crates/interpreter",
     "crates/precompile",
     "crates/optimism",
+    "crates/database",
     "crates/database/interface",
     "crates/bytecode",
     "crates/state",
     "crates/wiring",
     "crates/specification",
+
+    # examples
+    #"examples/block_traces",
+    #"examples/contract_deployment",
+    #"examples/custom_opcodes",
+    #"examples/database_components",
+    #"examples/database_ref",
+    #"examples/uniswap_get_reserves",
+    #"examples/uniswap_v2_usdc_swap",
 ]
-resolver = "2"
-default-members = ["crates/revm"]
 
 [workspace.dependencies]
 # revm
 primitives = { path = "crates/primitives", package = "revm-primitives", version = "9.0.1", default-features = false }
 bytecode = { path = "crates/bytecode", package = "revm-bytecode", version = "1.0.0", default-features = false }
+database = { path = "crates/database", package = "revm-database", version = "1.0.0", default-features = false }
 database-interface = { path = "crates/database/interface", package = "revm-database-interface", version = "1.0.0", default-features = false }
 specification = { path = "crates/specification", package = "revm-specification", version = "1.0.0", default-features = false }
 state = { path = "crates/state", package = "revm-state", version = "1.0.0", default-features = false }
 wiring = { path = "crates/wiring", package = "revm-wiring", version = "1.0.0", default-features = false }
 revm = { path = "crates/revm", version = "14.0.1", default-features = false }
 interpreter = { path = "crates/interpreter", package = "revm-interpreter", version = "10.0.1", default-features = false }
 precompile = { path = "crates/precompile", package = "revm-precompile", version = "11.0.1", default-features = false }
-# misc
+
+[workspace.package]
+license = "MIT"
+authors = ["Dragan Rakita <dragan0rakita@gmail.com>"]
+categories = ["no-std", "compilers", "cryptography::cryptocurrencies"]
+keywords = ["revm", "evm", "ethereum", "blockchain", "no_std"]
+repository = "https://github.com/bluealloy/revm"
+documentation = "https://bluealloy.github.io/revm/"
+homepage = ""
+edition = "2021"
 
 [workspace.metadata.docs.rs]
 all-features = true

Cargo.toml

@@ -1,14 +1,15 @@
 [package]
-authors = ["Dragan Rakita <dragan0rakita@gmail.com>"]
-edition = "2021"
 name = "revme"
-keywords = ["ethereum", "evm"]
-license = "MIT"
-repository = "https://github.com/bluealloy/revm"
 description = "Rust Ethereum Virtual Machine Executable"
 version = "0.10.1"
+authors.workspace = true
+edition.workspace = true
+keywords.workspace = true
+license.workspace = true
+repository.workspace = true
 
 [dependencies]
+database.workspace = true
 # revm
 revm = { workspace = true, features = [
     "std",

bins/revme/Cargo.toml

@@ -1,6 +1,6 @@
+use database::{BenchmarkDB, EthereumBenchmarkWiring};
 use revm::{
     bytecode::Bytecode,
-    db::{BenchmarkDB, EthereumBenchmarkWiring},
     interpreter::analysis::to_analysed,
     primitives::{address, bytes, Bytes, TxKind},
     Evm,

bins/revme/src/cmd/bench/analysis.rs

@@ -8,9 +8,9 @@ use static_data::{
 
 use alloy_sol_macro::sol;
 use alloy_sol_types::SolCall;
+use database::CacheDB;
 use revm::{
     database_interface::EmptyDB,
-    db::CacheDB,
     primitives::{address, hex, keccak256, Address, Bytes, TxKind, B256, U256},
     state::{AccountInfo, Bytecode},
     wiring::{

bins/revme/src/cmd/bench/burntpix.rs

@@ -1,6 +1,6 @@
+use database::{BenchmarkDB, EthereumBenchmarkWiring};
 use revm::{
     bytecode::Bytecode,
-    db::{BenchmarkDB, EthereumBenchmarkWiring},
     interpreter::analysis::to_analysed,
     primitives::{address, bytes, Bytes, TxKind},
     Evm,

bins/revme/src/cmd/bench/snailtracer.rs

@@ -1,6 +1,6 @@
+use database::{BenchmarkDB, EthereumBenchmarkWiring};
 use revm::{
     bytecode::Bytecode,
-    db::{BenchmarkDB, EthereumBenchmarkWiring},
     primitives::{TxKind, U256},
     Evm,
 };

bins/revme/src/cmd/bench/transfer.rs

@@ -1,7 +1,7 @@
 use clap::Parser;
+use database::BenchmarkDB;
 use revm::{
     bytecode::{Bytecode, BytecodeDecodeError},
-    db::BenchmarkDB,
     inspector_handle_register,
     inspectors::TracerEip3155,
     primitives::{address, Address, TxKind},

bins/revme/src/cmd/evmrunner.rs

@@ -1,10 +1,8 @@
 use alloy_rlp::{RlpEncodable, RlpMaxEncodedLen};
+use database::PlainAccount;
 use hash_db::Hasher;
 use plain_hasher::PlainHasher;
-use revm::{
-    db::PlainAccount,
-    primitives::{keccak256, Address, Log, B256, U256},
-};
+use revm::primitives::{keccak256, Address, Log, B256, U256};
 use triehash::sec_trie_root;
 
 pub fn log_rlp_hash(logs: &[Log]) -> B256 {

bins/revme/src/cmd/statetest/merkle_trie.rs

@@ -3,11 +3,11 @@ use super::{
     models::{SpecName, Test, TestSuite},
     utils::recover_address,
 };
+use database::State;
 use indicatif::{ProgressBar, ProgressDrawTarget};
 use revm::{
     bytecode::Bytecode,
     database_interface::EmptyDB,
-    db::State,
     inspector_handle_register,
     inspectors::TracerEip3155,
     interpreter::analysis::to_analysed,
@@ -276,7 +276,7 @@ pub fn execute_test_suite(
 
     for (name, unit) in suite.0 {
         // Create database and insert cache
-        let mut cache_state = revm::CacheState::new(false);
+        let mut cache_state = database::CacheState::new(false);
         for (address, info) in unit.pre {
             let code_hash = keccak256(&info.code);
             let bytecode = to_analysed(Bytecode::new_raw(info.code));
@@ -397,7 +397,7 @@ pub fn execute_test_suite(
 
                 let mut cache = cache_state.clone();
                 cache.set_state_clear_flag(SpecId::enabled(spec_id, SpecId::SPURIOUS_DRAGON));
-                let mut state = revm::db::State::builder()
+                let mut state = database::State::builder()
                     .with_cached_prestate(cache)
                     .with_bundle_update()
                     .build();
@@ -466,7 +466,7 @@ pub fn execute_test_suite(
                 // re build to run with tracing
                 let mut cache = cache_state.clone();
                 cache.set_state_clear_flag(SpecId::enabled(spec_id, SpecId::SPURIOUS_DRAGON));
-                let mut state = revm::db::State::builder()
+                let mut state = database::State::builder()
                     .with_cached_prestate(cache)
                     .with_bundle_update()
                     .build();