Merge remote-tracking branch 'origin/main' into fix/autoswap

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/app.go

@@ -10,8 +10,8 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/neutron-org/neutron/v4/x/dynamicfees"
-	dynamicfeestypes "github.com/neutron-org/neutron/v4/x/dynamicfees/types"
+	"github.com/neutron-org/neutron/v5/x/dynamicfees"
+	dynamicfeestypes "github.com/neutron-org/neutron/v5/x/dynamicfees/types"
 
 	"github.com/skip-mev/feemarket/x/feemarket"
 	feemarketkeeper "github.com/skip-mev/feemarket/x/feemarket/keeper"
@@ -21,7 +21,7 @@ import (
 	"cosmossdk.io/core/appmodule"
 	authcodec "github.com/cosmos/cosmos-sdk/x/auth/codec"
 
-	appconfig "github.com/neutron-org/neutron/v4/app/config"
+	appconfig "github.com/neutron-org/neutron/v5/app/config"
 
 	"github.com/skip-mev/slinky/abci/strategies/aggregator"
 	"github.com/skip-mev/slinky/x/oracle"
@@ -36,10 +36,9 @@ import (
 	oracleclient "github.com/skip-mev/slinky/service/clients/oracle"
 	servicemetrics "github.com/skip-mev/slinky/service/metrics"
 
-	v401 "github.com/neutron-org/neutron/v4/app/upgrades/v4.0.1"
-	v500 "github.com/neutron-org/neutron/v4/app/upgrades/v5.0.0"
-	"github.com/neutron-org/neutron/v4/x/globalfee"
-	globalfeetypes "github.com/neutron-org/neutron/v4/x/globalfee/types"
+	v500 "github.com/neutron-org/neutron/v5/app/upgrades/v5.0.0"
+	"github.com/neutron-org/neutron/v5/x/globalfee"
+	globalfeetypes "github.com/neutron-org/neutron/v5/x/globalfee/types"
 
 	"cosmossdk.io/log"
 	db "github.com/cosmos/cosmos-db"
@@ -57,11 +56,11 @@ import (
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 	tendermint "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint"
 
-	"github.com/neutron-org/neutron/v4/docs"
+	"github.com/neutron-org/neutron/v5/docs"
 
-	"github.com/neutron-org/neutron/v4/app/upgrades"
+	"github.com/neutron-org/neutron/v5/app/upgrades"
 
-	"github.com/neutron-org/neutron/v4/x/cron"
+	"github.com/neutron-org/neutron/v5/x/cron"
 
 	"cosmossdk.io/x/evidence"
 	evidencekeeper "cosmossdk.io/x/evidence/keeper"
@@ -141,12 +140,12 @@ import (
 
 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 
-	cronkeeper "github.com/neutron-org/neutron/v4/x/cron/keeper"
-	crontypes "github.com/neutron-org/neutron/v4/x/cron/types"
+	cronkeeper "github.com/neutron-org/neutron/v5/x/cron/keeper"
+	crontypes "github.com/neutron-org/neutron/v5/x/cron/types"
 
-	"github.com/neutron-org/neutron/v4/x/tokenfactory"
-	tokenfactorykeeper "github.com/neutron-org/neutron/v4/x/tokenfactory/keeper"
-	tokenfactorytypes "github.com/neutron-org/neutron/v4/x/tokenfactory/types"
+	"github.com/neutron-org/neutron/v5/x/tokenfactory"
+	tokenfactorykeeper "github.com/neutron-org/neutron/v5/x/tokenfactory/keeper"
+	tokenfactorytypes "github.com/neutron-org/neutron/v5/x/tokenfactory/types"
 
 	"github.com/cosmos/admin-module/v2/x/adminmodule"
 	adminmodulecli "github.com/cosmos/admin-module/v2/x/adminmodule/client/cli"
@@ -155,29 +154,29 @@ import (
 	govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
-	appparams "github.com/neutron-org/neutron/v4/app/params"
-	"github.com/neutron-org/neutron/v4/wasmbinding"
-	"github.com/neutron-org/neutron/v4/x/contractmanager"
-	contractmanagermodulekeeper "github.com/neutron-org/neutron/v4/x/contractmanager/keeper"
-	contractmanagermoduletypes "github.com/neutron-org/neutron/v4/x/contractmanager/types"
-	dynamicfeeskeeper "github.com/neutron-org/neutron/v4/x/dynamicfees/keeper"
-	"github.com/neutron-org/neutron/v4/x/feeburner"
-	feeburnerkeeper "github.com/neutron-org/neutron/v4/x/feeburner/keeper"
-	feeburnertypes "github.com/neutron-org/neutron/v4/x/feeburner/types"
-	"github.com/neutron-org/neutron/v4/x/feerefunder"
-	feekeeper "github.com/neutron-org/neutron/v4/x/feerefunder/keeper"
-	ibchooks "github.com/neutron-org/neutron/v4/x/ibc-hooks"
-	ibchookstypes "github.com/neutron-org/neutron/v4/x/ibc-hooks/types"
-	"github.com/neutron-org/neutron/v4/x/interchainqueries"
-	interchainqueriesmodulekeeper "github.com/neutron-org/neutron/v4/x/interchainqueries/keeper"
-	interchainqueriesmoduletypes "github.com/neutron-org/neutron/v4/x/interchainqueries/types"
-	"github.com/neutron-org/neutron/v4/x/interchaintxs"
-	interchaintxskeeper "github.com/neutron-org/neutron/v4/x/interchaintxs/keeper"
-	interchaintxstypes "github.com/neutron-org/neutron/v4/x/interchaintxs/types"
-	transferSudo "github.com/neutron-org/neutron/v4/x/transfer"
-	wrapkeeper "github.com/neutron-org/neutron/v4/x/transfer/keeper"
-
-	feetypes "github.com/neutron-org/neutron/v4/x/feerefunder/types"
+	appparams "github.com/neutron-org/neutron/v5/app/params"
+	"github.com/neutron-org/neutron/v5/wasmbinding"
+	"github.com/neutron-org/neutron/v5/x/contractmanager"
+	contractmanagermodulekeeper "github.com/neutron-org/neutron/v5/x/contractmanager/keeper"
+	contractmanagermoduletypes "github.com/neutron-org/neutron/v5/x/contractmanager/types"
+	dynamicfeeskeeper "github.com/neutron-org/neutron/v5/x/dynamicfees/keeper"
+	"github.com/neutron-org/neutron/v5/x/feeburner"
+	feeburnerkeeper "github.com/neutron-org/neutron/v5/x/feeburner/keeper"
+	feeburnertypes "github.com/neutron-org/neutron/v5/x/feeburner/types"
+	"github.com/neutron-org/neutron/v5/x/feerefunder"
+	feekeeper "github.com/neutron-org/neutron/v5/x/feerefunder/keeper"
+	ibchooks "github.com/neutron-org/neutron/v5/x/ibc-hooks"
+	ibchookstypes "github.com/neutron-org/neutron/v5/x/ibc-hooks/types"
+	"github.com/neutron-org/neutron/v5/x/interchainqueries"
+	interchainqueriesmodulekeeper "github.com/neutron-org/neutron/v5/x/interchainqueries/keeper"
+	interchainqueriesmoduletypes "github.com/neutron-org/neutron/v5/x/interchainqueries/types"
+	"github.com/neutron-org/neutron/v5/x/interchaintxs"
+	interchaintxskeeper "github.com/neutron-org/neutron/v5/x/interchaintxs/keeper"
+	interchaintxstypes "github.com/neutron-org/neutron/v5/x/interchaintxs/types"
+	transferSudo "github.com/neutron-org/neutron/v5/x/transfer"
+	wrapkeeper "github.com/neutron-org/neutron/v5/x/transfer/keeper"
+
+	feetypes "github.com/neutron-org/neutron/v5/x/feerefunder/types"
 
 	ccvconsumer "github.com/cosmos/interchain-security/v5/x/ccv/consumer"
 	ccvconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
@@ -190,12 +189,12 @@ import (
 	pfmkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/keeper"
 	pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types"
 
-	"github.com/neutron-org/neutron/v4/x/dex"
-	dexkeeper "github.com/neutron-org/neutron/v4/x/dex/keeper"
-	dextypes "github.com/neutron-org/neutron/v4/x/dex/types"
+	"github.com/neutron-org/neutron/v5/x/dex"
+	dexkeeper "github.com/neutron-org/neutron/v5/x/dex/keeper"
+	dextypes "github.com/neutron-org/neutron/v5/x/dex/types"
 
-	globalfeekeeper "github.com/neutron-org/neutron/v4/x/globalfee/keeper"
-	gmpmiddleware "github.com/neutron-org/neutron/v4/x/gmp"
+	globalfeekeeper "github.com/neutron-org/neutron/v5/x/globalfee/keeper"
+	gmpmiddleware "github.com/neutron-org/neutron/v5/x/gmp"
 
 	// Block-sdk imports
 	blocksdkabci "github.com/skip-mev/block-sdk/v2/abci"
@@ -222,7 +221,7 @@ const (
 )
 
 var (
-	Upgrades = []upgrades.Upgrade{v401.Upgrade, v500.Upgrade}
+	Upgrades = []upgrades.Upgrade{v500.Upgrade}
 
 	// DefaultNodeHome default home directories for the application daemon
 	DefaultNodeHome string

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

@@ -19,17 +19,17 @@ import (
 	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 {

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,18 @@ 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"
 	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"