Skip to content

chore(deps): bump revm 27.0.2 #53

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

Merged
merged 18 commits into from
Jul 10, 2025
Merged

chore(deps): bump revm 27.0.2 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
621d528
bump for revm 25 compatibility, not clear what BlobExcessGasAndPrice …
zerosnacks Jun 10, 2025
91b76a3
Merge remote-tracking branch 'origin/main' into zerosnacks/bump-revm-…
zerosnacks Jun 17, 2025
b742f13
bump deps
zerosnacks Jun 24, 2025
2cc5629
remove with_block, it is no longer possible to reliably set directly …
zerosnacks Jun 24, 2025
d1d62a2
Merge branch 'main' into zerosnacks/bump-revm-26.0.0
zerosnacks Jun 30, 2025
8e1e69f
bump alloy
zerosnacks Jun 30, 2025
d366fbd
re-add with_block
zerosnacks Jun 30, 2025
c4f6bf0
bump to revm 27
zerosnacks Jul 1, 2025
4ed9afb
update new `from_chain_and_timestamp` method
zerosnacks Jul 7, 2025
3ec870f
bump alloy
zerosnacks Jul 9, 2025
e819e0a
remove with_block as it is unused in Foundry
zerosnacks Jul 9, 2025
2212816
restore test
zerosnacks Jul 9, 2025
da31b84
revert, pass chain as parameter is cleanest in my opinion
zerosnacks Jul 10, 2025
7c57782
add set_chain builder method, default to `mainnet` => Prague
zerosnacks Jul 10, 2025
b4f7b03
Option<Chain>, default to Prague if not set
zerosnacks Jul 10, 2025
515a153
fmt
zerosnacks Jul 10, 2025
18c4ceb
address feedback, meta should also handle chain accordingly
zerosnacks Jul 10, 2025
221098e
fix, apply default
zerosnacks Jul 10, 2025
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
14 changes: 8 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,19 @@ all-features = true
rustdoc-args = ["--cfg", "docsrs"]

[dependencies]
alloy-primitives = { version = "1.0", features = ["map"] }
alloy-provider = { version = "1.0.3", default-features = false }
alloy-rpc-types = { version = "1.0.3", features = ["eth"] }
alloy-consensus = { version = "1.0.3", default-features = false }
alloy-chains = { version = "0.2", default-features = false, features = ["serde"] }
alloy-consensus = { version = "1.0.20", default-features = false }
alloy-hardforks = { version = "0.2.12", default-features = false }
alloy-primitives = { version = "1.2", features = ["map"] }
alloy-provider = { version = "1.0.20", default-features = false }
alloy-rpc-types = { version = "1.0.20", features = ["eth"] }

eyre = "0.6"
futures = "0.3"

parking_lot = "0.12"

revm = { version = "24.0.0", features = ["std", "serde"] }
revm = { version = "27.0.2", features = ["std", "serde"] }

serde = "1.0"
serde_json = "1.0"
Expand All @@ -47,7 +49,7 @@ tracing = "0.1"
url = "2"

[dev-dependencies]
alloy-rpc-client = "1.0.3"
alloy-rpc-client = "1.0.20"
tiny_http = "0.12"

# [patch.crates-io]
Expand Down
37 changes: 11 additions & 26 deletions src/backend.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,10 +997,11 @@ impl DatabaseRef for SharedBackend {
mod tests {
use super::*;
use crate::cache::{BlockchainDbMeta, JsonBlockCacheDB};
use alloy_consensus::BlockHeader;
use alloy_provider::ProviderBuilder;
use alloy_rpc_client::ClientBuilder;
use serde::Deserialize;
use std::{collections::BTreeSet, fs, path::PathBuf};
use std::{fs, path::PathBuf};
use tiny_http::{Response, Server};

pub fn get_http_provider(endpoint: &str) -> impl Provider<AnyNetwork> + Clone {
Expand All @@ -1017,18 +1018,17 @@ mod tests {
let provider = get_http_provider(endpoint);

let any_rpc_block = provider.get_block(BlockId::latest()).hashes().await.unwrap().unwrap();
let _meta = BlockchainDbMeta::default().with_block(&any_rpc_block.inner);
let meta = BlockchainDbMeta::default().with_block(&any_rpc_block.inner);

assert_eq!(meta.block_env.number, U256::from(any_rpc_block.header.number()));
}

#[tokio::test(flavor = "multi_thread")]
async fn shared_backend() {
let Some(endpoint) = ENDPOINT else { return };

let provider = get_http_provider(endpoint);
let meta = BlockchainDbMeta {
block_env: Default::default(),
hosts: BTreeSet::from([endpoint.to_string()]),
};
let meta = BlockchainDbMeta::new(Default::default(), endpoint.to_string());

let db = BlockchainDb::new(meta, None);
let backend = SharedBackend::spawn_backend(Arc::new(provider), db.clone(), None).await;
Expand Down Expand Up @@ -1076,10 +1076,7 @@ mod tests {
let Some(endpoint) = ENDPOINT else { return };

let provider = get_http_provider(endpoint);
let meta = BlockchainDbMeta {
block_env: Default::default(),
hosts: BTreeSet::from([endpoint.to_string()]),
};
let meta = BlockchainDbMeta::new(Default::default(), endpoint.to_string());

let db = BlockchainDb::new(meta, None);
let backend = SharedBackend::spawn_backend(Arc::new(provider), db.clone(), None).await;
Expand Down Expand Up @@ -1141,10 +1138,7 @@ mod tests {
let Some(endpoint) = ENDPOINT else { return };

let provider = get_http_provider(endpoint);
let meta = BlockchainDbMeta {
block_env: Default::default(),
hosts: BTreeSet::from([endpoint.to_string()]),
};
let meta = BlockchainDbMeta::new(Default::default(), endpoint.to_string());

let db = BlockchainDb::new(meta, None);
let backend = SharedBackend::spawn_backend(Arc::new(provider), db.clone(), None).await;
Expand Down Expand Up @@ -1203,10 +1197,7 @@ mod tests {
let Some(endpoint) = ENDPOINT else { return };

let provider = get_http_provider(endpoint);
let meta = BlockchainDbMeta {
block_env: Default::default(),
hosts: BTreeSet::from([endpoint.to_string()]),
};
let meta = BlockchainDbMeta::new(Default::default(), endpoint.to_string());

let db = BlockchainDb::new(meta, None);
let backend = SharedBackend::spawn_backend(Arc::new(provider), db.clone(), None).await;
Expand Down Expand Up @@ -1255,10 +1246,7 @@ mod tests {
let Some(endpoint) = ENDPOINT else { return };

let provider = get_http_provider(endpoint);
let meta = BlockchainDbMeta {
block_env: Default::default(),
hosts: BTreeSet::from([endpoint.to_string()]),
};
let meta = BlockchainDbMeta::new(Default::default(), endpoint.to_string());

// create a temporary file
fs::copy("test-data/storage.json", "test-data/storage-tmp.json").unwrap();
Expand Down Expand Up @@ -1413,10 +1401,7 @@ mod tests {
});

let provider = get_http_provider(&endpoint);
let meta = BlockchainDbMeta {
block_env: Default::default(),
hosts: BTreeSet::from([endpoint.to_string()]),
};
let meta = BlockchainDbMeta::new(Default::default(), endpoint.to_string());

let db = BlockchainDb::new(meta, None);
let provider_inner = provider.clone();
Expand Down
40 changes: 32 additions & 8 deletions src/cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
//! Cache related abstraction

use alloy_chains::Chain;
use alloy_consensus::BlockHeader;
use alloy_hardforks::EthereumHardfork;
use alloy_primitives::{Address, B256, U256};
use alloy_provider::network::TransactionResponse;
use parking_lot::RwLock;
use revm::{
context::BlockEnv,
context_interface::block::BlobExcessGasAndPrice,
primitives::{
eip4844::{BLOB_BASE_FEE_UPDATE_FRACTION_CANCUN, BLOB_BASE_FEE_UPDATE_FRACTION_PRAGUE},
map::{AddressHashMap, HashMap},
KECCAK_EMPTY,
},
Expand Down Expand Up @@ -123,8 +127,11 @@ impl BlockchainDb {
}

/// relevant identifying markers in the context of [BlockchainDb]
#[derive(Clone, Debug, Eq, Serialize, Default)]
#[derive(Clone, Debug, Default, Eq, Serialize)]
pub struct BlockchainDbMeta {
/// The chain of the blockchain of the block environment
#[serde(default, skip_serializing_if = "Option::is_none")]
pub chain: Option<Chain>,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we mark this default and skip if none

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in 221098e

/// The block environment
pub block_env: BlockEnv,
/// All the hosts used to connect to
Expand All @@ -139,25 +146,33 @@ impl BlockchainDbMeta {
.and_then(|url| url.host().map(|host| host.to_string()))
.unwrap_or(url);

Self { block_env, hosts: BTreeSet::from([host]) }
Self { chain: None, block_env, hosts: BTreeSet::from([host]) }
}

/// Sets the [BlockEnv] of this instance using the provided [alloy_rpc_types::Block]
/// Sets the [BlockEnv] of this instance using the provided [Chain] and [alloy_rpc_types::Block]
pub fn with_block<T: TransactionResponse, H: BlockHeader>(
mut self,
block: &alloy_rpc_types::Block<T, H>,
) -> Self {
let blob_base_fee_update_fraction =
self.chain.map_or(BLOB_BASE_FEE_UPDATE_FRACTION_PRAGUE, |chain| {
match EthereumHardfork::from_chain_and_timestamp(chain, block.header.timestamp()) {
Some(EthereumHardfork::Cancun) => BLOB_BASE_FEE_UPDATE_FRACTION_CANCUN,
_ => BLOB_BASE_FEE_UPDATE_FRACTION_PRAGUE,
}
});

self.block_env = BlockEnv {
number: block.header.number(),
number: U256::from(block.header.number()),
beneficiary: block.header.beneficiary(),
timestamp: block.header.timestamp(),
timestamp: U256::from(block.header.timestamp()),
difficulty: U256::from(block.header.difficulty()),
basefee: block.header.base_fee_per_gas().unwrap_or_default(),
gas_limit: block.header.gas_limit(),
prevrandao: block.header.mix_hash(),
blob_excess_gas_and_price: Some(BlobExcessGasAndPrice::new(
block.header.excess_blob_gas().unwrap_or_default(),
false,
blob_base_fee_update_fraction,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we really need this, this previously also just defaulted to pre-prague and I believe we only use this to tag the metadata?
should we just use BLOB_BASE_FEE_UPDATE_FRACTION_PRAGUE and remove the chainid arg?

Copy link
Member Author

@zerosnacks zerosnacks Jul 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated, now we have a builder method set_chain that allows for optional setting of the chain, defaulting to use BLOB_BASE_FEE_UPDATE_FRACTION_PRAGUE if none is set. This should be both correct and a good user experience.

)),
};

Expand All @@ -174,9 +189,16 @@ impl BlockchainDbMeta {
self
}

/// Sets the [Chain] of this instance
pub fn set_chain(mut self, chain: Chain) -> Self {
self.chain = Some(chain);
self
}

/// Sets the [BlockEnv] of this instance
pub fn set_block_env(mut self, block_env: revm::context::BlockEnv) {
pub fn set_block_env(mut self, block_env: revm::context::BlockEnv) -> Self {
self.block_env = block_env;
self
}
}

Expand Down Expand Up @@ -229,6 +251,7 @@ impl<'de> Deserialize<'de> for BlockchainDbMeta {
// custom deserialize impl to not break existing cache files
#[derive(Deserialize)]
struct Meta {
chain: Option<Chain>,
block_env: BlockEnvBackwardsCompat,
/// all the hosts used to connect to
#[serde(alias = "host")]
Expand All @@ -242,8 +265,9 @@ impl<'de> Deserialize<'de> for BlockchainDbMeta {
Single(String),
}

let Meta { block_env, hosts } = Meta::deserialize(deserializer)?;
let Meta { chain, block_env, hosts } = Meta::deserialize(deserializer)?;
Ok(Self {
chain,
block_env: block_env.inner,
hosts: match hosts {
Hosts::Multi(hosts) => hosts,
Expand Down