mirror/erigon-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/erigon-pulse.git synced 2025-01-11 05:20:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- parent node type - doesn't matter for IH - just check that node itself is fullNode or duoNode is enough (#518)

Browse Source 
- in unloading - 64 nibbles - it's hex of a.storage, but not a - then 64 nibbles hex must be stored in IH with incarnation
- EmptyRoot can't come to `WillUnloadBranchNode` method - because if account has no storage - then accountNode will have no branches in a.storage, a.storage will equal to `hashNode(EmptyRoot)` - and we don't unload hashNodes (only fullNode/duoNode).
This commit is contained in:
Alex Sharov 2020-05-06 15:58:37 +07:00 committed by GitHub
parent 39a37f2dd9
commit 56022d8d85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/state/intermediate_hashes.go
View File

@ -40,7 +40,7 @@ func (ih *IntermediateHashes) WillUnloadBranchNode(prefixAsNibbles []byte, nodeH
trie.CompressNibbles(prefixAsNibbles, &buf.B)
var key []byte
if len(buf.B) > common.HashLength {
if len(buf.B) >= common.HashLength {
key = dbutils.GenerateCompositeStoragePrefix(buf.B[:common.HashLength], incarnation, buf.B[common.HashLength:])
} else {
key = common.CopyBytes(buf.B)
@ -63,7 +63,7 @@ func (ih *IntermediateHashes) BranchNodeLoaded(prefixAsNibbles []byte, incarnati
trie.CompressNibbles(prefixAsNibbles, &buf.B)
var key []byte
if len(buf.B) > common.HashLength {
if len(buf.B) >= common.HashLength {
key = dbutils.GenerateCompositeStoragePrefix(buf.B[:common.HashLength], incarnation, buf.B[common.HashLength:])
} else {
key = common.CopyBytes(buf.B)

9
trie/trie.go
View File

@ -1208,13 +1208,19 @@ func (t *Trie) EvictNode(hex []byte) {
hnode := hashNode(hn[:])
t.observers.WillUnloadNode(hex, hn)
switch nd.(type) {
case *fullNode, *duoNode:
t.observers.WillUnloadBranchNode(hex, hn, incarnation)
default:
// nothing to do
}
switch p := parent.(type) {
case nil:
t.root = hnode
case *shortNode:
p.Val = hnode
case *duoNode:
t.observers.WillUnloadBranchNode(hex, hn, incarnation)
i1, i2 := p.childrenIdx()
switch hex[len(hex)-1] {
case i1:
@ -1223,7 +1229,6 @@ func (t *Trie) EvictNode(hex []byte) {
p.child2 = hnode
}
case *fullNode:
t.observers.WillUnloadBranchNode(hex, hn, incarnation)
idx := hex[len(hex)-1]
p.Children[idx] = hnode
case *accountNode: