IBC: rate limit native tokens on all channels

x/ibc-rate-limit/ibc_middleware_test.go

@@ -211,10 +211,10 @@ func (suite *MiddlewareTestSuite) AssertSend(success bool, msg sdk.Msg) (*sdk.Re
 	return r, err
 }
 
-func (suite *MiddlewareTestSuite) BuildChannelQuota(name, denom string, duration, send_precentage, recv_percentage uint32) string {
+func (suite *MiddlewareTestSuite) BuildChannelQuota(name, channel, denom string, duration, send_precentage, recv_percentage uint32) string {
 	return fmt.Sprintf(`
-          {"channel_id": "channel-0", "denom": "%s", "quotas": [{"name":"%s", "duration": %d, "send_recv":[%d, %d]}] }
-    `, denom, name, duration, send_precentage, recv_percentage)
+          {"channel_id": "%s", "denom": "%s", "quotas": [{"name":"%s", "duration": %d, "send_recv":[%d, %d]}] }
+    `, channel, denom, name, duration, send_precentage, recv_percentage)
 }
 
 // Tests
@@ -259,9 +259,11 @@ func (suite *MiddlewareTestSuite) fullSendTest(native bool) map[string]string {
 	suite.initializeEscrow()
 	// Get the denom and amount to send
 	denom := sdk.DefaultBondDenom
+	channel := "any"
 	if !native {
 		denomTrace := transfertypes.ParseDenomTrace(transfertypes.GetPrefixedDenom("transfer", "channel-0", denom))
 		denom = denomTrace.IBCDenom()
+		channel = "channel-0"
 	}
 
 	osmosisApp := suite.chainA.GetOsmosisApp()
@@ -277,7 +279,7 @@ func (suite *MiddlewareTestSuite) fullSendTest(native bool) map[string]string {
 
 	// Setup contract
 	suite.chainA.StoreContractCode(&suite.Suite)
-	quotas := suite.BuildChannelQuota("weekly", denom, 604800, 5, 5)
+	quotas := suite.BuildChannelQuota("weekly", channel, denom, 604800, 5, 5)
 	fmt.Println(quotas)
 	addr := suite.chainA.InstantiateContract(&suite.Suite, quotas)
 	suite.chainA.RegisterRateLimitingContract(addr)
@@ -343,9 +345,11 @@ func (suite *MiddlewareTestSuite) fullRecvTest(native bool) {
 	suite.initializeEscrow()
 	// Get the denom and amount to send
 	denom := sdk.DefaultBondDenom
+	channel := "any"
 	if !native {
 		denomTrace := transfertypes.ParseDenomTrace(transfertypes.GetPrefixedDenom("transfer", "channel-0", denom))
 		denom = denomTrace.IBCDenom()
+		channel = "channel-0"
 	}
 
 	osmosisApp := suite.chainA.GetOsmosisApp()
@@ -361,7 +365,7 @@ func (suite *MiddlewareTestSuite) fullRecvTest(native bool) {
 
 	// Setup contract
 	suite.chainA.StoreContractCode(&suite.Suite)
-	quotas := suite.BuildChannelQuota("weekly", denom, 604800, 5, 5)
+	quotas := suite.BuildChannelQuota("weekly", channel, denom, 604800, 5, 5)
 	addr := suite.chainA.InstantiateContract(&suite.Suite, quotas)
 	suite.chainA.RegisterRateLimitingContract(addr)
 
@@ -400,7 +404,7 @@ func (suite *MiddlewareTestSuite) TestFailedSendTransfer() {
 	suite.initializeEscrow()
 	// Setup contract
 	suite.chainA.StoreContractCode(&suite.Suite)
-	quotas := suite.BuildChannelQuota("weekly", sdk.DefaultBondDenom, 604800, 1, 1)
+	quotas := suite.BuildChannelQuota("weekly", "any", sdk.DefaultBondDenom, 604800, 1, 1)
 	addr := suite.chainA.InstantiateContract(&suite.Suite, quotas)
 	suite.chainA.RegisterRateLimitingContract(addr)
 

x/ibc-rate-limit/ibc_module.go

@@ -2,6 +2,7 @@ package ibc_rate_limit
 
 import (
 	"encoding/json"
+	"strings"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
@@ -136,13 +137,20 @@ func (im *IBCModule) OnRecvPacket(
 
 	channelValue := im.ics4Middleware.CalculateChannelValue(ctx, denom)
 
+	channel := packet.GetSourceChannel()
+	if !strings.HasPrefix(denom, "ibc/") {
+		// For native channels, we want to have only one limit across all channels. We can use a quota for
+		//channel "any" for this
+		channel = "any"
+	}
+
 	err = CheckAndUpdateRateLimits(
 		ctx,
 		im.ics4Middleware.ContractKeeper,
 		"recv_packet",
 		contract,
 		channelValue,
-		packet.GetDestChannel(),
+		channel,
 		denom, // We always use the packet's denom here, as we want the limits to be the same on both directions
 		amount,
 	)
@@ -219,11 +227,18 @@ func (im *IBCModule) RevertSentPacket(
 		return nil
 	}
 
+	channel := packet.GetSourceChannel()
+	if !strings.HasPrefix(data.Denom, "ibc/") {
+		// For native channels, we want to have only one limit across all channels. We can use a quota for
+		//channel "any" for this
+		channel = "any"
+	}
+
 	if err := UndoSendRateLimit(
 		ctx,
 		im.ics4Middleware.ContractKeeper,
 		contract,
-		packet.GetSourceChannel(),
+		channel,
 		data.Denom,
 		data.Amount,
 	); err != nil {

x/ibc-rate-limit/ics4_wrapper.go

@@ -11,6 +11,7 @@ import (
 	channelkeeper "github.com/cosmos/ibc-go/v3/modules/core/04-channel/keeper"
 	porttypes "github.com/cosmos/ibc-go/v3/modules/core/05-port/types"
 	"github.com/cosmos/ibc-go/v3/modules/core/exported"
+	"strings"
 )
 
 var (
@@ -59,13 +60,20 @@ func (i *ICS4Wrapper) SendPacket(ctx sdk.Context, chanCap *capabilitytypes.Capab
 
 	channelValue := i.CalculateChannelValue(ctx, denom)
 
+	channel := packet.GetSourceChannel()
+	if !strings.HasPrefix(denom, "ibc/") {
+		// For native channels, we want to have only one limit across all channels. We can use a quota for
+		//channel "any" for this
+		channel = "any"
+	}
+
 	err = CheckAndUpdateRateLimits(
 		ctx,
 		i.ContractKeeper,
 		"send_packet",
 		contract,
 		channelValue,
-		packet.GetSourceChannel(),
+		channel,
 		denom, // We always use the packet's denom here, as we want the limits to be the same on both directions
 		amount,
 	)