Fix iterator from t8n #434
Merged
Conversation
This file contains 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
gballet
commented
May 7, 2024
Comment on lines
-234
to
-238
| func nodeToDBKey(n verkle.VerkleNode) []byte { | ||
| ret := n.Commitment().Bytes() | ||
| return ret[:] | ||
| } | ||
|
|
There was a problem hiding this comment.
this function is no longer in use, as it was still using the "hash-based" storage model
gballet
commented
May 7, 2024
| @@ -97,9 +97,9 @@ func (it *verkleNodeIterator) Next(descend bool) bool { | |||
| it.current = it.stack[len(it.stack)-1].Node | |||
| it.stack[len(it.stack)-1].Index++ | |||
| return it.Next(descend) | |||
| case *verkle.HashedNode: | |||
There was a problem hiding this comment.
this code was so old that we were still using the version of HashedNode that was storing commitments (and a potential stem as well)
gballet
commented
May 7, 2024
| // resolve the node | ||
| data, err := it.trie.db.diskdb.Get(nodeToDBKey(node)) |
There was a problem hiding this comment.
(incorrect) remnants of the hash-based period.
gballet
commented
May 7, 2024
| @@ -147,7 +147,7 @@ func (it *verkleNodeIterator) Path() []byte { | |||
| var path []byte | |||
| for i, state := range it.stack { | |||
| // skip the last byte | |||
| if i <= len(it.stack)-1 { | |||
There was a problem hiding this comment.
this would always return an empty path
gballet
commented
May 7, 2024
| @@ -112,7 +112,7 @@ func (it *verkleNodeIterator) Next(descend bool) bool { | |||
| it.stack[len(it.stack)-1].Node = it.current | |||
| parent := &it.stack[len(it.stack)-2] | |||
| parent.Node.(*verkle.InternalNode).SetChild(parent.Index, it.current) | |||
| return true | |||
There was a problem hiding this comment.
if a node was resolved, the function needs to be called recursively so that the iteration covers the child nodes
jsign
approved these changes
May 7, 2024
gballet
added a commit
that referenced
this pull request
May 7, 2024
* various verkle iterator fixes * remove unused nodeToDBKey
gballet
added a commit
that referenced
this pull request
May 8, 2024
* various verkle iterator fixes * remove unused nodeToDBKey
gballet
added a commit
that referenced
this pull request
May 8, 2024
* various verkle iterator fixes * remove unused nodeToDBKey
gballet
added a commit
that referenced
this pull request
May 8, 2024
* various verkle iterator fixes * remove unused nodeToDBKey
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.
While working on a verkle-enabled
evm t8n, I found out that the iterator was broken. This PR merges the fixes back intokaustinen-with-shapellaso that I can keep the t8n PR minimal.