Merge pull request ethereum#3515 from bas-vk/exportropsten

core,cmd/utils: bugfix for ropsten dump imports
s7v7nislands · Jan 5, 2017 · bbce726 · bbce726
2 parents bbc4ea4 + a1798a8
commit bbce726
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -924,11 +924,19 @@ func MakeChain(ctx *cli.Context, stack *node.Node) (chain *core.BlockChain, chai
 	chainDb = MakeChainDatabase(ctx, stack)
 
 	if ctx.GlobalBool(OlympicFlag.Name) {
+		_, err := core.WriteOlympicGenesisBlock(chainDb)
+		if err != nil {
+			glog.Fatalln(err)
+		}
+	}
+
+	if ctx.GlobalBool(TestNetFlag.Name) {
 		_, err := core.WriteTestNetGenesisBlock(chainDb)
 		if err != nil {
 			glog.Fatalln(err)
 		}
 	}
+
 	chainConfig := MakeChainConfigFromDb(ctx, chainDb)
 
 	pow := pow.PoW(core.FakePow{})

diff --git a/core/default_genesis.go b/core/default_genesis.go
diff --git a/core/genesis.go b/core/genesis.go
@@ -172,7 +172,7 @@ func WriteDefaultGenesisBlock(chainDb ethdb.Database) (*types.Block, error) {
 	return WriteGenesisBlock(chainDb, strings.NewReader(DefaultGenesisBlock()))
 }
 
-// WriteTestNetGenesisBlock assembles the Morden test network genesis block and
+// WriteTestNetGenesisBlock assembles the test network genesis block and
 // writes it - along with all associated state - into a chain database.
 func WriteTestNetGenesisBlock(chainDb ethdb.Database) (*types.Block, error) {
 	return WriteGenesisBlock(chainDb, strings.NewReader(DefaultTestnetGenesisBlock()))
@@ -198,6 +198,8 @@ func DefaultGenesisBlock() string {
 	return string(blob)
 }
 
+// DefaultTestnetGenesisBlock assembles a JSON string representing the default Ethereum
+// test network genesis block.
 func DefaultTestnetGenesisBlock() string {
 	reader := bzip2.NewReader(base64.NewDecoder(base64.StdEncoding, strings.NewReader(defaultTestnetGenesisBlock)))
 	blob, err := ioutil.ReadAll(reader)