diff --git a/Cargo.toml b/Cargo.toml index a6d3152..1ffb2fd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,17 +25,16 @@ 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-primitives = { version = "1.2", features = ["map"] } +alloy-provider = { version = "1.0.12", default-features = false } +alloy-rpc-types = { version = "1.0.12", features = ["eth"] } eyre = "0.6" futures = "0.3" parking_lot = "0.12" -revm = { version = "24.0.0", features = ["std", "serde"] } +revm = { version = "26.0.1", features = ["std", "serde"] } serde = "1.0" serde_json = "1.0" @@ -47,7 +46,7 @@ tracing = "0.1" url = "2" [dev-dependencies] -alloy-rpc-client = "1.0.3" +alloy-rpc-client = "1.0.12" tiny_http = "0.12" # [patch.crates-io] diff --git a/src/backend.rs b/src/backend.rs index fb42353..f4525aa 100644 --- a/src/backend.rs +++ b/src/backend.rs @@ -913,15 +913,6 @@ mod tests { const ENDPOINT: Option<&str> = option_env!("ETH_RPC_URL"); - #[tokio::test(flavor = "multi_thread")] - async fn test_builder() { - let Some(endpoint) = ENDPOINT else { return }; - 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); - } - #[tokio::test(flavor = "multi_thread")] async fn shared_backend() { let Some(endpoint) = ENDPOINT else { return }; diff --git a/src/cache.rs b/src/cache.rs index 2c7779c..3bec106 100644 --- a/src/cache.rs +++ b/src/cache.rs @@ -1,11 +1,9 @@ //! Cache related abstraction -use alloy_consensus::BlockHeader; + use alloy_primitives::{Address, B256, U256}; -use alloy_provider::network::TransactionResponse; use parking_lot::RwLock; use revm::{ context::BlockEnv, - context_interface::block::BlobExcessGasAndPrice, primitives::{ map::{AddressHashMap, HashMap}, KECCAK_EMPTY, @@ -142,28 +140,6 @@ impl BlockchainDbMeta { Self { block_env, hosts: BTreeSet::from([host]) } } - /// Sets the [BlockEnv] of this instance using the provided [alloy_rpc_types::Block] - pub fn with_block( - mut self, - block: &alloy_rpc_types::Block, - ) -> Self { - self.block_env = BlockEnv { - number: block.header.number(), - beneficiary: block.header.beneficiary(), - timestamp: 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, - )), - }; - - self - } - /// Infers the host from the provided url and adds it to the set of hosts pub fn with_url(mut self, url: &str) -> Self { let host = Url::parse(url)