Merge remote-tracking branch 'origin/main' into chore/better_update_f…

…n_naming

app/ante_handler.go

@@ -16,8 +16,8 @@ import (
 	ibcconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
 	feemarketante "github.com/skip-mev/feemarket/x/feemarket/ante"
 
-	globalfeeante "github.com/neutron-org/neutron/v4/x/globalfee/ante"
-	globalfeekeeper "github.com/neutron-org/neutron/v4/x/globalfee/keeper"
+	globalfeeante "github.com/neutron-org/neutron/v5/x/globalfee/ante"
+	globalfeekeeper "github.com/neutron-org/neutron/v5/x/globalfee/keeper"
 )
 
 // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC

app/encoding.go

@@ -3,7 +3,7 @@ package app
 import (
 	"github.com/cosmos/cosmos-sdk/std"
 
-	"github.com/neutron-org/neutron/v4/app/params"
+	"github.com/neutron-org/neutron/v5/app/params"
 )
 
 // MakeEncodingConfig creates an EncodingConfig for testing

app/proposals_allowlisting.go

@@ -16,20 +16,21 @@ import (
 	ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
 	ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" //nolint:staticcheck
 	ccvconsumertypes "github.com/cosmos/interchain-security/v5/x/ccv/consumer/types"
+	ibcratelimittypes "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/types"
 	feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types"
 	marketmaptypes "github.com/skip-mev/slinky/x/marketmap/types"
 
-	dynamicfeestypes "github.com/neutron-org/neutron/v4/x/dynamicfees/types"
-	globalfeetypes "github.com/neutron-org/neutron/v4/x/globalfee/types"
+	dynamicfeestypes "github.com/neutron-org/neutron/v5/x/dynamicfees/types"
+	globalfeetypes "github.com/neutron-org/neutron/v5/x/globalfee/types"
 
-	contractmanagertypes "github.com/neutron-org/neutron/v4/x/contractmanager/types"
-	crontypes "github.com/neutron-org/neutron/v4/x/cron/types"
-	dextypes "github.com/neutron-org/neutron/v4/x/dex/types"
-	feeburnertypes "github.com/neutron-org/neutron/v4/x/feeburner/types"
-	feerefundertypes "github.com/neutron-org/neutron/v4/x/feerefunder/types"
-	interchainqueriestypes "github.com/neutron-org/neutron/v4/x/interchainqueries/types"
-	interchaintxstypes "github.com/neutron-org/neutron/v4/x/interchaintxs/types"
-	tokenfactorytypes "github.com/neutron-org/neutron/v4/x/tokenfactory/types"
+	contractmanagertypes "github.com/neutron-org/neutron/v5/x/contractmanager/types"
+	crontypes "github.com/neutron-org/neutron/v5/x/cron/types"
+	dextypes "github.com/neutron-org/neutron/v5/x/dex/types"
+	feeburnertypes "github.com/neutron-org/neutron/v5/x/feeburner/types"
+	feerefundertypes "github.com/neutron-org/neutron/v5/x/feerefunder/types"
+	interchainqueriestypes "github.com/neutron-org/neutron/v5/x/interchainqueries/types"
+	interchaintxstypes "github.com/neutron-org/neutron/v5/x/interchaintxs/types"
+	tokenfactorytypes "github.com/neutron-org/neutron/v5/x/tokenfactory/types"
 )
 
 func IsConsumerProposalAllowlisted(content govtypes.Content) bool {
@@ -93,7 +94,8 @@ func isSdkMessageWhitelisted(msg sdk.Msg) bool {
 		*feemarkettypes.MsgParams,
 		*dynamicfeestypes.MsgUpdateParams,
 		*ibctransfertypes.MsgUpdateParams,
-		*globalfeetypes.MsgUpdateParams:
+		*globalfeetypes.MsgUpdateParams,
+		*ibcratelimittypes.MsgUpdateParams:
 		return true
 	}
 	return false

app/proposals_allowlisting_test.go

@@ -3,15 +3,15 @@ package app_test
 import (
 	"testing"
 
-	"github.com/neutron-org/neutron/v4/app/config"
+	"github.com/neutron-org/neutron/v5/app/config"
 
 	cmttypes "github.com/cometbft/cometbft/types"
 	ibctesting "github.com/cosmos/ibc-go/v8/testing"
 	icssimapp "github.com/cosmos/interchain-security/v5/testutil/ibc_testing"
 	"github.com/stretchr/testify/require"
 
-	"github.com/neutron-org/neutron/v4/app"
-	"github.com/neutron-org/neutron/v4/testutil"
+	"github.com/neutron-org/neutron/v5/app"
+	"github.com/neutron-org/neutron/v5/testutil"
 )
 
 func TestConsumerWhitelistingKeys(t *testing.T) {

app/upgrades/types.go

@@ -13,18 +13,19 @@ import (
 	slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
 	capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
 	ccvconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
+	dexkeeper "github.com/neutron-org/neutron/v5/x/dex/keeper"
+	ibcratelimitkeeper "github.com/neutron-org/neutron/v5/x/ibc-rate-limit/keeper"
 	auctionkeeper "github.com/skip-mev/block-sdk/v2/x/auction/keeper"
 	feemarketkeeper "github.com/skip-mev/feemarket/x/feemarket/keeper"
 	marketmapkeeper "github.com/skip-mev/slinky/x/marketmap/keeper"
 
-	dynamicfeeskeeper "github.com/neutron-org/neutron/v4/x/dynamicfees/keeper"
+	dynamicfeeskeeper "github.com/neutron-org/neutron/v5/x/dynamicfees/keeper"
 
-	contractmanagerkeeper "github.com/neutron-org/neutron/v4/x/contractmanager/keeper"
-	cronkeeper "github.com/neutron-org/neutron/v4/x/cron/keeper"
-	dexkeeper "github.com/neutron-org/neutron/v4/x/dex/keeper"
-	feeburnerkeeper "github.com/neutron-org/neutron/v4/x/feeburner/keeper"
-	icqkeeper "github.com/neutron-org/neutron/v4/x/interchainqueries/keeper"
-	tokenfactorykeeper "github.com/neutron-org/neutron/v4/x/tokenfactory/keeper"
+	contractmanagerkeeper "github.com/neutron-org/neutron/v5/x/contractmanager/keeper"
+	cronkeeper "github.com/neutron-org/neutron/v5/x/cron/keeper"
+	feeburnerkeeper "github.com/neutron-org/neutron/v5/x/feeburner/keeper"
+	icqkeeper "github.com/neutron-org/neutron/v5/x/interchainqueries/keeper"
+	tokenfactorykeeper "github.com/neutron-org/neutron/v5/x/tokenfactory/keeper"
 
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	transferkeeper "github.com/cosmos/ibc-go/v8/modules/apps/transfer/keeper"
@@ -66,6 +67,7 @@ type UpgradeKeepers struct {
 	FeeMarketKeeper    *feemarketkeeper.Keeper
 	DynamicfeesKeeper  *dynamicfeeskeeper.Keeper
 	DexKeeper          *dexkeeper.Keeper
+	IbcRateLimitKeeper *ibcratelimitkeeper.Keeper
 	// subspaces
 	GlobalFeeSubspace   paramtypes.Subspace
 	CcvConsumerSubspace paramtypes.Subspace