Skip to content

Commit

Permalink
eth/catalyst: disable the disabling of the miner
Browse files Browse the repository at this point in the history
  • Loading branch information
MariusVanDerWijden committed Mar 16, 2022
1 parent 3035ed6 commit 2215ec2
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions eth/catalyst/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ import (

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
beaconEngine "github.com/ethereum/go-ethereum/consensus/beacon"
"github.com/ethereum/go-ethereum/consensus/ethash"
"github.com/ethereum/go-ethereum/core/beacon"
"github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/core/types"
Expand Down Expand Up @@ -114,12 +112,6 @@ func (api *ConsensusAPI) ForkchoiceUpdatedV1(update beacon.ForkchoiceStateV1, pa
if merger := api.eth.Merger(); !merger.TDDReached() {
merger.ReachTTD()
api.eth.Downloader().Cancel()
// Shutdown gpu miner
if eng, ok := api.eth.Engine().(*beaconEngine.Beacon); ok {
if inner, ok := eng.InnerEngine().(*ethash.Ethash); ok {
inner.StopRemoteSealer()
}
}
}
log.Info("Forkchoice requested sync to new head", "number", header.Number, "hash", header.Hash())
if err := api.eth.Downloader().BeaconSync(api.eth.SyncMode(), header); err != nil {
Expand Down Expand Up @@ -320,12 +312,6 @@ func (api *ConsensusAPI) NewPayloadV1(params beacon.ExecutableDataV1) (beacon.Pa
if merger := api.eth.Merger(); !merger.TDDReached() {
merger.ReachTTD()
api.eth.Downloader().Cancel()
// Shutdown gpu miner
if eng, ok := api.eth.Engine().(*beaconEngine.Beacon); ok {
if inner, ok := eng.InnerEngine().(*ethash.Ethash); ok {
inner.StopRemoteSealer()
}
}
}
hash := block.Hash()
return beacon.PayloadStatusV1{Status: beacon.VALID, LatestValidHash: &hash}, nil
Expand Down

0 comments on commit 2215ec2

Please sign in to comment.