trie: fix size accounting in cleaner (ethereum#25007)

aaronbuchwald · jagdeep sidhu · commit 32b03acc61c5 · 2022-06-22T08:56:51.000-07:00
Decrease children size instead of dirties size when marking dirties as cleaned up in trie cleaner
diff --git a/trie/database.go b/trie/database.go
@@ -812,7 +812,7 @@ func (c *cleaner) Put(key []byte, rlp []byte) error {
 	delete(c.db.dirties, hash)
 	c.db.dirtiesSize -= common.StorageSize(common.HashLength + int(node.size))
 	if node.children != nil {
-		c.db.dirtiesSize -= common.StorageSize(cachedNodeChildrenSize + len(node.children)*(common.HashLength+2))
+		c.db.childrenSize -= common.StorageSize(cachedNodeChildrenSize + len(node.children)*(common.HashLength+2))
 	}
 	// Move the flushed node into the clean cache to prevent insta-reloads
 	if c.db.cleans != nil {

Original file line number	Diff line number	Diff line change
`@@ -812,7 +812,7 @@ func (c *cleaner) Put(key []byte, rlp []byte) error {`
`812`	`812`	`delete(c.db.dirties, hash)`
`813`	`813`	`c.db.dirtiesSize -= common.StorageSize(common.HashLength + int(node.size))`
`814`	`814`	`if node.children != nil {`
`815`		`- c.db.dirtiesSize -= common.StorageSize(cachedNodeChildrenSize + len(node.children)*(common.HashLength+2))`
	`815`	`+ c.db.childrenSize -= common.StorageSize(cachedNodeChildrenSize + len(node.children)*(common.HashLength+2))`
`816`	`816`	`}`
`817`	`817`	`// Move the flushed node into the clean cache to prevent insta-reloads`
`818`	`818`	`if c.db.cleans != nil {`