From f43228152b361c18e4f75388950ef7647f94a7f9 Mon Sep 17 00:00:00 2001 From: cui Date: Fri, 28 Nov 2025 17:13:01 +0800 Subject: [PATCH] cmd/utils: fix dumpconfig (#33302) --- cmd/utils/flags.go | 3 +-- miner/miner.go | 2 +- miner/worker.go | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 536f8c9e65..072a1d607b 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -1577,8 +1577,7 @@ func setMiner(ctx *cli.Context, cfg *miner.Config) { cfg.Recommit = ctx.Duration(MinerNewPayloadTimeoutFlag.Name) } if ctx.IsSet(MinerMaxBlobsFlag.Name) { - maxBlobs := ctx.Int(MinerMaxBlobsFlag.Name) - cfg.MaxBlobsPerBlock = &maxBlobs + cfg.MaxBlobsPerBlock = ctx.Int(MinerMaxBlobsFlag.Name) } } diff --git a/miner/miner.go b/miner/miner.go index 4c40b0c4f8..ee890b5e54 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -48,7 +48,7 @@ type Config struct { GasCeil uint64 // Target gas ceiling for mined blocks. GasPrice *big.Int // Minimum gas price for mining a transaction Recommit time.Duration // The time interval for miner to re-create mining work. - MaxBlobsPerBlock *int // Maximum number of blobs per block (unset uses protocol default) + MaxBlobsPerBlock int // Maximum number of blobs per block (0 for unset uses protocol default) } // DefaultConfig contains default settings for miner. diff --git a/miner/worker.go b/miner/worker.go index e0dcdca456..45d7073ed7 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -47,8 +47,8 @@ var ( // Users can specify the maximum number of blobs per block if necessary. func (miner *Miner) maxBlobsPerBlock(time uint64) int { maxBlobs := eip4844.MaxBlobsPerBlock(miner.chainConfig, time) - if miner.config.MaxBlobsPerBlock != nil { - maxBlobs = *miner.config.MaxBlobsPerBlock + if miner.config.MaxBlobsPerBlock != 0 { + maxBlobs = miner.config.MaxBlobsPerBlock } return maxBlobs }