Remove deprecated ellaism config

README.md

@@ -27,15 +27,6 @@ or, to build the full suite of utilities:
 
     make all
 
-## Ellaism network
-
-This is originally an [Ellaism
-Project](https://github.com/ellaism). However, A [recent hard
-fork](https://github.com/ellaism/specs/blob/master/specs/2018-0003-wasm-hardfork.md)
-makes Ellaism not feasible to support go-ethereum any more. Existing
-Ellaism users are asked to switch to
-[Parity](https://github.com/paritytech/parity).
-
 ## Executables
 
 The go-ethereum project comes with several wrappers/executables found in the `cmd` directory.
@@ -80,20 +71,6 @@ This command will:
    This too is optional and if you leave it out you can always attach to an already running Geth instance
    with `geth attach`.
 
-### Full node on the main Ellaism network
-
-To get on Ellaism network and take advantage of fast-sync:
-
-```
-$ geth --ellaism console
-```
-
-This command will:
-
- * Start geth in fast sync mode and start up geth's built-in interactive JavaScript console,
-   connecting to Ellaism network.
- * Default data directory will be `~/.ethereum/ellaism`.
-
 ### Full node on the main Ethereum Classic network
 
 To get on Ethereum Classic network and take advantage of fast-sync:
@@ -114,9 +91,9 @@ For a full list of networks supported by multi-geth, take a look at the command-
 
 ```
 --testnet                            Ropsten network: pre-configured proof-of-work test network
---ellaism                            Ellaism network: pre-configured Ellaism mainnet
 --classic                            Ethereum Classic network: pre-configured Ethereum Classic mainnet
 --social                             Ethereum Social network: pre-configured Ethereum Social mainnet
+--callisto                           Callisto network: pre-configured Callisto mainnet
 --rinkeby                            Rinkeby network: pre-configured proof-of-authority test network
 ```
 

cmd/geth/chaincmd.go

@@ -136,7 +136,6 @@ The export-preimages command export hash preimages to an RLP encoded stream`,
 			utils.SyncModeFlag,
 			utils.FakePoWFlag,
 			utils.TestnetFlag,
-			utils.EllaismFlag,
 			utils.ClassicFlag,
 			utils.SocialFlag,
 			utils.CallistoFlag,

cmd/geth/consolecmd.go

@@ -126,8 +126,6 @@ func remoteConsole(ctx *cli.Context) error {
 				path = filepath.Join(path, "testnet")
 			} else if ctx.GlobalBool(utils.RinkebyFlag.Name) {
 				path = filepath.Join(path, "rinkeby")
-			} else if ctx.GlobalBool(utils.EllaismFlag.Name) {
-				path = filepath.Join(path, "ellaism")
 			} else if ctx.GlobalBool(utils.ClassicFlag.Name) {
 				path = filepath.Join(path, "classic")
 			} else if ctx.GlobalBool(utils.SocialFlag.Name) {

cmd/geth/main.go

@@ -110,7 +110,6 @@ var (
 		utils.DeveloperFlag,
 		utils.DeveloperPeriodFlag,
 		utils.TestnetFlag,
-		utils.EllaismFlag,
 		utils.ClassicFlag,
 		utils.SocialFlag,
 		utils.CallistoFlag,

cmd/geth/usage.go

@@ -73,7 +73,6 @@ var AppHelpFlagGroups = []flagGroup{
 			utils.NoUSBFlag,
 			utils.NetworkIdFlag,
 			utils.TestnetFlag,
-			utils.EllaismFlag,
 			utils.ClassicFlag,
 			utils.SocialFlag,
 			utils.CallistoFlag,

cmd/utils/flags.go

@@ -137,10 +137,6 @@ var (
 		Name:  "testnet",
 		Usage: "Ropsten network: pre-configured proof-of-work test network",
 	}
-	EllaismFlag = cli.BoolFlag{
-		Name:  "ellaism",
-		Usage: "Ellaism network: pre-configured Ellaism mainnet",
-	}
 	ClassicFlag = cli.BoolFlag{
 		Name:  "classic",
 		Usage: "Ethereum Classic network: pre-configured Ethereum Classic mainnet",
@@ -595,9 +591,6 @@ func MakeDataDir(ctx *cli.Context) string {
 		if ctx.GlobalBool(TestnetFlag.Name) {
 			return filepath.Join(path, "testnet")
 		}
-		if ctx.GlobalBool(EllaismFlag.Name) {
-			return filepath.Join(path, "ellaism")
-		}
 		if ctx.GlobalBool(ClassicFlag.Name) {
 			return filepath.Join(path, "classic")
 		}
@@ -662,8 +655,6 @@ func setBootstrapNodes(ctx *cli.Context, cfg *p2p.Config) {
 		}
 	case ctx.GlobalBool(TestnetFlag.Name):
 		urls = params.TestnetBootnodes
-	case ctx.GlobalBool(EllaismFlag.Name):
-		urls = params.EllaismBootnodes
 	case ctx.GlobalBool(ClassicFlag.Name):
 		urls = params.ClassicBootnodes
 	case ctx.GlobalBool(SocialFlag.Name):
@@ -955,8 +946,6 @@ func SetNodeConfig(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(EllaismFlag.Name):
-		cfg.DataDir = filepath.Join(node.DefaultDataDir(), "ellaism")
 	case ctx.GlobalBool(ClassicFlag.Name):
 		cfg.DataDir = filepath.Join(node.DefaultDataDir(), "classic")
 	case ctx.GlobalBool(SocialFlag.Name):
@@ -1092,18 +1081,11 @@ func SetShhConfig(ctx *cli.Context, stack *node.Node, cfg *whisper.Config) {
 // SetEthConfig applies eth-related command line flags to the config.
 func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
 	// Avoid conflicting network flags
-	checkExclusive(ctx, DeveloperFlag, TestnetFlag, RinkebyFlag, EllaismFlag, ClassicFlag, SocialFlag, CallistoFlag)
+	checkExclusive(ctx, DeveloperFlag, TestnetFlag, RinkebyFlag, ClassicFlag, SocialFlag, CallistoFlag)
 	checkExclusive(ctx, FastSyncFlag, LightModeFlag, SyncModeFlag)
 	checkExclusive(ctx, LightServFlag, LightModeFlag)
 	checkExclusive(ctx, LightServFlag, SyncModeFlag, "light")
 
-	if ctx.GlobalIsSet(EllaismFlag.Name) {
-		log.Warn("-------------------------------------------------------------------")
-		log.Warn("multi-geth Ellaism support is deprecated, please upgrade to Parity")
-		log.Warn("(https://github.com/paritytech/parity) before block 2,000,000.")
-		log.Warn("-------------------------------------------------------------------")
-	}
-
 	ks := stack.AccountManager().Backends(keystore.KeyStoreType)[0].(*keystore.KeyStore)
 	setEtherbase(ctx, ks, cfg)
 	setGPO(ctx, &cfg.GPO)
@@ -1165,11 +1147,6 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
 			cfg.NetworkId = 3
 		}
 		cfg.Genesis = core.DefaultTestnetGenesisBlock()
-	case ctx.GlobalBool(EllaismFlag.Name):
-		if !ctx.GlobalIsSet(NetworkIdFlag.Name) {
-			cfg.NetworkId = 64
-		}
-		cfg.Genesis = core.DefaultEllaismGenesisBlock()
 	case ctx.GlobalBool(ClassicFlag.Name):
 		if !ctx.GlobalIsSet(NetworkIdFlag.Name) {
 			cfg.NetworkId = 1
@@ -1334,8 +1311,6 @@ func MakeGenesis(ctx *cli.Context) *core.Genesis {
 	switch {
 	case ctx.GlobalBool(TestnetFlag.Name):
 		genesis = core.DefaultTestnetGenesisBlock()
-	case ctx.GlobalBool(EllaismFlag.Name):
-		genesis = core.DefaultEllaismGenesisBlock()
 	case ctx.GlobalBool(ClassicFlag.Name):
 		genesis = core.DefaultClassicGenesisBlock()
 	case ctx.GlobalBool(SocialFlag.Name):

core/genesis.go

@@ -213,8 +213,6 @@ func (g *Genesis) configOrDefault(ghash common.Hash) *params.ChainConfig {
 		return params.MainnetChainConfig
 	case ghash == params.TestnetGenesisHash:
 		return params.TestnetChainConfig
-	case ghash == params.EllaismGenesisHash:
-		return params.EllaismChainConfig
 	case ghash == params.SocialGenesisHash:
 		return params.SocialChainConfig
 	case ghash == params.CallistoGenesisHash:
@@ -315,18 +313,6 @@ func DefaultGenesisBlock() *Genesis {
 	}
 }
 
-// EllaismGenesisBlock returns the Ellaism genesis block.
-func DefaultEllaismGenesisBlock() *Genesis {
-	return &Genesis{
-		Config:     params.EllaismChainConfig,
-		Nonce:      64,
-		ExtraData:  hexutil.MustDecode("0x0000000000000000000000000000000000000000000000000000000000000000"),
-		GasLimit:   5000,
-		Difficulty: big.NewInt(1073741824),
-		Alloc:      decodePrealloc(ellaismAllocData),
-	}
-}
-
 // ClassicGenesisBlock returns the Ethereum Classic genesis block.
 func DefaultClassicGenesisBlock() *Genesis {
 	return &Genesis{

mobile/geth.go

@@ -152,12 +152,6 @@ func NewNode(datadir string, config *NodeConfig) (stack *Node, _ error) {
 				config.EthereumNetworkID = 3
 			}
 		}
-		if config.EthereumGenesis == EllaismGenesis() {
-			genesis.Config = params.EllaismChainConfig
-			if config.EthereumNetworkID == 1 {
-				config.EthereumNetworkID = 64
-			}
-		}
 		if config.EthereumGenesis == SocialGenesis() {
 			genesis.Config = params.SocialChainConfig
 			if config.EthereumNetworkID == 1 {

mobile/params.go

@@ -32,15 +32,6 @@ func MainnetGenesis() string {
 	return ""
 }
 
-// EllaismGenesis returns the JSON spec to use for the Ellaism network.
-func EllaismGenesis() string {
-	enc, err := json.Marshal(core.DefaultEllaismGenesisBlock())
-	if err != nil {
-		panic(err)
-	}
-	return string(enc)
-}
-
 // SocialGenesis returns the JSON spec to use for the Ethereum Social network.
 func SocialGenesis() string {
 	enc, err := json.Marshal(core.DefaultSocialGenesisBlock())

params/bootnodes.go

@@ -30,20 +30,6 @@ var MainnetBootnodes = []string{
 	"enode://979b7fa28feeb35a4741660a16076f1943202cb72b6af70d327f053e248bab9ba81760f39d0701ef1d8f89cc1fbd2cacba0710a12cd5314d5e0c9021aa3637f9@5.1.83.226:30303", // DE
 }
 
-// EllaismBootnodes are the enode URLs of the P2P bootstrap nodes running on
-// the Ellaism network.
-var EllaismBootnodes = []string{
-	"enode://0d88e242aa0b01ee306ca43e956174677c96ec8eba4197f4d8be6fd7d4f2e57731e95d533b88229b66eb1a44399d870e99b7a4fe6547c8c80cdf00407a986e14@94.130.237.158:30303",
-	"enode://4be9e419d3efb0214faf3ef1794a0c33ebbd7633ece734a0a956faa166fefc496b2692a2a485adc66af805e461ba3e12f8d3941ec207e56bb9f3d3626787a705@94.130.237.158:60606",
-	"enode://834246cc2a7584df29ccdcf3b5366f118a0e291264980376769e809665a02c4caf0d68c43eecf8390dbeaf861823b05583807af0a62542a1f3f717046b958a76@45.77.106.33:30303",
-	"enode://d8059dcb137cb52b8960ca82613eeba1d121105572decd8f1d3ea22b09070645eeab548d2a3cd2914f206e1331c7870bd2bd5a231ebac6b3d4886ec3b8e627e5@173.212.216.105:30303",
-	"enode://9215ad77bd081e35013cb42a8ceadff9d8e94a78fcc680dff1752a54e7484badff0904e331c4b40a68be593782e55acfd800f076d22f9d2832e8483733ade149@213.14.82.125:30303",
-	"enode://5dd35866da95aea15211fb1f98684f6e8c4e355e6aa3cc17585680ed53fa164477b8c52cb6ca4b24ec4d80f3d48ff9212b53feb131d825c7945a3abaaf02d24d@178.79.189.58:60606",
-	"enode://6c585c18024eb902ca093278af73b04863ac904caabc39ac2920c23532307c572ad92afd828a990c980d272b1f26307f2409cc97aec3ff9fe866732cae49a8c2@144.217.163.224:31337",
-	"enode://edd90c4cc64528802ad52fd127d80b641ff80fd43fa5292fb111c8bd2914482dffee288fd1b0d26440c6b2c669b10a53cbcd37c895ba0d6194110e100a965b2d@188.166.179.159:30303",
-	"enode://9d960373335c1cc38ca696dea8f2893e2a071c8f21524f21e8aae22be032acc3b67797b1d21e866f9d832943ae7d9555b8466c6ab34f473d21e547114952df37@213.32.53.183:30303",
-}
-
 // ClassicBootnodes are the enode URLs of the P2P bootstrap nodes running on
 // the Ethereum Classic network.
 var ClassicBootnodes = []string{

params/config.go

@@ -27,7 +27,6 @@ import (
 var (
 	MainnetGenesisHash  = common.HexToHash("0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3")
 	TestnetGenesisHash  = common.HexToHash("0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d")
-	EllaismGenesisHash  = common.HexToHash("0x4d7df65052bb21264d6ad2d6fe2d5578a36be12f71bf8d0559b0c15c4dc539b5")
 	SocialGenesisHash   = common.HexToHash("0xba8314d5c2ebddaf58eb882b364b27cbfa4d3402dacd32b60986754ac25cfe8d")
 	CallistoGenesisHash = common.HexToHash("0x82270b80fc90beb005505a9ef95039639968a0e81b2904ad30128c93d713d2c4")
 )
@@ -49,25 +48,7 @@ var (
 		Ethash:              new(EthashConfig),
 	}
 
-	// EllaismChainConfig is the chain parameters to run a node on the Ellaism main network.
+	// ClassicChainConfig is the chain parameters to run a node on the Ethereum Classic main network.
-	EllaismChainConfig = &ChainConfig{
-		ChainID:             big.NewInt(64),
-		HomesteadBlock:      big.NewInt(0),
-		DAOForkBlock:        nil,
-		DAOForkSupport:      true,
-		EIP150Block:         big.NewInt(0),
-		EIP150Hash:          common.HexToHash("0x4d7df65052bb21264d6ad2d6fe2d5578a36be12f71bf8d0559b0c15c4dc539b5"),
-		EIP155Block:         big.NewInt(0),
-		EIP158Block:         nil,
-		ByzantiumBlock:      nil,
-		DisposalBlock:       big.NewInt(0),
-		ConstantinopleBlock: nil,
-		ECIP1017EraRounds:   big.NewInt(10000000),
-		EIP160Block:         big.NewInt(0),
-		Ethash:              new(EthashConfig),
-	}
-
-	// ClassicChainConfig is the chain parameters to run a node on the Ellaism main network.
 	ClassicChainConfig = &ChainConfig{
 		ChainID:             big.NewInt(61),
 		HomesteadBlock:      big.NewInt(1150000),
@@ -105,7 +86,7 @@ var (
 		Ethash:              new(EthashConfig),
 	}
 
-	// Callisto Mainnet chain parameters
+	// CallistoChainConfig is the chain parameters to run a node on the Callisto main network.
 	CallistoChainConfig = &ChainConfig{
 		ChainID:             big.NewInt(820),
 		HomesteadBlock:      big.NewInt(0),