From 927abd60f8f33418988cd35aae2ecd3f5f59d8f1 Mon Sep 17 00:00:00 2001 From: islishude Date: Wed, 5 Mar 2025 16:42:17 +0800 Subject: [PATCH 1/6] eth/catlyst,cmd/geth: improve devnet experience --- cmd/geth/config.go | 2 +- cmd/utils/flags.go | 25 +++++++++++++------------ eth/catalyst/simulated_beacon.go | 3 ++- eth/catalyst/simulated_beacon_test.go | 2 +- ethclient/simulated/backend.go | 2 +- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/cmd/geth/config.go b/cmd/geth/config.go index ecee2bfd805..30de2eb78a0 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -233,7 +233,7 @@ func makeFullNode(ctx *cli.Context) *node.Node { if ctx.IsSet(utils.DeveloperFlag.Name) { // Start dev mode. - simBeacon, err := catalyst.NewSimulatedBeacon(ctx.Uint64(utils.DeveloperPeriodFlag.Name), eth) + simBeacon, err := catalyst.NewSimulatedBeacon(ctx.Uint64(utils.DeveloperPeriodFlag.Name), cfg.Eth.Miner.Etherbase, eth) if err != nil { utils.Fatalf("failed to register dev mode catalyst service: %v", err) } diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 728ec2d667c..86954099868 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -1730,20 +1730,21 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) { // setEtherbase has been called above, configuring the miner address from command line flags. if cfg.Miner.PendingFeeRecipient != (common.Address{}) { developer = accounts.Account{Address: cfg.Miner.PendingFeeRecipient} - } else if accs := ks.Accounts(); len(accs) > 0 { - developer = ks.Accounts()[0] } else { - developer, err = ks.NewAccount(passphrase) - if err != nil { - Fatalf("Failed to create developer account: %v", err) + if accs := ks.Accounts(); len(accs) > 0 { + developer = ks.Accounts()[0] + } else { + developer, err = ks.NewAccount(passphrase) + if err != nil { + Fatalf("Failed to create developer account: %v", err) + } } - } - // Make sure the address is configured as fee recipient, otherwise - // the miner will fail to start. - cfg.Miner.PendingFeeRecipient = developer.Address - - if err := ks.Unlock(developer, passphrase); err != nil { - Fatalf("Failed to unlock developer account: %v", err) + if err := ks.Unlock(developer, passphrase); err != nil { + Fatalf("Failed to unlock developer account: %v", err) + } + // Make sure the address is configured as fee recipient, otherwise + // the miner will fail to start. + cfg.Miner.PendingFeeRecipient = developer.Address } log.Info("Using developer account", "address", developer.Address) diff --git a/eth/catalyst/simulated_beacon.go b/eth/catalyst/simulated_beacon.go index c71add93bc9..dd9d8f90629 100644 --- a/eth/catalyst/simulated_beacon.go +++ b/eth/catalyst/simulated_beacon.go @@ -108,7 +108,7 @@ func payloadVersion(config *params.ChainConfig, time uint64) engine.PayloadVersi } // NewSimulatedBeacon constructs a new simulated beacon chain. -func NewSimulatedBeacon(period uint64, eth *eth.Ethereum) (*SimulatedBeacon, error) { +func NewSimulatedBeacon(period uint64, feeRecipient common.Address, eth *eth.Ethereum) (*SimulatedBeacon, error) { block := eth.BlockChain().CurrentBlock() current := engine.ForkchoiceStateV1{ HeadBlockHash: block.Hash(), @@ -131,6 +131,7 @@ func NewSimulatedBeacon(period uint64, eth *eth.Ethereum) (*SimulatedBeacon, err engineAPI: engineAPI, lastBlockTime: block.Time, curForkchoiceState: current, + feeRecipient: feeRecipient, }, nil } diff --git a/eth/catalyst/simulated_beacon_test.go b/eth/catalyst/simulated_beacon_test.go index ea354828969..36ebbba84a0 100644 --- a/eth/catalyst/simulated_beacon_test.go +++ b/eth/catalyst/simulated_beacon_test.go @@ -55,7 +55,7 @@ func startSimulatedBeaconEthService(t *testing.T, genesis *core.Genesis, period t.Fatal("can't create eth service:", err) } - simBeacon, err := NewSimulatedBeacon(period, ethservice) + simBeacon, err := NewSimulatedBeacon(period, common.Address{}, ethservice) if err != nil { t.Fatal("can't create simulated beacon:", err) } diff --git a/ethclient/simulated/backend.go b/ethclient/simulated/backend.go index 65d44b9efad..d573c7e7507 100644 --- a/ethclient/simulated/backend.go +++ b/ethclient/simulated/backend.go @@ -120,7 +120,7 @@ func newWithNode(stack *node.Node, conf *eth.Config, blockPeriod uint64) (*Backe return nil, err } // Set up the simulated beacon - beacon, err := catalyst.NewSimulatedBeacon(blockPeriod, backend) + beacon, err := catalyst.NewSimulatedBeacon(blockPeriod, common.Address{}, backend) if err != nil { return nil, err } From c086718f4da0433c3539125f9ae33791cbf05959 Mon Sep 17 00:00:00 2001 From: islishude Date: Wed, 5 Mar 2025 16:52:51 +0800 Subject: [PATCH 2/6] cmd/utils: don't unlock new keystore --- cmd/utils/flags.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 86954099868..1ce673afbae 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -1733,15 +1733,15 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) { } else { if accs := ks.Accounts(); len(accs) > 0 { developer = ks.Accounts()[0] + if err := ks.Unlock(developer, passphrase); err != nil { + Fatalf("Failed to unlock developer account: %v", err) + } } else { developer, err = ks.NewAccount(passphrase) if err != nil { Fatalf("Failed to create developer account: %v", err) } } - if err := ks.Unlock(developer, passphrase); err != nil { - Fatalf("Failed to unlock developer account: %v", err) - } // Make sure the address is configured as fee recipient, otherwise // the miner will fail to start. cfg.Miner.PendingFeeRecipient = developer.Address From ed4799f86f28fcc6cbeeea7cef2fdc46225b0bf7 Mon Sep 17 00:00:00 2001 From: islishude Date: Wed, 5 Mar 2025 21:09:49 +0800 Subject: [PATCH 3/6] cmd/geth: update PendingFeeRecipient in simulated beacon configuration --- cmd/geth/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/geth/config.go b/cmd/geth/config.go index 30de2eb78a0..14e15478255 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -233,7 +233,7 @@ func makeFullNode(ctx *cli.Context) *node.Node { if ctx.IsSet(utils.DeveloperFlag.Name) { // Start dev mode. - simBeacon, err := catalyst.NewSimulatedBeacon(ctx.Uint64(utils.DeveloperPeriodFlag.Name), cfg.Eth.Miner.Etherbase, eth) + simBeacon, err := catalyst.NewSimulatedBeacon(ctx.Uint64(utils.DeveloperPeriodFlag.Name), cfg.Eth.Miner.PendingFeeRecipient, eth) if err != nil { utils.Fatalf("failed to register dev mode catalyst service: %v", err) } From 5ef338d5d6c13f5cf380098f1ce77a520b184e3b Mon Sep 17 00:00:00 2001 From: islishude Date: Wed, 12 Mar 2025 15:49:15 +0800 Subject: [PATCH 4/6] cmd/utils: move unlock developer account logic to ensure it executes correctly --- cmd/utils/flags.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 1ce673afbae..86954099868 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -1733,15 +1733,15 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) { } else { if accs := ks.Accounts(); len(accs) > 0 { developer = ks.Accounts()[0] - if err := ks.Unlock(developer, passphrase); err != nil { - Fatalf("Failed to unlock developer account: %v", err) - } } else { developer, err = ks.NewAccount(passphrase) if err != nil { Fatalf("Failed to create developer account: %v", err) } } + if err := ks.Unlock(developer, passphrase); err != nil { + Fatalf("Failed to unlock developer account: %v", err) + } // Make sure the address is configured as fee recipient, otherwise // the miner will fail to start. cfg.Miner.PendingFeeRecipient = developer.Address From 5abf406387c7b16954779cf8dd4ba87bc278eb5e Mon Sep 17 00:00:00 2001 From: islishude Date: Wed, 12 Mar 2025 18:58:11 +0800 Subject: [PATCH 5/6] cmd/utils: streamline developer account setup and unlocking logic --- cmd/utils/flags.go | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 86954099868..abb6fc43c88 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -1726,25 +1726,28 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) { Fatalf("Keystore is not available") } + isKeystoreNonEmpty := len(ks.Accounts()) > 0 // Figure out the dev account address. // setEtherbase has been called above, configuring the miner address from command line flags. if cfg.Miner.PendingFeeRecipient != (common.Address{}) { developer = accounts.Account{Address: cfg.Miner.PendingFeeRecipient} + } else if isKeystoreNonEmpty { + developer = ks.Accounts()[0] } else { - if accs := ks.Accounts(); len(accs) > 0 { - developer = ks.Accounts()[0] - } else { - developer, err = ks.NewAccount(passphrase) - if err != nil { - Fatalf("Failed to create developer account: %v", err) - } + developer, err = ks.NewAccount(passphrase) + if err != nil { + Fatalf("Failed to create developer account: %v", err) } + } + // Make sure the address is configured as fee recipient, otherwise + // the miner will fail to start. + cfg.Miner.PendingFeeRecipient = developer.Address + + // try to unlock the first keystore account + if isKeystoreNonEmpty { if err := ks.Unlock(developer, passphrase); err != nil { Fatalf("Failed to unlock developer account: %v", err) } - // Make sure the address is configured as fee recipient, otherwise - // the miner will fail to start. - cfg.Miner.PendingFeeRecipient = developer.Address } log.Info("Using developer account", "address", developer.Address) From f931c12150206dbd758fd382b1866707e0960ca4 Mon Sep 17 00:00:00 2001 From: islishude Date: Wed, 12 Mar 2025 20:20:39 +0800 Subject: [PATCH 6/6] cmd/utils: simplify developer account selection and unlocking logic --- cmd/utils/flags.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index abb6fc43c88..bf422d11d50 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -1726,12 +1726,11 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) { Fatalf("Keystore is not available") } - isKeystoreNonEmpty := len(ks.Accounts()) > 0 // Figure out the dev account address. // setEtherbase has been called above, configuring the miner address from command line flags. if cfg.Miner.PendingFeeRecipient != (common.Address{}) { developer = accounts.Account{Address: cfg.Miner.PendingFeeRecipient} - } else if isKeystoreNonEmpty { + } else if accs := ks.Accounts(); len(accs) > 0 { developer = ks.Accounts()[0] } else { developer, err = ks.NewAccount(passphrase) @@ -1744,7 +1743,7 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) { cfg.Miner.PendingFeeRecipient = developer.Address // try to unlock the first keystore account - if isKeystoreNonEmpty { + if len(ks.Accounts()) > 0 { if err := ks.Unlock(developer, passphrase); err != nil { Fatalf("Failed to unlock developer account: %v", err) }