Skip to content

cmd/utils, internal/flags: deprecate flag XDCx-dbName and XDCx.dbName #1823

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

Open
gzliudan wants to merge 1 commit into
base: dev-upgrade
Choose a base branch
from
Open

cmd/utils, internal/flags: deprecate flag XDCx-dbName and XDCx.dbName #1823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 15 deletions cmd/utils/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,15 +848,6 @@ var (
Usage: "Enable slave mode",
Category: flags.XdcCategory,
}

// XDCX settings
XDCXDBNameFlag = &cli.StringFlag{
Name: "XDCx-dbName",
Aliases: []string{"XDCx.dbName"},
Usage: "Database name for XDCX",
Value: "XDCdex",
Category: flags.XdcxCategory,
}
)

var (
Expand Down Expand Up @@ -1452,14 +1443,13 @@ func SetXDCXConfig(ctx *cli.Context, cfg *XDCx.Config, XDCDataDir string) {
if ctx.IsSet(XDCXDataDirFlag.Name) {
log.Warn("The flag XDCx-datadir or XDCx.datadir is deprecated, please remove this flag")
}
// XDCx datadir: XDCDataDir/XDCx
cfg.DataDir = filepath.Join(XDCDataDir, "XDCx")
log.Info("XDCX datadir", "path", cfg.DataDir)
if ctx.IsSet(XDCXDBNameFlag.Name) {
cfg.DBName = ctx.String(XDCXDBNameFlag.Name)
} else {
cfg.DBName = XDCXDBNameFlag.Value
log.Warn("The flag XDCx-dbName or XDCx.dbName is deprecated, please remove this flag")
}
// XDCx datadir: XDCDataDir/XDCx
cfg.DataDir = filepath.Join(XDCDataDir, "XDCx")
cfg.DBName = "XDCdex"
log.Info("Set XDCX config", "DataDir", cfg.DataDir, "DBName", cfg.DBName)
}

// SetEthConfig applies eth-related command line flags to the config.
Expand Down
17 changes: 13 additions & 4 deletions cmd/utils/flags_legacy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ var DeprecatedFlags = []cli.Flag{
LogDebugFlag,
MiningEnabledFlag,
XDCXDataDirFlag,
XDCXDBNameFlag,
LightServFlag,
LightPeersFlag,
}
Expand Down Expand Up @@ -83,21 +84,29 @@ var (
LightServFlag = &cli.IntFlag{
Name: "light-serv",
Aliases: []string{"lightserv"},
Usage: "Maximum percentage of time allowed for serving LES requests (0-90)",
Usage: "Maximum percentage of time allowed for serving LES requests (0-90) (deprecated)",
Value: ethconfig.Defaults.LightServ,
Category: flags.DeprecatedCategory,
}
LightPeersFlag = &cli.IntFlag{
Name: "light-peers",
Aliases: []string{"lightpeers"},
Usage: "Maximum number of LES client peers",
Usage: "Maximum number of LES client peers (deprecated)",
Value: ethconfig.Defaults.LightPeers,
Category: flags.DeprecatedCategory,
}
// Deprecated Oct 2024
// Deprecated July 2025
EnablePersonal = &cli.BoolFlag{
Name: "rpc.enabledeprecatedpersonal",
Usage: "This used to enable the 'personal' namespace.",
Usage: "This used to enable the 'personal' namespace (deprecated)",
Category: flags.DeprecatedCategory,
}
// Deprecated November 2025
XDCXDBNameFlag = &cli.StringFlag{
Name: "XDCx-dbName",
Aliases: []string{"XDCx.dbName"},
Usage: "Database name for XDCX (deprecated)",
Value: "XDCdex",
Category: flags.DeprecatedCategory,
}
)
Expand Down
1 change: 0 additions & 1 deletion internal/flags/categories.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ const (
MiscCategory = "MISC"
DeprecatedCategory = "ALIASED (deprecated)"
XdcCategory = "XDC"
XdcxCategory = "XDCx"
)

func init() {
Expand Down