reth 15476:Make DatabaseProof trait stateful #15541
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Rjected
requested changes
Apr 22, 2025
| pub trait DatabaseStorageProof<'a, TX> { | ||
| /// Create a new [`StorageProof`] from database transaction and account address. | ||
| fn from_tx(tx: &'a TX, address: Address) -> Self; | ||
| // Add constructor for Proof |
Comment on lines
-92
to
+95
| address: Address, | ||
| &self, | ||
| slot: B256, | ||
| storage: HashedStorage, | ||
| ) -> Result<reth_trie::StorageProof, StateProofError>; | ||
|
|
||
| /// Generates the storage multiproof for target slots based on [`TrieInput`]. | ||
| fn overlay_storage_multiproof( | ||
| tx: &'a TX, | ||
| address: Address, | ||
| &self, |
There was a problem hiding this comment.
we need to keep address in the trait I think? Even if we already have the address in the DatabaseStorageProof struct, we should keep the behavior consistent with how we did it previously, which was hashing the input addr and returning the storage proof for that hashed addr
| &state_sorted, | ||
| )) | ||
| .with_prefix_set_mut(prefix_set) | ||
| .storage_multiproof(targets) | ||
| } | ||
| } | ||
|
|
||
| // Add constructor for StorageProof |
| input: TrieInput, | ||
| address: Address, | ||
| slots: &[B256], | ||
| ) -> Result<AccountProof, StateProofError>; | ||
|
|
||
| /// Generates the state [`MultiProof`] for target hashed account and storage keys. | ||
| fn overlay_multiproof( | ||
| tx: &'a TX, | ||
| &self, |
There was a problem hiding this comment.
I wonder if this should actually be self given I think we create a new Proof struct every time this method is called, then we don't have to do self.clone() in the impls below
There was a problem hiding this comment.
sure @Rjected , I will resolve the issues in my next commit
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #15476 , updated the databaseproof and the databasestorageproof functions to use self parameters instead of <'a, TX>