cmd/utils: don't crash on nonexistent datadir (#22738)

MariusVanDerWijden · web-flow · commit 8f94fc26e3a9 · 2021-05-03T15:29:05.000+03:00
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -1662,7 +1662,7 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
 		if ctx.GlobalIsSet(DataDirFlag.Name) {
 			// Check if we have an already initialized chain and fall back to
 			// that if so. Otherwise we need to generate a new genesis spec.
-			chaindb := MakeChainDatabase(ctx, stack, true)
+			chaindb := MakeChainDatabase(ctx, stack, false) // TODO (MariusVanDerWijden) make this read only
 			if rawdb.ReadCanonicalHash(chaindb, 0) != (common.Hash{}) {
 				cfg.Genesis = nil // fallback to db content
 			}

Original file line number	Diff line number	Diff line change
`@@ -1662,7 +1662,7 @@ func SetEthConfig(ctx cli.Context, stack node.Node, cfg *ethconfig.Config) {`
`1662`	`1662`	`if ctx.GlobalIsSet(DataDirFlag.Name) {`
`1663`	`1663`	`// Check if we have an already initialized chain and fall back to`
`1664`	`1664`	`// that if so. Otherwise we need to generate a new genesis spec.`
`1665`		`- chaindb := MakeChainDatabase(ctx, stack, true)`
	`1665`	`+ chaindb := MakeChainDatabase(ctx, stack, false) // TODO (MariusVanDerWijden) make this read only`
`1666`	`1666`	`if rawdb.ReadCanonicalHash(chaindb, 0) != (common.Hash{}) {`
`1667`	`1667`	`cfg.Genesis = nil // fallback to db content`
`1668`	`1668`	`}`