wip

Author: kariy

crates/storage/provider/provider/src/providers/db/state.rs

@@ -86,7 +86,7 @@ impl<Tx: DbTxMut> ContractClassWriter for DbProvider<Tx> {
 
 impl<Tx: DbTx> StateFactoryProvider for DbProvider<Tx> {
     fn latest(&self) -> ProviderResult<Box<dyn StateProvider>> {
-        Ok(Box::new(LatestStateProvider(self.0.clone())))
+        Ok(Box::new(LatestStateProvider(self.clone())))
     }
 
     fn historical(
@@ -115,7 +115,7 @@ impl<Tx: DbTx> StateFactoryProvider for DbProvider<Tx> {
 
 /// A state provider that provides the latest states from the database.
 #[derive(Debug)]
-pub(crate) struct LatestStateProvider<Tx: DbTx>(pub(crate) Tx);
+pub(crate) struct LatestStateProvider<Tx: DbTx>(pub(crate) DbProvider<Tx>);
 
 impl<Tx: DbTx> ContractClassProvider for LatestStateProvider<Tx> {
     fn class(&self, hash: ClassHash) -> ProviderResult<Option<ContractClass>> {
@@ -161,7 +161,7 @@ impl<Tx: DbTx> StateProvider for LatestStateProvider<Tx> {
 
 impl<Tx: DbTx> StateProofProvider for LatestStateProvider<Tx> {
     fn class_multiproof(&self, classes: Vec<ClassHash>) -> ProviderResult<katana_trie::MultiProof> {
-        let mut trie = TrieDbFactory::new(&self.0).latest().classes_trie();
+        let mut trie = TrieDbFactory::new(self.0.tx()).latest().classes_trie();
         let proofs = trie.multiproof(classes);
         Ok(proofs)
     }
@@ -170,7 +170,7 @@ impl<Tx: DbTx> StateProofProvider for LatestStateProvider<Tx> {
         &self,
         addresses: Vec<ContractAddress>,
     ) -> ProviderResult<katana_trie::MultiProof> {
-        let mut trie = TrieDbFactory::new(&self.0).latest().contracts_trie();
+        let mut trie = TrieDbFactory::new(self.0.tx()).latest().contracts_trie();
         let proofs = trie.multiproof(addresses);
         Ok(proofs)
     }
@@ -180,25 +180,25 @@ impl<Tx: DbTx> StateProofProvider for LatestStateProvider<Tx> {
         address: ContractAddress,
         storage_keys: Vec<StorageKey>,
     ) -> ProviderResult<katana_trie::MultiProof> {
-        let mut trie = TrieDbFactory::new(&self.0).latest().storages_trie(address);
+        let mut trie = TrieDbFactory::new(self.0.tx()).latest().storages_trie(address);
         let proofs = trie.multiproof(storage_keys);
         Ok(proofs)
     }
 }
 
 impl<Tx: DbTx> StateRootProvider for LatestStateProvider<Tx> {
     fn classes_root(&self) -> ProviderResult<Felt> {
-        let trie = TrieDbFactory::new(&self.0).latest().classes_trie();
+        let trie = TrieDbFactory::new(self.0.tx()).latest().classes_trie();
         Ok(trie.root())
     }
 
     fn contracts_root(&self) -> ProviderResult<Felt> {
-        let trie = TrieDbFactory::new(&self.0).latest().contracts_trie();
+        let trie = TrieDbFactory::new(self.0.tx()).latest().contracts_trie();
         Ok(trie.root())
     }
 
     fn storage_root(&self, contract: ContractAddress) -> ProviderResult<Option<Felt>> {
-        let trie = TrieDbFactory::new(&self.0).latest().storages_trie(contract);
+        let trie = TrieDbFactory::new(self.0.tx()).latest().storages_trie(contract);
         Ok(Some(trie.root()))
     }
 }

crates/storage/provider/provider/src/providers/fork/state.rs

@@ -23,7 +23,7 @@ use crate::ProviderResult;
 
 impl<Tx1: DbTx, Tx2: DbTxMut> StateFactoryProvider for ForkedProvider<Tx1, Tx2> {
     fn latest(&self) -> ProviderResult<Box<dyn StateProvider>> {
-        let local_provider = db::state::LatestStateProvider(self.local_db.tx().clone());
+        let local_provider = db::state::LatestStateProvider(self.local_db.clone());
         let fork_provider = self.fork_db.clone();
         Ok(Box::new(LatestStateProvider { local_provider, fork_provider }))
     }
@@ -178,7 +178,7 @@ impl<Tx1: DbTx, Tx2: DbTxMut> StateProvider for LatestStateProvider<Tx1, Tx2> {
 impl<Tx1: DbTx, Tx2: DbTxMut> StateProofProvider for LatestStateProvider<Tx1, Tx2> {
     fn class_multiproof(&self, classes: Vec<ClassHash>) -> ProviderResult<katana_trie::MultiProof> {
         let fork_point = self.fork_provider.block_id;
-        let latest_block_number = match self.local_provider.latest_number() {
+        let latest_block_number = match self.local_provider.0.latest_number() {
             Ok(num) => num,
             // return the fork block number if local db return this error. this can only happen whne
             // the ForkedProvider is constructed without inserting any locally produced
@@ -202,7 +202,7 @@ impl<Tx1: DbTx, Tx2: DbTxMut> StateProofProvider for LatestStateProvider<Tx1, Tx
         addresses: Vec<ContractAddress>,
     ) -> ProviderResult<katana_trie::MultiProof> {
         let fork_point = self.fork_provider.block_id;
-        let latest_block_number = match self.local_provider.latest_number() {
+        let latest_block_number = match self.local_provider.0.latest_number() {
             Ok(num) => num,
             // return the fork block number if local db return this error. this can only happen whne
             // the ForkedProvider is constructed without inserting any locally produced
@@ -227,7 +227,7 @@ impl<Tx1: DbTx, Tx2: DbTxMut> StateProofProvider for LatestStateProvider<Tx1, Tx
         storage_keys: Vec<StorageKey>,
     ) -> ProviderResult<katana_trie::MultiProof> {
         let fork_point = self.fork_provider.block_id;
-        let latest_block_number = match self.local_provider.latest_number() {
+        let latest_block_number = match self.local_provider.0.latest_number() {
             Ok(num) => num,
             // return the fork block number if local db return this error. this can only happen whne
             // the ForkedProvider is constructed without inserting any locally produced
@@ -253,7 +253,7 @@ impl<Tx1: DbTx, Tx2: DbTxMut> StateProofProvider for LatestStateProvider<Tx1, Tx
 impl<Tx1: DbTx, Tx2: DbTxMut> StateRootProvider for LatestStateProvider<Tx1, Tx2> {
     fn classes_root(&self) -> ProviderResult<Felt> {
         let fork_point = self.fork_provider.block_id;
-        let latest_block_number = match self.local_provider.latest_number() {
+        let latest_block_number = match self.local_provider.0.latest_number() {
             Ok(num) => num,
             // return the fork block number if local db return this error. this can only happen whne
             // the ForkedProvider is constructed without inserting any locally produced
@@ -274,7 +274,7 @@ impl<Tx1: DbTx, Tx2: DbTxMut> StateRootProvider for LatestStateProvider<Tx1, Tx2
 
     fn contracts_root(&self) -> ProviderResult<Felt> {
         let fork_point = self.fork_provider.block_id;
-        let latest_block_number = match self.local_provider.latest_number() {
+        let latest_block_number = match self.local_provider.0.latest_number() {
             Ok(num) => num,
             // return the fork block number if local db return this error. this can only happen whne
             // the ForkedProvider is constructed without inserting any locally produced
@@ -295,7 +295,7 @@ impl<Tx1: DbTx, Tx2: DbTxMut> StateRootProvider for LatestStateProvider<Tx1, Tx2
 
     fn storage_root(&self, contract: ContractAddress) -> ProviderResult<Option<Felt>> {
         let fork_point = self.fork_provider.block_id;
-        let latest_block_number = match self.local_provider.latest_number() {
+        let latest_block_number = match self.local_provider.0.latest_number() {
             Ok(num) => num,
             // return the fork block number if local db return this error. this can only happen whne
             // the ForkedProvider is constructed without inserting any locally produced