Remove spm (#812)

* successful spm removal

* add app params

* fix codec/marshaler

app/consumer-democracy/ante/forbidden_proposals_ante_test.go

@@ -11,11 +11,10 @@ import (
  app "github.com/cosmos/interchain-security/app/consumer-democracy"
  "github.com/cosmos/interchain-security/app/consumer-democracy/ante"
  "github.com/stretchr/testify/require"
- "github.com/tendermint/spm/cosmoscmd"
 )
 
 func TestForbiddenProposalsDecorator(t *testing.T) {
- txCfg := cosmoscmd.MakeEncodingConfig(app.ModuleBasics).TxConfig
+ txCfg := app.MakeTestEncodingConfig().TxConfig
 
  testCases := []struct {
  name string

app/consumer-democracy/app.go

@@ -8,6 +8,8 @@ import (
  "os"
  "path/filepath"
 
+ appparams "github.com/cosmos/interchain-security/app/params"
+
  "github.com/cosmos/cosmos-sdk/baseapp"
  "github.com/cosmos/cosmos-sdk/client"
  "github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
@@ -18,6 +20,7 @@ import (
  "github.com/cosmos/cosmos-sdk/server/config"
  servertypes "github.com/cosmos/cosmos-sdk/server/types"
  "github.com/cosmos/cosmos-sdk/simapp"
+ "github.com/cosmos/cosmos-sdk/std"
  store "github.com/cosmos/cosmos-sdk/store/types"
  sdk "github.com/cosmos/cosmos-sdk/types"
  "github.com/cosmos/cosmos-sdk/types/module"
@@ -74,7 +77,6 @@ import (
  "github.com/gorilla/mux"
  "github.com/rakyll/statik/fs"
  "github.com/spf13/cast"
- "github.com/tendermint/spm/cosmoscmd"
  abci "github.com/tendermint/tendermint/abci/types"
  tmjson "github.com/tendermint/tendermint/libs/json"
  "github.com/tendermint/tendermint/libs/log"
@@ -166,7 +168,6 @@ var (
 var (
  _ simapp.App = (*App)(nil)
  _ servertypes.Application = (*App)(nil)
- _ cosmoscmd.CosmosApp = (*App)(nil)
  _ ibctesting.TestingApp = (*App)(nil)
 )
 
@@ -236,10 +237,10 @@ func New(
  skipUpgradeHeights map[int64]bool,
  homePath string,
  invCheckPeriod uint,
- encodingConfig cosmoscmd.EncodingConfig,
+ encodingConfig appparams.EncodingConfig,
  appOpts servertypes.AppOptions,
  baseAppOptions ...func(*baseapp.BaseApp),
-) cosmoscmd.App {
+) *App {
 
  appCodec := encodingConfig.Marshaler
  legacyAmino := encodingConfig.Amino
@@ -829,7 +830,7 @@ func (app *App) GetScopedIBCKeeper() capabilitykeeper.ScopedKeeper {
 
 // GetTxConfig implements the TestingApp interface.
 func (app *App) GetTxConfig() client.TxConfig {
- return cosmoscmd.MakeEncodingConfig(ModuleBasics).TxConfig
+ return MakeTestEncodingConfig().TxConfig
 }
 
 // RegisterAPIRoutes registers all application module routes with the provided
@@ -902,3 +903,16 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 
  return paramsKeeper
 }
+
+// MakeTestEncodingConfig creates an EncodingConfig for testing. This function
+// should be used only in tests or when creating a new app instance (NewApp*()).
+// App user shouldn't create new codecs - use the app.AppCodec instead.
+// [DEPRECATED]
+func MakeTestEncodingConfig() appparams.EncodingConfig {
+ encodingConfig := appparams.MakeTestEncodingConfig()
+ std.RegisterLegacyAminoCodec(encodingConfig.Amino)
+ std.RegisterInterfaces(encodingConfig.InterfaceRegistry)
+ ModuleBasics.RegisterLegacyAminoCodec(encodingConfig.Amino)
+ ModuleBasics.RegisterInterfaces(encodingConfig.InterfaceRegistry)
+ return encodingConfig
+}

app/consumer/ante/disabled_modules_ante_test.go

@@ -8,14 +8,13 @@ import (
  evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types"
  slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
  ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types"
- appconsumer "github.com/cosmos/interchain-security/app/consumer"
  "github.com/cosmos/interchain-security/app/consumer/ante"
+ "github.com/cosmos/interchain-security/app/params"
  "github.com/stretchr/testify/require"
- "github.com/tendermint/spm/cosmoscmd"
 )
 
 func TestDisabledModulesDecorator(t *testing.T) {
- txCfg := cosmoscmd.MakeEncodingConfig(appconsumer.ModuleBasics).TxConfig
+ txCfg := params.MakeTestEncodingConfig().TxConfig
 
  testCases := []struct {
  name string

app/consumer/ante/msg_filter_ante_test.go

@@ -6,10 +6,9 @@ import (
  sdk "github.com/cosmos/cosmos-sdk/types"
  banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
  ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types"
- appconsumer "github.com/cosmos/interchain-security/app/consumer"
  "github.com/cosmos/interchain-security/app/consumer/ante"
+ "github.com/cosmos/interchain-security/app/params"
  "github.com/stretchr/testify/require"
- "github.com/tendermint/spm/cosmoscmd"
 )
 
 type consumerKeeper struct {
@@ -27,7 +26,7 @@ func noOpAnteDecorator() sdk.AnteHandler {
 }
 
 func TestMsgFilterDecorator(t *testing.T) {
- txCfg := cosmoscmd.MakeEncodingConfig(appconsumer.ModuleBasics).TxConfig
+ txCfg := params.MakeTestEncodingConfig().TxConfig
 
  testCases := []struct {
  name string

app/consumer/app.go

@@ -18,6 +18,7 @@ import (
  "github.com/cosmos/cosmos-sdk/server/config"
  servertypes "github.com/cosmos/cosmos-sdk/server/types"
  "github.com/cosmos/cosmos-sdk/simapp"
+ "github.com/cosmos/cosmos-sdk/std"
  store "github.com/cosmos/cosmos-sdk/store/types"
  sdk "github.com/cosmos/cosmos-sdk/types"
  "github.com/cosmos/cosmos-sdk/types/module"
@@ -66,12 +67,12 @@ import (
  porttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types"
  ibchost "github.com/cosmos/ibc-go/v4/modules/core/24-host"
  ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
+ appparams "github.com/cosmos/interchain-security/app/params"
  ibctestingcore "github.com/cosmos/interchain-security/legacy_ibc_testing/core"
  ibctesting "github.com/cosmos/interchain-security/legacy_ibc_testing/testing"
  "github.com/gorilla/mux"
  "github.com/rakyll/statik/fs"
  "github.com/spf13/cast"
- "github.com/tendermint/spm/cosmoscmd"
  abci "github.com/tendermint/tendermint/abci/types"
  tmjson "github.com/tendermint/tendermint/libs/json"
  "github.com/tendermint/tendermint/libs/log"
@@ -130,7 +131,6 @@ var (
 var (
  _ simapp.App = (*App)(nil)
  _ servertypes.Application = (*App)(nil)
- _ cosmoscmd.CosmosApp = (*App)(nil)
  _ ibctesting.TestingApp = (*App)(nil)
 )
 
@@ -201,10 +201,10 @@ func New(
  skipUpgradeHeights map[int64]bool,
  homePath string,
  invCheckPeriod uint,
- encodingConfig cosmoscmd.EncodingConfig,
+ encodingConfig appparams.EncodingConfig,
  appOpts servertypes.AppOptions,
  baseAppOptions ...func(*baseapp.BaseApp),
-) cosmoscmd.App {
+) *App {
 
  appCodec := encodingConfig.Marshaler
  legacyAmino := encodingConfig.Amino
@@ -697,7 +697,7 @@ func (app *App) GetScopedIBCKeeper() capabilitykeeper.ScopedKeeper {
 
 // GetTxConfig implements the TestingApp interface.
 func (app *App) GetTxConfig() client.TxConfig {
- return cosmoscmd.MakeEncodingConfig(ModuleBasics).TxConfig
+ return MakeTestEncodingConfig().TxConfig
 }
 
 // RegisterAPIRoutes registers all application module routes with the provided
@@ -766,3 +766,16 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 
  return paramsKeeper
 }
+
+// MakeTestEncodingConfig creates an EncodingConfig for testing. This function
+// should be used only in tests or when creating a new app instance (NewApp*()).
+// App user shouldn't create new codecs - use the app.AppCodec instead.
+// [DEPRECATED]
+func MakeTestEncodingConfig() appparams.EncodingConfig {
+ encodingConfig := appparams.MakeTestEncodingConfig()
+ std.RegisterLegacyAminoCodec(encodingConfig.Amino)
+ std.RegisterInterfaces(encodingConfig.InterfaceRegistry)
+ ModuleBasics.RegisterLegacyAminoCodec(encodingConfig.Amino)
+ ModuleBasics.RegisterInterfaces(encodingConfig.InterfaceRegistry)
+ return encodingConfig
+}

app/params/config.go

@@ -0,0 +1,35 @@
+package params
+
+import (
+ sdk "github.com/cosmos/cosmos-sdk/types"
+)
+
+var (
+ Bech32Prefix = "cosmos"
+
+ // Bech32PrefixAccAddr defines the Bech32 prefix of an account's address
+ Bech32PrefixAccAddr = Bech32Prefix
+ // Bech32PrefixAccPub defines the Bech32 prefix of an account's public key
+ Bech32PrefixAccPub = Bech32Prefix + sdk.PrefixPublic
+ // Bech32PrefixValAddr defines the Bech32 prefix of a validator's operator address
+ Bech32PrefixValAddr = Bech32Prefix + sdk.PrefixValidator + sdk.PrefixOperator
+ // Bech32PrefixValPub defines the Bech32 prefix of a validator's operator public key
+ Bech32PrefixValPub = Bech32Prefix + sdk.PrefixValidator + sdk.PrefixOperator + sdk.PrefixPublic
+ // Bech32PrefixConsAddr defines the Bech32 prefix of a consensus node address
+ Bech32PrefixConsAddr = Bech32Prefix + sdk.PrefixValidator + sdk.PrefixConsensus
+ // Bech32PrefixConsPub defines the Bech32 prefix of a consensus node public key
+ Bech32PrefixConsPub = Bech32Prefix + sdk.PrefixValidator + sdk.PrefixConsensus + sdk.PrefixPublic
+)
+
+// SetAddressPrefixes builds the Config with Bech32 addressPrefix and publKeyPrefix for accounts, validators, and consensus nodes and verifies that addreeses have correct format.
+// Not sealed yet
+func SetAddressPrefixes() {
+ cfg := sdk.GetConfig()
+ cfg.SetBech32PrefixForAccount(Bech32PrefixAccAddr, Bech32PrefixAccPub)
+ cfg.SetBech32PrefixForValidator(Bech32PrefixValAddr, Bech32PrefixValPub)
+ cfg.SetBech32PrefixForConsensusNode(Bech32PrefixConsAddr, Bech32PrefixConsPub)
+}
+
+func init() {
+ SetAddressPrefixes()
+}

app/params/doc.go

@@ -0,0 +1,19 @@
+/*
+Package params defines the simulation parameters in the gaia.
+
+It contains the default weights used for each transaction used on the module's
+simulation. These weights define the chance for a transaction to be simulated at
+any gived operation.
+
+You can repace the default values for the weights by providing a params.json
+file with the weights defined for each of the transaction operations:
+
+ {
+ "op_weight_msg_send": 60,
+ "op_weight_msg_delegate": 100,
+ }
+
+In the example above, the `MsgSend` has 60% chance to be simulated, while the
+`MsgDelegate` will always be simulated.
+*/
+package params

app/params/encoding.go

@@ -0,0 +1,16 @@
+package params
+
+import (
+ "github.com/cosmos/cosmos-sdk/client"
+ "github.com/cosmos/cosmos-sdk/codec"
+ "github.com/cosmos/cosmos-sdk/codec/types"
+)
+
+// EncodingConfig specifies the concrete encoding types to use for a given app.
+// This is provided for compatibility between protobuf and amino implementations.
+type EncodingConfig struct {
+ InterfaceRegistry types.InterfaceRegistry
+ Marshaler codec.Codec
+ TxConfig client.TxConfig
+ Amino *codec.LegacyAmino
+}

app/params/params.go

@@ -0,0 +1,7 @@
+package params
+
+// Simulation parameter constants
+const (
+ StakePerAccount = "stake_per_account"
+ InitiallyBondedValidators = "initially_bonded_validators"
+)

app/params/proto.go

@@ -0,0 +1,22 @@
+package params
+
+import (
+ "github.com/cosmos/cosmos-sdk/codec"
+ "github.com/cosmos/cosmos-sdk/codec/types"
+ "github.com/cosmos/cosmos-sdk/x/auth/tx"
+)
+
+// MakeTestEncodingConfig creates an EncodingConfig for an amino based test configuration.
+func MakeTestEncodingConfig() EncodingConfig {
+ amino := codec.NewLegacyAmino()
+ interfaceRegistry := types.NewInterfaceRegistry()
+ chainCodec := codec.NewProtoCodec(interfaceRegistry)
+ txCfg := tx.NewTxConfig(chainCodec, tx.DefaultSignModes)
+
+ return EncodingConfig{
+ InterfaceRegistry: interfaceRegistry,
+ Marshaler: chainCodec,
+ TxConfig: txCfg,
+ Amino: amino,
+ }
+}

app/params/weights.go

@@ -0,0 +1,42 @@
+package params
+
+// Default simulation operation weights for messages and gov proposals
+const (
+ DefaultWeightMsgSend int = 100
+ DefaultWeightMsgMultiSend int = 10
+ DefaultWeightMsgSetWithdrawAddress int = 50
+ DefaultWeightMsgWithdrawDelegationReward int = 50
+ DefaultWeightMsgWithdrawValidatorCommission int = 50
+ DefaultWeightMsgFundCommunityPool int = 50
+ DefaultWeightMsgDeposit int = 100
+ DefaultWeightMsgVote int = 67
+ DefaultWeightMsgUnjail int = 100
+ DefaultWeightMsgCreateValidator int = 100
+ DefaultWeightMsgEditValidator int = 5
+ DefaultWeightMsgDelegate int = 100
+ DefaultWeightMsgUndelegate int = 100
+ DefaultWeightMsgBeginRedelegate int = 100
+
+ DefaultWeightCommunitySpendProposal int = 5
+ DefaultWeightTextProposal int = 5
+ DefaultWeightParamChangeProposal int = 5
+
+ DefaultWeightMsgStoreCode int = 50
+ DefaultWeightMsgInstantiateContract int = 100
+ DefaultWeightMsgExecuteContract int = 100
+ DefaultWeightMsgUpdateAdmin int = 25
+ DefaultWeightMsgClearAdmin int = 10
+ DefaultWeightMsgMigrateContract int = 50
+
+ DefaultWeightStoreCodeProposal int = 5
+ DefaultWeightInstantiateContractProposal int = 5
+ DefaultWeightUpdateAdminProposal int = 5
+ DefaultWeightExecuteContractProposal int = 5
+ DefaultWeightClearAdminProposal int = 5
+ DefaultWeightMigrateContractProposal int = 5
+ DefaultWeightSudoContractProposal int = 5
+ DefaultWeightPinCodesProposal int = 5
+ DefaultWeightUnpinCodesProposal int = 5
+ DefaultWeightUpdateInstantiateConfigProposal int = 5
+ DefaultWeightStoreAndInstantiateContractProposal int = 5
+)