@ -127,7 +127,7 @@ var (
}
NetworkIdFlag = & cli . Uint64Flag {
Name : "networkid" ,
Usage : "Explicitly set network id (integer)(For testnets: use --ropsten, --r inkeby, --goerli instead)" ,
Usage : "Explicitly set network id (integer)(For testnets: use --rinkeby, --goerli, --sepolia instead)" ,
Value : ethconfig . Defaults . NetworkId ,
Category : flags . EthCategory ,
}
@ -136,11 +136,6 @@ var (
Usage : "Ethereum mainnet" ,
Category : flags . EthCategory ,
}
RopstenFlag = & cli . BoolFlag {
Name : "ropsten" ,
Usage : "Ropsten network: pre-configured proof-of-stake test network" ,
Category : flags . EthCategory ,
}
RinkebyFlag = & cli . BoolFlag {
Name : "rinkeby" ,
Usage : "Rinkeby network: pre-configured proof-of-authority test network" ,
@ -998,7 +993,6 @@ Please note that --` + MetricsHTTPFlag.Name + ` must be set to start the server.
var (
// TestnetFlags is the flag group of all built-in supported testnets.
TestnetFlags = [ ] cli . Flag {
RopstenFlag ,
RinkebyFlag ,
GoerliFlag ,
SepoliaFlag ,
@ -1020,11 +1014,6 @@ var (
// then a subdirectory of the specified datadir will be used.
func MakeDataDir ( ctx * cli . Context ) string {
if path := ctx . String ( DataDirFlag . Name ) ; path != "" {
if ctx . Bool ( RopstenFlag . Name ) {
// Maintain compatibility with older Geth configurations storing the
// Ropsten database in `testnet` instead of `ropsten`.
return filepath . Join ( path , "ropsten" )
}
if ctx . Bool ( RinkebyFlag . Name ) {
return filepath . Join ( path , "rinkeby" )
}
@ -1080,8 +1069,6 @@ func setBootstrapNodes(ctx *cli.Context, cfg *p2p.Config) {
switch {
case ctx . IsSet ( BootnodesFlag . Name ) :
urls = SplitAndTrim ( ctx . String ( BootnodesFlag . Name ) )
case ctx . Bool ( RopstenFlag . Name ) :
urls = params . RopstenBootnodes
case ctx . Bool ( SepoliaFlag . Name ) :
urls = params . SepoliaBootnodes
case ctx . Bool ( RinkebyFlag . Name ) :
@ -1525,18 +1512,6 @@ func SetDataDir(ctx *cli.Context, cfg *node.Config) {
cfg . DataDir = ctx . String ( DataDirFlag . Name )
case ctx . Bool ( DeveloperFlag . Name ) :
cfg . DataDir = "" // unless explicitly requested, use memory databases
case ctx . Bool ( RopstenFlag . Name ) && cfg . DataDir == node . DefaultDataDir ( ) :
// Maintain compatibility with older Geth configurations storing the
// Ropsten database in `testnet` instead of `ropsten`.
legacyPath := filepath . Join ( node . DefaultDataDir ( ) , "testnet" )
if common . FileExist ( legacyPath ) {
log . Warn ( "Using the deprecated `testnet` datadir. Future versions will store the Ropsten chain in `ropsten`." )
cfg . DataDir = legacyPath
} else {
cfg . DataDir = filepath . Join ( node . DefaultDataDir ( ) , "ropsten" )
}
cfg . DataDir = filepath . Join ( node . DefaultDataDir ( ) , "ropsten" )
case ctx . Bool ( RinkebyFlag . Name ) && cfg . DataDir == node . DefaultDataDir ( ) :
cfg . DataDir = filepath . Join ( node . DefaultDataDir ( ) , "rinkeby" )
case ctx . Bool ( GoerliFlag . Name ) && cfg . DataDir == node . DefaultDataDir ( ) :
@ -1733,7 +1708,7 @@ func CheckExclusive(ctx *cli.Context, args ...interface{}) {
// SetEthConfig applies eth-related command line flags to the config.
func SetEthConfig ( ctx * cli . Context , stack * node . Node , cfg * ethconfig . Config ) {
// Avoid conflicting network flags
CheckExclusive ( ctx , MainnetFlag , DeveloperFlag , RopstenFlag , R inkebyFlag , GoerliFlag , SepoliaFlag )
CheckExclusive ( ctx , MainnetFlag , DeveloperFlag , RinkebyFlag , GoerliFlag , SepoliaFlag )
CheckExclusive ( ctx , LightServeFlag , SyncModeFlag , "light" )
CheckExclusive ( ctx , DeveloperFlag , ExternalSignerFlag ) // Can't use both ephemeral unlocked and external signer
if ctx . String ( GCModeFlag . Name ) == "archive" && ctx . Uint64 ( TxLookupLimitFlag . Name ) != 0 {
@ -1871,12 +1846,6 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
}
cfg . Genesis = core . DefaultGenesisBlock ( )
SetDNSDiscoveryDefaults ( cfg , params . MainnetGenesisHash )
case ctx . Bool ( RopstenFlag . Name ) :
if ! ctx . IsSet ( NetworkIdFlag . Name ) {
cfg . NetworkId = 3
}
cfg . Genesis = core . DefaultRopstenGenesisBlock ( )
SetDNSDiscoveryDefaults ( cfg , params . RopstenGenesisHash )
case ctx . Bool ( SepoliaFlag . Name ) :
if ! ctx . IsSet ( NetworkIdFlag . Name ) {
cfg . NetworkId = 11155111
@ -2219,8 +2188,6 @@ func MakeGenesis(ctx *cli.Context) *core.Genesis {
switch {
case ctx . Bool ( MainnetFlag . Name ) :
genesis = core . DefaultGenesisBlock ( )
case ctx . Bool ( RopstenFlag . Name ) :
genesis = core . DefaultRopstenGenesisBlock ( )
case ctx . Bool ( SepoliaFlag . Name ) :
genesis = core . DefaultSepoliaGenesisBlock ( )
case ctx . Bool ( RinkebyFlag . Name ) :
Péter Szilágyi
2 years ago
committed by
GitHub