core: track state size in blockchain.go

Signed-off-by: jsvisa <[email protected]>

Author: jsvisa

core/blockchain.go

@@ -331,6 +331,8 @@ type BlockChain struct {
 	processor  Processor // Block transaction processor interface
 	logger     *tracing.Hooks
 
+	stateSizeGen *state.StateSizeGenerator // State size tracking
+
 	lastForkReadyAlert time.Time // Last time there was a fork readiness print out
 }
 
@@ -523,6 +525,11 @@ func NewBlockChain(db ethdb.Database, genesis *Genesis, engine consensus.Engine,
 	if bc.cfg.TxLookupLimit >= 0 {
 		bc.txIndexer = newTxIndexer(uint64(bc.cfg.TxLookupLimit), bc)
 	}
+
+	// Start state size tracker
+	bc.stateSizeGen = state.NewStateSizeGenerator(bc.statedb.DiskDB(), bc.triedb, head.Root)
+	log.Info("Started state size generator", "root", head.Root)
+
 	return bc, nil
 }
 
@@ -1310,6 +1317,12 @@ func (bc *BlockChain) Stop() {
 			}
 		}
 	}
+	// Stop state size generator if running
+	if bc.stateSizeGen != nil {
+		bc.stateSizeGen.Stop()
+		log.Info("Stopped state size generator")
+	}
+
 	// Allow tracers to clean-up and release resources.
 	if bc.logger != nil && bc.logger.OnClose != nil {
 		bc.logger.OnClose()
@@ -1583,10 +1596,15 @@ func (bc *BlockChain) writeBlockWithState(block *types.Block, receipts []*types.
 		log.Crit("Failed to write block into disk", "err", err)
 	}
 	// Commit all cached state changes into underlying memory database.
-	root, err := statedb.Commit(block.NumberU64(), bc.chainConfig.IsEIP158(block.Number()), bc.chainConfig.IsCancun(block.Number(), block.Time()))
+	root, stateUpdate, err := statedb.CommitWithUpdate(block.NumberU64(), bc.chainConfig.IsEIP158(block.Number()), bc.chainConfig.IsCancun(block.Number(), block.Time()))
 	if err != nil {
 		return err
 	}
+
+	// Track state size changes if generator is running
+	if bc.stateSizeGen != nil && stateUpdate != nil {
+		bc.stateSizeGen.Track(stateUpdate)
+	}
 	// If node is running in path mode, skip explicit gc operation
 	// which is unnecessary in this mode.
 	if bc.triedb.Scheme() == rawdb.PathScheme {

core/state/database.go

@@ -269,6 +269,11 @@ func (db *CachingDB) TrieDB() *triedb.Database {
 	return db.triedb
 }
 
+// DiskDB returns the underlying disk database for direct access.
+func (db *CachingDB) DiskDB() ethdb.KeyValueStore {
+	return db.disk
+}
+
 // PointCache returns the cache of evaluated curve points.
 func (db *CachingDB) PointCache() *utils.PointCache {
 	return db.pointCache

core/state/statedb.go

@@ -138,9 +138,6 @@ type StateDB struct {
 	// State witness if cross validation is needed
 	witness *stateless.Witness
 
-	// State size tracking
-	stateSizeGen *stateSizeGenerator
-
 	// Measurements gathered during execution for debugging purposes
 	AccountReads    time.Duration
 	AccountHashes   time.Duration
@@ -189,14 +186,6 @@ func NewWithReader(root common.Hash, db Database, reader Reader) (*StateDB, erro
 		sdb.accessEvents = NewAccessEvents(db.PointCache())
 	}
 
-	// Initialize state size tracking
-	if cachingDB, ok := db.(*CachingDB); ok {
-		sdb.stateSizeGen = newStateSizeGenerator(cachingDB.disk, db, root)
-		if !db.TrieDB().IsVerkle() {
-			sdb.stateSizeGen.run()
-		}
-	}
-
 	return sdb, nil
 }
 
@@ -1340,11 +1329,6 @@ func (s *StateDB) commitAndFlush(block uint64, deleteEmptyObjects bool, noStorag
 				return nil, err
 			}
 			s.TrieDBCommits += time.Since(start)
-
-			// Update state size metrics
-			if s.stateSizeGen != nil {
-				s.stateSizeGen.updateMetrics(ret)
-			}
 		}
 	}
 	s.reader, _ = s.db.Reader(s.originalRoot)
@@ -1373,6 +1357,16 @@ func (s *StateDB) Commit(block uint64, deleteEmptyObjects bool, noStorageWiping
 	return ret.root, nil
 }
 
+// CommitWithUpdate writes the state mutations and returns both the root hash and the state update.
+// This is useful for tracking state changes at the blockchain level.
+func (s *StateDB) CommitWithUpdate(block uint64, deleteEmptyObjects bool, noStorageWiping bool) (common.Hash, *stateUpdate, error) {
+	ret, err := s.commitAndFlush(block, deleteEmptyObjects, noStorageWiping)
+	if err != nil {
+		return common.Hash{}, nil, err
+	}
+	return ret.root, ret, nil
+}
+
 // Prepare handles the preparatory steps for executing a state transition with.
 // This method must be invoked before state transition.
 //