@agoric/cosmos 0.35.0-u21.0 → 0.35.0-u22.0

package/app/upgrade.go

@@ -1,33 +1,28 @@
 package gaia
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	swingsetkeeper "github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/keeper"
-	"github.com/cosmos/cosmos-sdk/baseapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
-	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
-	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
-	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
-	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
-	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
+	upgradetypes "cosmossdk.io/x/upgrade/types"
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
-	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
-	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	ibctmmigrations "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint/migrations"
+	icahosttypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/types"
+	ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
+	ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
+	ibcconnectiontypes "github.com/cosmos/ibc-go/v8/modules/core/03-connection/types"
+	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
+	ibctmmigrations "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint/migrations"
 )
 
 var upgradeNamesOfThisVersion = []string{
-	"agoric-upgrade-21",
-	"agoric-upgrade-21-a3p",
+	"agoric-upgrade-22",
 }
 
 // isUpgradeNameOfThisVersion returns whether the provided plan name is a
@@ -61,8 +56,7 @@ func isPrimaryUpgradeName(name string) bool {
 		return false
 	}
 	switch name {
-	case validUpgradeName("agoric-upgrade-21"),
-		validUpgradeName("agoric-upgrade-21-a3p"):
+	case validUpgradeName("agoric-upgrade-22"):
 		return true
 	default:
 		panic(fmt.Errorf("unexpected upgrade name %s", validUpgradeName(name)))
@@ -73,7 +67,11 @@ func isPrimaryUpgradeName(name string) bool {
 // upgrade plan name of this version have previously been applied.
 func isFirstTimeUpgradeOfThisVersion(app *GaiaApp, ctx sdk.Context) bool {
 	for _, name := range upgradeNamesOfThisVersion {
-		if app.UpgradeKeeper.GetDoneHeight(ctx, name) != 0 {
+		height, err := app.UpgradeKeeper.GetDoneHeight(ctx, name)
+		if err != nil {
+			panic(fmt.Errorf("error getting done height: %s", err))
+		}
+		if height != 0 {
 			return false
 		}
 	}
@@ -110,10 +108,17 @@ func buildProposalStepWithArgs(moduleName string, entrypoint string, args ...vm.
 
 func getVariantFromUpgradeName(upgradeName string) string {
 	switch upgradeName {
-	case "agoric-upgrade-21-a3p":
+	case "UNRELEASED_A3P_INTEGRATION":
 		return "A3P_INTEGRATION"
-	case "agoric-upgrade-21":
+	case "UNRELEASED_main":
 		return "MAINNET"
+	case "UNRELEASED_devnet":
+		return "DEVNET"
+	case "UNRELEASED_emerynet":
+		return "EMERYNET"
+	case "UNRELEASED_BASIC":
+		// Noupgrade for this version.
+		return ""
 	default:
 		return ""
 	}
@@ -142,26 +147,15 @@ func buildProposalStepFromScript(targetUpgrade string, builderScript string) (vm
 func (app *GaiaApp) RegisterUpgradeHandlers() {
 	// Set param key table for params module migration
 	for _, subspace := range app.ParamsKeeper.GetSubspaces() {
-		subspace := subspace
-
 		var keyTable paramstypes.KeyTable
 		switch subspace.Name() {
-		case authtypes.ModuleName:
-			keyTable = authtypes.ParamKeyTable() //nolint:staticcheck
-		case banktypes.ModuleName:
-			keyTable = banktypes.ParamKeyTable() //nolint:staticcheck
-		case stakingtypes.ModuleName:
-			keyTable = stakingtypes.ParamKeyTable() //nolint:staticcheck
-		case minttypes.ModuleName:
-			keyTable = minttypes.ParamKeyTable() //nolint:staticcheck
-		case distrtypes.ModuleName:
-			keyTable = distrtypes.ParamKeyTable() //nolint:staticcheck
-		case slashingtypes.ModuleName:
-			keyTable = slashingtypes.ParamKeyTable() //nolint:staticcheck
-		case govtypes.ModuleName:
-			keyTable = govv1.ParamKeyTable() //nolint:staticcheck
-		case crisistypes.ModuleName:
-			keyTable = crisistypes.ParamKeyTable() //nolint:staticcheck
+		case ibcexported.ModuleName:
+			keyTable = ibcclienttypes.ParamKeyTable() //nolint:staticcheck
+			keyTable.RegisterParamSet(&ibcconnectiontypes.Params{})
+		case icahosttypes.SubModuleName:
+			keyTable = icahosttypes.ParamKeyTable() //nolint:staticcheck
+		case ibctransfertypes.ModuleName:
+			keyTable = ibctransfertypes.ParamKeyTable() //nolint:staticcheck
 		default:
 			continue
 		}
@@ -171,31 +165,21 @@ func (app *GaiaApp) RegisterUpgradeHandlers() {
 		}
 	}
 
-	baseAppLegacySS := app.ParamsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramstypes.ConsensusParamsKeyTable())
-
 	for _, name := range upgradeNamesOfThisVersion {
 		app.UpgradeKeeper.SetUpgradeHandler(
 			name,
-			upgrade21Handler(app, name, baseAppLegacySS),
+			upgrade22Handler(app, name),
 		)
 	}
 }
 
-// upgrade21Handler performs standard upgrade actions plus custom actions for upgrade-21.
-func upgrade21Handler(app *GaiaApp, targetUpgrade string, baseAppLegacySS paramstypes.Subspace) func(sdk.Context, upgradetypes.Plan, module.VersionMap) (module.VersionMap, error) {
+// upgrade22Handler performs standard upgrade actions plus custom actions for upgrade-22.
+func upgrade22Handler(app *GaiaApp, targetUpgrade string) upgradetypes.UpgradeHandler {
 	_ = targetUpgrade
-	return func(ctx sdk.Context, plan upgradetypes.Plan, fromVm module.VersionMap) (module.VersionMap, error) {
+	return func(goCtx context.Context, plan upgradetypes.Plan, fromVm module.VersionMap) (module.VersionMap, error) {
+		ctx := sdk.UnwrapSDKContext(goCtx)
 		app.CheckControllerInited(false)
 
-		// prune expired tendermint consensus states to save storage space
-		_, err := ibctmmigrations.PruneExpiredConsensusStates(ctx, app.AppCodec(), app.IBCKeeper.ClientKeeper)
-		if err != nil {
-			return nil, err
-		}
-
-		// Migrate Tendermint consensus parameters from x/params module to a dedicated x/consensus module.
-		baseapp.MigrateParams(ctx, baseAppLegacySS, &app.ConsensusParamsKeeper)
-
 		CoreProposalSteps := []vm.CoreProposalStep{}
 
 		// These CoreProposalSteps are not idempotent and should only be executed
@@ -208,62 +192,33 @@ func upgrade21Handler(app *GaiaApp, targetUpgrade string, baseAppLegacySS params
 				return module.VersionMap{}, fmt.Errorf("cannot run %s as first upgrade", plan.Name)
 			}
 
-			// Each CoreProposalStep runs sequentially, and can be constructed from
-			// one or more modules executing in parallel within the step.
-			CoreProposalSteps = append(CoreProposalSteps,
-				// Register a new ZCF to be used for all future contract instances and upgrades
-				vm.CoreProposalStepForModules(
-					"@agoric/builders/scripts/vats/upgrade-zcf.js",
-				),
-				vm.CoreProposalStepForModules(
-					"@agoric/builders/scripts/vats/upgrade-provisionPool-to-BLD.js",
-				),
-				// because of #10794, we need to do at least a null upgrade of
-				// the walletFactory on every software upgrade
-				vm.CoreProposalStepForModules(
-					"@agoric/builders/scripts/smart-wallet/build-wallet-factory2-upgrade.js",
-				),
-			)
-
-			// Reserve contract needs to be upgraded for IST wind-down.
-			reserveUpgradeStep, err := buildProposalStepWithArgs(
-				"@agoric/builders/scripts/vats/upgrade-vats.js",
-				"upgradeZoeContractsProposalBuilder",
-				[]struct {
-					KitLookup  []string `json:"kitLookup"`
-					BundleName string   `json:"bundleName"`
-					Entrypoint string   `json:"entrypoint"`
-				}{
-					{
-						KitLookup:  []string{"reserveKit"},
-						BundleName: "reserve",
-						Entrypoint: "@agoric/inter-protocol/src/reserve/assetReserve.js",
-					},
-				},
-			)
+			// prune expired tendermint consensus states to save storage space.
+			_, err := ibctmmigrations.PruneExpiredConsensusStates(ctx, app.AppCodec(), app.IBCKeeper.ClientKeeper)
 			if err != nil {
-				return module.VersionMap{}, err
+				return nil, err
 			}
-			CoreProposalSteps = append(CoreProposalSteps,
-				reserveUpgradeStep,
-			)
 
 			// terminationTargets is a slice of "$boardID:$instanceKitLabel" strings.
 			var terminationTargets []string
-			switch getVariantFromUpgradeName(targetUpgrade) {
-			case "MAINNET":
-				// v111 "zcf-b1-4522b-stkATOM-USD_price_feed"
-				terminationTargets = []string{"board052184:stkATOM-USD_price_feed"}
-			case "A3P_INTEGRATION":
-				terminationTargets = []string{"board04091:stATOM-USD_price_feed"}
+			switch ctx.ChainID() {
+			case "agoric-3": // MAINNET
+				terminationTargets = []string{
+					// v29 "zcf-b1-4522b-ATOM-USD_price_feed"
+					"board02963:ATOM-USD_price_feed",
+					// v68 "zcf-b1-4522b-stATOM-USD_price_feed"
+					"board012113:stATOM-USD_price_feed",
+					// v98 "zcf-b1-4522b-stOSMO-USD_price_feed"
+					"board002164:stOSMO-USD_price_feed",
+					// v104 "zcf-b1-4522b-stTIA-USD_price_feed"
+					"board043173:stTIA-USD_price_feed",
+				}
 			}
 			if len(terminationTargets) > 0 {
-				args := []vm.Jsonable{terminationTargets}
 				terminationStep, err := buildProposalStepWithArgs(
 					"@agoric/vats/src/proposals/terminate-governed-instance.js",
 					// defaultProposalBuilder(powers, targets)
 					"defaultProposalBuilder",
-					args...,
+					terminationTargets,
 				)
 				if err != nil {
 					return module.VersionMap{}, err

package/app/upgrade_test.go

@@ -17,7 +17,7 @@ func TestBuildProposalSteps(t *testing.T) {
 			"buildProposalStepFromScript",
 			func() (vm.CoreProposalStep, error) {
 				return buildProposalStepFromScript(
-					"agoric-upgrade-21-a3p",
+					"UNRELEASED_A3P_INTEGRATION",
 					"@agoric/builders/scripts/vats/upgrade-orchestration.js",
 				)
 			},

package/cmd/agd/agvm.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"os/exec"
 
-	"github.com/cometbft/cometbft/libs/log"
+	"cosmossdk.io/log"
 )
 
 // NewVMCommand creates a new OS command to run the Agoric VM.  It sets up the

package/cmd/agd/main.go

@@ -10,7 +10,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/cometbft/cometbft/libs/log"
+	"cosmossdk.io/log"
 	"github.com/spf13/cast"
 
 	gaia "github.com/Agoric/agoric-sdk/golang/cosmos/app"

package/cmd/libdaemon/main.go

@@ -17,7 +17,7 @@ import (
 	"path/filepath"
 	"runtime/debug"
 
-	log "github.com/cometbft/cometbft/libs/log"
+	"cosmossdk.io/log"
 
 	gaia "github.com/Agoric/agoric-sdk/golang/cosmos/app"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/daemon"
@@ -38,7 +38,7 @@ type goReturn = struct {
 
 const SwingSetPort = 123
 
-var logger = log.NewTMLogger(log.NewSyncWriter(os.Stderr)).With("module", "cmd/libdaemon")
+var logger = log.NewLogger(os.Stderr).With("module", "cmd/libdaemon")
 
 var vmClientCodec *vm.ClientCodec
 var agdServer *vm.AgdServer

package/daemon/cmd/root.go

@@ -10,12 +10,15 @@ import (
 
 	serverconfig "github.com/cosmos/cosmos-sdk/server/config"
 
-	rosettaCmd "cosmossdk.io/tools/rosetta/cmd"
+	rosettaCmd "github.com/cosmos/rosetta/cmd"
 
-	dbm "github.com/cometbft/cometbft-db"
+	"cosmossdk.io/log"
+	"cosmossdk.io/simapp/params"
+	simdcmd "cosmossdk.io/simapp/simd/cmd"
+	confixcmd "cosmossdk.io/tools/confix/cmd"
 	tmcfg "github.com/cometbft/cometbft/config"
 	tmcli "github.com/cometbft/cometbft/libs/cli"
-	"github.com/cometbft/cometbft/libs/log"
+	dbm "github.com/cosmos/cosmos-db"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/config"
 	"github.com/cosmos/cosmos-sdk/client/debug"
@@ -24,23 +27,32 @@ import (
 	"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/codec/address"
 	"github.com/cosmos/cosmos-sdk/server"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
+	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
 	authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
 	vestingcli "github.com/cosmos/cosmos-sdk/x/auth/vesting/client/cli"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+	"github.com/cosmos/cosmos-sdk/x/crisis"
 	genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
+	"github.com/cosmos/cosmos-sdk/types/tx/signing"
+	"github.com/cosmos/cosmos-sdk/x/auth/tx"
+	authtxconfig "github.com/cosmos/cosmos-sdk/x/auth/tx/config"
+
 	gaia "github.com/Agoric/agoric-sdk/golang/cosmos/app"
-	"github.com/Agoric/agoric-sdk/golang/cosmos/app/params"
+	"github.com/Agoric/agoric-sdk/golang/cosmos/app/txconfig"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	swingset "github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset"
 	swingsetkeeper "github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/keeper"
+	rosetta "github.com/cosmos/rosetta"
 )
 
 var AppName = "agd"
@@ -53,6 +65,7 @@ type CustomAppConfig struct {
 	// Swingset must be named as expected by swingset.DefaultConfigTemplate
 	// and must use a mapstructure key matching swingset.ConfigPrefix.
 	Swingset swingset.SwingsetConfig `mapstructure:"swingset"`
+	Rosetta  rosetta.Config          `mapstructure:"rosetta"`
 }
 
 type cobraRunE func(cmd *cobra.Command, args []string) error
@@ -75,9 +88,27 @@ func appendToPreRunE(cmd *cobra.Command, fn cobraRunE) {
 // NewRootCmd creates a new root command for simd. It is called once in the
 // main function.
 func NewRootCmd(sender vm.Sender) (*cobra.Command, params.EncodingConfig) {
-	encodingConfig := gaia.MakeEncodingConfig()
+	// we "pre"-instantiate the application for getting the injected/configured encoding configuration
+	// note, this is not necessary when using app wiring, as depinject can be directly used (see root_v2.go)
+
+	appOpts := make(simtestutil.AppOptionsMap, 0)
+	tempApp := gaia.NewSimApp(
+		log.NewNopLogger(),
+		dbm.NewMemDB(),
+		nil,
+		false, // we don't want to run the app, just get the encoding config
+		appOpts,
+	)
+
+	encodingConfig := params.EncodingConfig{
+		Codec:             tempApp.AppCodec(),
+		InterfaceRegistry: tempApp.InterfaceRegistry(),
+		TxConfig:          tempApp.GetTxConfig(),
+		Amino:             tempApp.LegacyAmino(),
+	}
+
 	initClientCtx := client.Context{}.
-		WithCodec(encodingConfig.Marshaler).
+		WithCodec(encodingConfig.Codec).
 		WithInterfaceRegistry(encodingConfig.InterfaceRegistry).
 		WithTxConfig(encodingConfig.TxConfig).
 		WithLegacyAmino(encodingConfig.Amino).
@@ -94,6 +125,7 @@ func NewRootCmd(sender vm.Sender) (*cobra.Command, params.EncodingConfig) {
 			cmd.SetOut(cmd.OutOrStdout())
 			cmd.SetErr(cmd.ErrOrStderr())
 
+			initClientCtx = initClientCtx.WithCmdContext(cmd.Context())
 			initClientCtx, err := client.ReadPersistentCommandFlags(initClientCtx, cmd.Flags())
 			if err != nil {
 				return err
@@ -104,22 +136,51 @@ func NewRootCmd(sender vm.Sender) (*cobra.Command, params.EncodingConfig) {
 				return err
 			}
 
+			// This needs to go after ReadFromClientConfig, as that function
+			// sets the RPC client needed for SIGN_MODE_TEXTUAL. This sign mode
+			// is only available if the client is online.
+			if !initClientCtx.Offline {
+				enabledSignModes := append(tx.DefaultSignModes, signing.SignMode_SIGN_MODE_TEXTUAL)
+				txConfigOpts := tx.ConfigOptions{
+					EnabledSignModes:           enabledSignModes,
+					TextualCoinMetadataQueryFn: authtxconfig.NewGRPCCoinMetadataQueryFn(initClientCtx),
+				}
+				txConfig, err := txconfig.NewTxConfigWithOptionsWithCustomEncoders(
+					initClientCtx.Codec,
+					txConfigOpts,
+				)
+				if err != nil {
+					return err
+				}
+
+				initClientCtx = initClientCtx.WithTxConfig(txConfig)
+			}
+
 			if err := client.SetCmdClientContextHandler(initClientCtx, cmd); err != nil {
 				return err
 			}
 
 			customAppTemplate, customAppConfig := initAppConfig()
-			customTMConfig := initTendermintConfig()
-			return server.InterceptConfigsPreRunHandler(cmd, customAppTemplate, customAppConfig, customTMConfig)
+			customCMTConfig := initCometBFTConfig()
+
+			return server.InterceptConfigsPreRunHandler(cmd, customAppTemplate, customAppConfig, customCMTConfig)
 		},
 	}
 
-	initRootCmd(sender, rootCmd, encodingConfig)
+	initRootCmd(sender, rootCmd, encodingConfig, tempApp.BasicModuleManager)
+
+	// add keyring to autocli opts
+	autoCliOpts := tempApp.AutoCliOpts()
+	autoCliOpts.ClientCtx = initClientCtx
+
+	if err := autoCliOpts.EnhanceRootCommand(rootCmd); err != nil {
+		panic(err)
+	}
 
 	return rootCmd, encodingConfig
 }
 
-func initTendermintConfig() *tmcfg.Config {
+func initCometBFTConfig() *tmcfg.Config {
 	cfg := tmcfg.DefaultConfig()
 	// customize config here
 	return cfg
@@ -149,7 +210,7 @@ func initAppConfig() (string, interface{}) {
 	return customAppTemplate, customAppConfig
 }
 
-func initRootCmd(sender vm.Sender, rootCmd *cobra.Command, encodingConfig params.EncodingConfig) {
+func initRootCmd(sender vm.Sender, rootCmd *cobra.Command, encodingConfig params.EncodingConfig, basicManager module.BasicManager) {
 	cfg := sdk.GetConfig()
 	cfg.Seal()
 
@@ -160,12 +221,12 @@ func initRootCmd(sender vm.Sender, rootCmd *cobra.Command, encodingConfig params
 
 	genesisCmd := genutilcli.GenesisCoreCommand(
 		encodingConfig.TxConfig,
-		gaia.ModuleBasics,
+		basicManager,
 		gaia.DefaultNodeHome,
 	)
 
 	rootCmd.AddCommand(
-		genutilcli.InitCmd(gaia.ModuleBasics, gaia.DefaultNodeHome),
+		genutilcli.InitCmd(basicManager, gaia.DefaultNodeHome),
 		genesisCmd,
 	)
 	// Alias all the genesis commands to the top level as well.
@@ -174,14 +235,19 @@ func initRootCmd(sender vm.Sender, rootCmd *cobra.Command, encodingConfig params
 	)
 	rootCmd.AddCommand(
 		tmcli.NewCompletionCmd(rootCmd, true),
-		NewTestnetCmd(gaia.ModuleBasics, banktypes.GenesisBalancesIterator{}, AppName),
+		simdcmd.NewTestnetCmd(basicManager, banktypes.GenesisBalancesIterator{}, AppName),
 		debug.Cmd(),
-		config.Cmd(),
+		confixcmd.ConfigCommand(),
 		pruning.Cmd(ac.newSnapshotsApp, gaia.DefaultNodeHome),
 		snapshot.Cmd(ac.newSnapshotsApp),
 	)
 
-	server.AddCommands(rootCmd, gaia.DefaultNodeHome, ac.newApp, ac.appExport, addStartFlags)
+	server.AddCommandsWithStartCmdOptions(rootCmd, gaia.DefaultNodeHome, ac.newApp, ac.appExport, server.StartCmdOptions{
+		AddFlags: func(startCmd *cobra.Command) {
+			addStartFlags(startCmd)
+			crisis.AddModuleInitFlags(startCmd)
+		},
+	})
 
 	for _, command := range rootCmd.Commands() {
 		switch command.Name() {
@@ -219,14 +285,21 @@ func initRootCmd(sender vm.Sender, rootCmd *cobra.Command, encodingConfig params
 	}
 
 	// add keybase, auxiliary RPC, query, and tx child commands
+	qcmd := queryCommand()
+	tcmd := txCommand()
+
+	basicManager.AddQueryCommands(qcmd)
+	basicManager.AddTxCommands(tcmd)
 	rootCmd.AddCommand(
-		rpc.StatusCommand(),
-		queryCommand(),
-		txCommand(),
-		keys.Commands(gaia.DefaultNodeHome),
+		server.StatusCommand(),
+		qcmd,
+		tcmd,
+		keys.Commands(),
 	)
 	// add rosetta
-	rootCmd.AddCommand(rosettaCmd.RosettaCommand(encodingConfig.InterfaceRegistry, encodingConfig.Marshaler))
+	rootCmd.AddCommand(
+		rosettaCmd.RosettaCommand(encodingConfig.InterfaceRegistry, encodingConfig.Codec),
+	)
 }
 
 const (
@@ -266,16 +339,14 @@ func queryCommand() *cobra.Command {
 	}
 
 	cmd.AddCommand(
-		authcmd.GetAccountCmd(),
+		rpc.WaitTxCmd(),
 		rpc.ValidatorCommand(),
-		rpc.BlockCommand(),
+		server.QueryBlockCmd(),
 		authcmd.QueryTxsByEventsCmd(),
+		server.QueryBlocksCmd(),
 		authcmd.QueryTxCmd(),
 	)
 
-	gaia.ModuleBasics.AddQueryCommands(cmd)
-	cmd.PersistentFlags().String(flags.FlagChainID, "", "The network chain ID")
-
 	return cmd
 }
 
@@ -298,12 +369,10 @@ func txCommand() *cobra.Command {
 		authcmd.GetBroadcastCommand(),
 		authcmd.GetEncodeCommand(),
 		authcmd.GetDecodeCommand(),
-		authcmd.GetAuxToFeeCommand(),
 		flags.LineBreak,
-		vestingcli.GetTxCmd(),
+		vestingcli.GetTxCmd(address.NewBech32Codec(sdk.Bech32PrefixAccAddr)),
 	)
 
-	gaia.ModuleBasics.AddTxCommands(cmd)
 	cmd.PersistentFlags().String(flags.FlagChainID, "", "The network chain ID")
 
 	return cmd
@@ -506,7 +575,7 @@ func (ac appCreator) appExport(
 		appOpts,
 	)
 
-	if height != -1 {
+	if !loadLatest {
 		if err := gaiaApp.LoadHeight(height); err != nil {
 			return servertypes.ExportedApp{}, err
 		}

package/daemon/cmd/root_test.go

@@ -10,8 +10,8 @@ import (
 	"github.com/spf13/pflag"
 	"github.com/stretchr/testify/require"
 
-	dbm "github.com/cometbft/cometbft-db"
-	"github.com/cometbft/cometbft/libs/log"
+	"cosmossdk.io/log"
+	dbm "github.com/cosmos/cosmos-db"
 	"github.com/cosmos/cosmos-sdk/server"
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 	serverconfig "github.com/cosmos/cosmos-sdk/server/config"
@@ -39,10 +39,8 @@ func TestCLIFlags(t *testing.T) {
 	// handling should not be added in the Agoric app (most likely in root.go)
 	expectedFlagNames := map[string]interface{}{
 		"abci":                  "",
-		"abci-client-type":      "",
 		"address":               "",
 		"app-db-backend":        "",
-		"block_sync":            "",
 		"cpu-profile":           "",
 		"db_backend":            "",
 		"db_dir":                "",
@@ -53,7 +51,6 @@ func TestCLIFlags(t *testing.T) {
 		"home":                  "",
 		"iavl-cache-size":       "",
 		"iavl-disable-fastnode": "",
-		"iavl-lazy-loading":     "",
 		"index-events":          "",
 		"inter-block-cache":     "",
 		"inv-check-period":      "",
@@ -65,11 +62,13 @@ func TestCLIFlags(t *testing.T) {
 		"pruning":               "default",
 		"pruning-interval":      "",
 		"pruning-keep-recent":   "",
+		"query-gas-limit":       "",
+		"shutdown-grace":        "",
 		"trace":                 "",
 		"trace-store":           "",
 		"transport":             "",
 		"unsafe-skip-upgrades":  "",
-		"with-tendermint":       "",
+		"with-comet":            "",
 
 		"api.address":              "",
 		"api.enable":               "",
@@ -84,9 +83,7 @@ func TestCLIFlags(t *testing.T) {
 		"consensus.create_empty_blocks_interval": "",
 		"consensus.double_sign_check_height":     "",
 
-		"grpc-web.address":            "",
-		"grpc-web.enable":             "",
-		"grpc-web.enable-unsafe-cors": "",
+		"grpc-web.enable": "",
 
 		"grpc.address":           "",
 		"grpc.enable":            "",
@@ -109,27 +106,12 @@ func TestCLIFlags(t *testing.T) {
 		"rpc.pprof_laddr": "",
 		"rpc.unsafe":      "",
 
-		"rosetta.address":               "",
-		"rosetta.blockchain":            "",
-		"rosetta.denom-to-suggest":      "",
-		"rosetta.enable-fee-suggestion": "",
-		"rosetta.enable":                "",
-		"rosetta.gas-to-suggest":        "",
-		"rosetta.network":               "",
-		"rosetta.offline":               "",
-		"rosetta.retries":               "",
-
 		"state-sync.snapshot-interval":    "",
 		"state-sync.snapshot-keep-recent": "",
 
-		"store.streamers": "",
-
-		"streamers.file.fsync":              "",
-		"streamers.file.keys":               "",
-		"streamers.file.output-metadata":    "",
-		"streamers.file.prefix":             "",
-		"streamers.file.stop-node-on-error": "",
-		"streamers.file.write_dir":          "",
+		"streaming.abci.plugin":           "",
+		"streaming.abci.keys":             "",
+		"streaming.abci.stop-node-on-err": "",
 
 		"telemetry.enable-hostname-label":     "",
 		"telemetry.enable-hostname":           "",
@@ -138,6 +120,9 @@ func TestCLIFlags(t *testing.T) {
 		"telemetry.global-labels":             "",
 		"telemetry.prometheus-retention-time": "",
 		"telemetry.service-name":              "",
+		"telemetry.metrics-sink":              "",
+		"telemetry.datadog-hostname":          "",
+		"telemetry.statsd-addr":               "",
 	}
 	unknownFlagNames := []string{}
 	missingFlagNames := map[string]bool{}

package/daemon/main.go

@@ -7,7 +7,6 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/cosmos/cosmos-sdk/server"
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/agoric"
@@ -46,13 +45,7 @@ func RunWithController(sendToController vm.Sender) {
 
 	rootCmd, _ := cmd.NewRootCmd(sendToController)
 	if err := svrcmd.Execute(rootCmd, "", app.DefaultNodeHome); err != nil {
-		switch e := err.(type) {
-		case server.ErrorCode:
-			os.Exit(e.Code)
-
-		default:
-			fmt.Fprintf(os.Stderr, "Error: %v\n", e)
-			os.Exit(1)
-		}
+		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
+		os.Exit(1)
 	}
 }