Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Combine '--mine' and '--slave' into one, make relevant account-related flags optional #494

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+40 −46
Open

Feat: Combine '--mine' and '--slave' into one, make relevant account-related flags optional #494

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0541fb6
feat: combine 'mine' and 'slave' into one, make etherbase optional
tuanha-98 Dec 16, 2024
ac5b73c
recover etherbase error log, skip etherbase check for fullnode via co…
tuanha-98 Dec 16, 2024
2f4e37d
chore: disable change via gofmt
tuanha-98 Dec 17, 2024
7fb48ad
fix: CheckpointCh will block until the receiver is ready to read, cau…
tuanha-98 Jan 6, 2025
b61fe42
chore: removed unused code instead of commenting it out
tuanha-98 Jan 8, 2025
194a409
chore: removed unused
tuanha-98 Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions cmd/tomo/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,23 +129,23 @@ func defaultNodeConfig() node.Config {
func makeConfigNode(ctx *cli.Context) (*node.Node, tomoConfig) {
// Load defaults.
cfg := tomoConfig{
Eth: eth.DefaultConfig,
Shh: whisper.DefaultConfig,
TomoX: tomox.DefaultConfig,
Node: defaultNodeConfig(),
StakeEnable: true,
Verbosity: 3,
NAT: "",
Eth: eth.DefaultConfig,
Shh: whisper.DefaultConfig,
TomoX: tomox.DefaultConfig,
Node: defaultNodeConfig(),
// StakeEnable: true,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When code is not used anymore, please remove instead of comment

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noted, I’ll remove unused code instead of commenting it out.

Verbosity: 3,
NAT: "",
}
// Load config file.
if file := ctx.GlobalString(configFileFlag.Name); file != "" {
if err := loadConfig(file, &cfg); err != nil {
utils.Fatalf("%v", err)
}
}
if ctx.GlobalIsSet(utils.StakingEnabledFlag.Name) {
cfg.StakeEnable = ctx.GlobalBool(utils.StakingEnabledFlag.Name)
}
// if ctx.GlobalIsSet(utils.StakingEnabledFlag.Name) {
// cfg.StakeEnable = ctx.GlobalBool(utils.StakingEnabledFlag.Name)
// }
if !ctx.GlobalIsSet(debug.VerbosityFlag.Name) {
debug.Glogger.Verbosity(log.Lvl(cfg.Verbosity))
}
Expand Down
60 changes: 30 additions & 30 deletions cmd/tomo/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ var (
utils.AnnounceTxsFlag,
utils.StoreRewardFlag,
utils.RollbackFlag,
utils.TomoSlaveModeFlag,
// utils.TomoSlaveModeFlag,
}

rpcFlags = []cli.Flag{
Expand Down Expand Up @@ -296,16 +296,16 @@ func startNode(ctx *cli.Context, stack *node.Node, cfg tomoConfig) {
if _, ok := ethereum.Engine().(*posv.Posv); ok {
go func() {
started := false
slaveMode := ctx.GlobalIsSet(utils.TomoSlaveModeFlag.Name)
ok, err := ethereum.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 {
miningEnable := ctx.GlobalIsSet(utils.StakingEnabledFlag.Name)

defer close(core.CheckpointCh)
if miningEnable {
log.Info("Staking mode enabled.")
ok, err := ethereum.ValidateMasternode()
if err != nil {
utils.Fatalf("Can't verify masternode permission: %v", err)
}
if ok {
log.Info("Masternode found. Enabling staking mode...")
// Use a reduced number of threads if requested
if threads := ctx.GlobalInt(utils.StakerThreadsFlag.Name); threads > 0 {
Expand All @@ -324,26 +324,21 @@ func startNode(ctx *cli.Context, stack *node.Node, cfg tomoConfig) {
started = true
log.Info("Enabled staking node!!!")
}
}
defer close(core.CheckpointCh)
for range core.CheckpointCh {
log.Info("Checkpoint!!! It's time to reconcile node's state...")
ok, err := ethereum.ValidateMasternode()
if err != nil {
utils.Fatalf("Can't verify masternode permission: %v", err)
}
if !ok {
if started {
log.Info("Only masternode can propose and verify blocks. Cancelling staking on this node...")
ethereum.StopStaking()
started = false
log.Info("Cancelled mining mode!!!")

for range core.CheckpointCh {
log.Info("Checkpoint!!! It's time to reconcile node's state...")
ok, err := ethereum.ValidateMasternode()
if err != nil {
utils.Fatalf("Can't verify masternode permission: %v", err)
}
} else if !started {
if slaveMode {
log.Info("Masternode slave mode found.")
started = false
} else {
if !ok {
if started {
log.Info("Only masternode can propose and verify blocks. Cancelling staking on this node...")
ethereum.StopStaking()
started = false
log.Info("Cancelled mining mode!!!")
}
} else if !started {
log.Info("Masternode found. Enabling staking mode...")
// Use a reduced number of threads if requested
if threads := ctx.GlobalInt(utils.StakerThreadsFlag.Name); threads > 0 {
Expand All @@ -363,6 +358,11 @@ func startNode(ctx *cli.Context, stack *node.Node, cfg tomoConfig) {
log.Info("Enabled staking node!!!")
}
}
} else {
log.Info("Staking mode disabled.")
for range core.CheckpointCh {
log.Info("Checkpoint!!! It's time to reconcile node's state...")
}
}
}()
}
Expand Down
8 changes: 4 additions & 4 deletions cmd/utils/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,10 +556,10 @@ var (
Name: "tomox.dbReplicaSetName",
Usage: "ReplicaSetName if Master-Slave is setup",
}
TomoSlaveModeFlag = cli.BoolFlag{
Name: "slave",
Usage: "Enable slave mode",
}
// TomoSlaveModeFlag = cli.BoolFlag{
// Name: "slave",
// Usage: "Enable slave mode",
// }
)

// MakeDataDir retrieves the currently requested data directory, terminating
Expand Down
6 changes: 4 additions & 2 deletions eth/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,10 @@ func New(ctx *node.ServiceContext, config *Config, tomoXServ *tomox.TomoX, lendi
return block, false, nil
}

eth.protocolManager.fetcher.SetSignHook(signHook)
eth.protocolManager.fetcher.SetAppendM2HeaderHook(appendM2HeaderHook)
if ctx.GetConfig().KeyStoreDir != "" {
eth.protocolManager.fetcher.SetSignHook(signHook)
eth.protocolManager.fetcher.SetAppendM2HeaderHook(appendM2HeaderHook)
}

// Hook prepares validators M2 for the current epoch at checkpoint block
c.HookValidator = func(header *types.Header, signers []common.Address) ([]byte, error) {
Expand Down