Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/google.golang.org/grpc…
Browse files Browse the repository at this point in the history
…-1.66.0
  • Loading branch information
pr0n00gler committed Aug 29, 2024
2 parents 88d9c0b + 6c975ef commit fd783f6
Showing 2 changed files with 8 additions and 0 deletions.
6 changes: 6 additions & 0 deletions app/app.go
Original file line number Diff line number Diff line change
@@ -183,6 +183,7 @@ import (
ccvconsumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"

storetypes "cosmossdk.io/store/types"
"github.com/cosmos/cosmos-sdk/x/consensus"
consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper"
consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
pfmkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/keeper"
@@ -279,6 +280,7 @@ var (
oracle.AppModuleBasic{},
marketmap.AppModuleBasic{},
dynamicfees.AppModuleBasic{},
consensus.AppModuleBasic{},
)

// module account permissions
@@ -969,6 +971,7 @@ func New(
marketmapModule,
oracleModule,
auction.NewAppModule(appCodec, app.AuctionKeeper),
consensus.NewAppModule(appCodec, app.ConsensusParamsKeeper),
// always be last to make sure that it checks for all invariants and not only part of them
crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)),
)
@@ -1015,6 +1018,7 @@ func New(
feemarkettypes.ModuleName,
ibcswaptypes.ModuleName,
dextypes.ModuleName,
consensusparamtypes.ModuleName,
)

app.mm.SetOrderEndBlockers(
@@ -1051,6 +1055,7 @@ func New(
feemarkettypes.ModuleName,
ibcswaptypes.ModuleName,
dextypes.ModuleName,
consensusparamtypes.ModuleName,
)

// NOTE: The genutils module must occur after staking so that pools are
@@ -1093,6 +1098,7 @@ func New(
ibcswaptypes.ModuleName,
dextypes.ModuleName,
dynamicfeestypes.ModuleName,
consensusparamtypes.ModuleName,
)

app.mm.RegisterInvariants(&app.CrisisKeeper)
2 changes: 2 additions & 0 deletions app/proposals_allowlisting.go
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
@@ -63,6 +64,7 @@ func isSdkMessageWhitelisted(msg sdk.Msg) bool {
*wasmtypes.MsgUpdateParams,
*wasmtypes.MsgPinCodes,
*wasmtypes.MsgUnpinCodes,
*consensustypes.MsgUpdateParams,
*upgradetypes.MsgSoftwareUpgrade,
*upgradetypes.MsgCancelUpgrade,
*ibcclienttypes.MsgRecoverClient,

0 comments on commit fd783f6

Please sign in to comment.