diff --git a/app/app.go b/app/app.go index 451b38a1f..fd6dbf5fc 100644 --- a/app/app.go +++ b/app/app.go @@ -37,7 +37,6 @@ import ( sigtypes "github.com/cosmos/cosmos-sdk/types/tx/signing" txmodule "github.com/cosmos/cosmos-sdk/x/auth/tx/config" - // "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/runtime" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" @@ -60,14 +59,11 @@ import ( v1_7 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.7" v1_8 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.8" - // v1_9 "github.com/scrtlabs/SecretNetwork/app/upgrades/v1.9" - icaauthtypes "github.com/scrtlabs/SecretNetwork/x/mauth/types" "github.com/cosmos/cosmos-sdk/version" "github.com/cosmos/cosmos-sdk/x/auth/ante" - // authrest "github.com/cosmos/cosmos-sdk/x/auth/client/rest" evidencetypes "cosmossdk.io/x/evidence/types" "cosmossdk.io/x/feegrant" authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" @@ -84,7 +80,6 @@ import ( capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper" capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" - // stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" "cosmossdk.io/log" upgradetypes "cosmossdk.io/x/upgrade/types" abci "github.com/cometbft/cometbft/abci/types" @@ -118,13 +113,11 @@ var ( } Upgrades = []upgrades.Upgrade{ - // v1_3.Upgrade, v1_4.Upgrade, v1_5.Upgrade, v1_6.Upgrade, v1_7.Upgrade, v1_8.Upgrade, - // v1_9.Upgrade, v1_10.Upgrade, v1_11.Upgrade, v1_12.Upgrade, @@ -134,7 +127,6 @@ var ( // Verify app interface at compile time var ( - // _ simapp.App = (*SecretNetworkApp)(nil) _ runtime.AppI = (*SecretNetworkApp)(nil) _ servertypes.Application = (*SecretNetworkApp)(nil) ) @@ -168,10 +160,6 @@ func (app *SecretNetworkApp) GetInterfaceRegistry() types.InterfaceRegistry { return app.interfaceRegistry } -func (app *SecretNetworkApp) GetCodec() codec.Codec { - return app.appCodec -} - func (app *SecretNetworkApp) GetBaseApp() *baseapp.BaseApp { return app.BaseApp } @@ -291,7 +279,8 @@ func NewSecretNetworkApp( app.AppKeepers.InitSdkKeepers(appCodec, legacyAmino, bApp, ModuleAccountPermissions, app.BlockedAddrs(), invCheckPeriod, skipUpgradeHeights, homePath, logger, &app.event) - enabledSignModes := append(authtx.DefaultSignModes, sigtypes.SignMode_SIGN_MODE_TEXTUAL) + enabledSignModes := authtx.DefaultSignModes + enabledSignModes = append(enabledSignModes, sigtypes.SignMode_SIGN_MODE_TEXTUAL) signingOpts, err := authtx.NewDefaultSigningOptions() if err != nil { @@ -445,7 +434,9 @@ func (app *SecretNetworkApp) InitChainer(ctx sdk.Context, req *abci.RequestInitC panic(err) } - app.AppKeepers.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap()) + if err := app.AppKeepers.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap()); err != nil { + panic(err) + } return app.mm.InitGenesis(ctx, app.appCodec, genesisState) } diff --git a/app/config.go b/app/config.go index 210866274..2124637fa 100644 --- a/app/config.go +++ b/app/config.go @@ -8,7 +8,6 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/address" - "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/auth" @@ -84,14 +83,6 @@ var mbasics = module.NewBasicManager( )..., ) -func customKVStoreKeys() []string { - return []string{ - compute.StoreKey, - registration.StoreKey, - icaauth.StoreKey, - } -} - func customModuleBasics() []module.AppModuleBasic { return []module.AppModuleBasic{ compute.AppModuleBasic{}, @@ -109,42 +100,12 @@ func ModuleBasics() module.BasicManager { // 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 + InterfaceRegistry codectypes.InterfaceRegistry Codec codec.Codec TxConfig client.TxConfig Amino *codec.LegacyAmino } -// func MakeEncodingConfig() EncodingConfig { -// amino := codec.NewLegacyAmino() -// interfaceRegistry, _ := types.NewInterfaceRegistryWithOptions(types.InterfaceRegistryOptions{ -// ProtoFiles: proto.HybridResolver, -// SigningOptions: signing.Options{ -// AddressCodec: address.Bech32Codec{ -// Bech32Prefix: sdk.GetConfig().GetBech32AccountAddrPrefix(), -// }, -// ValidatorAddressCodec: address.Bech32Codec{ -// Bech32Prefix: sdk.GetConfig().GetBech32ValidatorAddrPrefix(), -// }, -// }, -// }) -// appCodec := codec.NewProtoCodec(interfaceRegistry) -// txCfg := tx.NewTxConfig(appCodec, tx.DefaultSignModes) - -// std.RegisterInterfaces(interfaceRegistry) -// std.RegisterLegacyAminoCodec(amino) - -// ModuleBasics().RegisterLegacyAminoCodec(amino) -// ModuleBasics().RegisterInterfaces(interfaceRegistry) - -// return EncodingConfig{ -// InterfaceRegistry: interfaceRegistry, -// Codec: appCodec, -// TxConfig: txCfg, -// Amino: amino, -// } -// } - type ( CodecOptions struct { AccAddressPrefix string diff --git a/app/encoding.go b/app/encoding.go deleted file mode 100644 index 4879f7a48..000000000 --- a/app/encoding.go +++ /dev/null @@ -1 +0,0 @@ -package app diff --git a/app/export.go b/app/export.go index 2f28de6bc..c7c0a0e44 100644 --- a/app/export.go +++ b/app/export.go @@ -2,6 +2,9 @@ package app import ( "encoding/json" + "fmt" + + cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" storetypes "cosmossdk.io/store/types" servertypes "github.com/cosmos/cosmos-sdk/server/types" @@ -14,7 +17,7 @@ import ( func (app *SecretNetworkApp) ExportAppStateAndValidators(forZeroHeight bool, jailAllowedAddrs []string, modulesToExport []string, ) (servertypes.ExportedApp, error) { // as if they could withdraw from the start of the next block - ctx := app.BaseApp.NewContext(true) + ctx := app.NewContextLegacy(true, cmtproto.Header{Height: app.LastBlockHeight()}) // We export at last height + 1, because that's the height at which // Tendermint will start InitChain. @@ -44,7 +47,7 @@ func (app *SecretNetworkApp) ExportAppStateAndValidators(forZeroHeight bool, jai Validators: validators, Height: height, ConsensusParams: app.BaseApp.GetConsensusParams(ctx), - }, nil + }, err } // prepare for fresh start at zero height @@ -75,24 +78,31 @@ func (app *SecretNetworkApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllow /* Handle fee distribution state. */ // withdraw all validator commission - app.AppKeepers.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) { - valAddr, _ := sdk.ValAddressFromBech32(val.GetOperator()) + err := app.AppKeepers.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) { + valAddr, err := app.AppKeepers.StakingKeeper.ValidatorAddressCodec().StringToBytes(val.GetOperator()) + if err != nil { + panic(err) + } _, _ = app.AppKeepers.DistrKeeper.WithdrawValidatorCommission(ctx, valAddr) return false }) + if err != nil { + panic(err) + } // withdraw all delegator rewards - dels, _ := app.AppKeepers.StakingKeeper.GetAllDelegations(ctx) + dels, err := app.AppKeepers.StakingKeeper.GetAllDelegations(ctx) + if err != nil { + panic(err) + } + for _, delegation := range dels { valAddr, err := sdk.ValAddressFromBech32(delegation.ValidatorAddress) if err != nil { panic(err) } - delAddr, err := sdk.AccAddressFromBech32(delegation.DelegatorAddress) - if err != nil { - panic(err) - } + delAddr := sdk.MustAccAddressFromBech32(delegation.DelegatorAddress) _, _ = app.AppKeepers.DistrKeeper.WithdrawDelegationRewards(ctx, delAddr, valAddr) } @@ -108,15 +118,28 @@ func (app *SecretNetworkApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllow ctx = ctx.WithBlockHeight(0) // reinitialize all validators - app.AppKeepers.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) { - valAddr, _ := sdk.ValAddressFromBech32(val.GetOperator()) + err = app.AppKeepers.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) { + valAddr, err := app.AppKeepers.StakingKeeper.ValidatorAddressCodec().StringToBytes(val.GetOperator()) + if err != nil { + panic(err) + } // donate any unwithdrawn outstanding reward fraction tokens to the community pool - scraps, _ := app.AppKeepers.DistrKeeper.GetValidatorOutstandingRewardsCoins(ctx, valAddr) - feePool, _ := app.AppKeepers.DistrKeeper.FeePool.Get(ctx) + scraps, err := app.AppKeepers.DistrKeeper.GetValidatorOutstandingRewardsCoins(ctx, valAddr) + if err != nil { + panic(err) + } + feePool, err := app.AppKeepers.DistrKeeper.FeePool.Get(ctx) + if err != nil { + panic(err) + } feePool.CommunityPool = feePool.CommunityPool.Add(scraps...) - app.AppKeepers.DistrKeeper.FeePool.Set(ctx, feePool) + if err := app.AppKeepers.DistrKeeper.FeePool.Set(ctx, feePool); err != nil { + panic(err) + } - app.AppKeepers.DistrKeeper.Hooks().AfterValidatorCreated(ctx, valAddr) + if err := app.AppKeepers.DistrKeeper.Hooks().AfterValidatorCreated(ctx, valAddr); err != nil { + panic(err) + } return false }) @@ -126,14 +149,17 @@ func (app *SecretNetworkApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllow if err != nil { panic(err) } + delAddr := sdk.MustAccAddressFromBech32(del.DelegatorAddress) - delAddr, err := sdk.AccAddressFromBech32(del.DelegatorAddress) - if err != nil { - panic(err) + if err := app.AppKeepers.DistrKeeper.Hooks().BeforeDelegationCreated(ctx, delAddr, valAddr); err != nil { + // never called as BeforeDelegationCreated always returns nil + panic(fmt.Errorf("error while incrementing period: %w", err)) } - app.AppKeepers.DistrKeeper.Hooks().BeforeDelegationCreated(ctx, delAddr, valAddr) - app.AppKeepers.DistrKeeper.Hooks().AfterDelegationModified(ctx, delAddr, valAddr) + if err := app.AppKeepers.DistrKeeper.Hooks().AfterDelegationModified(ctx, delAddr, valAddr); err != nil { + // never called as AfterDelegationModified always returns nil + panic(fmt.Errorf("error while creating a new delegation period record: %w", err)) + } } // reset context height @@ -142,22 +168,34 @@ func (app *SecretNetworkApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllow /* Handle staking state. */ // iterate through redelegations, reset creation height - app.AppKeepers.StakingKeeper.IterateRedelegations(ctx, func(_ int64, red stakingtypes.Redelegation) (stop bool) { + err = app.AppKeepers.StakingKeeper.IterateRedelegations(ctx, func(_ int64, red stakingtypes.Redelegation) (stop bool) { for i := range red.Entries { red.Entries[i].CreationHeight = 0 } - app.AppKeepers.StakingKeeper.SetRedelegation(ctx, red) + err = app.AppKeepers.StakingKeeper.SetRedelegation(ctx, red) + if err != nil { + panic(err) + } return false }) + if err != nil { + panic(err) + } // iterate through unbonding delegations, reset creation height - app.AppKeepers.StakingKeeper.IterateUnbondingDelegations(ctx, func(_ int64, ubd stakingtypes.UnbondingDelegation) (stop bool) { + err = app.AppKeepers.StakingKeeper.IterateUnbondingDelegations(ctx, func(_ int64, ubd stakingtypes.UnbondingDelegation) (stop bool) { for i := range ubd.Entries { ubd.Entries[i].CreationHeight = 0 } - app.AppKeepers.StakingKeeper.SetUnbondingDelegation(ctx, ubd) + err = app.AppKeepers.StakingKeeper.SetUnbondingDelegation(ctx, ubd) + if err != nil { + panic(err) + } return false }) + if err != nil { + panic(err) + } // Iterate through validators by power descending, reset bond heights, and // update bond intra-tx counters. @@ -166,7 +204,7 @@ func (app *SecretNetworkApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllow counter := int16(0) for ; iter.Valid(); iter.Next() { - addr := sdk.ValAddress(iter.Key()[1:]) + addr := sdk.ValAddress(stakingtypes.AddressFromValidatorsKey(iter.Key())) validator, err := app.AppKeepers.StakingKeeper.GetValidator(ctx, addr) if err != nil { panic("expected validator, not found") @@ -175,27 +213,49 @@ func (app *SecretNetworkApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllow validator.UnbondingHeight = 0 if applyAllowedAddrs && !allowedAddrsMap[addr.String()] { validator.Jailed = true - app.AppKeepers.StakingKeeper.SetValidator(ctx, validator) - app.AppKeepers.StakingKeeper.DeleteValidatorByPowerIndex(ctx, validator) + err = app.AppKeepers.StakingKeeper.SetValidator(ctx, validator) + if err != nil { + panic(err) + } + err = app.AppKeepers.StakingKeeper.DeleteValidatorByPowerIndex(ctx, validator) + if err != nil { + panic(err) + } } else { - app.AppKeepers.StakingKeeper.SetValidator(ctx, validator) + err = app.AppKeepers.StakingKeeper.SetValidator(ctx, validator) + if err != nil { + panic(err) + } } counter++ } - iter.Close() + if err := iter.Close(); err != nil { + app.Logger().Error("error while closing the key-value store reverse prefix iterator: ", err) + return + } + + _, err = app.AppKeepers.StakingKeeper.ApplyAndReturnValidatorSetUpdates(ctx) + if err != nil { + panic(err) + } - _, _ = app.AppKeepers.StakingKeeper.ApplyAndReturnValidatorSetUpdates(ctx) /* Handle slashing state. */ // reset start height on signing infos - app.AppKeepers.SlashingKeeper.IterateValidatorSigningInfos( + err = app.AppKeepers.SlashingKeeper.IterateValidatorSigningInfos( ctx, func(addr sdk.ConsAddress, info slashingtypes.ValidatorSigningInfo) (stop bool) { info.StartHeight = 0 - app.AppKeepers.SlashingKeeper.SetValidatorSigningInfo(ctx, addr, info) + err = app.AppKeepers.SlashingKeeper.SetValidatorSigningInfo(ctx, addr, info) + if err != nil { + panic(err) + } return false }, ) + if err != nil { + panic(err) + } } diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 6c0fdb8da..64a428a3b 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -27,7 +27,6 @@ import ( distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" @@ -52,8 +51,6 @@ import ( "github.com/cosmos/ibc-go/v8/modules/apps/transfer" ibctransferkeeper "github.com/cosmos/ibc-go/v8/modules/apps/transfer/keeper" ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" - ibcclient "github.com/cosmos/ibc-go/v8/modules/core/02-client" - ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" porttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types" ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported" ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper" @@ -77,7 +74,7 @@ import ( ibchookstypes "github.com/scrtlabs/SecretNetwork/x/ibc-hooks/types" consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" - // paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" + consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" scrt "github.com/scrtlabs/SecretNetwork/types" ) @@ -168,13 +165,11 @@ func (ak *SecretAppKeepers) InitSdkKeepers( ak.ConsensusParamsKeeper = consensusparamkeeper.NewKeeper( appCodec, - runtime.NewKVStoreService(ak.keys[upgradetypes.StoreKey]), + runtime.NewKVStoreService(ak.keys[consensusparamtypes.StoreKey]), authtypes.NewModuleAddress(govtypes.ModuleName).String(), *event, ) app.SetParamStore(&ak.ConsensusParamsKeeper.ParamsStore) - // set the BaseApp's parameter store - // app.SetParamStore(ak.ParamsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramskeeper.ConsensusParamsKeyTable())) // add keepers accountKeeper := authkeeper.NewAccountKeeper( @@ -303,8 +298,7 @@ func (ak *SecretAppKeepers) InitSdkKeepers( // by granting the governance module the right to execute the message. // See: https://docs.cosmos.network/main/modules/gov#proposal-messages govRouter.AddRoute(govtypes.RouterKey, govv1beta1.ProposalHandler). - AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(*ak.ParamsKeeper)). - AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(ak.IbcKeeper.ClientKeeper)) + AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(*ak.ParamsKeeper)) govConfig := govtypes.DefaultConfig() govKeeper := govkeeper.NewKeeper( @@ -624,19 +618,7 @@ func (ak *SecretAppKeepers) InitKeys() { // initParamsKeeper init params keeper and its subspaces func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino, key, tkey storetypes.StoreKey) paramskeeper.Keeper { paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey) - // subspaceParams := []paramtypes.ParamSetPair{ - // paramtypes.NewParamSetPair([]byte("MaxMemoCharacters"), uint64(256), valMaxMemoCharacters), - // paramtypes.NewParamSetPair([]byte("TxSigLimit"), uint64(7), valTxSigLimit), - // paramtypes.NewParamSetPair([]byte("TxSizeCostPerByte"), uint64(10), valTxSizeCostPerByte), - // paramtypes.NewParamSetPair([]byte("SigVerifyCostED25519"), uint64(590), valSigVerifyCostED25519), - // paramtypes.NewParamSetPair([]byte("SigVerifyCostSecp256k1"), uint64(1000), valSigVerifyCostSecp256k1), - // } - - // authsub := paramsKeeper.Subspace(authtypes.ModuleName) - - // authsub.WithKeyTable(paramtypes.NewKeyTable(subspaceParams...)) - - paramsKeeper.Subspace(authtypes.ModuleName).WithKeyTable(authtypes.ParamKeyTable()) + paramsKeeper.Subspace(authtypes.ModuleName) paramsKeeper.Subspace(banktypes.ModuleName) paramsKeeper.Subspace(stakingtypes.ModuleName) paramsKeeper.Subspace(minttypes.ModuleName) @@ -646,7 +628,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(ibcexported.ModuleName) paramsKeeper.Subspace(icacontrollertypes.SubModuleName) paramsKeeper.Subspace(icahosttypes.SubModuleName) - paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govtypesv1.ParamKeyTable()) + paramsKeeper.Subspace(govtypes.ModuleName) paramsKeeper.Subspace(crisistypes.ModuleName) paramsKeeper.Subspace(compute.ModuleName) paramsKeeper.Subspace(reg.ModuleName) diff --git a/app/keepers/validation.go b/app/keepers/validation.go deleted file mode 100644 index f39425b7f..000000000 --- a/app/keepers/validation.go +++ /dev/null @@ -1,68 +0,0 @@ -package keepers - -import "errors" - -const MaxMaxMemoCharacters = 1 << 10 - -func valMaxMemoCharacters(value interface{}) error { - i, ok := value.(uint64) - if !ok { - return errors.New("invalid value type") - } - if i > MaxMaxMemoCharacters { - return errors.New("exceeds max allowed value") - } - return nil -} - -const MaxTxSigLimit uint64 = 1 << 4 - -func valTxSigLimit(value interface{}) error { - i, ok := value.(uint64) - if !ok { - return errors.New("invalid value type") - } - if i > MaxTxSigLimit { - return errors.New("exceeds max allowed value") - } - return nil -} - -const MaxTxSizeCostPerByte uint64 = 1 << 40 - -func valTxSizeCostPerByte(value interface{}) error { - i, ok := value.(uint64) - if !ok { - return errors.New("invalid value type") - } - if i > MaxTxSizeCostPerByte { - return errors.New("exceeds max allowed value") - } - return nil -} - -const MaxSigVerifyCostED25519 uint64 = 1 << 40 - -func valSigVerifyCostED25519(value interface{}) error { - i, ok := value.(uint64) - if !ok { - return errors.New("invalid value type") - } - if i > MaxSigVerifyCostED25519 { - return errors.New("exceeds max allowed value") - } - return nil -} - -const MaxSigVerifyCostSecp256k1 uint64 = 1 << 40 - -func valSigVerifyCostSecp256k1(value interface{}) error { - i, ok := value.(uint64) - if !ok { - return errors.New("invalid value type") - } - if i > 1024 { - return errors.New("exceeds max allowed value") - } - return nil -} diff --git a/app/migrations/migrate.go b/app/migrations/migrate.go index e97664182..543e6da14 100644 --- a/app/migrations/migrate.go +++ b/app/migrations/migrate.go @@ -8,24 +8,24 @@ import ( "github.com/cosmos/cosmos-sdk/x/authz" - "github.com/pkg/errors" - "github.com/spf13/cobra" tmjson "github.com/cometbft/cometbft/libs/json" tmtypes "github.com/cometbft/cometbft/types" + "github.com/pkg/errors" + "github.com/spf13/cobra" ibcxfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" host "github.com/cosmos/ibc-go/v8/modules/core/24-host" "github.com/cosmos/ibc-go/v8/modules/core/exported" ibccoretypes "github.com/cosmos/ibc-go/v8/modules/core/types" + evtypes "cosmossdk.io/x/evidence/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - captypes "github.com/cosmos/ibc-go/modules/capability/types" - evtypes "cosmossdk.io/x/evidence/types" "github.com/cosmos/cosmos-sdk/x/genutil/types" staking "github.com/cosmos/cosmos-sdk/x/staking/types" + captypes "github.com/cosmos/ibc-go/modules/capability/types" legacy170 "github.com/scrtlabs/SecretNetwork/app/migrations/v170" ) diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 22db400c3..4bdd069ee 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -2,11 +2,11 @@ package upgrades import ( store "cosmossdk.io/store/types" + upgradetypes "cosmossdk.io/x/upgrade/types" + abci "github.com/cometbft/cometbft/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - upgradetypes "cosmossdk.io/x/upgrade/types" "github.com/scrtlabs/SecretNetwork/app/keepers" - abci "github.com/cometbft/cometbft/types" ) // BaseAppParamManager defines an interrace that BaseApp is expected to fullfil diff --git a/app/upgrades/v1.10/upgrade.go b/app/upgrades/v1.10/upgrade.go index 0992cdfcf..47cbb1434 100644 --- a/app/upgrades/v1.10/upgrade.go +++ b/app/upgrades/v1.10/upgrade.go @@ -7,8 +7,8 @@ import ( "cosmossdk.io/log" store "cosmossdk.io/store/types" - "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "cosmossdk.io/x/upgrade/types" + "github.com/cosmos/cosmos-sdk/types/module" "github.com/scrtlabs/SecretNetwork/app/keepers" "github.com/scrtlabs/SecretNetwork/app/upgrades" ) diff --git a/app/upgrades/v1.11/upgrade.go b/app/upgrades/v1.11/upgrade.go index 48de297e0..720650295 100644 --- a/app/upgrades/v1.11/upgrade.go +++ b/app/upgrades/v1.11/upgrade.go @@ -7,8 +7,8 @@ import ( "cosmossdk.io/log" store "cosmossdk.io/store/types" - "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "cosmossdk.io/x/upgrade/types" + "github.com/cosmos/cosmos-sdk/types/module" "github.com/scrtlabs/SecretNetwork/app/keepers" "github.com/scrtlabs/SecretNetwork/app/upgrades" ibchookstypes "github.com/scrtlabs/SecretNetwork/x/ibc-hooks/types" diff --git a/app/upgrades/v1.12/upgrade.go b/app/upgrades/v1.12/upgrade.go index 186afd9c2..d3a1c1bc6 100644 --- a/app/upgrades/v1.12/upgrade.go +++ b/app/upgrades/v1.12/upgrade.go @@ -7,8 +7,8 @@ import ( "cosmossdk.io/log" store "cosmossdk.io/store/types" - "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "cosmossdk.io/x/upgrade/types" + "github.com/cosmos/cosmos-sdk/types/module" "github.com/scrtlabs/SecretNetwork/app/keepers" "github.com/scrtlabs/SecretNetwork/app/upgrades" ) diff --git a/app/upgrades/v1.4/cos_patch.go b/app/upgrades/v1.4/cos_patch.go index 00fe80ac5..904478ebe 100644 --- a/app/upgrades/v1.4/cos_patch.go +++ b/app/upgrades/v1.4/cos_patch.go @@ -97,7 +97,10 @@ func revertTombstone(ctx sdk.Context, slashingKeeper *slashingkeeper.Keeper) err slashingKeeper.RevertTombstone(ctx, cosConsAddress) // Set jail until=now, the validator then must unjail manually - slashingKeeper.JailUntil(ctx, cosConsAddress, ctx.BlockTime()) + err = slashingKeeper.JailUntil(ctx, cosConsAddress, ctx.BlockTime()) + if err != nil { + panic(fmt.Sprintf("failed to jail: %s", cosValAddress)) + } return nil } diff --git a/app/upgrades/v1.4/upgrade.go b/app/upgrades/v1.4/upgrade.go index 4a1e6d4f5..18b585c60 100644 --- a/app/upgrades/v1.4/upgrade.go +++ b/app/upgrades/v1.4/upgrade.go @@ -7,9 +7,9 @@ import ( "cosmossdk.io/log" store "cosmossdk.io/store/types" + upgradetypes "cosmossdk.io/x/upgrade/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - upgradetypes "cosmossdk.io/x/upgrade/types" "github.com/scrtlabs/SecretNetwork/app/keepers" "github.com/scrtlabs/SecretNetwork/app/upgrades" ) diff --git a/app/upgrades/v1.5/upgrade.go b/app/upgrades/v1.5/upgrade.go index bdbbc3216..38d689519 100644 --- a/app/upgrades/v1.5/upgrade.go +++ b/app/upgrades/v1.5/upgrade.go @@ -6,8 +6,8 @@ import ( "cosmossdk.io/log" store "cosmossdk.io/store/types" - "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "cosmossdk.io/x/upgrade/types" + "github.com/cosmos/cosmos-sdk/types/module" "github.com/scrtlabs/SecretNetwork/app/keepers" "github.com/scrtlabs/SecretNetwork/app/upgrades" ) diff --git a/app/upgrades/v1.6/upgrade.go b/app/upgrades/v1.6/upgrade.go index fdde306bd..351c0c986 100644 --- a/app/upgrades/v1.6/upgrade.go +++ b/app/upgrades/v1.6/upgrade.go @@ -6,8 +6,8 @@ import ( "cosmossdk.io/log" store "cosmossdk.io/store/types" - "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "cosmossdk.io/x/upgrade/types" + "github.com/cosmos/cosmos-sdk/types/module" "github.com/scrtlabs/SecretNetwork/app/keepers" "github.com/scrtlabs/SecretNetwork/app/upgrades" ) diff --git a/app/upgrades/v1.7/upgrade.go b/app/upgrades/v1.7/upgrade.go index 16c7ee5b2..0e6d3d164 100644 --- a/app/upgrades/v1.7/upgrade.go +++ b/app/upgrades/v1.7/upgrade.go @@ -13,9 +13,9 @@ import ( "cosmossdk.io/log" store "cosmossdk.io/store/types" + upgradetypes "cosmossdk.io/x/upgrade/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - upgradetypes "cosmossdk.io/x/upgrade/types" "github.com/scrtlabs/SecretNetwork/app/keepers" "github.com/scrtlabs/SecretNetwork/app/upgrades" reg "github.com/scrtlabs/SecretNetwork/x/registration" diff --git a/app/upgrades/v1.8/upgrade.go b/app/upgrades/v1.8/upgrade.go index 1d398130b..30d2c2910 100644 --- a/app/upgrades/v1.8/upgrade.go +++ b/app/upgrades/v1.8/upgrade.go @@ -7,8 +7,8 @@ import ( "cosmossdk.io/log" store "cosmossdk.io/store/types" - "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "cosmossdk.io/x/upgrade/types" + "github.com/cosmos/cosmos-sdk/types/module" "github.com/scrtlabs/SecretNetwork/app/keepers" "github.com/scrtlabs/SecretNetwork/app/upgrades" )