refactor(anvil): make StorageInfo<N: Network> generic (#13749)

Author: stevencartavia

Cargo.lock

@@ -871,7 +871,7 @@ impl EthApi {
     }
 
     /// Returns a new accessor for certain storage elements
-    pub fn storage_info(&self) -> StorageInfo {
+    pub fn storage_info(&self) -> StorageInfo<FoundryNetwork> {
         StorageInfo::new(Arc::clone(&self.backend))
     }
 

crates/anvil/src/eth/api.rs

@@ -1,7 +1,7 @@
 //! Handler that can get current storage related data
 
 use crate::mem::Backend;
-use alloy_network::AnyRpcBlock;
+use alloy_network::{AnyRpcBlock, Network};
 use alloy_primitives::B256;
 use anvil_core::eth::block::Block;
 use foundry_primitives::{FoundryNetwork, FoundryReceiptEnvelope};
@@ -13,30 +13,20 @@ use std::{fmt, sync::Arc};
 /// fetch ethereum storage related data
 // TODO(mattsee): once we have multiple Backend types, this should be turned into a trait
 #[derive(Clone)]
-pub struct StorageInfo {
-    backend: Arc<Backend<FoundryNetwork>>,
+pub struct StorageInfo<N: Network> {
+    backend: Arc<Backend<N>>,
 }
 
-impl StorageInfo {
-    pub(crate) fn new(backend: Arc<Backend<FoundryNetwork>>) -> Self {
+impl<N: Network> StorageInfo<N> {
+    pub(crate) fn new(backend: Arc<Backend<N>>) -> Self {
         Self { backend }
     }
 
-    /// Returns the receipts of the current block
-    pub fn current_receipts(&self) -> Option<Vec<FoundryReceiptEnvelope>> {
-        self.backend.mined_receipts(self.backend.best_hash())
-    }
-
     /// Returns the current block
     pub fn current_block(&self) -> Option<Block> {
         self.backend.get_block(self.backend.best_number())
     }
 
-    /// Returns the receipts of the block with the given hash
-    pub fn receipts(&self, hash: B256) -> Option<Vec<FoundryReceiptEnvelope>> {
-        self.backend.mined_receipts(hash)
-    }
-
     /// Returns the block with the given hash
     pub fn block(&self, hash: B256) -> Option<Block> {
         self.backend.get_block_by_hash(hash)
@@ -49,7 +39,21 @@ impl StorageInfo {
     }
 }
 
-impl fmt::Debug for StorageInfo {
+impl StorageInfo<FoundryNetwork> {
+    // TODO: receipts methods require N::ReceiptEnvelope generalization
+
+    /// Returns the receipts of the current block
+    pub fn current_receipts(&self) -> Option<Vec<FoundryReceiptEnvelope>> {
+        self.backend.mined_receipts(self.backend.best_hash())
+    }
+
+    /// Returns the receipts of the block with the given hash
+    pub fn receipts(&self, hash: B256) -> Option<Vec<FoundryReceiptEnvelope>> {
+        self.backend.mined_receipts(hash)
+    }
+}
+
+impl<N: Network> fmt::Debug for StorageInfo<N> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("StorageInfo").finish_non_exhaustive()
     }

crates/anvil/src/eth/backend/info.rs

@@ -17,6 +17,7 @@ use crate::eth::{
     backend::{info::StorageInfo, notifications::NewBlockNotifications},
     error::BlockchainError,
 };
+use foundry_primitives::FoundryNetwork;
 
 /// Maximum number of entries in the fee history cache
 pub const MAX_FEE_HISTORY_CACHE_SIZE: u64 = 2048u64;
@@ -199,15 +200,15 @@ pub struct FeeHistoryService {
     /// number of items to consider
     fee_history_limit: u64,
     /// a type that can fetch ethereum-storage data
-    storage_info: StorageInfo,
+    storage_info: StorageInfo<FoundryNetwork>,
 }
 
 impl FeeHistoryService {
     pub fn new(
         blob_params: BlobParams,
         new_blocks: NewBlockNotifications,
         cache: FeeHistoryCache,
-        storage_info: StorageInfo,
+        storage_info: StorageInfo<FoundryNetwork>,
     ) -> Self {
         Self {
             blob_params,

crates/anvil/src/eth/fees.rs

@@ -11,6 +11,7 @@ use anvil_rpc::{
     error::{ErrorCode, RpcError},
     response::ResponseResult,
 };
+use foundry_primitives::FoundryNetwork;
 use futures::{Stream, StreamExt, channel::mpsc::Receiver};
 use std::{
     pin::Pin,
@@ -158,7 +159,7 @@ pub struct LogsFilter {
     /// listener for new blocks
     pub blocks: NewBlockNotifications,
     /// accessor for block storage
-    pub storage: StorageInfo,
+    pub storage: StorageInfo<FoundryNetwork>,
     /// matcher with all provided filter params
     pub filter: FilteredParams,
     /// existing logs that matched the filter when the listener was installed

crates/anvil/src/filter.rs

@@ -8,6 +8,7 @@ use alloy_primitives::{B256, TxHash};
 use alloy_rpc_types::{FilteredParams, Log, Transaction, pubsub::SubscriptionResult};
 use anvil_core::eth::{block::Block, subscription::SubscriptionId};
 use anvil_rpc::{request::Version, response::ResponseResult};
+use foundry_primitives::FoundryNetwork;
 use futures::{Stream, StreamExt, channel::mpsc::Receiver, ready};
 use serde::Serialize;
 use std::{
@@ -21,7 +22,7 @@ use tokio::sync::mpsc::UnboundedReceiver;
 #[derive(Debug)]
 pub struct LogsSubscription {
     pub blocks: NewBlockNotifications,
-    pub storage: StorageInfo,
+    pub storage: StorageInfo<FoundryNetwork>,
     pub filter: FilteredParams,
     pub queued: VecDeque<Log>,
     pub id: SubscriptionId,
@@ -87,7 +88,7 @@ pub struct EthSubscriptionParams {
 #[derive(Debug)]
 pub enum EthSubscription {
     Logs(Box<LogsSubscription>),
-    Header(NewBlockNotifications, StorageInfo, SubscriptionId),
+    Header(NewBlockNotifications, StorageInfo<FoundryNetwork>, SubscriptionId),
     PendingTransactions(Receiver<TxHash>, SubscriptionId),
     FullPendingTransactions(UnboundedReceiver<AnyRpcTransaction>, SubscriptionId),
 }