Merge branch 'master' into posting_gas_hook

arbitrum/recordingdb.go

@@ -322,7 +322,7 @@ func (r *RecordingDatabase) GetOrRecreateState(ctx context.Context, header *type
 	returnedBlockNumber := header.Number.Uint64()
 	for ctx.Err() == nil {
 		var block *types.Block
-		state, block, err = AdvanceStateByBlock(ctx, r.bc, state, header, blockToRecreate, prevHash, logFunc)
+		state, block, err = AdvanceStateByBlock(ctx, r.bc, state, blockToRecreate, prevHash, logFunc)
 		if err != nil {
 			return nil, err
 		}

arbitrum/recreatestate.go

@@ -21,7 +21,7 @@ type StateReleaseFunc tracers.StateReleaseFunc
 
 var NoopStateRelease StateReleaseFunc = func() {}
 
-type StateBuildingLogFunction func(targetHeader, header *types.Header, hasState bool)
+type StateBuildingLogFunction func(header *types.Header, hasState bool)
 type StateForHeaderFunction func(header *types.Header) (*state.StateDB, StateReleaseFunc, error)
 
 // finds last available state and header checking it first for targetHeader then looking backwards
@@ -56,7 +56,7 @@ func FindLastAvailableState(ctx context.Context, bc *core.BlockChain, stateFor S
 			return nil, lastHeader, nil, err
 		}
 		if logFunc != nil {
-			logFunc(targetHeader, currentHeader, false)
+			logFunc(currentHeader, false)
 		}
 		if currentHeader.Number.Uint64() <= genesis {
 			return nil, lastHeader, nil, errors.Wrap(err, fmt.Sprintf("moved beyond genesis looking for state %d, genesis %d", targetHeader.Number.Uint64(), genesis))
@@ -69,7 +69,7 @@ func FindLastAvailableState(ctx context.Context, bc *core.BlockChain, stateFor S
 	return state, currentHeader, release, ctx.Err()
 }
 
-func AdvanceStateByBlock(ctx context.Context, bc *core.BlockChain, state *state.StateDB, targetHeader *types.Header, blockToRecreate uint64, prevBlockHash common.Hash, logFunc StateBuildingLogFunction) (*state.StateDB, *types.Block, error) {
+func AdvanceStateByBlock(ctx context.Context, bc *core.BlockChain, state *state.StateDB, blockToRecreate uint64, prevBlockHash common.Hash, logFunc StateBuildingLogFunction) (*state.StateDB, *types.Block, error) {
 	block := bc.GetBlockByNumber(blockToRecreate)
 	if block == nil {
 		return nil, nil, fmt.Errorf("block not found while recreating: %d", blockToRecreate)
@@ -78,32 +78,11 @@ func AdvanceStateByBlock(ctx context.Context, bc *core.BlockChain, state *state.
 		return nil, nil, fmt.Errorf("reorg detected: number %d expectedPrev: %v foundPrev: %v", blockToRecreate, prevBlockHash, block.ParentHash())
 	}
 	if logFunc != nil {
-		logFunc(targetHeader, block.Header(), true)
+		logFunc(block.Header(), true)
 	}
 	_, _, _, err := bc.Processor().Process(block, state, vm.Config{})
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed recreating state for block %d : %w", blockToRecreate, err)
 	}
 	return state, block, nil
 }
-
-func AdvanceStateUpToBlock(ctx context.Context, bc *core.BlockChain, state *state.StateDB, targetHeader *types.Header, lastAvailableHeader *types.Header, logFunc StateBuildingLogFunction) (*state.StateDB, error) {
-	returnedBlockNumber := targetHeader.Number.Uint64()
-	blockToRecreate := lastAvailableHeader.Number.Uint64() + 1
-	prevHash := lastAvailableHeader.Hash()
-	for ctx.Err() == nil {
-		state, block, err := AdvanceStateByBlock(ctx, bc, state, targetHeader, blockToRecreate, prevHash, logFunc)
-		if err != nil {
-			return nil, err
-		}
-		prevHash = block.Hash()
-		if blockToRecreate >= returnedBlockNumber {
-			if block.Hash() != targetHeader.Hash() {
-				return nil, fmt.Errorf("blockHash doesn't match when recreating number: %d expected: %v got: %v", blockToRecreate, targetHeader.Hash(), block.Hash())
-			}
-			return state, nil
-		}
-		blockToRecreate++
-	}
-	return nil, ctx.Err()
-}

ethdb/pebble/pebble.go

@@ -93,7 +93,8 @@ type Database struct {
 	commitWALRotation         atomic.Int64
 	commitWait                atomic.Int64
 
-	levelsGauge []metrics.Gauge // Gauge for tracking the number of tables in levels
+	level0SublevelsGauge metrics.Gauge
+	levelsGauge          []metrics.Gauge // Gauge for tracking the number of tables in levels
 
 	quitLock sync.RWMutex    // Mutex protecting the quit channel and the closed flag
 	quitChan chan chan error // Quit channel to stop the metrics collection before closing the database
@@ -329,6 +330,8 @@ func New(file string, cache int, handles int, namespace string, readonly bool, e
 	db.commitWALRotationMeter = metrics.GetOrRegisterMeter(namespace+"commit/duration/walrotation", nil)
 	db.commitWaitMeter = metrics.GetOrRegisterMeter(namespace+"commit/duration/commitwait", nil)
 
+	db.level0SublevelsGauge = metrics.GetOrRegisterGauge(namespace+"tables/level0/sublevels", nil)
+
 	// Start up the metrics gathering and return
 	go db.meter(metricsGatheringInterval, namespace)
 	return db, nil
@@ -650,6 +653,9 @@ func (d *Database) meter(refresh time.Duration, namespace string) {
 		d.compDebtGauge.Update(int64(stats.Compact.EstimatedDebt))
 		d.compInProgressGauge.Update(stats.Compact.NumInProgress)
 
+		if len(stats.Levels) > 0 {
+			d.level0SublevelsGauge.Update(int64(stats.Levels[0].Sublevels))
+		}
 		for i, level := range stats.Levels {
 			// Append metrics for additional layers
 			if i >= len(d.levelsGauge) {