merging to get fix in place for wasm keys error

Author: dekm

app/app.go

@@ -14,7 +14,6 @@ import (
 	evidencekeeper "cosmossdk.io/x/evidence/keeper"
 	feegrantkeeper "cosmossdk.io/x/feegrant/keeper"
 	upgradekeeper "cosmossdk.io/x/upgrade/keeper"
-	cosmwasmmodulekeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	abci "github.com/cometbft/cometbft/abci/types"
 	dbm "github.com/cosmos/cosmos-db"
 	"github.com/cosmos/cosmos-sdk/baseapp"
@@ -132,7 +131,7 @@ type App struct {
 
 	// Scoped Wasm
 	ScopedWasmKeeper capabilitykeeper.ScopedKeeper
-	WasmKeeper       cosmwasmmodulekeeper.Keeper
+	WasmKeeper       wasmkeeper.Keeper
 	PaxKeeper        paxmodulekeeper.Keeper
 	UgdvestingKeeper ugdvestingmodulekeeper.Keeper
 	UgdmintKeeper    ugdmintmodulekeeper.Keeper
@@ -208,6 +207,7 @@ func New(
 				// This needs to be removed after IBC supports App Wiring.
 				app.GetIBCKeeper,
 				app.GetCapabilityScopedKeeper,
+				app.WasmKeeper,
 				// Supply the logger
 				logger,
 
@@ -444,6 +444,11 @@ func (app *App) GetIBCKeeper() *ibckeeper.Keeper {
 	return app.IBCKeeper
 }
 
+// GetWasmKeeper reurns the wasm keeper
+func (app *App) GetWasmKeeper() wasmkeeper.Keeper {
+	return app.WasmKeeper
+}
+
 // GetCapabilityScopedKeeper returns the capability scoped keeper.
 func (app *App) GetCapabilityScopedKeeper(moduleName string) capabilitykeeper.ScopedKeeper {
 	return app.CapabilityKeeper.ScopeToModule(moduleName)

app/app_config.go

@@ -203,7 +203,7 @@ var (
 		{Account: ugdmintmoduletypes.ModuleName, Permissions: []string{authtypes.Minter}},
 		{Account: gridnodemoduletypes.ModuleName},
 		{Account: ugdvestingmoduletypes.ModuleName},
-		{Account: cosmwasmmoduletypes.ModuleName},
+		{Account: cosmwasmmoduletypes.ModuleName, Permissions: []string{authtypes.Burner}},
 		// this line is used by starport scaffolding # stargate/app/maccPerms
 	}
 

app/legecyModules.go

@@ -214,7 +214,7 @@ func (app *App) registerLegecyModules(appOpts servertypes.AppOptions) {
 		wasmOpts...,
 	)
 
-	app.IBCKeeper.SetRouter(ibcRouter)
+	//app.IBCKeeper.SetRouter(ibcRouter)
 
 	app.ScopedIBCKeeper = scopedIBCKeeper
 	app.ScopedIBCTransferKeeper = scopedIBCTransferKeeper

docs/static/openapi.yml

@@ -1933,132 +1933,6 @@ paths:
             description: MsgUpdateParams is the Msg/UpdateParams request type.
       tags:
         - Msg
-  /cosmos.crisis.v1beta1.Msg/UpdateParams:
-    post:
-      summary: >-
-        UpdateParams defines a governance operation for updating the x/crisis
-        module
-
-        parameters. The authority is defined in the keeper.
-      description: 'Since: cosmos-sdk 0.47'
-      operationId: CosmosCrisisV1Beta1Msg_UpdateParams
-      responses:
-        '200':
-          description: A successful response.
-          schema:
-            type: object
-            description: >-
-              MsgUpdateParamsResponse defines the response structure for
-              executing a
-
-              MsgUpdateParams message.
-
-
-              Since: cosmos-sdk 0.47
-        default:
-          description: An unexpected error response.
-          schema:
-            type: object
-            properties:
-              code:
-                type: integer
-                format: int32
-              message:
-                type: string
-              details:
-                type: array
-                items:
-                  type: object
-                  properties:
-                    '@type':
-                      type: string
-                  additionalProperties: {}
-      parameters:
-        - name: body
-          description: |-
-            MsgUpdateParams is the Msg/UpdateParams request type.
-
-            Since: cosmos-sdk 0.47
-          in: body
-          required: true
-          schema:
-            type: object
-            properties:
-              authority:
-                type: string
-                description: >-
-                  authority is the address that controls the module (defaults to
-                  x/gov unless overwritten).
-              constant_fee:
-                description: constant_fee defines the x/crisis parameter.
-                type: object
-                properties:
-                  denom:
-                    type: string
-                  amount:
-                    type: string
-            description: |-
-              MsgUpdateParams is the Msg/UpdateParams request type.
-
-              Since: cosmos-sdk 0.47
-      tags:
-        - Msg
-  /cosmos.crisis.v1beta1.Msg/VerifyInvariant:
-    post:
-      summary: VerifyInvariant defines a method to verify a particular invariant.
-      operationId: CosmosCrisisV1Beta1Msg_VerifyInvariant
-      responses:
-        '200':
-          description: A successful response.
-          schema:
-            type: object
-            description: >-
-              MsgVerifyInvariantResponse defines the Msg/VerifyInvariant
-              response type.
-        default:
-          description: An unexpected error response.
-          schema:
-            type: object
-            properties:
-              code:
-                type: integer
-                format: int32
-              message:
-                type: string
-              details:
-                type: array
-                items:
-                  type: object
-                  properties:
-                    '@type':
-                      type: string
-                  additionalProperties: {}
-      parameters:
-        - name: body
-          description: >-
-            MsgVerifyInvariant represents a message to verify a particular
-            invariance.
-          in: body
-          required: true
-          schema:
-            type: object
-            properties:
-              sender:
-                type: string
-                description: >-
-                  sender is the account address of private key to send coins to
-                  fee collector account.
-              invariant_module_name:
-                type: string
-                description: name of the invariant module.
-              invariant_route:
-                type: string
-                description: invariant_route is the msg's invariant route.
-            description: >-
-              MsgVerifyInvariant represents a message to verify a particular
-              invariance.
-      tags:
-        - Msg
   /cosmos.distribution.v1beta1.Msg/CommunityPoolSpend:
     post:
       summary: >-
@@ -20632,48 +20506,13 @@ definitions:
     description: |-
       ValidatorParams restrict the public key types validators can use.
       NOTE: uses ABCI pubkey naming, not Amino names.
-  cosmos.crisis.v1beta1.MsgUpdateParams:
-    type: object
-    properties:
-      authority:
-        type: string
-        description: >-
-          authority is the address that controls the module (defaults to x/gov
-          unless overwritten).
-      constant_fee:
-        description: constant_fee defines the x/crisis parameter.
-        type: object
-        properties:
-          denom:
-            type: string
-          amount:
-            type: string
-    description: |-
-      MsgUpdateParams is the Msg/UpdateParams request type.
-
-      Since: cosmos-sdk 0.47
   cosmos.crisis.v1beta1.MsgUpdateParamsResponse:
     type: object
     description: |-
       MsgUpdateParamsResponse defines the response structure for executing a
       MsgUpdateParams message.
 
       Since: cosmos-sdk 0.47
-  cosmos.crisis.v1beta1.MsgVerifyInvariant:
-    type: object
-    properties:
-      sender:
-        type: string
-        description: >-
-          sender is the account address of private key to send coins to fee
-          collector account.
-      invariant_module_name:
-        type: string
-        description: name of the invariant module.
-      invariant_route:
-        type: string
-        description: invariant_route is the msg's invariant route.
-    description: MsgVerifyInvariant represents a message to verify a particular invariance.
   cosmos.crisis.v1beta1.MsgVerifyInvariantResponse:
     type: object
     description: MsgVerifyInvariantResponse defines the Msg/VerifyInvariant response type.