From 9e22e912e3781556bf85364bb51099f369ad7632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Tue, 21 Jul 2020 15:53:47 +0300
Subject: [PATCH] cmd/utils: reuse existing genesis in persistent dev mode
---
cmd/utils/flags.go | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 30e4f783b..d5414b771 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -40,6 +40,7 @@ import (
"github.com/ethereum/go-ethereum/consensus/clique"
"github.com/ethereum/go-ethereum/consensus/ethash"
"github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/eth"
@@ -1627,7 +1628,17 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
}
log.Info("Using developer account", "address", developer.Address)
+ // Create a new developer genesis block or reuse existing one
cfg.Genesis = core.DeveloperGenesisBlock(uint64(ctx.GlobalInt(DeveloperPeriodFlag.Name)), developer.Address)
+ 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)
+ if rawdb.ReadCanonicalHash(chaindb, 0) != (common.Hash{}) {
+ cfg.Genesis = nil // fallback to db content
+ }
+ chaindb.Close()
+ }
if !ctx.GlobalIsSet(MinerGasPriceFlag.Name) && !ctx.GlobalIsSet(LegacyMinerGasPriceFlag.Name) {
cfg.Miner.GasPrice = big.NewInt(1)
}
--
GitLab