Skip to content

Commit ce7822c

Browse files
karalabekaralabe
authored
Merge pull request ethereum#3553 from bas-vk/rm-olympic-support
core: remove support for Olympic network
2 parents 218ec6c + 745a3ad commit ce7822c

File tree

6 files changed

+15
-62
lines changed

6 files changed

+15
-62
lines changed

‎cmd/geth/main.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ func init() {
8888
utils.BootnodesFlag,
8989
utils.DataDirFlag,
9090
utils.KeyStoreDirFlag,
91-
utils.OlympicFlag,
9291
utils.FastSyncFlag,
9392
utils.LightModeFlag,
9493
utils.LightServFlag,

‎cmd/geth/usage.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ var AppHelpFlagGroups = []flagGroup{
6767
utils.DataDirFlag,
6868
utils.KeyStoreDirFlag,
6969
utils.NetworkIdFlag,
70-
utils.OlympicFlag,
7170
utils.TestNetFlag,
7271
utils.DevModeFlag,
7372
utils.IdentityFlag,

‎cmd/utils/flags.go

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"crypto/ecdsa"
2222
"fmt"
2323
"io/ioutil"
24-
"math"
2524
"math/big"
2625
"os"
2726
"path/filepath"
@@ -116,13 +115,9 @@ var (
116115
}
117116
NetworkIdFlag = cli.IntFlag{
118117
Name: "networkid",
119-
Usage: "Network identifier (integer, 0=Olympic (disused), 1=Frontier, 2=Morden (disused), 3=Ropsten)",
118+
Usage: "Network identifier (integer, 1=Frontier, 2=Morden (disused), 3=Ropsten)",
120119
Value: eth.NetworkId,
121120
}
122-
OlympicFlag = cli.BoolFlag{
123-
Name: "olympic",
124-
Usage: "Olympic network: pre-configured pre-release test network",
125-
}
126121
TestNetFlag = cli.BoolFlag{
127122
Name: "testnet",
128123
Usage: "Ropsten network: pre-configured test network",
@@ -712,7 +707,7 @@ func MakeNode(ctx *cli.Context, name, gitCommit string) *node.Node {
712707
// given node.
713708
func RegisterEthService(ctx *cli.Context, stack *node.Node, extra []byte) {
714709
// Avoid conflicting network flags
715-
networks, netFlags := 0, []cli.BoolFlag{DevModeFlag, TestNetFlag, OlympicFlag}
710+
networks, netFlags := 0, []cli.BoolFlag{DevModeFlag, TestNetFlag}
716711
for _, flag := range netFlags {
717712
if ctx.GlobalBool(flag.Name) {
718713
networks++
@@ -750,20 +745,14 @@ func RegisterEthService(ctx *cli.Context, stack *node.Node, extra []byte) {
750745

751746
// Override any default configs in dev mode or the test net
752747
switch {
753-
case ctx.GlobalBool(OlympicFlag.Name):
754-
if !ctx.GlobalIsSet(NetworkIdFlag.Name) {
755-
ethConf.NetworkId = 1
756-
}
757-
ethConf.Genesis = core.OlympicGenesisBlock()
758-
759748
case ctx.GlobalBool(TestNetFlag.Name):
760749
if !ctx.GlobalIsSet(NetworkIdFlag.Name) {
761750
ethConf.NetworkId = 3
762751
}
763752
ethConf.Genesis = core.DefaultTestnetGenesisBlock()
764753

765754
case ctx.GlobalBool(DevModeFlag.Name):
766-
ethConf.Genesis = core.OlympicGenesisBlock()
755+
ethConf.Genesis = core.DevGenesisBlock()
767756
if !ctx.GlobalIsSet(GasPriceFlag.Name) {
768757
ethConf.GasPrice = new(big.Int)
769758
}
@@ -820,16 +809,6 @@ func RegisterEthStatsService(stack *node.Node, url string) {
820809

821810
// SetupNetwork configures the system for either the main net or some test network.
822811
func SetupNetwork(ctx *cli.Context) {
823-
switch {
824-
case ctx.GlobalBool(OlympicFlag.Name):
825-
params.DurationLimit = big.NewInt(8)
826-
params.GenesisGasLimit = big.NewInt(3141592)
827-
params.MinGasLimit = big.NewInt(125000)
828-
params.MaximumExtraDataSize = big.NewInt(1024)
829-
NetworkIdFlag.Value = 0
830-
core.BlockReward = big.NewInt(1.5e+18)
831-
core.ExpDiffPeriod = big.NewInt(math.MaxInt64)
832-
}
833812
params.TargetGasLimit = common.String2Big(ctx.GlobalString(TargetGasLimitFlag.Name))
834813
}
835814

@@ -920,13 +899,6 @@ func MakeChain(ctx *cli.Context, stack *node.Node) (chain *core.BlockChain, chai
920899
var err error
921900
chainDb = MakeChainDatabase(ctx, stack)
922901

923-
if ctx.GlobalBool(OlympicFlag.Name) {
924-
_, err := core.WriteOlympicGenesisBlock(chainDb)
925-
if err != nil {
926-
glog.Fatalln(err)
927-
}
928-
}
929-
930902
if ctx.GlobalBool(TestNetFlag.Name) {
931903
_, err := core.WriteTestNetGenesisBlock(chainDb)
932904
if err != nil {

‎core/default_genesis.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@ const defaultGenesisBlock = "H4sIAAAJbogA/5S9267gSHOl9y59PRd5Pszb5BEYQJi5sQEbgt/
2323
// defaultTestnetGenesisBlock is a gzip compressed dump of the official default Ethereum
2424
// test network genesis block (currently Ropsten).
2525
const defaultTestnetGenesisBlock = "QlpoOTFBWSZTWezl5v8AGI59gHRQABBcBH/0FGQ/795qUAN+PcGHAoQMVIwm0zCSp+ihiAANB6gqp+mmp6eMmqo0AADRpoABgAGjTQBk0BoMgNAbSqNAyDQyaBoNAyAGBUkhNNNA0JGmgD0g0AekxJtVIgTtRupd52vqSSSVfG2ALQBhhdbCIgmAgUiIJnEQTviQF8kkN1IOKiRVVFVSVXHT1cHLHdiSQBlAAG2JtCtNgCS5IEB6dNtP782Z729Tbt3Z6+uFr7u3w79widyYSMAhtlL5XeGZWdwEBNdFm+Hh5gVRBoslgksAMkUKmYlSJRTxBsQAAKKlnd3WjPWrNd66NR7WAu6AQL40vqlny1We+p3l1QThy4gRd2lSVjEKISLDFrVJ1UtjPEPctVSZGjBTJWRzpdgRmCCprJWGe3DK9wvz4eGvdv1ZZcMvxGgdakeMAVEeFywVQWLWCrUWg60Y9ZLoAuZ0uSJJUELb8N2e7j05d3Tlz7vRwgk+LisedJALLVUgFjLGzfv5SEGPLlhhjpx2aaO8T87whcYDmgPLVDBI3RF1TLnzvymWtN732u93GiAGiBdm5s1q9Haru7+yCLJAk3wBDTtrGeMVh3iJmXHo+OBAsqoDOZwjKM3d3mZmcHdBJiSVouSKVkDg+L4vSzNRqs7u6NEaIiUKoYxERGfTWIhoiHwQFESGzta21qu1qtZ3cAXQshVAUybTLbWttWh3iHLoDJEgkACRVCzbeX774Z6558+mfDTdz058efTpDbXai+tddbQBbn/YA9fwxy8/Pq3HFW7deL8W447duuyI2RGqIAAA9SOqHeXzbRtGiXeHiYBMggAAIyQh/f5vW96Xvvu7b7777yMURRHFE6EkEnxRIiOlY2ijs7RV4gYIB0R4LmgB49xg0Oz0bVr2a95u4AZE6rTjl2w58Cntu1ZV6e3Lw3ne2RegHw7R58NdbtVlJEkuqRV2WKa/hpbPIx3bIyX43aNWmezrCBry2ePzkA8reSwB/xdyRThQkOzl5v8="
26+
27+
// defaultDevnetGenesisBlockis a gzip compressed dump of a dev Ethereum network genesis block.
28+
const defaultDevnetGenesisBlock = "QlpoOTFBWSZTWb66siUAAmldgEERWAR/8AAEP6eOakACGu6ULVwyRNGKeBCbUaAGIJUDJpT2lP1BQAAANqp6jTUxMIxGmAJgFVTAp4mjSaoAxAB4cLqQ6aBgTRPcAECErBIZ9PyZJw5IYvQPWlcXDXnhaC9buNtJaAFApAgwkUIRBmBY6EhTY8/6ZXse6lLD1Eh3sfas7VHnxse2LZeXpME9fADujvYB4Wr9cgQA+Wq0gRnrfVmgVwIiIrgfON+c4EhrApvQT2LjUh6y3x41XXOxriA89W52MDId9R7vasE3pfWWATQF7nAEAWRb861EU6M9SmBTET1UUGuBmgxzewhmUe4Rj4jSvgRFRTYgI8WzzcQn3nNr6x3GW94Yp1xG4kOoC/MxDhbF8uMahuMTmKyEep0SwLaxquoT3F9X0NxmouMWhxTAlxHQoN872vbYJS/Wrls2LuptmbKr4R6BJ/oJfPNpq+H362F5ZyhNQBxXep4ZOr94ylFM6UfOeUq37kFeGzXOle3LKItkvJ70OKqEqzujic72rnpZHym6b3xSONoWjYzRzIUbOKSUgdVtEhtvUg24asA2cy1zFzsfnj8CXe0Bdi7kinChIX11ZEo="

‎core/genesis.go

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,6 @@ func WriteTestNetGenesisBlock(chainDb ethdb.Database) (*types.Block, error) {
178178
return WriteGenesisBlock(chainDb, strings.NewReader(DefaultTestnetGenesisBlock()))
179179
}
180180

181-
// WriteOlympicGenesisBlock assembles the Olympic genesis block and writes it
182-
// along with all associated state into a chain database.
183-
func WriteOlympicGenesisBlock(db ethdb.Database) (*types.Block, error) {
184-
return WriteGenesisBlock(db, strings.NewReader(OlympicGenesisBlock()))
185-
}
186-
187181
// DefaultGenesisBlock assembles a JSON string representing the default Ethereum
188182
// genesis block.
189183
func DefaultGenesisBlock() string {
@@ -209,26 +203,12 @@ func DefaultTestnetGenesisBlock() string {
209203
return string(blob)
210204
}
211205

212-
// OlympicGenesisBlock assembles a JSON string representing the Olympic genesis
213-
// block.
214-
func OlympicGenesisBlock() string {
215-
return fmt.Sprintf(`{
216-
"nonce":"0x%x",
217-
"gasLimit":"0x%x",
218-
"difficulty":"0x%x",
219-
"alloc": {
220-
"0000000000000000000000000000000000000001": {"balance": "1"},
221-
"0000000000000000000000000000000000000002": {"balance": "1"},
222-
"0000000000000000000000000000000000000003": {"balance": "1"},
223-
"0000000000000000000000000000000000000004": {"balance": "1"},
224-
"dbdbdb2cbd23b783741e8d7fcf51e459b497e4a6": {"balance": "1606938044258990275541962092341162602522202993782792835301376"},
225-
"e4157b34ea9615cfbde6b4fda419828124b70c78": {"balance": "1606938044258990275541962092341162602522202993782792835301376"},
226-
"b9c015918bdaba24b4ff057a92a3873d6eb201be": {"balance": "1606938044258990275541962092341162602522202993782792835301376"},
227-
"6c386a4b26f73c802f34673f7248bb118f97424a": {"balance": "1606938044258990275541962092341162602522202993782792835301376"},
228-
"cd2a3d9f938e13cd947ec05abc7fe734df8dd826": {"balance": "1606938044258990275541962092341162602522202993782792835301376"},
229-
"2ef47100e0787b915105fd5e3f4ff6752079d5cb": {"balance": "1606938044258990275541962092341162602522202993782792835301376"},
230-
"e6716f9544a56c530d868e4bfbacb172315bdead": {"balance": "1606938044258990275541962092341162602522202993782792835301376"},
231-
"1a26338f0d905e295fccb71fa9ea849ffa12aaf4": {"balance": "1606938044258990275541962092341162602522202993782792835301376"}
232-
}
233-
}`, types.EncodeNonce(42), params.GenesisGasLimit.Bytes(), params.GenesisDifficulty.Bytes())
206+
// DevGenesisBlock assembles a JSON string representing a local dev genesis block.
207+
func DevGenesisBlock() string {
208+
reader := bzip2.NewReader(base64.NewDecoder(base64.StdEncoding, strings.NewReader(defaultDevnetGenesisBlock)))
209+
blob, err := ioutil.ReadAll(reader)
210+
if err != nil {
211+
panic(fmt.Sprintf("failed to load dev genesis: %v", err))
212+
}
213+
return string(blob)
234214
}

‎eth/handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ func (self *ProtocolManager) txBroadcastLoop() {
750750
// EthNodeInfo represents a short summary of the Ethereum sub-protocol metadata known
751751
// about the host peer.
752752
type EthNodeInfo struct {
753-
Network int `json:"network"` // Ethereum network ID (0=Olympic, 1=Frontier, 2=Morden)
753+
Network int `json:"network"` // Ethereum network ID (1=Frontier, 2=Morden, Ropsten=3)
754754
Difficulty *big.Int `json:"difficulty"` // Total difficulty of the host's blockchain
755755
Genesis common.Hash `json:"genesis"` // SHA3 hash of the host's genesis block
756756
Head common.Hash `json:"head"` // SHA3 hash of the host's best owned block

0 commit comments

Comments
 (0)