forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-07 23:48:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd/utils: fix dumpconfig (#33302)

Browse source
This commit is contained in:
cui 2025-11-28 17:13:01 +08:00 committed by GitHub
parent 446fdebdc3
commit f43228152b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/utils/flags.go
View file

@ -1577,8 +1577,7 @@ func setMiner(ctx *cli.Context, cfg *miner.Config) {
cfg.Recommit = ctx.Duration(MinerNewPayloadTimeoutFlag.Name) cfg.Recommit = ctx.Duration(MinerNewPayloadTimeoutFlag.Name)
} }
if ctx.IsSet(MinerMaxBlobsFlag.Name) { if ctx.IsSet(MinerMaxBlobsFlag.Name) {
maxBlobs := ctx.Int(MinerMaxBlobsFlag.Name) cfg.MaxBlobsPerBlock = ctx.Int(MinerMaxBlobsFlag.Name)
cfg.MaxBlobsPerBlock = &maxBlobs
} }
} }

2
miner/miner.go
View file

@ -48,7 +48,7 @@ type Config struct {
GasCeil uint64 // Target gas ceiling for mined blocks. GasCeil uint64 // Target gas ceiling for mined blocks.
GasPrice *big.Int // Minimum gas price for mining a transaction GasPrice *big.Int // Minimum gas price for mining a transaction
Recommit time.Duration // The time interval for miner to re-create mining work. 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. // DefaultConfig contains default settings for miner.

4
miner/worker.go
View file

@ -47,8 +47,8 @@ var (
// Users can specify the maximum number of blobs per block if necessary. // Users can specify the maximum number of blobs per block if necessary.
func (miner *Miner) maxBlobsPerBlock(time uint64) int { func (miner *Miner) maxBlobsPerBlock(time uint64) int {
maxBlobs := eip4844.MaxBlobsPerBlock(miner.chainConfig, time) maxBlobs := eip4844.MaxBlobsPerBlock(miner.chainConfig, time)
if miner.config.MaxBlobsPerBlock != nil { if miner.config.MaxBlobsPerBlock != 0 {
maxBlobs = *miner.config.MaxBlobsPerBlock maxBlobs = miner.config.MaxBlobsPerBlock
} }
return maxBlobs return maxBlobs
} }