build(deps): upgrade to Cosmos v0.44.0

.golangci.yml

@@ -51,10 +51,21 @@ issues:
  - text: "ST1003:"
  linters:
  - stylecheck
- # TODO: Remove this when we are ready to drop support for Legacy Amino
+ # TODO: Remove these when we are ready to drop support for Legacy Amino
  - text: "SA1019: codec.LegacyAmino is deprecated"
  linters:
  - staticcheck
+ - text: "SA1019: legacybech32.UnmarshalPubKey is deprecated"
+ linters:
+ - staticcheck
+ - text: "SA1019: package github.com/cosmos/cosmos-sdk/types/bech32/legacybech32 is deprecated"
+ linters:
+ - staticcheck
+
+ # TODO: Remove this once we have implemented expected_keepers for all the modules
+ - text: "`bk` can be `github.com/cosmos/cosmos-sdk/x/simulation.BankKeeper`"
+ linters:
+ - interfacer
  max-issues-per-linter: 10000
  max-same-issues: 10000
 

Makefile

@@ -313,12 +313,12 @@ proto-lint:
 proto-check-breaking:
  @$(DOCKER_BUF) breaking --against $(HTTPS_GIT)#branch=master
 
-TM_URL = https://raw.githubusercontent.com/tendermint/tendermint/v0.34.11/proto/tendermint
+TM_URL = https://raw.githubusercontent.com/tendermint/tendermint/v0.34.12/proto/tendermint
 GOGO_PROTO_URL = https://raw.githubusercontent.com/regen-network/protobuf/cosmos
-COSMOS_URL = https://raw.githubusercontent.com/cosmos/cosmos-sdk/v0.42.6/proto/cosmos
+COSMOS_URL = https://raw.githubusercontent.com/cosmos/cosmos-sdk/v0.43.0/proto/cosmos
 COSMOS_PROTO_URL = https://raw.githubusercontent.com/regen-network/cosmos-proto/master
 CONFIO_URL = https://raw.githubusercontent.com/confio/ics23/v0.6.3
-IBC_URL = https://raw.githubusercontent.com/cosmos/cosmos-sdk/v0.42.4/proto/ibc
+IBC_URL = https://raw.githubusercontent.com/cosmos/ibc-go/v1.0.1/proto/ibc
 
 TM_CRYPTO_TYPES = third_party/proto/tendermint/crypto
 TM_ABCI_TYPES = third_party/proto/tendermint/abci
@@ -337,6 +337,9 @@ proto-update-deps:
  @mkdir -p $(COSMOS_TYPES)/base/query/v1beta1
  @curl -sSL $(COSMOS_URL)/base/query/v1beta1/pagination.proto > $(COSMOS_TYPES)/base/query/v1beta1/pagination.proto
 
+ @mkdir -p $(COSMOS_TYPES)/upgrade/v1beta1
+ @curl -sSL $(COSMOS_URL)/upgrade/v1beta1/upgrade.proto > $(COSMOS_TYPES)/upgrade/v1beta1/upgrade.proto
+
  @mkdir -p $(GOGO_PROTO_TYPES)
  @curl -sSL $(GOGO_PROTO_URL)/gogoproto/gogo.proto > $(GOGO_PROTO_TYPES)/gogo.proto
 

app/desmos/cmd/root.go

@@ -5,6 +5,8 @@ import (
  "os"
  "path/filepath"
 
+ serverconfig "github.com/cosmos/cosmos-sdk/server/config"
+
  chainlinktypes "github.com/desmos-labs/desmos/app/desmos/cmd/chainlink/types"
 
  "github.com/desmos-labs/desmos/app/desmos/cmd/chainlink"
@@ -37,7 +39,6 @@ import (
  simcmd "github.com/cosmos/cosmos-sdk/simapp/simd/cmd"
  "github.com/cosmos/cosmos-sdk/store"
  sdk "github.com/cosmos/cosmos-sdk/types"
- authclient "github.com/cosmos/cosmos-sdk/x/auth/client"
  authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
  authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
  banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
@@ -49,14 +50,9 @@ import (
 // NewRootCmd creates a new root command for desmos. It is called once in the
 // main function.
 func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
- // Read in the configuration file for the sdk
- cfg := sdk.GetConfig()
- app.SetupConfig(cfg)
- cfg.Seal()
-
  encodingConfig := app.MakeTestEncodingConfig()
  initClientCtx := client.Context{}.
- WithJSONMarshaler(encodingConfig.Marshaler).
+ WithCodec(encodingConfig.Marshaler).
  WithInterfaceRegistry(encodingConfig.InterfaceRegistry).
  WithTxConfig(encodingConfig.TxConfig).
  WithLegacyAmino(encodingConfig.Amino).
@@ -70,6 +66,10 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
  Use: "desmos",
  Short: "Desmos application",
  PersistentPreRunE: func(cmd *cobra.Command, _ []string) error {
+ // set the default command outputs
+ cmd.SetOut(cmd.OutOrStdout())
+ cmd.SetErr(cmd.ErrOrStderr())
+
  initClientCtx = client.ReadHomeFlag(initClientCtx, cmd)
 
  initClientCtx, err := config.ReadFromClientConfig(initClientCtx)
@@ -81,7 +81,8 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
  return err
  }
 
- return server.InterceptConfigsPreRunHandler(cmd)
+ customAppTemplate, customAppConfig := initAppConfig()
+ return server.InterceptConfigsPreRunHandler(cmd, customAppTemplate, customAppConfig)
  },
  }
 
@@ -90,8 +91,67 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
  return rootCmd, encodingConfig
 }
 
+// initAppConfig helps to override default appConfig template and configs.
+// return "", nil if no custom configuration is required for the application.
+func initAppConfig() (string, interface{}) {
+ // The following code snippet is just for reference.
+
+ // WASMConfig defines configuration for the wasm module.
+ type WASMConfig struct {
+ // This is the maximum sdk gas (wasm and storage) that we allow for any x/wasm "smart" queries
+ QueryGasLimit uint64 `mapstructure:"query_gas_limit"`
+
+ // Address defines the gRPC-web server to listen on
+ LruSize uint64 `mapstructure:"lru_size"`
+ }
+
+ type CustomAppConfig struct {
+ serverconfig.Config
+
+ WASM WASMConfig `mapstructure:"wasm"`
+ }
+
+ // Optionally allow the chain developer to overwrite the SDK's default
+ // server config.
+ srvCfg := serverconfig.DefaultConfig()
+ // The SDK's default minimum gas price is set to "" (empty value) inside
+ // app.toml. If left empty by validators, the node will halt on startup.
+ // However, the chain developer can set a default app.toml value for their
+ // validators here.
+ //
+ // In summary:
+ // - if you leave srvCfg.MinGasPrices = "", all validators MUST tweak their
+ // own app.toml config,
+ // - if you set srvCfg.MinGasPrices non-empty, validators CAN tweak their
+ // own app.toml to override, or use this default value.
+ //
+ // In simapp, we set the min gas prices to 0.
+ srvCfg.MinGasPrices = "0stake"
+
+ customAppConfig := CustomAppConfig{
+ Config: *srvCfg,
+ WASM: WASMConfig{
+ LruSize: 1,
+ QueryGasLimit: 300000,
+ },
+ }
+
+ customAppTemplate := serverconfig.DefaultConfigTemplate + `
+[wasm]
+# This is the maximum sdk gas (wasm and storage) that we allow for any x/wasm "smart" queries
+query_gas_limit = 300000
+# This is the number of wasm vm instances we keep cached in memory for speed-up
+# Warning: this is currently unstable and may lead to crashes, best to keep for 0 unless testing locally
+lru_size = 0`
+
+ return customAppTemplate, customAppConfig
+}
+
 func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) {
- authclient.Codec = encodingConfig.Marshaler
+ // Read in the configuration file for the sdk
+ cfg := sdk.GetConfig()
+ app.SetupConfig(cfg)
+ cfg.Seal()
 
  rootCmd.AddCommand(
  initCmd(app.ModuleBasics, app.DefaultNodeHome),

app/desmos/cmd/sign/sign_test.go

@@ -48,9 +48,9 @@ func TestGetSignCmd(t *testing.T) {
  require.NoError(t, err)
 
  expected := cmd.SignatureData{
- Address: "d133e902b523aa568f0086609c958c83ac0c4fc1",
- PubKey: "03f3fa3e31c3c2833c92b83f26ef29397991acfeb0fbaad8864d047cdd6a0cc155",
- Signature: "5d492db8df4a6f912188610395574d36cdbaadec00e64bc6341722e81fe38cae7d8b7e6d2896f1fba03e45dd2a9534cab205347f00e177de6796a46811cfa35f",
+ Address: "8cbc1d27bd2c8675935f6018f08fed08c7add0d9",
+ PubKey: "0235088ee6a12267eda6410028706c4ec192b1ce04a298def8dad1c146257012eb",
+ Signature: "39cc04208d25e445a46bd6853cfa7b1b295961bc43d6facf387f4bd9c0c4647163ef2e296f49e307cdb657a7acdf4e2ee56e9bbf1f9723113385f4dd3601061e",
  Value: "This is my signed value",
  }
  require.Equal(t, expected, data)

app/desmos/cmd/testnet.go

@@ -202,8 +202,8 @@ func InitTestnet(
  return err
  }
 
- accTokens := sdk.TokensFromConsensusPower(1000)
- accStakingTokens := sdk.TokensFromConsensusPower(500)
+ accTokens := sdk.TokensFromConsensusPower(1000, sdk.DefaultPowerReduction)
+ accStakingTokens := sdk.TokensFromConsensusPower(500, sdk.DefaultPowerReduction)
  coins := sdk.Coins{
  sdk.NewCoin(fmt.Sprintf("%stoken", nodeDirName), accTokens),
  sdk.NewCoin(gentxCoinDenom, accStakingTokens),
@@ -212,7 +212,7 @@ func InitTestnet(
  genBalances = append(genBalances, banktypes.Balance{Address: addr.String(), Coins: coins.Sort()})
  genAccounts = append(genAccounts, authtypes.NewBaseAccount(addr, nil, 0, 0))
 
- valTokens := sdk.TokensFromConsensusPower(100)
+ valTokens := sdk.TokensFromConsensusPower(100, sdk.DefaultPowerReduction)
  createValMsg, err := stakingtypes.NewMsgCreateValidator(
  sdk.ValAddress(addr),
  valPubKeys[i],
@@ -277,29 +277,29 @@ func initGenFiles(
  genFiles []string, numValidators int,
 ) error {
 
- appGenState := mbm.DefaultGenesis(clientCtx.JSONMarshaler)
+ appGenState := mbm.DefaultGenesis(clientCtx.Codec)
 
  // set the accounts in the genesis state
  var authGenState authtypes.GenesisState
- clientCtx.JSONMarshaler.MustUnmarshalJSON(appGenState[authtypes.ModuleName], &authGenState)
+ clientCtx.Codec.MustUnmarshalJSON(appGenState[authtypes.ModuleName], &authGenState)
 
  accounts, err := authtypes.PackAccounts(genAccounts)
  if err != nil {
  return err
  }
 
  authGenState.Accounts = accounts
- appGenState[authtypes.ModuleName] = clientCtx.JSONMarshaler.MustMarshalJSON(&authGenState)
+ appGenState[authtypes.ModuleName] = clientCtx.Codec.MustMarshalJSON(&authGenState)
 
  // set the balances in the genesis state
  var bankGenState banktypes.GenesisState
- clientCtx.JSONMarshaler.MustUnmarshalJSON(appGenState[banktypes.ModuleName], &bankGenState)
+ clientCtx.Codec.MustUnmarshalJSON(appGenState[banktypes.ModuleName], &bankGenState)
 
  bankGenState.Balances = banktypes.SanitizeGenesisBalances(genBalances)
  for _, bal := range bankGenState.Balances {
  bankGenState.Supply = bankGenState.Supply.Add(bal.Coins...)
  }
- appGenState[banktypes.ModuleName] = clientCtx.JSONMarshaler.MustMarshalJSON(&bankGenState)
+ appGenState[banktypes.ModuleName] = clientCtx.Codec.MustMarshalJSON(&bankGenState)
 
  appGenStateJSON, err := json.MarshalIndent(appGenState, "", " ")
  if err != nil {
@@ -346,7 +346,7 @@ func collectGenFiles(
  return err
  }
 
- nodeAppState, err := genutil.GenAppStateFromConfig(clientCtx.JSONMarshaler, clientCtx.TxConfig, nodeConfig, initCfg, *genDoc, genBalIterator)
+ nodeAppState, err := genutil.GenAppStateFromConfig(clientCtx.Codec, clientCtx.TxConfig, nodeConfig, initCfg, *genDoc, genBalIterator)
  if err != nil {
  return err
  }

app/export.go

@@ -172,7 +172,7 @@ func (app *DesmosApp) prepForZeroHeightGenesis(ctx sdk.Context, jailWhiteList []
  counter := int16(0)
 
  for ; iter.Valid(); iter.Next() {
- addr := sdk.ValAddress(iter.Key()[1:])
+ addr := sdk.ValAddress(stakingtypes.AddressFromValidatorsKey(iter.Key()))
  validator, found := app.StakingKeeper.GetValidator(ctx, addr)
  if !found {
  panic("expected validator, not found")

app/genesis.go

@@ -4,7 +4,7 @@ import (
  "encoding/json"
 )
 
-// The genesis state of the blockchain is represented here as a map of raw json
+// GenesisState represents the genesis state of the blockchain as a map of raw json
 // messages key'd by a identifier string.
 // The identifier is used to determine which module genesis information belongs
 // to so it may be appropriately routed during init chain.

app/sim_test.go

@@ -30,8 +30,8 @@ import (
  dbm "github.com/tendermint/tm-db"
 
  capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
- ibctransfertypes "github.com/cosmos/cosmos-sdk/x/ibc/applications/transfer/types"
- ibchost "github.com/cosmos/cosmos-sdk/x/ibc/core/24-host"
+ ibctransfertypes "github.com/cosmos/ibc-go/modules/apps/transfer/types"
+ ibchost "github.com/cosmos/ibc-go/modules/core/24-host"
 
  "github.com/cosmos/cosmos-sdk/baseapp"
  "github.com/cosmos/cosmos-sdk/simapp"

go.mod

@@ -3,9 +3,10 @@ module github.com/desmos-labs/desmos
 go 1.15
 
 require (
- github.com/armon/go-metrics v0.3.8
- github.com/cosmos/cosmos-sdk v0.42.4
+ github.com/armon/go-metrics v0.3.9
+ github.com/cosmos/cosmos-sdk v0.43.0
  github.com/cosmos/go-bip39 v1.0.0
+ github.com/cosmos/ibc-go v1.0.1
  github.com/desmos-labs/Go-Emoji-Utils v1.1.1-0.20210623064146-c30bc8196d0f
  github.com/ghodss/yaml v1.0.0
  github.com/gogo/protobuf v1.3.3
@@ -19,19 +20,19 @@ require (
  github.com/spf13/cast v1.3.1
  github.com/spf13/cobra v1.1.3
  github.com/stretchr/testify v1.7.0
- github.com/tendermint/tendermint v0.34.11
+ github.com/tendermint/tendermint v0.34.12
  github.com/tendermint/tm-db v0.6.4
- google.golang.org/genproto v0.0.0-20210510173355-fb37daa5cd7a
- google.golang.org/grpc v1.37.0
+ google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c
+ google.golang.org/grpc v1.38.0
  google.golang.org/protobuf v1.26.0
 )
 
 replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 
-replace github.com/cosmos/cosmos-sdk => github.com/desmos-labs/cosmos-sdk v0.42.5-0.20210826081936-864fc99bab62
+replace github.com/cosmos/cosmos-sdk => github.com/desmos-labs/cosmos-sdk v0.43.0-alpha1.0.20210906075223-32780842edff
 
 replace google.golang.org/grpc => google.golang.org/grpc v1.33.2
 
-replace github.com/keybase/go-keychain => github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4
+replace github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
 
 replace github.com/cosmos/ledger-cosmos-go => github.com/desmos-labs/ledger-desmos-go v0.11.2-0.20210814121638-5d87e392e8a9