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

upstream: fixed all remaining compilation errors

Browse source
This commit is contained in:
Pratik Patil 2025-05-02 14:59:40 +05:30
parent 6e34cc4f2c
commit ac47cb3cde
No known key found for this signature in database
GPG key ID: AFDCA496554874B3
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/geth/config.go
View file

@ -254,7 +254,7 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
if ctx.IsSet(utils.DeveloperFlag.Name) {
// Start dev mode.
simBeacon, err := catalyst.NewSimulatedBeacon(ctx.Uint64(utils.DeveloperPeriodFlag.Name), cfg.Eth.Miner.PendingFeeRecipient, eth)
simBeacon, err := catalyst.NewSimulatedBeacon(ctx.Uint64(utils.DeveloperPeriodFlag.Name), common.Address{}, eth)
if err != nil {
utils.Fatalf("failed to register dev mode catalyst service: %v", err)
}

2
cmd/utils/flags.go
View file

@ -1394,7 +1394,7 @@ func setEtherbase(ctx *cli.Context, cfg *ethconfig.Config) {
return
}
cfg.Miner.PendingFeeRecipient = common.BytesToAddress(b)
cfg.Miner.Etherbase = common.BytesToAddress(b)
}

6
eth/downloader/bor_downloader.go
View file

@ -267,10 +267,10 @@ func (d *Downloader) Progress() ethereum.SyncProgress {
current := uint64(0)
mode := d.getMode()
switch mode {
case FullSync:
switch {
case d.blockchain != nil && mode == FullSync:
current = d.blockchain.CurrentBlock().Number.Uint64()
case SnapSync:
case d.blockchain != nil && mode == SnapSync:
current = d.blockchain.CurrentSnapBlock().Number.Uint64()
case d.lightchain != nil:
current = d.lightchain.CurrentHeader().Number.Uint64()