Cleanup

wormchain/app/app.go

@@ -603,19 +603,15 @@ func New(
 		app.BankKeeper,
 		app.StakingKeeper,
 		distrkeeper.NewQuerier(app.DistrKeeper),
-
-		// app.PacketForwardKeeper, // TODO: MAY BE WRONG
-		// app.HooksICS4Wrapper,
 		app.IBCKeeper.ChannelKeeper,
-
 		app.IBCKeeper.ChannelKeeper,
 		&app.IBCKeeper.PortKeeper,
 		app.scopedWasmKeeper,
 		app.TransferKeeper,
 		app.MsgServiceRouter(),
 		app.GRPCQueryRouter(),
 		wasmDir,
-		wasmConfig, // possible to cause errors
+		wasmConfig,
 		supportedFeatures,
 		govModAddress,
 		GetWasmOpts(app, appOpts)...,

wormchain/go.mod

@@ -203,5 +203,4 @@ replace (
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 	github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 	github.com/wormhole-foundation/wormhole/sdk => ../sdk
-// golang.org/x/exp => golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb
 )

wormchain/x/ibc-hooks/client/cli/query.go

@@ -36,7 +36,6 @@ func GetQueryCmd() *cobra.Command {
 		RunE:                       indexRunCmd,
 	}
 
-	cmd.Short = fmt.Sprintf("Querying commands for the %s module", types.ModuleName)
 	cmd.AddCommand(
 		GetCmdWasmSender(),
 	)

wormchain/x/ibc-hooks/types/errors.go

@@ -6,7 +6,7 @@ var (
 	ErrBadMetadataFormatMsg = "wasm metadata not properly formatted for: '%v'. %s"
 	ErrBadExecutionMsg      = "cannot execute contract: %v"
 
-	ErrMsgValidation = errors.Register(ModuleName, 2, "error in wasmhook message validation")
+	ErrMsgValidation = errors.Register("wasm-hooks", 2, "error in wasmhook message validation")
 	ErrMarshaling    = errors.Register("wasm-hooks", 3, "cannot marshal the ICS20 packet")
 	ErrInvalidPacket = errors.Register("wasm-hooks", 4, "invalid packet data")
 	ErrBadResponse   = errors.Register("wasm-hooks", 5, "cannot create response")

wormchain/x/tokenfactory/keeper/createdenom.go

@@ -53,13 +53,6 @@ func (k Keeper) createDenomAfterValidation(ctx sdk.Context, creatorAddr string,
 }
 
 func (k Keeper) validateCreateDenom(ctx sdk.Context, creatorAddr string, subdenom string) (newTokenDenom string, err error) {
-	// TODO: This was a nil key on Store issue. Removed as we are upgrading IBC versions now
-	// Temporary check until IBC bug is sorted out
-	// if k.bankKeeper.HasSupply(ctx, subdenom) {
-	// 	return "", fmt.Errorf("temporary error until IBC bug is sorted out, " +
-	// 		"can't create subdenoms that are the same as a native denom")
-	// }
-
 	denom, err := types.GetTokenDenom(creatorAddr, subdenom)
 	if err != nil {
 		return "", err