deps: bump SDK to 0.46-rc1

.github/workflows/build.yml

@@ -25,7 +25,7 @@ jobs:
  - name: Setup go
  uses: actions/setup-go@v1
  with:
- go-version: 1.15
+ go-version: 1.17
  env:
  GOOS: ${{ matrix.targetos }}
  GOARCH: ${{ matrix.arch }}

app/app.go

@@ -16,17 +16,16 @@ import (
 
  "github.com/cosmos/cosmos-sdk/baseapp"
  "github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
- "github.com/cosmos/cosmos-sdk/client/rpc"
  "github.com/cosmos/cosmos-sdk/codec"
  "github.com/cosmos/cosmos-sdk/server/api"
  "github.com/cosmos/cosmos-sdk/server/config"
  servertypes "github.com/cosmos/cosmos-sdk/server/types"
+ storetypes "github.com/cosmos/cosmos-sdk/store/types"
  sdk "github.com/cosmos/cosmos-sdk/types"
  "github.com/cosmos/cosmos-sdk/types/module"
  "github.com/cosmos/cosmos-sdk/version"
  "github.com/cosmos/cosmos-sdk/x/auth"
  "github.com/cosmos/cosmos-sdk/x/auth/ante"
- authrest "github.com/cosmos/cosmos-sdk/x/auth/client/rest"
  authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
  authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
  authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
@@ -57,6 +56,8 @@ import (
  govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
  govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
  govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
+ govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
+ govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
  "github.com/cosmos/cosmos-sdk/x/mint"
  mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper"
  minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
@@ -113,9 +114,12 @@ func getGovProposalHandlers() []govclient.ProposalHandler {
  govProposalHandlers = append(govProposalHandlers,
  paramsclient.ProposalHandler,
  distrclient.ProposalHandler,
- upgradeclient.ProposalHandler,
- upgradeclient.CancelProposalHandler,
- ibcclientclient.UpdateClientProposalHandler, ibcclientclient.UpgradeProposalHandler,
+ paramsclient.ProposalHandler,
+ distrclient.ProposalHandler,
+ upgradeclient.LegacyProposalHandler,
+ upgradeclient.LegacyCancelProposalHandler,
+ ibcclientclient.UpdateClientProposalHandler,
+ ibcclientclient.UpgradeProposalHandler,
  // this line is used by starport scaffolding # stargate/app/govProposalHandler
  )
 
@@ -137,7 +141,7 @@ var (
  staking.AppModuleBasic{},
  mint.AppModuleBasic{},
  distr.AppModuleBasic{},
- gov.NewAppModuleBasic(getGovProposalHandlers()...),
+ gov.NewAppModuleBasic(getGovProposalHandlers()),
  params.AppModuleBasic{},
  crisis.AppModuleBasic{},
  slashing.AppModuleBasic{},
@@ -197,9 +201,9 @@ type App struct {
  invCheckPeriod uint
 
  // keys to access the substores
- keys map[string]*sdk.KVStoreKey
- tkeys map[string]*sdk.TransientStoreKey
- memKeys map[string]*sdk.MemoryStoreKey
+ keys map[string]*storetypes.KVStoreKey
+ tkeys map[string]*storetypes.TransientStoreKey
+ memKeys map[string]*storetypes.MemoryStoreKey
 
  // keepers
  AccountKeeper authkeeper.AccountKeeper
@@ -280,7 +284,7 @@ func New(
  app.ParamsKeeper = initParamsKeeper(appCodec, cdc, keys[paramstypes.StoreKey], tkeys[paramstypes.TStoreKey])
 
  // set the BaseApp's parameter store
- bApp.SetParamStore(app.ParamsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramskeeper.ConsensusParamsKeyTable()))
+ bApp.SetParamStore(app.ParamsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramstypes.ConsensusParamsKeyTable()))
 
  // add capability keeper and ScopeToModule for ibc module
  app.CapabilityKeeper = capabilitykeeper.NewKeeper(appCodec, keys[capabilitytypes.StoreKey], memKeys[capabilitytypes.MemStoreKey])
@@ -297,7 +301,7 @@ func New(
 
  // add keepers
  app.AccountKeeper = authkeeper.NewAccountKeeper(
- appCodec, keys[authtypes.StoreKey], app.GetSubspace(authtypes.ModuleName), authtypes.ProtoBaseAccount, maccPerms,
+ appCodec, keys[authtypes.StoreKey], app.GetSubspace(authtypes.ModuleName), authtypes.ProtoBaseAccount, maccPerms, sdk.Bech32MainPrefix,
  )
  app.BankKeeper = bankkeeper.NewBaseKeeper(
  appCodec, keys[banktypes.StoreKey], app.AccountKeeper, app.GetSubspace(banktypes.ModuleName), app.BlockedAddrs(),
@@ -311,7 +315,7 @@ func New(
  )
  app.DistrKeeper = distrkeeper.NewKeeper(
  appCodec, keys[distrtypes.StoreKey], app.GetSubspace(distrtypes.ModuleName), app.AccountKeeper, app.BankKeeper,
- &stakingKeeper, authtypes.FeeCollectorName, app.ModuleAccountAddrs(),
+ &stakingKeeper, authtypes.FeeCollectorName,
  )
  app.SlashingKeeper = slashingkeeper.NewKeeper(
  appCodec, keys[slashingtypes.StoreKey], &stakingKeeper, app.GetSubspace(slashingtypes.ModuleName),
@@ -321,7 +325,7 @@ func New(
  )
 
  app.FeeGrantKeeper = feegrantkeeper.NewKeeper(appCodec, keys[feegrant.StoreKey], app.AccountKeeper)
- app.UpgradeKeeper = upgradekeeper.NewKeeper(skipUpgradeHeights, keys[upgradetypes.StoreKey], appCodec, homePath, app.BaseApp)
+ app.UpgradeKeeper = upgradekeeper.NewKeeper(skipUpgradeHeights, keys[upgradetypes.StoreKey], appCodec, homePath, app.BaseApp, authtypes.NewModuleAddress(govtypes.ModuleName).String())
 
  // register the staking hooks
  // NOTE: stakingKeeper above is passed by reference, so that it will contain these hooks
@@ -337,8 +341,8 @@ func New(
  )
 
  // register the proposal types
- govRouter := govtypes.NewRouter()
- govRouter.AddRoute(govtypes.RouterKey, govtypes.ProposalHandler).
+ govRouter := govv1beta1.NewRouter()
+ govRouter.AddRoute(govtypes.RouterKey, govv1beta1.ProposalHandler).
  AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)).
  AddRoute(distrtypes.RouterKey, distr.NewCommunityPoolSpendProposalHandler(app.DistrKeeper)).
  AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper)).
@@ -389,10 +393,10 @@ func New(
  app.EvidenceKeeper = *evidenceKeeper
 
  // this line is used by starport scaffolding # stargate/app/keeperDefinition
-
+ govConfig := govtypes.DefaultConfig()
  app.GovKeeper = govkeeper.NewKeeper(
  appCodec, keys[govtypes.StoreKey], app.GetSubspace(govtypes.ModuleName), app.AccountKeeper, app.BankKeeper,
- &stakingKeeper, govRouter,
+ &stakingKeeper, govRouter, app.MsgServiceRouter(), govConfig,
  )
 
  /**** Module Options ****/
@@ -416,7 +420,7 @@ func New(
  crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants),
  feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry),
  gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper),
- mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper),
+ mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil),
  slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
  distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
  staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper),
@@ -577,21 +581,21 @@ func (app *App) InterfaceRegistry() types.InterfaceRegistry {
 // GetKey returns the KVStoreKey for the provided store key.
 //
 // NOTE: This is solely to be used for testing purposes.
-func (app *App) GetKey(storeKey string) *sdk.KVStoreKey {
+func (app *App) GetKey(storeKey string) *storetypes.KVStoreKey {
  return app.keys[storeKey]
 }
 
 // GetTKey returns the TransientStoreKey for the provided store key.
 //
 // NOTE: This is solely to be used for testing purposes.
-func (app *App) GetTKey(storeKey string) *sdk.TransientStoreKey {
+func (app *App) GetTKey(storeKey string) *storetypes.TransientStoreKey {
  return app.tkeys[storeKey]
 }
 
 // GetMemKey returns the MemStoreKey for the provided mem key.
 //
 // NOTE: This is solely used for testing purposes.
-func (app *App) GetMemKey(storeKey string) *sdk.MemoryStoreKey {
+func (app *App) GetMemKey(storeKey string) *storetypes.MemoryStoreKey {
  return app.memKeys[storeKey]
 }
 
@@ -607,16 +611,13 @@ func (app *App) GetSubspace(moduleName string) paramstypes.Subspace {
 // API server.
 func (app *App) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.APIConfig) {
  clientCtx := apiSvr.ClientCtx
- rpc.RegisterRoutes(clientCtx, apiSvr.Router)
- // Register legacy tx routes.
- authrest.RegisterTxRoutes(clientCtx, apiSvr.Router)
+
  // Register new tx routes from grpc-gateway.
  authtx.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter)
  // Register new tendermint queries routes from grpc-gateway.
  tmservice.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter)
 
- // Register legacy and grpc-gateway routes for all modules.
- ModuleBasics.RegisterRESTRoutes(clientCtx, apiSvr.Router)
+ // Register grpc-gateway routes for all modules.
  ModuleBasics.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter)
 }
 
@@ -627,7 +628,7 @@ func (app *App) RegisterTxService(clientCtx client.Context) {
 
 // RegisterTendermintService implements the Application.RegisterTendermintService method.
 func (app *App) RegisterTendermintService(clientCtx client.Context) {
- tmservice.RegisterTendermintService(app.BaseApp.GRPCQueryRouter(), clientCtx, app.interfaceRegistry)
+ tmservice.RegisterTendermintService(clientCtx, app.BaseApp.GRPCQueryRouter(), app.interfaceRegistry, app.Query)
 }
 
 // GetMaccPerms returns a copy of the module account permissions
@@ -640,7 +641,7 @@ func GetMaccPerms() map[string][]string {
 }
 
 // initParamsKeeper init params keeper and its subspaces
-func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino, key, tkey sdk.StoreKey) paramskeeper.Keeper {
+func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino, key, tkey storetypes.StoreKey) paramskeeper.Keeper {
  paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey)
 
  paramsKeeper.Subspace(authtypes.ModuleName)
@@ -649,7 +650,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
  paramsKeeper.Subspace(minttypes.ModuleName)
  paramsKeeper.Subspace(distrtypes.ModuleName)
  paramsKeeper.Subspace(slashingtypes.ModuleName)
- paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govtypes.ParamKeyTable())
+ paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govv1.ParamKeyTable())
  paramsKeeper.Subspace(crisistypes.ModuleName)
  paramsKeeper.Subspace(ibctransfertypes.ModuleName)
  paramsKeeper.Subspace(ibchost.ModuleName)

cmd/icad/cmd/genaccounts.go

@@ -40,7 +40,7 @@ contain valid denominations. Accounts may optionally be supplied with vesting pa
  Args: cobra.ExactArgs(2),
  RunE: func(cmd *cobra.Command, args []string) error {
  clientCtx := client.GetClientContextFromCmd(cmd)
- depCdc := clientCtx.JSONCodec
+ depCdc := clientCtx.Codec
  cdc := depCdc.(codec.Codec)
 
  serverCtx := server.GetServerContextFromCmd(cmd)
@@ -62,7 +62,7 @@ contain valid denominations. Accounts may optionally be supplied with vesting pa
  }
 
  // attempt to lookup address from Keybase if no address was provided
- kb, err := keyring.New(sdk.KeyringServiceName(), keyringBackend, clientCtx.HomeDir, inBuf)
+ kb, err := keyring.New(sdk.KeyringServiceName(), keyringBackend, clientCtx.HomeDir, inBuf, clientCtx.Codec)
  if err != nil {
  return err
  }
@@ -72,7 +72,10 @@ contain valid denominations. Accounts may optionally be supplied with vesting pa
  return fmt.Errorf("failed to get address from Keybase: %w", err)
  }
 
- addr = info.GetAddress()
+ addr, err = info.GetAddress()
+ if err != nil {
+ return fmt.Errorf("failed to get address of the record: %w", err)
+ }
  }
 
  vestingStart, err := cmd.Flags().GetInt64(flagVestingStart)

cmd/icad/cmd/root.go

@@ -26,6 +26,7 @@ import (
  "github.com/cosmos/cosmos-sdk/server"
  serverconfig "github.com/cosmos/cosmos-sdk/server/config"
  servertypes "github.com/cosmos/cosmos-sdk/server/types"
+ snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types"
  "github.com/cosmos/cosmos-sdk/store"
  sdk "github.com/cosmos/cosmos-sdk/types"
  authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
@@ -35,6 +36,7 @@ import (
  "github.com/cosmos/cosmos-sdk/x/crisis"
  genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
  "github.com/cosmos/interchain-accounts/app"
+ tmcfg "github.com/tendermint/tendermint/config"
  // this line is used by starport scaffolding # stargate/root/import
 )
 
@@ -81,8 +83,9 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
  }
 
  customAppTemplate, customAppConfig := initAppConfig()
+ customTMConfig := initTendermintConfig()
 
- return server.InterceptConfigsPreRunHandler(cmd, customAppTemplate, customAppConfig)
+ return server.InterceptConfigsPreRunHandler(cmd, customAppTemplate, customAppConfig, customTMConfig)
  },
  }
 
@@ -151,6 +154,16 @@ lru_size = 0`
  return customAppTemplate, customAppConfig
 }
 
+func initTendermintConfig() *tmcfg.Config {
+ cfg := tmcfg.DefaultConfig()
+
+ // these values put a higher strain on node memory
+ // cfg.P2P.MaxNumInboundPeers = 100
+ // cfg.P2P.MaxNumOutboundPeers = 40
+
+ return cfg
+}
+
 func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) {
  cfg := sdk.GetConfig()
  cfg.Seal()
@@ -268,6 +281,11 @@ func (a appCreator) newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, a
  panic(err)
  }
 
+ snapshotOptions := snapshottypes.NewSnapshotOptions(
+ cast.ToUint64(appOpts.Get(server.FlagStateSyncSnapshotInterval)),
+ cast.ToUint32(appOpts.Get(server.FlagStateSyncSnapshotKeepRecent)),
+ )
+
  return app.New(
  logger, db, traceStore, true, skipUpgradeHeights,
  cast.ToString(appOpts.Get(flags.FlagHome)),
@@ -283,9 +301,7 @@ func (a appCreator) newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, a
  baseapp.SetInterBlockCache(cache),
  baseapp.SetTrace(cast.ToBool(appOpts.Get(server.FlagTrace))),
  baseapp.SetIndexEvents(cast.ToStringSlice(appOpts.Get(server.FlagIndexEvents))),
- baseapp.SetSnapshotStore(snapshotStore),
- baseapp.SetSnapshotInterval(cast.ToUint64(appOpts.Get(server.FlagStateSyncSnapshotInterval))),
- baseapp.SetSnapshotKeepRecent(cast.ToUint32(appOpts.Get(server.FlagStateSyncSnapshotKeepRecent))),
+ baseapp.SetSnapshot(snapshotStore, snapshotOptions),
  )
 }
 

cmd/icad/main.go

@@ -3,14 +3,22 @@ package main
 import (
  "os"
 
+ "github.com/cosmos/cosmos-sdk/server"
  svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
  "github.com/cosmos/interchain-accounts/app"
  "github.com/cosmos/interchain-accounts/cmd/icad/cmd"
 )
 
 func main() {
  rootCmd, _ := cmd.NewRootCmd()
- if err := svrcmd.Execute(rootCmd, app.DefaultNodeHome); err != nil {
- os.Exit(1)
+
+ if err := svrcmd.Execute(rootCmd, "icad", app.DefaultNodeHome); err != nil {
+ switch e := err.(type) {
+ case server.ErrorCode:
+ os.Exit(e.Code)
+
+ default:
+ os.Exit(1)
+ }
  }
 }