feat: restructure part3 fix examples (#1792)

* fix contract deployment example * database component example * fix examples * fix uniswap usdc swap * fmt * docs * rm comment
bluealloy · Sep 20, 2024 · f75998a · f75998a
1 parent 5b6846b
commit f75998a
Show file tree

Hide file tree

Showing 18 changed files with 295 additions and 382 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,13 +20,13 @@ members = [
     "crates/specification",
 
     # examples
-    #"examples/block_traces",
-    #"examples/contract_deployment",
+    "examples/block_traces",
+    "examples/contract_deployment",
+    "examples/database_components",
+    "examples/database_ref",
+    "examples/uniswap_get_reserves",
+    "examples/uniswap_v2_usdc_swap",
     #"examples/custom_opcodes",
-    #"examples/database_components",
-    #"examples/database_ref",
-    #"examples/uniswap_get_reserves",
-    #"examples/uniswap_v2_usdc_swap",
 ]
 
 [workspace.dependencies]

diff --git a/bins/revme/Cargo.toml b/bins/revme/Cargo.toml
@@ -12,7 +12,7 @@ repository.workspace = true
 # revm
 database.workspace = true
 revm = { workspace = true, features = ["std", "hashbrown", "c-kzg", "blst"] }
-inspector = { workspace = true, features = ["std", "serde", "serde-json"] }
+inspector = { workspace = true, features = ["std", "serde-json"] }
 
 hash-db = "0.15"
 hex = "0.4"

diff --git a/crates/database/src/ethersdb.rs b/crates/database/src/ethersdb.rs
diff --git a/examples/block_traces/Cargo.toml b/examples/block_traces/Cargo.toml
@@ -23,4 +23,18 @@ all = "warn"
 
 [dependencies]
 revm.workspace = true
-database.workspace = true
+database = { workspace = true, features = ["std", "alloydb"] }
+inspector = { workspace = true, features = ["std", "serde-json"] }
+
+# tokio
+tokio = { version = "1.40", features = ["rt-multi-thread", "macros"] }
+
+# alloy
+alloy-eips = "0.3.6"
+alloy-provider = "0.3"
+
+# progress bar
+indicatif = "0.17"
+
+# mics
+anyhow = "1.0.89"
diff --git a/examples/block_traces/src/main.rs b/examples/block_traces/src/main.rs
@@ -3,11 +3,10 @@
 
 use alloy_eips::{BlockId, BlockNumberOrTag};
 use alloy_provider::{network::primitives::BlockTransactions, Provider, ProviderBuilder};
+use database::{AlloyDB, CacheDB, StateBuilder};
 use indicatif::ProgressBar;
+use inspector::{inspector_handle_register, inspectors::TracerEip3155};
 use revm::{
-    db::{AlloyDB, CacheDB, StateBuilder},
-    inspector_handle_register,
-    inspectors::TracerEip3155,
     primitives::{TxKind, B256, U256},
     specification::eip2930::AccessListItem,
     wiring::EthereumWiring,

diff --git a/examples/contract_deployment/Cargo.toml b/examples/contract_deployment/Cargo.toml
@@ -22,5 +22,8 @@ rust_2018_idioms = "deny"
 all = "warn"
 
 [dependencies]
-revm.workspace = true
+revm = { workspace = true, features = ["std"] }
 database.workspace = true
+
+# mics
+anyhow = "1.0.89"
diff --git a/examples/contract_deployment/src/main.rs b/examples/contract_deployment/src/main.rs
@@ -89,7 +89,7 @@ fn main() -> anyhow::Result<()> {
         bail!("Failed to write storage in the init code: {result:#?}");
     };
 
-    println!("storage U256(0) at{address}:  {storage0:#?}");
+    println!("storage U256(0) at {address}:  {storage0:#?}");
     assert_eq!(storage0.present_value(), param.try_into()?, "{result:#?}");
     Ok(())
 }
diff --git a/examples/database_components/Cargo.toml b/examples/database_components/Cargo.toml
@@ -22,5 +22,8 @@ rust_2018_idioms = "deny"
 all = "warn"
 
 [dependencies]
+# srevm 
 revm.workspace = true
-database.workspace = true
+
+# mics
+auto_impl = "1.2"