forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

trie: fixes to also support storage tries (#16)

Browse source 
* fix issues when using storage trie

* bugfix: 0 as first key byte would produce invalid results
This commit is contained in:
Guillaume Ballet 2020-05-06 10:33:21 +02:00 committed by GitHub
parent f4b7ec6384
commit ddda96e296
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
trie/stacktrie.go
View file

@ -314,7 +314,7 @@ func (st *ReStackTrie) getDiffIndex(key []byte) int {
func (st *ReStackTrie) insert(key, value []byte) { func (st *ReStackTrie) insert(key, value []byte) {
switch st.nodeType { switch st.nodeType {
case branchNode: /* Branch */ case branchNode: /* Branch */
idx := key[st.keyOffset] idx := int(key[st.keyOffset])
if st.children[idx] == nil { if st.children[idx] == nil {
st.children[idx] = NewReStackTrie() st.children[idx] = NewReStackTrie()
st.children[idx].keyOffset = st.keyOffset + 1 st.children[idx].keyOffset = st.keyOffset + 1
@ -514,6 +514,11 @@ func writeHPRLP(writer io.Writer, key, val []byte, leaf bool) {
// value part will be two bytes as the leaf is more than 56 bytes // value part will be two bytes as the leaf is more than 56 bytes
// long. // long.
valHeaderLen := 1 valHeaderLen := 1
if len(val) == 1 && val[0] < 128 {
// Don't reserve space for the header if this
// is an integer < 128
valHeaderLen = 0
}
if len(val) > 56 { if len(val) > 56 {
valHeaderLen = 2 valHeaderLen = 2
} }
@ -550,9 +555,10 @@ func writeHPRLP(writer io.Writer, key, val []byte, leaf bool) {
} }
} }
if leaf { // Write the RLP prefix to the value if needed
if len(val) > 56 {
writer.Write([]byte{0xb8, byte(len(val))}) writer.Write([]byte{0xb8, byte(len(val))})
} else { } else if len(val) > 1 || val[0] >= 128 {
writer.Write([]byte{0x80 + byte(len(val))}) writer.Write([]byte{0x80 + byte(len(val))})
} }
writer.Write(val) writer.Write(val)