bump to revm 5.0.0 (#871)

* bump to 5.0.0 --------- Co-authored-by: Waylon Jepsen <[email protected]> Co-authored-by: Waylon Jepsen <[email protected]>
anthias-labs · Feb 12, 2024 · 9ff5cae · 9ff5cae
1 parent 85d4a8c
commit 9ff5cae
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 63 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,10 +32,10 @@ path = "bin/main.rs"
 [workspace.dependencies]
 # Local
 arbiter-bindings = "0.1.2"
-arbiter-core = "0.10.0"
-arbiter-macros = "0.1.0" 
+arbiter-core = { path = "arbiter-core" }
+arbiter-macros = "0.1.0"
 
-revm = { version = "=4.0.0", features = ["ethersdb", "std", "serde"] }
+revm = { version = "5.0.0", features = ["ethersdb", "std", "serde"] }
 revm-primitives = "=2.0.0"
 ethers = { version = "2.0.13" }
 

diff --git a/arbiter-core/tests/environment_integration.rs b/arbiter-core/tests/environment_integration.rs
@@ -4,7 +4,7 @@ use arbiter_bindings::bindings::{self, weth::weth};
 use arbiter_core::database::fork::Fork;
 use ethers::{
     prelude::Middleware,
-    types::{Address, H256, U256 as eU256, U64},
+    types::{Address, U256 as eU256, U64},
 };
 include!("common.rs");
 

diff --git a/bin/fork/mod.rs b/bin/fork/mod.rs
@@ -9,7 +9,7 @@ use ethers::{
     utils::{hex, keccak256},
 };
 use revm::{
-    db::{ethersdb::EthersDB, CacheDB, EmptyDB},
+    db::{ethersdb::EthersDB, in_memory_db::CacheDB, EmptyDB, EmptyDBTyped},
     Database,
 };
 use serde::Serialize;
@@ -63,7 +63,7 @@ impl ForkConfig {
     pub(crate) fn digest_config(&self) -> Result<CacheDB<EmptyDB>, ArbiterError> {
         // Spawn the `EthersDB` and the `CacheDB` we will write to.
         let ethers_db = &mut self.spawn_ethers_db()?;
-        let mut db = CacheDB::new(EmptyDB::default());
+        let mut db = CacheDB::new(EmptyDBTyped::default());
         for contract_data in self.contracts_meta.values() {
             let address = contract_data.address;
             let info = ethers_db