Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump to revm 5.0.0 #871

Merged
merged 3 commits into from
Feb 12, 2024
Merged

bump to revm 5.0.0 #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a6a512
bump to 5.0.0
Autoparallel Feb 12, 2024
3e13c66
Merge branch 'main' into revm-bump
0xJepsen Feb 12, 2024
05052f7
chore: version jujistu
0xJepsen Feb 12, 2024
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
85 changes: 28 additions & 57 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }

Expand Down
2 changes: 1 addition & 1 deletion arbiter-core/tests/environment_integration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down
4 changes: 2 additions & 2 deletions bin/fork/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
Loading