aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/clef/README.md2
-rw-r--r--cmd/gtan/consolecmd.go4
-rw-r--r--cmd/gtan/main.go2
-rw-r--r--cmd/gtan/usage.go4
-rw-r--r--cmd/utils/flags.go54
5 files changed, 6 insertions, 60 deletions
diff --git a/cmd/clef/README.md b/cmd/clef/README.md
index 1eba03e51..fc2e73896 100644
--- a/cmd/clef/README.md
+++ b/cmd/clef/README.md
@@ -31,7 +31,7 @@ GLOBAL OPTIONS:
--loglevel value log level to emit to the screen (default: 4)
--keystore value Directory for the keystore (default: "$HOME/.ethereum/keystore")
--configdir value Directory for clef configuration (default: "$HOME/.clef")
- --networkid value Network identifier (integer, 237=Mainnet, 238=Testnet) (default: 237)
+ --networkid value Network identifier (integer, 373=Mainnet, 374=Testnet) (default: 373)
--lightkdf Reduce key-derivation RAM & CPU usage at some expense of KDF strength
--nousb Disables monitoring for and managing USB hardware wallets
--rpcaddr value HTTP-RPC server listening interface (default: "localhost")
diff --git a/cmd/gtan/consolecmd.go b/cmd/gtan/consolecmd.go
index 750570094..90e383aa1 100644
--- a/cmd/gtan/consolecmd.go
+++ b/cmd/gtan/consolecmd.go
@@ -124,10 +124,6 @@ func remoteConsole(ctx *cli.Context) error {
if path != "" {
if ctx.GlobalBool(utils.TestnetFlag.Name) {
path = filepath.Join(path, "testnet")
- } else if ctx.GlobalBool(utils.TaipeiFlag.Name) {
- path = filepath.Join(path, "taipei")
- } else if ctx.GlobalBool(utils.YilanFlag.Name) {
- path = filepath.Join(path, "yilan")
}
}
endpoint = fmt.Sprintf("%s/gtan.ipc", path)
diff --git a/cmd/gtan/main.go b/cmd/gtan/main.go
index 311c81187..7dd734a2d 100644
--- a/cmd/gtan/main.go
+++ b/cmd/gtan/main.go
@@ -122,8 +122,6 @@ var (
utils.DeveloperFlag,
utils.DeveloperPeriodFlag,
utils.TestnetFlag,
- utils.TaipeiFlag,
- utils.YilanFlag,
utils.VMEnableDebugFlag,
utils.NetworkIdFlag,
utils.ConstantinopleOverrideFlag,
diff --git a/cmd/gtan/usage.go b/cmd/gtan/usage.go
index 117aa17a8..537e420d3 100644
--- a/cmd/gtan/usage.go
+++ b/cmd/gtan/usage.go
@@ -65,7 +65,7 @@ type flagGroup struct {
// AppHelpFlagGroups is the application flags, grouped by functionality.
var AppHelpFlagGroups = []flagGroup{
{
- Name: "DEXON",
+ Name: "TANGERINE",
Flags: []cli.Flag{
configFileFlag,
utils.DataDirFlag,
@@ -73,8 +73,6 @@ var AppHelpFlagGroups = []flagGroup{
utils.NoUSBFlag,
utils.NetworkIdFlag,
utils.TestnetFlag,
- utils.TaipeiFlag,
- utils.YilanFlag,
utils.SyncModeFlag,
utils.GCModeFlag,
utils.EthStatsURLFlag,
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 544f328b8..2e1053c83 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -130,21 +130,13 @@ var (
}
NetworkIdFlag = cli.Uint64Flag{
Name: "networkid",
- Usage: "Network identifier (integer, 237=Mainnet, 238=Testnet, 239=Taipei, 240=Yilan) (default: 237)",
- Value: eth.DefaultConfig.NetworkId,
+ Usage: "Network identifier (integer, 373=Mainnet, 374=Testnet) (default: 373)",
+ Value: dex.DefaultConfig.NetworkId,
}
TestnetFlag = cli.BoolFlag{
Name: "testnet",
Usage: "Taiwan network: default public testnet",
}
- TaipeiFlag = cli.BoolFlag{
- Name: "taipei",
- Usage: "Taipei network: tapei public testnet",
- }
- YilanFlag = cli.BoolFlag{
- Name: "yilan",
- Usage: "Yilan network: yilan public testnet",
- }
ConstantinopleOverrideFlag = cli.Uint64Flag{
Name: "override.constantinople",
Usage: "Manually specify constantinople fork-block, overriding the bundled setting",
@@ -681,12 +673,6 @@ func MakeDataDir(ctx *cli.Context) string {
if ctx.GlobalBool(TestnetFlag.Name) {
return filepath.Join(path, "testnet")
}
- if ctx.GlobalBool(TaipeiFlag.Name) {
- return filepath.Join(path, "taipei")
- }
- if ctx.GlobalBool(YilanFlag.Name) {
- return filepath.Join(path, "yilan")
- }
return path
}
Fatalf("Cannot determine default data directory, please set manually (--datadir)")
@@ -739,10 +725,6 @@ func setBootstrapNodes(ctx *cli.Context, cfg *p2p.Config) {
}
case ctx.GlobalBool(TestnetFlag.Name):
urls = params.TestnetBootnodes
- case ctx.GlobalBool(TaipeiFlag.Name):
- urls = params.TaipeiBootnodes
- case ctx.GlobalBool(YilanFlag.Name):
- urls = params.YilanBootnodes
case cfg.BootstrapNodes != nil:
return // already set, don't apply defaults.
}
@@ -768,10 +750,6 @@ func setBootstrapNodesV5(ctx *cli.Context, cfg *p2p.Config) {
} else {
urls = strings.Split(ctx.GlobalString(BootnodesFlag.Name), ",")
}
- case ctx.GlobalBool(TaipeiFlag.Name):
- urls = params.TaipeiBootnodes
- case ctx.GlobalBool(YilanFlag.Name):
- urls = params.YilanBootnodes
case cfg.BootstrapNodesV5 != nil:
return // already set, don't apply defaults.
}
@@ -1046,10 +1024,6 @@ func setDataDir(ctx *cli.Context, cfg *node.Config) {
cfg.DataDir = "" // unless explicitly requested, use memory databases
case ctx.GlobalBool(TestnetFlag.Name):
cfg.DataDir = filepath.Join(node.DefaultDataDir(), "testnet")
- case ctx.GlobalBool(TaipeiFlag.Name):
- cfg.DataDir = filepath.Join(node.DefaultDataDir(), "taipei")
- case ctx.GlobalBool(YilanFlag.Name):
- cfg.DataDir = filepath.Join(node.DefaultDataDir(), "yilan")
}
}
@@ -1206,7 +1180,7 @@ func SetShhConfig(ctx *cli.Context, stack *node.Node, cfg *whisper.Config) {
// SetDexConfig applies eth-related command line flags to the config.
func SetDexConfig(ctx *cli.Context, stack *node.Node, cfg *dex.Config) {
// Avoid conflicting network flags
- checkExclusive(ctx, DeveloperFlag, TestnetFlag, TaipeiFlag, YilanFlag)
+ checkExclusive(ctx, DeveloperFlag, TestnetFlag)
checkExclusive(ctx, LightServFlag, SyncModeFlag, "light")
ks := stack.AccountManager().Backends(keystore.KeyStoreType)[0].(*keystore.KeyStore)
@@ -1272,28 +1246,12 @@ func SetDexConfig(ctx *cli.Context, stack *node.Node, cfg *dex.Config) {
switch {
case ctx.GlobalBool(TestnetFlag.Name):
if !ctx.GlobalIsSet(NetworkIdFlag.Name) {
- cfg.NetworkId = 238
+ cfg.NetworkId = 374
}
if !ctx.GlobalIsSet(RecoveryNetworkRPCFlag.Name) {
cfg.RecoveryNetworkRPC = defaultRecoveryNetworkRPC
}
cfg.Genesis = core.DefaultTestnetGenesisBlock()
- case ctx.GlobalBool(TaipeiFlag.Name):
- if !ctx.GlobalIsSet(NetworkIdFlag.Name) {
- cfg.NetworkId = 239
- }
- if !ctx.GlobalIsSet(RecoveryNetworkRPCFlag.Name) {
- cfg.RecoveryNetworkRPC = defaultRecoveryNetworkRPC
- }
- cfg.Genesis = core.DefaultTaipeiGenesisBlock()
- case ctx.GlobalBool(YilanFlag.Name):
- if !ctx.GlobalIsSet(NetworkIdFlag.Name) {
- cfg.NetworkId = 240
- }
- if !ctx.GlobalIsSet(RecoveryNetworkRPCFlag.Name) {
- cfg.RecoveryNetworkRPC = defaultRecoveryNetworkRPC
- }
- cfg.Genesis = core.DefaultYilanGenesisBlock()
case ctx.GlobalBool(DeveloperFlag.Name):
if !ctx.GlobalIsSet(NetworkIdFlag.Name) {
cfg.NetworkId = 1337
@@ -1467,10 +1425,6 @@ func MakeGenesis(ctx *cli.Context) *core.Genesis {
switch {
case ctx.GlobalBool(TestnetFlag.Name):
genesis = core.DefaultTestnetGenesisBlock()
- case ctx.GlobalBool(TaipeiFlag.Name):
- genesis = core.DefaultTaipeiGenesisBlock()
- case ctx.GlobalBool(YilanFlag.Name):
- genesis = core.DefaultYilanGenesisBlock()
case ctx.GlobalBool(DeveloperFlag.Name):
Fatalf("Developer chains are ephemeral")
}
generated by cgit (git 2.34.1) at 2024-11-14 09:38:51 +0800