Merge PR #5367: Regen network/skip upgrade

server/start.go

@@ -20,15 +20,16 @@ import (
 
 // Tendermint full-node start flags
 const (
-	flagWithTendermint  = "with-tendermint"
-	flagAddress         = "address"
-	flagTraceStore      = "trace-store"
-	flagPruning         = "pruning"
-	flagCPUProfile      = "cpu-profile"
-	FlagMinGasPrices    = "minimum-gas-prices"
-	FlagHaltHeight      = "halt-height"
-	FlagHaltTime        = "halt-time"
-	FlagInterBlockCache = "inter-block-cache"
+	flagWithTendermint     = "with-tendermint"
+	flagAddress            = "address"
+	flagTraceStore         = "trace-store"
+	flagPruning            = "pruning"
+	flagCPUProfile         = "cpu-profile"
+	FlagMinGasPrices       = "minimum-gas-prices"
+	FlagHaltHeight         = "halt-height"
+	FlagHaltTime           = "halt-time"
+	FlagInterBlockCache    = "inter-block-cache"
+	FlagUnsafeSkipUpgrades = "unsafe-skip-upgrades"
 )
 
 // StartCmd runs the service passed in, either stand-alone or in-process with
@@ -77,6 +78,7 @@ which accepts a path for the resulting pprof file.
 		FlagMinGasPrices, "",
 		"Minimum gas prices to accept for transactions; Any fee in a tx must meet this minimum (e.g. 0.01photino;0.0001stake)",
 	)
+	cmd.Flags().IntSlice(FlagUnsafeSkipUpgrades, []int{}, "Skip a set of upgrade heights to continue the old binary")
 	cmd.Flags().Uint64(FlagHaltHeight, 0, "Block height at which to gracefully halt the chain and shutdown the node")
 	cmd.Flags().Uint64(FlagHaltTime, 0, "Minimum block time (in Unix seconds) at which to gracefully halt the chain and shutdown the node")
 	cmd.Flags().Bool(FlagInterBlockCache, true, "Enable inter-block caching")
@@ -130,12 +132,13 @@ func startStandAlone(ctx *Context, appCreator AppCreator) error {
 func startInProcess(ctx *Context, appCreator AppCreator) (*node.Node, error) {
 	cfg := ctx.Config
 	home := cfg.RootDir
-	traceWriterFile := viper.GetString(flagTraceStore)
 
+	traceWriterFile := viper.GetString(flagTraceStore)
 	db, err := openDB(home)
 	if err != nil {
 		return nil, err
 	}
+
 	traceWriter, err := openTraceWriter(traceWriterFile)
 	if err != nil {
 		return nil, err