Rebase & merge changes

cmd/gaia/cmd/gaiad/main.go

@@ -24,7 +24,6 @@ func main() {
 		PersistentPreRunE: server.PersistentPreRunEFn(ctx),
 	}
 
-	server.AddCommands(ctx, cdc, rootCmd, app.GaiaAppInit(), generateApp)
 	server.AddCommands(ctx, cdc, rootCmd, app.GaiaAppInit(), generateApp, exportApp)
 
 	// prepare and add flags

server/util.go

@@ -68,8 +68,7 @@ func PersistentPreRunEFn(context *Context) func(*cobra.Command, []string) error
 func AddCommands(
 	ctx *Context, cdc *wire.Codec,
 	rootCmd *cobra.Command, appInit AppInit,
-	appCreator AppCreator, appExporter AppExporter,
-	context *Context) {
+	appCreator AppCreator, appExporter AppExporter) {
 
 	rootCmd.PersistentFlags().String("log_level", ctx.Config.LogLevel, "Log level")
 
@@ -79,8 +78,8 @@ func AddCommands(
 		UnsafeResetAllCmd(ctx),
 		ShowNodeIDCmd(ctx),
 		ShowValidatorCmd(ctx),
-		ExportCmd(appExporter, context),
-		UnsafeResetAllCmd(context),
+		ExportCmd(appExporter, ctx),
+		UnsafeResetAllCmd(ctx),
 		version.VersionCmd,
 	)
 }