Skip to content

Commit 33f2813

Browse files
jessetaneholiman
andauthored
cmd/geth: add flag --dev.gaslimit for dev mode (#23686)
* cmd, core: add flag --dev.gaslimit to allow configuring initial block gas limit in dev mode * core: use provided gaslimit Co-authored-by: Martin Holst Swende <[email protected]>
1 parent b7a6409 commit 33f2813

File tree

6 files changed

+12
-5
lines changed

6 files changed

+12
-5
lines changed

cmd/geth/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ var (
140140
utils.MainnetFlag,
141141
utils.DeveloperFlag,
142142
utils.DeveloperPeriodFlag,
143+
utils.DeveloperGasLimitFlag,
143144
utils.RopstenFlag,
144145
utils.SepoliaFlag,
145146
utils.RinkebyFlag,

cmd/geth/usage.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ var AppHelpFlagGroups = []flags.FlagGroup{
7575
Flags: []cli.Flag{
7676
utils.DeveloperFlag,
7777
utils.DeveloperPeriodFlag,
78+
utils.DeveloperGasLimitFlag,
7879
},
7980
},
8081
{

cmd/utils/flags.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,11 @@ var (
167167
Name: "dev.period",
168168
Usage: "Block period to use in developer mode (0 = mine only if transaction pending)",
169169
}
170+
DeveloperGasLimitFlag = cli.Uint64Flag{
171+
Name: "dev.gaslimit",
172+
Usage: "Initial block gas limit",
173+
Value: 11500000,
174+
}
170175
IdentityFlag = cli.StringFlag{
171176
Name: "identity",
172177
Usage: "Custom node name",
@@ -1661,7 +1666,7 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
16611666
log.Info("Using developer account", "address", developer.Address)
16621667

16631668
// Create a new developer genesis block or reuse existing one
1664-
cfg.Genesis = core.DeveloperGenesisBlock(uint64(ctx.GlobalInt(DeveloperPeriodFlag.Name)), developer.Address)
1669+
cfg.Genesis = core.DeveloperGenesisBlock(uint64(ctx.GlobalInt(DeveloperPeriodFlag.Name)), ctx.GlobalUint64(DeveloperGasLimitFlag.Name), developer.Address)
16651670
if ctx.GlobalIsSet(DataDirFlag.Name) {
16661671
// Check if we have an already initialized chain and fall back to
16671672
// that if so. Otherwise we need to generate a new genesis spec.

console/console_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func newTester(t *testing.T, confOverride func(*ethconfig.Config)) *tester {
9999
t.Fatalf("failed to create node: %v", err)
100100
}
101101
ethConf := &ethconfig.Config{
102-
Genesis: core.DeveloperGenesisBlock(15, common.Address{}),
102+
Genesis: core.DeveloperGenesisBlock(15, 11_500_000, common.Address{}),
103103
Miner: miner.Config{
104104
Etherbase: common.HexToAddress(testAddress),
105105
},

core/genesis.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ func DefaultSepoliaGenesisBlock() *Genesis {
416416
}
417417

418418
// DeveloperGenesisBlock returns the 'geth --dev' genesis block.
419-
func DeveloperGenesisBlock(period uint64, faucet common.Address) *Genesis {
419+
func DeveloperGenesisBlock(period uint64, gasLimit uint64, faucet common.Address) *Genesis {
420420
// Override the default period to the user requested one
421421
config := *params.AllCliqueProtocolChanges
422422
config.Clique = &params.CliqueConfig{
@@ -428,7 +428,7 @@ func DeveloperGenesisBlock(period uint64, faucet common.Address) *Genesis {
428428
return &Genesis{
429429
Config: &config,
430430
ExtraData: append(append(make([]byte, 32), faucet[:]...), make([]byte, crypto.SignatureLength)...),
431-
GasLimit: 11500000,
431+
GasLimit: gasLimit,
432432
BaseFee: big.NewInt(params.InitialBaseFee),
433433
Difficulty: big.NewInt(1),
434434
Alloc: map[common.Address]GenesisAccount{

miner/miner_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ func createMiner(t *testing.T) (*Miner, *event.TypeMux) {
237237
// Create chainConfig
238238
memdb := memorydb.New()
239239
chainDB := rawdb.NewDatabase(memdb)
240-
genesis := core.DeveloperGenesisBlock(15, common.HexToAddress("12345"))
240+
genesis := core.DeveloperGenesisBlock(15, 11_500_000, common.HexToAddress("12345"))
241241
chainConfig, _, err := core.SetupGenesisBlock(chainDB, genesis)
242242
if err != nil {
243243
t.Fatalf("can't create new chain config: %v", err)

0 commit comments

Comments
 (0)