witness: Fix storage proofs for accounts with no storage#18988
Merged
Conversation
AskAlexSharov
approved these changes
Feb 6, 2026
Contributor
Author
|
Confirmed that latest code passes all cases in the eth_getProof test suite. |
Sahil-4555
pushed a commit
to Sahil-4555/erigon
that referenced
this pull request
Feb 11, 2026
…18988) Problematic scenario encountered while working on erigontech#18290 When requesting proof of a non-existent storage key for an account that has no storage, the traversal does not stop after the account is encountered, and garbage data from the rows in the grid below the account are incorporated into the proof. This ultimately results in incorrect trie root hash. This problem never surfaced with `eth_getProof` calls because that RPC call has logic to avoid calling `GenerateWitness` when the account in the account proof has an empty storage root. The fix is to stop the traversal if `len(hashedKey)>64` and storage root of account is empty. --------- Co-authored-by: antonis19 <antonis19@users.noreply.github.com>
Sahil-4555
pushed a commit
to Sahil-4555/erigon
that referenced
this pull request
Feb 11, 2026
…18988) Problematic scenario encountered while working on erigontech#18290 When requesting proof of a non-existent storage key for an account that has no storage, the traversal does not stop after the account is encountered, and garbage data from the rows in the grid below the account are incorporated into the proof. This ultimately results in incorrect trie root hash. This problem never surfaced with `eth_getProof` calls because that RPC call has logic to avoid calling `GenerateWitness` when the account in the account proof has an empty storage root. The fix is to stop the traversal if `len(hashedKey)>64` and storage root of account is empty. --------- Co-authored-by: antonis19 <antonis19@users.noreply.github.com>
antonis19
added a commit
that referenced
this pull request
Feb 11, 2026
Some tests in `Test_WitnessTrie_GenerateWitness` incorrectly passed because the cached trie node hashes were cached, but when `tr.Reset()` was being called, the unit tests started failing which exposed issues in the trie structure. Due to this, problems appeared with the witness of #18290 because proofs are requested even for storage keys that haven't been created yet for accounts with no storage, and there was no logic to prevent traversing further than the account. There was a handling introduced for that in #18988 but the fix there was insufficient and the caching hid that the problem wasn't fixed. This PR fixes the unit tests correctly. --------- Co-authored-by: antonis19 <antonis19@users.noreply.github.com>
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
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.
Problematic scenario encountered while working on #18290
When requesting proof of a non-existent storage key for an account that has no storage, the traversal does not stop after the account is encountered, and garbage data from the rows in the grid below the account are incorporated into the proof. This ultimately results in incorrect trie root hash.
This problem never surfaced with
eth_getProofcalls because that RPC call has logic to avoid callingGenerateWitnesswhen the account in the account proof has an empty storage root.The fix is to stop the traversal if
len(hashedKey)>64and storage root of account is empty.