forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-19 21:31:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cmd: remove slave mode and flag XDCSlaveModeFlag (#1824)

Browse source
This commit is contained in:
Daniel Liu 2025-12-08 15:23:05 +08:00 committed by GitHub
parent 016ab30c50
commit 8eb5fa7666
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
cmd/XDC/main.go
View file

@ -139,7 +139,6 @@ var (
utils.StoreRewardFlag,
utils.SetHeadFlag,
utils.DeleteAllBadBlocksFlag,
utils.XDCSlaveModeFlag,
}, utils.NetworkFlags, utils.DatabaseFlags)
rpcFlags = []cli.Flag{
@ -346,35 +345,29 @@ func startNode(ctx *cli.Context, stack *node.Node, backend ethapi.Backend, cfg X
go func() {
started := false
ok := false
slaveMode := ctx.IsSet(utils.XDCSlaveModeFlag.Name)
var err error
ok, err = ethBackend.ValidateMasternode()
if err != nil {
utils.Fatalf("Can't verify masternode permission: %v", err)
}
if ok {
if slaveMode {
log.Info("Masternode slave mode found.")
started = false
} else {
log.Info("Masternode found. Enabling staking mode...")
// Use a reduced number of threads if requested
if threads := ctx.Int(utils.MinerThreadsFlag.Name); threads > 0 {
type threaded interface {
SetThreads(threads int)
}
if th, ok := ethBackend.Engine().(threaded); ok {
th.SetThreads(threads)
}
log.Info("Masternode found. Enabling staking mode...")
// Use a reduced number of threads if requested
if threads := ctx.Int(utils.MinerThreadsFlag.Name); threads > 0 {
type threaded interface {
SetThreads(threads int)
}
// Set the gas price to the limits from the CLI and start mining
ethBackend.TxPool().SetGasPrice(cfg.Eth.GasPrice)
if err := ethBackend.StartStaking(true); err != nil {
utils.Fatalf("Failed to start staking: %v", err)
if th, ok := ethBackend.Engine().(threaded); ok {
th.SetThreads(threads)
}
started = true
log.Info("Enabled staking node!!!")
}
// Set the gas price to the limits from the CLI and start mining
ethBackend.TxPool().SetGasPrice(cfg.Eth.GasPrice)
if err := ethBackend.StartStaking(true); err != nil {
utils.Fatalf("Failed to start staking: %v", err)
}
started = true
log.Info("Enabled staking node!!!")
}
defer close(core.CheckpointCh)
for range core.CheckpointCh {
@ -395,28 +388,23 @@ func startNode(ctx *cli.Context, stack *node.Node, backend ethapi.Backend, cfg X
log.Info("Cancelled mining mode!!!")
}
} else if !started {
if slaveMode {
log.Info("Masternode slave mode found.")
started = false
} else {
log.Info("Masternode found. Enabling staking mode...")
// Use a reduced number of threads if requested
if threads := ctx.Int(utils.MinerThreadsFlag.Name); threads > 0 {
type threaded interface {
SetThreads(threads int)
}
if th, ok := ethBackend.Engine().(threaded); ok {
th.SetThreads(threads)
}
log.Info("Masternode found. Enabling staking mode...")
// Use a reduced number of threads if requested
if threads := ctx.Int(utils.MinerThreadsFlag.Name); threads > 0 {
type threaded interface {
SetThreads(threads int)
}
// Set the gas price to the limits from the CLI and start mining
ethBackend.TxPool().SetGasPrice(cfg.Eth.GasPrice)
if err := ethBackend.StartStaking(true); err != nil {
utils.Fatalf("Failed to start staking: %v", err)
if th, ok := ethBackend.Engine().(threaded); ok {
th.SetThreads(threads)
}
started = true
log.Info("Enabled staking node!!!")
}
// Set the gas price to the limits from the CLI and start mining
ethBackend.TxPool().SetGasPrice(cfg.Eth.GasPrice)
if err := ethBackend.StartStaking(true); err != nil {
utils.Fatalf("Failed to start staking: %v", err)
}
started = true
log.Info("Enabled staking node!!!")
}
}
}()

5
cmd/utils/flags.go
View file

@ -837,11 +837,6 @@ var (
Value: false,
Category: flags.XdcCategory,
}
XDCSlaveModeFlag = &cli.BoolFlag{
Name: "slave",
Usage: "Enable slave mode",
Category: flags.XdcCategory,
}
// XDCX settings
XDCXDBNameFlag = &cli.StringFlag{