Skip to content

Commit

Permalink
chore; bump revm to 14.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
prestwich committed Oct 4, 2024
1 parent ed9940d commit 3590b52
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 14 deletions.
22 changes: 13 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "trevm"
version = "0.11.0"
version = "0.12.0"
rust-version = "1.79.0"
edition = "2021"
authors = ["init4"]
Expand All @@ -27,20 +27,25 @@ option-if-let-else = "warn"
redundant-clone = "warn"

[dependencies]
alloy-primitives = "0.8"
alloy-sol-types = "0.8"
alloy-primitives = "=0.8.5"
alloy-sol-types = "=0.8.5"

alloy = { version = "=0.3.6", features = ["rpc-types-mev"] }
alloy = { version = "=0.4.2", features = ["rpc-types-mev"] }

revm = { version = "14.0.0", default-features = false, features = ["std"] }
revm = { version = "14.0.3", default-features = false, features = ["std"] }

zenith-types = "0.8"
zenith-types = "0.9"

thiserror = "1.0"
alloy-rlp = "0.3"

[dev-dependencies]
revm = { version = "14.0.0", features = ["test-utils", "serde-json", "std", "alloydb"] }
revm = { version = "14.0.3", features = [
"test-utils",
"serde-json",
"std",
"alloydb",
] }
tokio = { version = "1.39", features = ["macros", "rt-multi-thread"] }

alloy-rlp = { version = "0.3", default-features = false }
Expand All @@ -56,7 +61,7 @@ default = [
"revm/c-kzg",
"revm/blst",
"revm/portable",
"revm/secp256k1"
"revm/secp256k1",
]

test-utils = ["revm/test-utils", "revm/std", "revm/serde-json", "revm/alloydb"]
Expand Down Expand Up @@ -93,4 +98,3 @@ full_env_cfg = [
"optional_no_base_fee",
"optional_beneficiary_reward",
]

Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
//! This example demonstrates how to query storage slots of a contract, using AlloyDB.
//! This example demonstrates how to query storage slots of a contract, using
//! [`AlloyDB`].

//! This example is currently disabled while waiting for revm @ 14.0.4

use alloy::{eips::BlockId, providers::ProviderBuilder};
use alloy_primitives::{address, Address, TxKind, U256};
Expand Down
2 changes: 1 addition & 1 deletion src/journal/index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ impl From<BundleStateIndex<'_>> for BundleState {
// revm/src/db/states/bundle_state.rs
fn from(value: BundleStateIndex<'_>) -> Self {
let mut state_size = 0;
let state: HashMap<_, _> = value
let state: HashMap<_, _, _> = value
.state
.into_iter()
.map(|(address, info)| {
Expand Down
5 changes: 2 additions & 3 deletions src/system/eip4895.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
use crate::{EvmExtUnchecked, EvmNeedsTx};
use alloy::eips::eip4895::Withdrawal;
use alloy_primitives::U256;
use alloy_primitives::{map::HashMap, U256};
use revm::{primitives::EVMError, Database, DatabaseCommit};
use std::collections::HashMap;

impl<'a, Ext, Db: Database + DatabaseCommit> EvmNeedsTx<'a, Ext, Db> {
/// Apply the withdrawals to the EVM state.
Expand All @@ -15,7 +14,7 @@ impl<'a, Ext, Db: Database + DatabaseCommit> EvmNeedsTx<'a, Ext, Db> {
{
// We need to apply the withdrawals by incrementing the balances of the
// respective accounts, then committing the changes to the database.
let mut changes = HashMap::new();
let mut changes = HashMap::default();

let increments = withdrawals
.into_iter()
Expand Down

0 comments on commit 3590b52

Please sign in to comment.