Merge branch 'main' into dependabot/go_modules/github.com/prometheus/…

…client_golang-1.19.0

Makefile

@@ -201,7 +201,8 @@ proto-gen:
 	@$(protoImage) sh ./scripts/protocgen.sh
 
 proto-swagger-gen:
-	@$(protoImage) sh ./scripts/protoc-swagger-gen.sh
+	@$(DOCKER) build proto/ -t swagger-gen
+	@$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace swagger-gen ./scripts/protoc-swagger-gen.sh
 
 PROTO_FORMATTER_IMAGE=bufbuild/buf:1.28.1
 
@@ -251,9 +252,6 @@ start-docker-container:
 stop-docker-container:
 	@docker stop neutron
 
-openapi:
-	ignite generate openapi
-
 mocks:
 	@echo "Regenerate mocks..."
 	@go generate ./...

app/app.go

@@ -22,16 +22,16 @@ import (
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 	tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
 
-	"github.com/neutron-org/neutron/v2/app/upgrades/nextupgrade"
-	"github.com/neutron-org/neutron/v2/docs"
+	"github.com/neutron-org/neutron/v3/docs"
 
-	"github.com/neutron-org/neutron/v2/app/upgrades"
-	v030 "github.com/neutron-org/neutron/v2/app/upgrades/v0.3.0"
-	v044 "github.com/neutron-org/neutron/v2/app/upgrades/v0.4.4"
-	v200 "github.com/neutron-org/neutron/v2/app/upgrades/v2.0.0"
-	v202 "github.com/neutron-org/neutron/v2/app/upgrades/v2.0.2"
+	"github.com/neutron-org/neutron/v3/app/upgrades"
+	v030 "github.com/neutron-org/neutron/v3/app/upgrades/v0.3.0"
+	v044 "github.com/neutron-org/neutron/v3/app/upgrades/v0.4.4"
+	v200 "github.com/neutron-org/neutron/v3/app/upgrades/v2.0.0"
+	v202 "github.com/neutron-org/neutron/v3/app/upgrades/v2.0.2"
+	v300 "github.com/neutron-org/neutron/v3/app/upgrades/v3.0.0"
 
-	"github.com/neutron-org/neutron/v2/x/cron"
+	"github.com/neutron-org/neutron/v3/x/cron"
 
 	"github.com/CosmWasm/wasmd/x/wasm"
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
@@ -109,12 +109,12 @@ import (
 
 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 
-	cronkeeper "github.com/neutron-org/neutron/v2/x/cron/keeper"
-	crontypes "github.com/neutron-org/neutron/v2/x/cron/types"
+	cronkeeper "github.com/neutron-org/neutron/v3/x/cron/keeper"
+	crontypes "github.com/neutron-org/neutron/v3/x/cron/types"
 
-	"github.com/neutron-org/neutron/v2/x/tokenfactory"
-	tokenfactorykeeper "github.com/neutron-org/neutron/v2/x/tokenfactory/keeper"
-	tokenfactorytypes "github.com/neutron-org/neutron/v2/x/tokenfactory/types"
+	"github.com/neutron-org/neutron/v3/x/tokenfactory"
+	tokenfactorykeeper "github.com/neutron-org/neutron/v3/x/tokenfactory/keeper"
+	tokenfactorytypes "github.com/neutron-org/neutron/v3/x/tokenfactory/types"
 
 	"github.com/cosmos/admin-module/x/adminmodule"
 	adminmodulecli "github.com/cosmos/admin-module/x/adminmodule/client/cli"
@@ -123,28 +123,28 @@ 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/v2/app/params"
-	"github.com/neutron-org/neutron/v2/wasmbinding"
-	"github.com/neutron-org/neutron/v2/x/contractmanager"
-	contractmanagermodulekeeper "github.com/neutron-org/neutron/v2/x/contractmanager/keeper"
-	contractmanagermoduletypes "github.com/neutron-org/neutron/v2/x/contractmanager/types"
-	"github.com/neutron-org/neutron/v2/x/feeburner"
-	feeburnerkeeper "github.com/neutron-org/neutron/v2/x/feeburner/keeper"
-	feeburnertypes "github.com/neutron-org/neutron/v2/x/feeburner/types"
-	"github.com/neutron-org/neutron/v2/x/feerefunder"
-	feekeeper "github.com/neutron-org/neutron/v2/x/feerefunder/keeper"
-	ibchooks "github.com/neutron-org/neutron/v2/x/ibc-hooks"
-	ibchookstypes "github.com/neutron-org/neutron/v2/x/ibc-hooks/types"
-	"github.com/neutron-org/neutron/v2/x/interchainqueries"
-	interchainqueriesmodulekeeper "github.com/neutron-org/neutron/v2/x/interchainqueries/keeper"
-	interchainqueriesmoduletypes "github.com/neutron-org/neutron/v2/x/interchainqueries/types"
-	"github.com/neutron-org/neutron/v2/x/interchaintxs"
-	interchaintxskeeper "github.com/neutron-org/neutron/v2/x/interchaintxs/keeper"
-	interchaintxstypes "github.com/neutron-org/neutron/v2/x/interchaintxs/types"
-	transferSudo "github.com/neutron-org/neutron/v2/x/transfer"
-	wrapkeeper "github.com/neutron-org/neutron/v2/x/transfer/keeper"
-
-	feetypes "github.com/neutron-org/neutron/v2/x/feerefunder/types"
+	appparams "github.com/neutron-org/neutron/v3/app/params"
+	"github.com/neutron-org/neutron/v3/wasmbinding"
+	"github.com/neutron-org/neutron/v3/x/contractmanager"
+	contractmanagermodulekeeper "github.com/neutron-org/neutron/v3/x/contractmanager/keeper"
+	contractmanagermoduletypes "github.com/neutron-org/neutron/v3/x/contractmanager/types"
+	"github.com/neutron-org/neutron/v3/x/feeburner"
+	feeburnerkeeper "github.com/neutron-org/neutron/v3/x/feeburner/keeper"
+	feeburnertypes "github.com/neutron-org/neutron/v3/x/feeburner/types"
+	"github.com/neutron-org/neutron/v3/x/feerefunder"
+	feekeeper "github.com/neutron-org/neutron/v3/x/feerefunder/keeper"
+	ibchooks "github.com/neutron-org/neutron/v3/x/ibc-hooks"
+	ibchookstypes "github.com/neutron-org/neutron/v3/x/ibc-hooks/types"
+	"github.com/neutron-org/neutron/v3/x/interchainqueries"
+	interchainqueriesmodulekeeper "github.com/neutron-org/neutron/v3/x/interchainqueries/keeper"
+	interchainqueriesmoduletypes "github.com/neutron-org/neutron/v3/x/interchainqueries/types"
+	"github.com/neutron-org/neutron/v3/x/interchaintxs"
+	interchaintxskeeper "github.com/neutron-org/neutron/v3/x/interchaintxs/keeper"
+	interchaintxstypes "github.com/neutron-org/neutron/v3/x/interchaintxs/types"
+	transferSudo "github.com/neutron-org/neutron/v3/x/transfer"
+	wrapkeeper "github.com/neutron-org/neutron/v3/x/transfer/keeper"
+
+	feetypes "github.com/neutron-org/neutron/v3/x/feerefunder/types"
 
 	ccvconsumer "github.com/cosmos/interchain-security/v4/x/ccv/consumer"
 	ccvconsumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper"
@@ -156,15 +156,15 @@ import (
 	pfmkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper"
 	pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
 
-	"github.com/neutron-org/neutron/v2/x/dex"
-	dexkeeper "github.com/neutron-org/neutron/v2/x/dex/keeper"
-	dextypes "github.com/neutron-org/neutron/v2/x/dex/types"
+	"github.com/neutron-org/neutron/v3/x/dex"
+	dexkeeper "github.com/neutron-org/neutron/v3/x/dex/keeper"
+	dextypes "github.com/neutron-org/neutron/v3/x/dex/types"
 
-	"github.com/neutron-org/neutron/v2/x/ibcswap"
-	ibcswapkeeper "github.com/neutron-org/neutron/v2/x/ibcswap/keeper"
-	ibcswaptypes "github.com/neutron-org/neutron/v2/x/ibcswap/types"
+	"github.com/neutron-org/neutron/v3/x/ibcswap"
+	ibcswapkeeper "github.com/neutron-org/neutron/v3/x/ibcswap/keeper"
+	ibcswaptypes "github.com/neutron-org/neutron/v3/x/ibcswap/types"
 
-	gmpmiddleware "github.com/neutron-org/neutron/v2/x/gmp"
+	gmpmiddleware "github.com/neutron-org/neutron/v3/x/gmp"
 
 	// Block-sdk imports
 	blocksdkabci "github.com/skip-mev/block-sdk/abci"
@@ -183,7 +183,7 @@ const (
 )
 
 var (
-	Upgrades = []upgrades.Upgrade{v030.Upgrade, v044.Upgrade, v200.Upgrade, v202.Upgrade, nextupgrade.Upgrade}
+	Upgrades = []upgrades.Upgrade{v030.Upgrade, v044.Upgrade, v200.Upgrade, v202.Upgrade, v300.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/v2/app/params"
+	"github.com/neutron-org/neutron/v3/app/params"
 )
 
 // MakeEncodingConfig creates an EncodingConfig for testing

app/genesis.go

@@ -9,7 +9,7 @@ import (
 	ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
 	ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
 
-	"github.com/neutron-org/neutron/v2/app/params"
+	"github.com/neutron-org/neutron/v3/app/params"
 )
 
 // GenesisState is the genesis state of the blockchain represented here as a map of raw json

app/proposals_allowlisting.go

@@ -18,14 +18,14 @@ import (
 	ccvconsumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types"
 	ccv "github.com/cosmos/interchain-security/v4/x/ccv/types"
 
-	contractmanagertypes "github.com/neutron-org/neutron/v2/x/contractmanager/types"
-	crontypes "github.com/neutron-org/neutron/v2/x/cron/types"
-	dextypes "github.com/neutron-org/neutron/v2/x/dex/types"
-	feeburnertypes "github.com/neutron-org/neutron/v2/x/feeburner/types"
-	feerefundertypes "github.com/neutron-org/neutron/v2/x/feerefunder/types"
-	interchainqueriestypes "github.com/neutron-org/neutron/v2/x/interchainqueries/types"
-	interchaintxstypes "github.com/neutron-org/neutron/v2/x/interchaintxs/types"
-	tokenfactorytypes "github.com/neutron-org/neutron/v2/x/tokenfactory/types"
+	contractmanagertypes "github.com/neutron-org/neutron/v3/x/contractmanager/types"
+	crontypes "github.com/neutron-org/neutron/v3/x/cron/types"
+	dextypes "github.com/neutron-org/neutron/v3/x/dex/types"
+	feeburnertypes "github.com/neutron-org/neutron/v3/x/feeburner/types"
+	feerefundertypes "github.com/neutron-org/neutron/v3/x/feerefunder/types"
+	interchainqueriestypes "github.com/neutron-org/neutron/v3/x/interchainqueries/types"
+	interchaintxstypes "github.com/neutron-org/neutron/v3/x/interchaintxs/types"
+	tokenfactorytypes "github.com/neutron-org/neutron/v3/x/tokenfactory/types"
 )
 
 func IsConsumerProposalAllowlisted(content govtypes.Content) bool {

app/proposals_allowlisting_test.go

@@ -8,8 +8,8 @@ import (
 	icssimapp "github.com/cosmos/interchain-security/v4/testutil/ibc_testing"
 	"github.com/stretchr/testify/require"
 
-	"github.com/neutron-org/neutron/v2/app"
-	"github.com/neutron-org/neutron/v2/testutil"
+	"github.com/neutron-org/neutron/v3/app"
+	"github.com/neutron-org/neutron/v3/testutil"
 )
 
 func TestConsumerWhitelistingKeys(t *testing.T) {

app/upgrades/types.go

@@ -14,11 +14,11 @@ import (
 	ccvconsumerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/consumer/keeper"
 	auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper"
 
-	contractmanagerkeeper "github.com/neutron-org/neutron/v2/x/contractmanager/keeper"
-	cronkeeper "github.com/neutron-org/neutron/v2/x/cron/keeper"
-	feeburnerkeeper "github.com/neutron-org/neutron/v2/x/feeburner/keeper"
-	icqkeeper "github.com/neutron-org/neutron/v2/x/interchainqueries/keeper"
-	tokenfactorykeeper "github.com/neutron-org/neutron/v2/x/tokenfactory/keeper"
+	contractmanagerkeeper "github.com/neutron-org/neutron/v3/x/contractmanager/keeper"
+	cronkeeper "github.com/neutron-org/neutron/v3/x/cron/keeper"
+	feeburnerkeeper "github.com/neutron-org/neutron/v3/x/feeburner/keeper"
+	icqkeeper "github.com/neutron-org/neutron/v3/x/interchainqueries/keeper"
+	tokenfactorykeeper "github.com/neutron-org/neutron/v3/x/tokenfactory/keeper"
 
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 )

app/upgrades/v0.3.0/constants.go

@@ -4,7 +4,7 @@ import (
 	store "github.com/cosmos/cosmos-sdk/store/types"
 	ccvprovider "github.com/cosmos/interchain-security/v4/x/ccv/provider/types"
 
-	"github.com/neutron-org/neutron/v2/app/upgrades"
+	"github.com/neutron-org/neutron/v3/app/upgrades"
 )
 
 const (

app/upgrades/v0.3.0/upgrades.go

@@ -6,11 +6,11 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/neutron-org/neutron/v2/app/upgrades"
+	"github.com/neutron-org/neutron/v3/app/upgrades"
 
-	crontypes "github.com/neutron-org/neutron/v2/x/cron/types"
-	icqtypes "github.com/neutron-org/neutron/v2/x/interchainqueries/types"
-	tokenfactorytypes "github.com/neutron-org/neutron/v2/x/tokenfactory/types"
+	crontypes "github.com/neutron-org/neutron/v3/x/cron/types"
+	icqtypes "github.com/neutron-org/neutron/v3/x/interchainqueries/types"
+	tokenfactorytypes "github.com/neutron-org/neutron/v3/x/tokenfactory/types"
 )
 
 func CreateUpgradeHandler(

app/upgrades/v0.4.4/constants.go

@@ -1,7 +1,7 @@
 package v044
 
 import (
-	"github.com/neutron-org/neutron/v2/app/upgrades"
+	"github.com/neutron-org/neutron/v3/app/upgrades"
 )
 
 const (

app/upgrades/v0.4.4/upgrades.go

@@ -8,10 +8,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	feeburnertypes "github.com/neutron-org/neutron/v2/x/feeburner/types"
-	tokenfactorytypes "github.com/neutron-org/neutron/v2/x/tokenfactory/types"
+	feeburnertypes "github.com/neutron-org/neutron/v3/x/feeburner/types"
+	tokenfactorytypes "github.com/neutron-org/neutron/v3/x/tokenfactory/types"
 
-	"github.com/neutron-org/neutron/v2/app/upgrades"
+	"github.com/neutron-org/neutron/v3/app/upgrades"
 )
 
 func CreateUpgradeHandler(

app/upgrades/v2.0.0/constants.go

@@ -5,8 +5,8 @@ import (
 	consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
 	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 
-	"github.com/neutron-org/neutron/v2/app/upgrades"
-	dextypes "github.com/neutron-org/neutron/v2/x/dex/types"
+	"github.com/neutron-org/neutron/v3/app/upgrades"
+	dextypes "github.com/neutron-org/neutron/v3/x/dex/types"
 )
 
 const (

app/upgrades/v2.0.0/upgrades.go

@@ -9,7 +9,7 @@ import (
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	ccv "github.com/cosmos/interchain-security/v4/x/ccv/types"
 
-	"github.com/neutron-org/neutron/v2/app/params"
+	"github.com/neutron-org/neutron/v3/app/params"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
@@ -21,15 +21,15 @@ import (
 	"github.com/cosmos/gaia/v11/x/globalfee/types"
 	v6 "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/migrations/v6"
 
-	"github.com/neutron-org/neutron/v2/app/upgrades"
-	contractmanagerkeeper "github.com/neutron-org/neutron/v2/x/contractmanager/keeper"
-	contractmanagertypes "github.com/neutron-org/neutron/v2/x/contractmanager/types"
-	crontypes "github.com/neutron-org/neutron/v2/x/cron/types"
-	feeburnertypes "github.com/neutron-org/neutron/v2/x/feeburner/types"
-	feerefundertypes "github.com/neutron-org/neutron/v2/x/feerefunder/types"
-	icqtypes "github.com/neutron-org/neutron/v2/x/interchainqueries/types"
-	interchaintxstypes "github.com/neutron-org/neutron/v2/x/interchaintxs/types"
-	tokenfactorytypes "github.com/neutron-org/neutron/v2/x/tokenfactory/types"
+	"github.com/neutron-org/neutron/v3/app/upgrades"
+	contractmanagerkeeper "github.com/neutron-org/neutron/v3/x/contractmanager/keeper"
+	contractmanagertypes "github.com/neutron-org/neutron/v3/x/contractmanager/types"
+	crontypes "github.com/neutron-org/neutron/v3/x/cron/types"
+	feeburnertypes "github.com/neutron-org/neutron/v3/x/feeburner/types"
+	feerefundertypes "github.com/neutron-org/neutron/v3/x/feerefunder/types"
+	icqtypes "github.com/neutron-org/neutron/v3/x/interchainqueries/types"
+	interchaintxstypes "github.com/neutron-org/neutron/v3/x/interchaintxs/types"
+	tokenfactorytypes "github.com/neutron-org/neutron/v3/x/tokenfactory/types"
 )
 
 func CreateUpgradeHandler(

app/upgrades/v2.0.0/upgrades_test.go

@@ -8,14 +8,14 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/errors"
 	ccv "github.com/cosmos/interchain-security/v4/x/ccv/types"
 
-	crontypes "github.com/neutron-org/neutron/v2/x/cron/types"
-	feeburnertypes "github.com/neutron-org/neutron/v2/x/feeburner/types"
-	feerefundertypes "github.com/neutron-org/neutron/v2/x/feerefunder/types"
-	icqtypes "github.com/neutron-org/neutron/v2/x/interchainqueries/types"
-	interchaintxstypes "github.com/neutron-org/neutron/v2/x/interchaintxs/types"
-	tokenfactorytypes "github.com/neutron-org/neutron/v2/x/tokenfactory/types"
+	crontypes "github.com/neutron-org/neutron/v3/x/cron/types"
+	feeburnertypes "github.com/neutron-org/neutron/v3/x/feeburner/types"
+	feerefundertypes "github.com/neutron-org/neutron/v3/x/feerefunder/types"
+	icqtypes "github.com/neutron-org/neutron/v3/x/interchainqueries/types"
+	interchaintxstypes "github.com/neutron-org/neutron/v3/x/interchaintxs/types"
+	tokenfactorytypes "github.com/neutron-org/neutron/v3/x/tokenfactory/types"
 
-	"github.com/neutron-org/neutron/v2/app/params"
+	"github.com/neutron-org/neutron/v3/app/params"
 
 	ccvconsumertypes "github.com/cosmos/interchain-security/v4/x/ccv/consumer/types"
 
@@ -25,8 +25,8 @@ import (
 	globalfeetypes "github.com/cosmos/gaia/v11/x/globalfee/types"
 	"github.com/stretchr/testify/suite"
 
-	v200 "github.com/neutron-org/neutron/v2/app/upgrades/v2.0.0"
-	"github.com/neutron-org/neutron/v2/testutil"
+	v200 "github.com/neutron-org/neutron/v3/app/upgrades/v2.0.0"
+	"github.com/neutron-org/neutron/v3/testutil"
 )
 
 type UpgradeTestSuite struct {

app/upgrades/v2.0.2/constants.go

@@ -1,7 +1,7 @@
 package v202
 
 import (
-	"github.com/neutron-org/neutron/v2/app/upgrades"
+	"github.com/neutron-org/neutron/v3/app/upgrades"
 )
 
 const (

app/upgrades/v2.0.2/upgrades.go

@@ -8,7 +8,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	"github.com/neutron-org/neutron/v2/app/upgrades"
+	"github.com/neutron-org/neutron/v3/app/upgrades"
 )
 
 func CreateUpgradeHandler(

app/upgrades/nextupgrade/constants.go → app/upgrades/v3.0.0/constants.go

@@ -1,4 +1,4 @@
-package nextupgrade
+package v300
 
 import (
 	"cosmossdk.io/math"
@@ -7,12 +7,12 @@ import (
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	auctiontypes "github.com/skip-mev/block-sdk/x/auction/types"
 
-	"github.com/neutron-org/neutron/v2/app/upgrades"
+	"github.com/neutron-org/neutron/v3/app/upgrades"
 )
 
 const (
 	// UpgradeName defines the on-chain upgrade name.
-	UpgradeName = "nextupgrade"
+	UpgradeName = "v3.0.0"
 
 	AuctionParamsMaxBundleSize          = 2
 	AuctionParamsFrontRunningProtection = true