diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 07526c69e906..dbef2fdc6378 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -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 ( @@ -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. diff --git a/cmd/utils/flags_legacy.go b/cmd/utils/flags_legacy.go index ca43ffe71fe5..93855f507a60 100644 --- a/cmd/utils/flags_legacy.go +++ b/cmd/utils/flags_legacy.go @@ -38,6 +38,7 @@ var DeprecatedFlags = []cli.Flag{ LogDebugFlag, MiningEnabledFlag, XDCXDataDirFlag, + XDCXDBNameFlag, LightServFlag, LightPeersFlag, } @@ -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, } ) diff --git a/internal/flags/categories.go b/internal/flags/categories.go index 52376be15d31..1155164be268 100644 --- a/internal/flags/categories.go +++ b/internal/flags/categories.go @@ -35,7 +35,6 @@ const ( MiscCategory = "MISC" DeprecatedCategory = "ALIASED (deprecated)" XdcCategory = "XDC" - XdcxCategory = "XDCx" ) func init() {