From ac47cb3cde5d32b2021b19aeb4a0d47a060b6f28 Mon Sep 17 00:00:00 2001 From: Pratik Patil Date: Fri, 2 May 2025 14:59:40 +0530 Subject: [PATCH] upstream: fixed all remaining compilation errors --- cmd/geth/config.go | 2 +- cmd/utils/flags.go | 2 +- eth/downloader/bor_downloader.go | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/geth/config.go b/cmd/geth/config.go index 6d1265752c..b1736fd140 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -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) } diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index fbbb48ba94..3a54544ce7 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -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) } diff --git a/eth/downloader/bor_downloader.go b/eth/downloader/bor_downloader.go index f5bc7fd434..4369570418 100644 --- a/eth/downloader/bor_downloader.go +++ b/eth/downloader/bor_downloader.go @@ -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()