diff --git a/golang/cosmos/daemon/cmd/root.go b/golang/cosmos/daemon/cmd/root.go index e8649cecf91..851dc63ac26 100644 --- a/golang/cosmos/daemon/cmd/root.go +++ b/golang/cosmos/daemon/cmd/root.go @@ -15,7 +15,9 @@ import ( "github.com/cosmos/cosmos-sdk/client/debug" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/keys" + "github.com/cosmos/cosmos-sdk/client/pruning" "github.com/cosmos/cosmos-sdk/client/rpc" + "github.com/cosmos/cosmos-sdk/client/snapshot" "github.com/cosmos/cosmos-sdk/server" servertypes "github.com/cosmos/cosmos-sdk/server/types" "github.com/cosmos/cosmos-sdk/snapshots" @@ -126,9 +128,15 @@ func initRootCmd(sender Sender, rootCmd *cobra.Command, encodingConfig params.En cfg := sdk.GetConfig() cfg.Seal() + ac := appCreator{ + encCfg: encodingConfig, + sender: sender, + } + rootCmd.AddCommand( genutilcli.InitCmd(gaia.ModuleBasics, gaia.DefaultNodeHome), genutilcli.CollectGenTxsCmd(banktypes.GenesisBalancesIterator{}, gaia.DefaultNodeHome), + genutilcli.MigrateGenesisCmd(), genutilcli.GenTxCmd(gaia.ModuleBasics, encodingConfig.TxConfig, banktypes.GenesisBalancesIterator{}, gaia.DefaultNodeHome), genutilcli.ValidateGenesisCmd(gaia.ModuleBasics), AddGenesisAccountCmd(encodingConfig.Marshaler, gaia.DefaultNodeHome), @@ -136,12 +144,10 @@ func initRootCmd(sender Sender, rootCmd *cobra.Command, encodingConfig params.En testnetCmd(gaia.ModuleBasics, banktypes.GenesisBalancesIterator{}), debug.Cmd(), config.Cmd(), + pruning.Cmd(ac.newApp, gaia.DefaultNodeHome), + snapshot.Cmd(ac.newApp), ) - ac := appCreator{ - encCfg: encodingConfig, - sender: sender, - } server.AddCommands(rootCmd, gaia.DefaultNodeHome, ac.newApp, ac.appExport, addModuleInitFlags) for _, command := range rootCmd.Commands() { @@ -231,6 +237,7 @@ func txCommand() *cobra.Command { authcmd.GetBroadcastCommand(), authcmd.GetEncodeCommand(), authcmd.GetDecodeCommand(), + authcmd.GetAuxToFeeCommand(), flags.LineBreak, vestingcli.GetTxCmd(), ) diff --git a/golang/cosmos/x/swingset/keeper/swing_store_exports_handler.go b/golang/cosmos/x/swingset/keeper/swing_store_exports_handler.go index 2cc7e83f588..e1519f23132 100644 --- a/golang/cosmos/x/swingset/keeper/swing_store_exports_handler.go +++ b/golang/cosmos/x/swingset/keeper/swing_store_exports_handler.go @@ -751,11 +751,15 @@ func (exportsHandler SwingStoreExportsHandler) RestoreExport(provider SwingStore } defer os.RemoveAll(exportDir) + exportsHandler.logger.Info("creating swing-store restore", "exportDir", exportDir, "height", blockHeight) + err = WriteSwingStoreExportToDirectory(provider, exportDir) if err != nil { return err } + exportsHandler.logger.Info("restoring swing-store", "exportDir", exportDir, "height", blockHeight) + action := &swingStoreRestoreExportAction{ Type: swingStoreExportActionType, BlockHeight: blockHeight, @@ -772,7 +776,7 @@ func (exportsHandler SwingStoreExportsHandler) RestoreExport(provider SwingStore return err } - exportsHandler.logger.Info("restored swing-store export", "exportDir", exportDir, "height", blockHeight) + exportsHandler.logger.Info("restored swing-store", "exportDir", exportDir, "height", blockHeight) return nil }