From a8ca75738a45a137ff7b2dfa276398fad26439da Mon Sep 17 00:00:00 2001
From: Jeffrey Wilcke <jeffrey@ethereum.org>
Date: Sun, 20 Nov 2016 22:32:31 +0100
Subject: core: implemented new ropsten testnet

---
 cmd/geth/dao_test.go |  5 +++--
 cmd/utils/flags.go   | 32 +++++++++-----------------------
 2 files changed, 12 insertions(+), 25 deletions(-)

(limited to 'cmd')

diff --git a/cmd/geth/dao_test.go b/cmd/geth/dao_test.go
index f90bb182d..06578b612 100644
--- a/cmd/geth/dao_test.go
+++ b/cmd/geth/dao_test.go
@@ -191,14 +191,15 @@ func testDAOForkBlockNewChain(t *testing.T, testnet bool, genesis string, votes
 
 	genesisHash := common.HexToHash("0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3")
 	if testnet {
-		genesisHash = common.HexToHash("0x0cd786a2425d16f152c658316c423e6ce1181e15c3295826d7c9904cba9ce303")
+		genesisHash = common.HexToHash("0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d")
 	}
 	if genesis != "" {
 		genesisHash = daoGenesisHash
 	}
 	config, err := core.GetChainConfig(db, genesisHash)
 	if err != nil {
-		t.Fatalf("failed to retrieve chain config: %v", err)
+		t.Errorf("failed to retrieve chain config: %v", err)
+		return // we want to return here, the other checks can't make it past this point (nil panic).
 	}
 	// Validate the DAO hard-fork block number against the expected value
 	if config.DAOForkBlock == nil {
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index fcdd08737..fc7685b77 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -750,9 +750,9 @@ func RegisterEthService(ctx *cli.Context, stack *node.Node, extra []byte) {
 
 	case ctx.GlobalBool(TestNetFlag.Name):
 		if !ctx.GlobalIsSet(NetworkIdFlag.Name) {
-			ethConf.NetworkId = 2
+			ethConf.NetworkId = 3
 		}
-		ethConf.Genesis = core.TestNetGenesisBlock()
+		ethConf.Genesis = core.DefaultTestnetGenesisBlock()
 
 	case ctx.GlobalBool(DevModeFlag.Name):
 		ethConf.Genesis = core.OlympicGenesisBlock()
@@ -845,34 +845,20 @@ func MakeChainConfigFromDb(ctx *cli.Context, db ethdb.Database) *params.ChainCon
 		(genesis.Hash() == params.TestNetGenesisHash && ctx.GlobalBool(TestNetFlag.Name))
 
 	if defaults {
-		// Homestead fork
 		if ctx.GlobalBool(TestNetFlag.Name) {
-			config.HomesteadBlock = params.TestNetHomesteadBlock
+			config = params.TestnetChainConfig
 		} else {
+			// Homestead fork
 			config.HomesteadBlock = params.MainNetHomesteadBlock
-		}
-		// DAO fork
-		if ctx.GlobalBool(TestNetFlag.Name) {
-			config.DAOForkBlock = params.TestNetDAOForkBlock
-		} else {
+			// DAO fork
 			config.DAOForkBlock = params.MainNetDAOForkBlock
-		}
-		config.DAOForkSupport = true
+			config.DAOForkSupport = true
 
-		// DoS reprice fork
-		if ctx.GlobalBool(TestNetFlag.Name) {
-			config.EIP150Block = params.TestNetHomesteadGasRepriceBlock
-			config.EIP150Hash = params.TestNetHomesteadGasRepriceHash
-		} else {
+			// DoS reprice fork
 			config.EIP150Block = params.MainNetHomesteadGasRepriceBlock
 			config.EIP150Hash = params.MainNetHomesteadGasRepriceHash
-		}
-		// DoS state cleanup fork
-		if ctx.GlobalBool(TestNetFlag.Name) {
-			config.EIP155Block = params.TestNetSpuriousDragon
-			config.EIP158Block = params.TestNetSpuriousDragon
-			config.ChainId = params.TestNetChainID
-		} else {
+
+			// DoS state cleanup fork
 			config.EIP155Block = params.MainNetSpuriousDragon
 			config.EIP158Block = params.MainNetSpuriousDragon
 			config.ChainId = params.MainNetChainID
-- 
cgit v1.2.3