Pure HashAndNibblize function
#13453
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
shohamc1
approved these changes
Jan 16, 2025
awskii
approved these changes
Jan 16, 2025
erigon-lib/commitment/commitment.go
Outdated
| @@ -138,7 +138,7 @@ func InitializeTrieAndUpdates(tv TrieVariant, mode Mode, tmpdir string) (Trie, * | |||
| default: | |||
|
|
|||
| trie := NewHexPatriciaHashed(length.Addr, nil, tmpdir) | |||
| tree := NewUpdates(mode, tmpdir, trie.HashAndNibblizeKey) | |||
| tree := NewUpdates(mode, tmpdir, HashAndNibblizeKey) | |||
There was a problem hiding this comment.
Lets specify count of nibbles per byte. Since this is for hex trie, it should be 2.
HashKeyToNibbles2 or HashKeyForHexTrie so we could have different HashKeyFor*. usage of this exact function is strictly bounded to preparing hex trie paths from plain keys
erigon-lib/commitment/utils.go
Outdated
| @@ -0,0 +1,138 @@ | |||
| package commitment | |||
There was a problem hiding this comment.
contents of file is not kind of utils but around plain key encoding back and forth. Keys.go or nibbles.go would better reflect it's contents.
erigon-lib/commitment/utils.go
Outdated
| ecrypto "github.com/erigontech/erigon-lib/crypto" | ||
| ) | ||
|
|
||
| // Hash the account or storage key and return the resulting hashed key in the nibblized form |
There was a problem hiding this comment.
update comment that this
- expects plain key
- splits each byte onto 2 nibbles => hex patricia only
erigon-lib/commitment/utils.go
Outdated
| // Hash the account or storage key and return the resulting hashed key in the nibblized form | ||
| func HashAndNibblizeKey(key []byte) []byte { | ||
| keyLen := length.Addr | ||
| if len(key) < length.Addr { |
erigon-lib/commitment/utils.go
Outdated
| if len(key) < length.Addr { | ||
| keyLen = len(key) | ||
| } | ||
| compactedHashKey := ecrypto.Keccak256(key[:keyLen]) |
There was a problem hiding this comment.
its not compacted, it's hashedKey of address part
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.
This PR extracts
HashAndNibblizeas a utility function, not dependent onHexPatriciaTrieHashed.Doing some benchmark comparisons this change doesn't impact performance (in fact it looks to make an improvement).
These are the comparisons:
For 25 million keys:
hph.HashAndNibblizeKey: 136.664sHashAndNibblizeKey: 108.215sFor 35 million keys:
hph.HashAndNibblizeKey: 351.598sHashAndNibblizeKey: 326.218sFor 50 million keys:
hph.HashAndNibblizeKey: 1055.217sHashAndNibblizeKey: 568.075s