remove ibc-rate-limits and move rate limits into ibctransfer module

app/app.go

@@ -120,16 +120,16 @@ import (
 	"github.com/umee-network/umee/v3/util/genmap"
 	uibctransfer "github.com/umee-network/umee/v3/x/ibctransfer"
 	uibctransferkeeper "github.com/umee-network/umee/v3/x/ibctransfer/keeper"
+	uibctransfertypes "github.com/umee-network/umee/v3/x/ibctransfer/types"
 	"github.com/umee-network/umee/v3/x/leverage"
 	leveragekeeper "github.com/umee-network/umee/v3/x/leverage/keeper"
 	leveragetypes "github.com/umee-network/umee/v3/x/leverage/types"
 	"github.com/umee-network/umee/v3/x/oracle"
 	oraclekeeper "github.com/umee-network/umee/v3/x/oracle/keeper"
 	oracletypes "github.com/umee-network/umee/v3/x/oracle/types"
 
-	ibcratelimit "github.com/umee-network/umee/v3/x/ibc-rate-limit"
-	ibcratelimitkeeper "github.com/umee-network/umee/v3/x/ibc-rate-limit/keeper"
-	ibcratelimittypes "github.com/umee-network/umee/v3/x/ibc-rate-limit/types"
+	ibcratelimit "github.com/umee-network/umee/v3/x/ibctransfer/ratelimits"
+	ibcratelimitkeeper "github.com/umee-network/umee/v3/x/ibctransfer/ratelimits/keeper"
 )
 
 var (
@@ -175,7 +175,7 @@ func init() {
 		leverage.AppModuleBasic{},
 		oracle.AppModuleBasic{},
 		bech32ibc.AppModuleBasic{},
-		ibcratelimit.AppModuleBasic{},
+		uibctransfer.AppModuleBasic{},
 	}
 
 	if Experimental {
@@ -197,7 +197,7 @@ func init() {
 		gravitytypes.ModuleName:      {authtypes.Minter, authtypes.Burner},
 		leveragetypes.ModuleName:     {authtypes.Minter, authtypes.Burner},
 		oracletypes.ModuleName:       nil,
-		ibcratelimittypes.ModuleName: nil,
+		uibctransfertypes.ModuleName: nil,
 	}
 
 	if Experimental {
@@ -309,7 +309,7 @@ func New(
 		authzkeeper.StoreKey, nftkeeper.StoreKey, group.StoreKey,
 		ibchost.StoreKey, ibctransfertypes.StoreKey,
 		gravitytypes.StoreKey,
-		leveragetypes.StoreKey, oracletypes.StoreKey, bech32ibctypes.StoreKey, ibcratelimittypes.StoreKey,
+		leveragetypes.StoreKey, oracletypes.StoreKey, bech32ibctypes.StoreKey, uibctransfertypes.StoreKey,
 	}
 	if Experimental {
 		storeKeys = append(storeKeys, wasm.StoreKey)
@@ -503,7 +503,7 @@ func New(
 
 	app.ibcRateLimitKeeper = ibcratelimitkeeper.NewKeeper(
 		appCodec,
-		keys[ibcratelimittypes.StoreKey], app.GetSubspace(ibcratelimittypes.ModuleName),
+		keys[uibctransfertypes.StoreKey], app.GetSubspace(uibctransfertypes.ModuleName),
 		app.IBCKeeper.ChannelKeeper,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
@@ -641,7 +641,7 @@ func New(
 		leverage.NewAppModule(appCodec, app.LeverageKeeper, app.AccountKeeper, app.BankKeeper),
 		oracle.NewAppModule(appCodec, app.OracleKeeper, app.AccountKeeper, app.BankKeeper, Experimental),
 		bech32ibc.NewAppModule(appCodec, app.bech32IbcKeeper),
-		ibcratelimit.NewAppModule(appCodec, app.ibcRateLimitKeeper),
+		uibctransfer.NewAppModule(appCodec, app.ibcRateLimitKeeper),
 	}
 	if Experimental {
 		appModules = append(appModules,
@@ -668,7 +668,7 @@ func New(
 		oracletypes.ModuleName,
 		gravitytypes.ModuleName,
 		bech32ibctypes.ModuleName,
-		ibcratelimittypes.ModuleName,
+		uibctransfertypes.ModuleName,
 	}
 	endBlockers := []string{
 		crisistypes.ModuleName,
@@ -684,7 +684,7 @@ func New(
 		leveragetypes.ModuleName,
 		gravitytypes.ModuleName,
 		bech32ibctypes.ModuleName,
-		ibcratelimittypes.ModuleName,
+		uibctransfertypes.ModuleName,
 	}
 
 	// NOTE: The genutils module must occur after staking so that pools are
@@ -705,7 +705,7 @@ func New(
 		leveragetypes.ModuleName,
 		gravitytypes.ModuleName,
 		bech32ibctypes.ModuleName,
-		ibcratelimittypes.ModuleName,
+		uibctransfertypes.ModuleName,
 	}
 	orderMigrations := []string{
 		capabilitytypes.ModuleName, authtypes.ModuleName, banktypes.ModuleName, distrtypes.ModuleName,
@@ -719,7 +719,7 @@ func New(
 		leveragetypes.ModuleName,
 		gravitytypes.ModuleName,
 		bech32ibctypes.ModuleName,
-		ibcratelimittypes.ModuleName}
+		uibctransfertypes.ModuleName}
 
 	if Experimental {
 		beginBlockers = append(beginBlockers, wasm.ModuleName)
@@ -1020,7 +1020,7 @@ func initParamsKeeper(
 	paramsKeeper.Subspace(ibchost.ModuleName)
 	// paramsKeeper.Subspace(icacontrollertypes.SubModuleName)
 	// paramsKeeper.Subspace(icahosttypes.SubModuleName)
-	paramsKeeper.Subspace(ibcratelimittypes.ModuleName)
+	paramsKeeper.Subspace(uibctransfertypes.ModuleName)
 	paramsKeeper.Subspace(gravitytypes.ModuleName)
 	paramsKeeper.Subspace(leveragetypes.ModuleName)
 	paramsKeeper.Subspace(oracletypes.ModuleName)

proto/umee/ibc_rate_limit/v1beta1/genesis.proto → proto/umee/ibctransfer/v1/genesis.proto

@@ -1,10 +1,10 @@
 syntax = "proto3";
-package umee.ibcratelimit.v1beta1;
+package umee.ibctransfer.v1;
 
 import "gogoproto/gogo.proto";
-import "umee/ibc_rate_limit/v1beta1/ibc_rate_limit.proto";
+import "umee/ibctransfer/v1/ibc_rate_limit.proto";
 
-option go_package                      = "github.com/umee-network/umee/v3/x/ibc-rate-limit/types";
+option go_package                      = "github.com/umee-network/umee/v3/x/ibctransfer/types";
 option (gogoproto.goproto_getters_all) = false;
 
 message GenesisState {

proto/umee/ibc_rate_limit/v1beta1/ibc_rate_limit.proto → proto/umee/ibctransfer/v1/ibc_rate_limit.proto

@@ -1,11 +1,11 @@
 syntax = "proto3";
-package umee.ibcratelimit.v1beta1;
+package umee.ibctransfer.v1;
 
 import "gogoproto/gogo.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/umee-network/umee/v3/x/ibc-rate-limit/types";
+option go_package = "github.com/umee-network/umee/v3/x/ibctransfer/types";
 
 // RateLimit is format of ibc rate limit
 message RateLimit {

proto/umee/ibc_rate_limit/v1beta1/metadata.proto → proto/umee/ibctransfer/v1/metadata.proto

@@ -1,9 +1,9 @@
 syntax = "proto3";
-package umee.ibcratelimit.v1beta1;
+package umee.ibctransfer.v1;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/umee-network/umee/v3/x/ibc-rate-limit/types";
+option go_package = "github.com/umee-network/umee/v3/x/ibctransfer/types";
 
 // Metadata defines the ICS29 channel specific metadata encoded into the channel version bytestring
 // See ICS004: https://github.com/cosmos/ibc/tree/master/spec/core/ics-004-channel-and-packet-semantics#Versioning

proto/umee/ibc_rate_limit/v1beta1/query.proto → proto/umee/ibctransfer/v1/query.proto

@@ -1,29 +1,29 @@
 syntax = "proto3";
-package umee.ibcratelimit.v1beta1;
+package umee.ibctransfer.v1;
 
 import "google/api/annotations.proto";
 import "gogoproto/gogo.proto";
-import "umee/ibc_rate_limit/v1beta1/ibc_rate_limit.proto";
+import "umee/ibctransfer/v1/ibc_rate_limit.proto";
 
-option go_package = "github.com/umee-network/umee/v3/x/ibc-rate-limit/types";
+option go_package = "github.com/umee-network/umee/v3/x/ibctransfer/types";
 
 option (gogoproto.goproto_getters_all) = false;
 
 // Query defines the gRPC querier service.
 service Query {
   // Params queries the parameters of the x/ibc-rate-limit module.
   rpc Params(QueryParams) returns (QueryParamsResponse) {
-    option (google.api.http).get = "/umee/ibc_rate_limit/v1/params";
+    option (google.api.http).get = "/umee/ibctransfer/v1/params";
   }
 
   // RateLimitsOfIBCDenoms queries the rate limits of ibc denoms.
   rpc RateLimitsOfIBCDenoms(QueryRateLimitsOfIBCDenoms) returns (QueryRateLimitsOfIBCDenomsResponse) {
-    option (google.api.http).get = "/umee/ibc_rate_limit/v1/rate_limits";
+    option (google.api.http).get = "/umee/ibctransfer/v1/rate_limits";
   }
 
   // RateLimitsOfIBCDenom queries the rate limits of ibc denom.
   rpc RateLimitsOfIBCDenom(QueryRateLimitsOfIBCDenom) returns (QueryRateLimitsOfIBCDenomResponse) {
-    option (google.api.http).get = "/umee/ibc_rate_limit/v1/rate_limits/{ibc_denom}";
+    option (google.api.http).get = "/umee/ibctransfer/v1/rate_limits/{ibc_denom}";
   }
 }
 

proto/umee/ibc_rate_limit/v1beta1/tx.proto → proto/umee/ibctransfer/v1/tx.proto

@@ -1,13 +1,13 @@
 syntax = "proto3";
-package umee.ibcratelimit.v1beta1;
+package umee.ibctransfer.v1;
 
 import "gogoproto/gogo.proto";
 import "google/protobuf/duration.proto";
 import "cosmos/msg/v1/msg.proto";
 import "cosmos_proto/cosmos.proto";
-import "umee/ibc_rate_limit/v1beta1/ibc_rate_limit.proto";
+import "umee/ibctransfer/v1/ibc_rate_limit.proto";
 
-option go_package = "github.com/umee-network/umee/v3/x/ibc-rate-limit/types";
+option go_package = "github.com/umee-network/umee/v3/x/ibctransfer/types";
 
 option (gogoproto.goproto_getters_all) = false;
 option (gogoproto.messagename_all)     = true;

x/ibc-rate-limit/abci.go → x/ibctransfer/abci.go

@@ -1,9 +1,9 @@
-package ibc_rate_limit
+package ibctransfer
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/umee-network/umee/v3/x/ibc-rate-limit/keeper"
+	"github.com/umee-network/umee/v3/x/ibctransfer/ratelimits/keeper"
 )
 
 // BeginBlock implements BeginBlock for the x/ibc-rate-limit module.

x/ibc-rate-limit/client/cli/query.go → x/ibctransfer/client/cli/query.go

@@ -7,7 +7,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/spf13/cobra"
 	"github.com/umee-network/umee/v3/util/cli"
-	"github.com/umee-network/umee/v3/x/ibc-rate-limit/types"
+	"github.com/umee-network/umee/v3/x/ibctransfer/types"
 )
 
 // GetQueryCmd returns the CLI query commands for the x/ibc-rate-limit module.

x/ibc-rate-limit/client/cli/tx.go → x/ibctransfer/client/cli/tx.go

@@ -7,10 +7,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	"github.com/spf13/cobra"
-	"github.com/umee-network/umee/v3/x/ibc-rate-limit/types"
+	"github.com/umee-network/umee/v3/x/ibctransfer/types"
 )
 
-// GetTxCmd returns the CLI transaction commands for the x/ibc-rate-limit module.
+// GetTxCmd returns the CLI transaction commands for the x/ibctransfer module.
 func GetTxCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                        types.ModuleName,

x/ibc-rate-limit/genesis.go → x/ibctransfer/genesis.go

@@ -1,9 +1,9 @@
-package ibc_rate_limit
+package ibctransfer
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/umee-network/umee/v3/x/ibc-rate-limit/keeper"
-	"github.com/umee-network/umee/v3/x/ibc-rate-limit/types"
+	"github.com/umee-network/umee/v3/x/ibctransfer/ratelimits/keeper"
+	"github.com/umee-network/umee/v3/x/ibctransfer/types"
 )
 
 // InitGenesis initializes the x/leverage module's state from a provided genesis

x/ibc-rate-limit/module.go → x/ibctransfer/module.go

@@ -1,4 +1,4 @@
-package ibc_rate_limit
+package ibctransfer
 
 import (
 	"context"
@@ -13,9 +13,9 @@ import (
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"
 	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/umee-network/umee/v3/x/ibc-rate-limit/client/cli"
-	"github.com/umee-network/umee/v3/x/ibc-rate-limit/keeper"
-	"github.com/umee-network/umee/v3/x/ibc-rate-limit/types"
+	"github.com/umee-network/umee/v3/x/ibctransfer/client/cli"
+	"github.com/umee-network/umee/v3/x/ibctransfer/ratelimits/keeper"
+	"github.com/umee-network/umee/v3/x/ibctransfer/types"
 )
 
 var (
@@ -140,12 +140,12 @@ func (AppModule) Route() sdk.Route {
 	return sdk.Route{}
 }
 
-// BeginBlock executes all ABCI BeginBlock logic respective to the x/ibc-rate-limit module.
+// BeginBlock executes all ABCI BeginBlock logic respective to the x/ibctransfer module.
 func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) {
 	BeginBlock(ctx, am.keeper)
 }
 
-// EndBlock executes all ABCI EndBlock logic respective to the x/ibc-rate-limit module.
+// EndBlock executes all ABCI EndBlock logic respective to the x/ibctransfer module.
 // It returns no validator updates.
 func (am AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate {
 	return EndBlocker(ctx, am.keeper)

x/ibc-rate-limit/ibc_module.go → x/ibctransfer/ratelimits/ibc_module.go

@@ -10,8 +10,8 @@ import (
 	channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types"
 	porttypes "github.com/cosmos/ibc-go/v5/modules/core/05-port/types"
 	"github.com/cosmos/ibc-go/v5/modules/core/exported"
-	"github.com/umee-network/umee/v3/x/ibc-rate-limit/keeper"
-	"github.com/umee-network/umee/v3/x/ibc-rate-limit/types"
+	"github.com/umee-network/umee/v3/x/ibctransfer/ratelimits/keeper"
+	"github.com/umee-network/umee/v3/x/ibctransfer/types"
 )
 
 type IBCMiddleware struct {

x/ibc-rate-limit/keeper/grpc_query.go → x/ibctransfer/ratelimits/keeper/grpc_query.go

@@ -4,7 +4,7 @@ import (
 	context "context"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/umee-network/umee/v3/x/ibc-rate-limit/types"
+	"github.com/umee-network/umee/v3/x/ibctransfer/types"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )

x/ibc-rate-limit/keeper/keeper.go → x/ibctransfer/ratelimits/keeper/keeper.go

@@ -5,7 +5,7 @@ import (
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
-	"github.com/umee-network/umee/v3/x/ibc-rate-limit/types"
+	"github.com/umee-network/umee/v3/x/ibctransfer/types"
 )
 
 type Keeper struct {

x/ibc-rate-limit/keeper/msg_server.go → x/ibctransfer/ratelimits/keeper/msg_server.go

@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
-	"github.com/umee-network/umee/v3/x/ibc-rate-limit/types"
+	"github.com/umee-network/umee/v3/x/ibctransfer/types"
 )
 
 var _ types.MsgServer = msgServer{}

x/ibc-rate-limit/keeper/params.go → x/ibctransfer/ratelimits/keeper/params.go

@@ -2,7 +2,7 @@ package keeper
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/umee-network/umee/v3/x/ibc-rate-limit/types"
+	"github.com/umee-network/umee/v3/x/ibctransfer/types"
 )
 
 // SetParams sets the x/ibc-rate-limit module's parameters.

x/ibc-rate-limit/keeper/rate_limits.go → x/ibctransfer/ratelimits/keeper/rate_limits.go

@@ -8,7 +8,7 @@ import (
 	transfertypes "github.com/cosmos/ibc-go/v5/modules/apps/transfer/types"
 	"github.com/cosmos/ibc-go/v5/modules/core/exported"
 
-	"github.com/umee-network/umee/v3/x/ibc-rate-limit/types"
+	"github.com/umee-network/umee/v3/x/ibctransfer/types"
 )
 
 // GetRateLimitsOfIBCDenoms returns rate limits of all registered ibc denoms.

x/ibc-rate-limit/keeper/relay.go → x/ibctransfer/ratelimits/keeper/relay.go

@@ -7,7 +7,7 @@ import (
 	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
 	ibcexported "github.com/cosmos/ibc-go/v5/modules/core/exported"
 
-	"github.com/umee-network/umee/v3/x/ibc-rate-limit/types"
+	"github.com/umee-network/umee/v3/x/ibctransfer/types"
 )
 
 // SendPacket wraps IBC ChannelKeeper's SendPacket function

x/ibctransfer/types/expected_keepers.go

@@ -3,6 +3,8 @@ package types
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/bank/types"
+	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
+	ibcexported "github.com/cosmos/ibc-go/v5/modules/core/exported"
 )
 
 // BankKeeper defines the expected x/bank keeper interface.
@@ -11,3 +13,10 @@ type BankKeeper interface {
 	SetDenomMetaData(ctx sdk.Context, denomMetaData types.Metadata)
 	IterateAllDenomMetaData(ctx sdk.Context, cb func(types.Metadata) bool)
 }
+
+// ICS4Wrapper defines the expected ICS4Wrapper for middleware
+type ICS4Wrapper interface {
+	WriteAcknowledgement(ctx sdk.Context, chanCap *capabilitytypes.Capability, packet ibcexported.PacketI, acknowledgement ibcexported.Acknowledgement) error
+	SendPacket(ctx sdk.Context, channelCap *capabilitytypes.Capability, packet ibcexported.PacketI) error
+	GetAppVersion(ctx sdk.Context, portID, channelID string) (string, bool)
+}