Skip to content

witness: Fix storage proofs for accounts with no storage#18988

Merged
antonis19 merged 5 commits into
mainfrom
fix-multiproof-non-existent-storage-key
Feb 10, 2026
Merged

witness: Fix storage proofs for accounts with no storage#18988
antonis19 merged 5 commits into
mainfrom
fix-multiproof-non-existent-storage-key

Conversation

@antonis19

@antonis19 antonis19 commented Feb 5, 2026

Copy link
Copy Markdown
Contributor

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_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.

@antonis19 antonis19 marked this pull request as draft February 6, 2026 12:15
@antonis19 antonis19 marked this pull request as ready for review February 10, 2026 14:58
@antonis19

Copy link
Copy Markdown
Contributor Author

Confirmed that latest code passes all cases in the eth_getProof test suite.

@yperbasis yperbasis requested a review from taratorio February 10, 2026 15:28
@antonis19 antonis19 merged commit 096ddfa into main Feb 10, 2026
32 of 35 checks passed
@antonis19 antonis19 deleted the fix-multiproof-non-existent-storage-key branch February 10, 2026 16:34
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants