Merge branch 'main' into rehearsals/v10.0.x

Author: pr0n00gler

Makefile

@@ -51,6 +51,7 @@ ifeq ($(WITH_CLEVELDB),yes)
   build_tags += gcc
 endif
 build_tags += $(BUILD_TAGS)
+build_tags += pebbledb
 build_tags := $(strip $(build_tags))
 
 build_tags_test_binary = $(build_tags)

app/ante_handler.go

@@ -14,8 +14,8 @@ import (
 	ibckeeper "github.com/cosmos/ibc-go/v10/modules/core/keeper"
 	feemarketante "github.com/skip-mev/feemarket/x/feemarket/ante"
 
-	globalfeeante "github.com/neutron-org/neutron/v9/x/globalfee/ante"
-	globalfeekeeper "github.com/neutron-org/neutron/v9/x/globalfee/keeper"
+	globalfeeante "github.com/neutron-org/neutron/v10/x/globalfee/ante"
+	globalfeekeeper "github.com/neutron-org/neutron/v10/x/globalfee/keeper"
 )
 
 // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC

app/app.go

@@ -12,39 +12,39 @@ import (
 
 	"cosmossdk.io/math"
 
-	nextupgrade "github.com/neutron-org/neutron/v9/app/upgrades/nextupgrade"
-	v700 "github.com/neutron-org/neutron/v9/app/upgrades/v7.0.0"
-	v800 "github.com/neutron-org/neutron/v9/app/upgrades/v8.0.0"
-	v800_rc0 "github.com/neutron-org/neutron/v9/app/upgrades/v8.0.0-rc0"
-	v810 "github.com/neutron-org/neutron/v9/app/upgrades/v8.1.0"
-	v820 "github.com/neutron-org/neutron/v9/app/upgrades/v8.2.0"
-	v900 "github.com/neutron-org/neutron/v9/app/upgrades/v9.0.0"
-	v910 "github.com/neutron-org/neutron/v9/app/upgrades/v9.1.0"
-	"github.com/neutron-org/neutron/v9/x/coinfactory"
-	dynamicfeestypes "github.com/neutron-org/neutron/v9/x/dynamicfees/types"
-	stateverifier "github.com/neutron-org/neutron/v9/x/state-verifier"
-	svkeeper "github.com/neutron-org/neutron/v9/x/state-verifier/keeper"
-	stateverifiertypes "github.com/neutron-org/neutron/v9/x/state-verifier/types"
-
-	"github.com/neutron-org/neutron/v9/x/harpoon"
+	v10_0_0 "github.com/neutron-org/neutron/v10/app/upgrades/v10.0.0"
+	v700 "github.com/neutron-org/neutron/v10/app/upgrades/v7.0.0"
+	v800 "github.com/neutron-org/neutron/v10/app/upgrades/v8.0.0"
+	v800_rc0 "github.com/neutron-org/neutron/v10/app/upgrades/v8.0.0-rc0"
+	v810 "github.com/neutron-org/neutron/v10/app/upgrades/v8.1.0"
+	v820 "github.com/neutron-org/neutron/v10/app/upgrades/v8.2.0"
+	v900 "github.com/neutron-org/neutron/v10/app/upgrades/v9.0.0"
+	v910 "github.com/neutron-org/neutron/v10/app/upgrades/v9.1.0"
+	"github.com/neutron-org/neutron/v10/x/coinfactory"
+	dynamicfeestypes "github.com/neutron-org/neutron/v10/x/dynamicfees/types"
+	stateverifier "github.com/neutron-org/neutron/v10/x/state-verifier"
+	svkeeper "github.com/neutron-org/neutron/v10/x/state-verifier/keeper"
+	stateverifiertypes "github.com/neutron-org/neutron/v10/x/state-verifier/types"
+
+	"github.com/neutron-org/neutron/v10/x/harpoon"
 
 	"github.com/cosmos/cosmos-sdk/x/staking"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	v601 "github.com/neutron-org/neutron/v9/app/upgrades/v6.0.1"
+	v601 "github.com/neutron-org/neutron/v10/app/upgrades/v6.0.1"
 
 	"github.com/skip-mev/feemarket/x/feemarket"
 	feemarketkeeper "github.com/skip-mev/feemarket/x/feemarket/keeper"
 	feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types"
 
-	"github.com/neutron-org/neutron/v9/x/dynamicfees"
-	ibcratelimit "github.com/neutron-org/neutron/v9/x/ibc-rate-limit"
+	"github.com/neutron-org/neutron/v10/x/dynamicfees"
+	ibcratelimit "github.com/neutron-org/neutron/v10/x/ibc-rate-limit"
 
 	"cosmossdk.io/client/v2/autocli"
 	"cosmossdk.io/core/appmodule"
 	authcodec "github.com/cosmos/cosmos-sdk/x/auth/codec"
 
-	appconfig "github.com/neutron-org/neutron/v9/app/config"
+	appconfig "github.com/neutron-org/neutron/v10/app/config"
 
 	"github.com/skip-mev/slinky/abci/strategies/aggregator"
 	"github.com/skip-mev/slinky/x/oracle"
@@ -59,8 +59,8 @@ import (
 	oracleclient "github.com/skip-mev/slinky/service/clients/oracle"
 	servicemetrics "github.com/skip-mev/slinky/service/metrics"
 
-	"github.com/neutron-org/neutron/v9/x/globalfee"
-	globalfeetypes "github.com/neutron-org/neutron/v9/x/globalfee/types"
+	"github.com/neutron-org/neutron/v10/x/globalfee"
+	globalfeetypes "github.com/neutron-org/neutron/v10/x/globalfee/types"
 
 	"cosmossdk.io/log"
 	db "github.com/cosmos/cosmos-db"
@@ -74,11 +74,11 @@ import (
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 	tendermint "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint"
 
-	"github.com/neutron-org/neutron/v9/docs"
+	"github.com/neutron-org/neutron/v10/docs"
 
-	"github.com/neutron-org/neutron/v9/app/upgrades"
+	"github.com/neutron-org/neutron/v10/app/upgrades"
 
-	"github.com/neutron-org/neutron/v9/x/cron"
+	"github.com/neutron-org/neutron/v10/x/cron"
 
 	"cosmossdk.io/x/evidence"
 	evidencekeeper "cosmossdk.io/x/evidence/keeper"
@@ -134,9 +134,9 @@ import (
 	slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 
-	"github.com/neutron-org/neutron/v9/x/revenue"
-	revenuekeeper "github.com/neutron-org/neutron/v9/x/revenue/keeper"
-	revenuetypes "github.com/neutron-org/neutron/v9/x/revenue/types"
+	"github.com/neutron-org/neutron/v10/x/revenue"
+	revenuekeeper "github.com/neutron-org/neutron/v10/x/revenue/keeper"
+	revenuetypes "github.com/neutron-org/neutron/v10/x/revenue/types"
 
 	// "github.com/cosmos/gaia/v11/x/globalfee"
 	ica "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts"
@@ -152,8 +152,8 @@ import (
 	ibcclienttypes "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" //nolint:staticcheck
 	ibcconnectiontypes "github.com/cosmos/ibc-go/v10/modules/core/03-connection/types"
 
-	ibcratelimitkeeper "github.com/neutron-org/neutron/v9/x/ibc-rate-limit/keeper"
-	ibcratelimittypes "github.com/neutron-org/neutron/v9/x/ibc-rate-limit/types"
+	ibcratelimitkeeper "github.com/neutron-org/neutron/v10/x/ibc-rate-limit/keeper"
+	ibcratelimittypes "github.com/neutron-org/neutron/v10/x/ibc-rate-limit/types"
 
 	//nolint:staticcheck
 	ibcporttypes "github.com/cosmos/ibc-go/v10/modules/core/05-port/types"
@@ -164,15 +164,15 @@ import (
 
 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 
-	cronkeeper "github.com/neutron-org/neutron/v9/x/cron/keeper"
-	crontypes "github.com/neutron-org/neutron/v9/x/cron/types"
+	cronkeeper "github.com/neutron-org/neutron/v10/x/cron/keeper"
+	crontypes "github.com/neutron-org/neutron/v10/x/cron/types"
 
-	coinfactorykeeper "github.com/neutron-org/neutron/v9/x/coinfactory/keeper"
-	"github.com/neutron-org/neutron/v9/x/tokenfactory"
-	tokenfactorykeeper "github.com/neutron-org/neutron/v9/x/tokenfactory/keeper"
-	tokenfactorytypes "github.com/neutron-org/neutron/v9/x/tokenfactory/types"
+	coinfactorykeeper "github.com/neutron-org/neutron/v10/x/coinfactory/keeper"
+	"github.com/neutron-org/neutron/v10/x/tokenfactory"
+	tokenfactorykeeper "github.com/neutron-org/neutron/v10/x/tokenfactory/keeper"
+	tokenfactorytypes "github.com/neutron-org/neutron/v10/x/tokenfactory/types"
 
-	coinfactorytypes "github.com/neutron-org/neutron/v9/x/coinfactory/types"
+	coinfactorytypes "github.com/neutron-org/neutron/v10/x/coinfactory/types"
 
 	"github.com/cosmos/admin-module/v2/x/adminmodule"
 	adminmodulecli "github.com/cosmos/admin-module/v2/x/adminmodule/client/cli"
@@ -181,29 +181,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/v9/app/params"
-	"github.com/neutron-org/neutron/v9/wasmbinding"
-	"github.com/neutron-org/neutron/v9/x/contractmanager"
-	contractmanagermodulekeeper "github.com/neutron-org/neutron/v9/x/contractmanager/keeper"
-	contractmanagermoduletypes "github.com/neutron-org/neutron/v9/x/contractmanager/types"
-	dynamicfeeskeeper "github.com/neutron-org/neutron/v9/x/dynamicfees/keeper"
-	"github.com/neutron-org/neutron/v9/x/feeburner"
-	feeburnerkeeper "github.com/neutron-org/neutron/v9/x/feeburner/keeper"
-	feeburnertypes "github.com/neutron-org/neutron/v9/x/feeburner/types"
-	"github.com/neutron-org/neutron/v9/x/feerefunder"
-	feekeeper "github.com/neutron-org/neutron/v9/x/feerefunder/keeper"
-	ibchooks "github.com/neutron-org/neutron/v9/x/ibc-hooks"
-	ibchookstypes "github.com/neutron-org/neutron/v9/x/ibc-hooks/types"
-	"github.com/neutron-org/neutron/v9/x/interchainqueries"
-	interchainqueriesmodulekeeper "github.com/neutron-org/neutron/v9/x/interchainqueries/keeper"
-	interchainqueriesmoduletypes "github.com/neutron-org/neutron/v9/x/interchainqueries/types"
-	"github.com/neutron-org/neutron/v9/x/interchaintxs"
-	interchaintxskeeper "github.com/neutron-org/neutron/v9/x/interchaintxs/keeper"
-	interchaintxstypes "github.com/neutron-org/neutron/v9/x/interchaintxs/types"
-	transferSudo "github.com/neutron-org/neutron/v9/x/transfer"
-	wrapkeeper "github.com/neutron-org/neutron/v9/x/transfer/keeper"
-
-	feetypes "github.com/neutron-org/neutron/v9/x/feerefunder/types"
+	appparams "github.com/neutron-org/neutron/v10/app/params"
+	"github.com/neutron-org/neutron/v10/wasmbinding"
+	"github.com/neutron-org/neutron/v10/x/contractmanager"
+	contractmanagermodulekeeper "github.com/neutron-org/neutron/v10/x/contractmanager/keeper"
+	contractmanagermoduletypes "github.com/neutron-org/neutron/v10/x/contractmanager/types"
+	dynamicfeeskeeper "github.com/neutron-org/neutron/v10/x/dynamicfees/keeper"
+	"github.com/neutron-org/neutron/v10/x/feeburner"
+	feeburnerkeeper "github.com/neutron-org/neutron/v10/x/feeburner/keeper"
+	feeburnertypes "github.com/neutron-org/neutron/v10/x/feeburner/types"
+	"github.com/neutron-org/neutron/v10/x/feerefunder"
+	feekeeper "github.com/neutron-org/neutron/v10/x/feerefunder/keeper"
+	ibchooks "github.com/neutron-org/neutron/v10/x/ibc-hooks"
+	ibchookstypes "github.com/neutron-org/neutron/v10/x/ibc-hooks/types"
+	"github.com/neutron-org/neutron/v10/x/interchainqueries"
+	interchainqueriesmodulekeeper "github.com/neutron-org/neutron/v10/x/interchainqueries/keeper"
+	interchainqueriesmoduletypes "github.com/neutron-org/neutron/v10/x/interchainqueries/types"
+	"github.com/neutron-org/neutron/v10/x/interchaintxs"
+	interchaintxskeeper "github.com/neutron-org/neutron/v10/x/interchaintxs/keeper"
+	interchaintxstypes "github.com/neutron-org/neutron/v10/x/interchaintxs/types"
+	transferSudo "github.com/neutron-org/neutron/v10/x/transfer"
+	wrapkeeper "github.com/neutron-org/neutron/v10/x/transfer/keeper"
+
+	feetypes "github.com/neutron-org/neutron/v10/x/feerefunder/types"
 
 	storetypes "cosmossdk.io/store/types"
 	"github.com/cosmos/cosmos-sdk/x/consensus"
@@ -212,12 +212,12 @@ import (
 	pfmkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v10/packetforward/keeper"
 	pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v10/packetforward/types"
 
-	"github.com/neutron-org/neutron/v9/x/dex"
-	dexkeeper "github.com/neutron-org/neutron/v9/x/dex/keeper"
-	dextypes "github.com/neutron-org/neutron/v9/x/dex/types"
+	"github.com/neutron-org/neutron/v10/x/dex"
+	dexkeeper "github.com/neutron-org/neutron/v10/x/dex/keeper"
+	dextypes "github.com/neutron-org/neutron/v10/x/dex/types"
 
-	globalfeekeeper "github.com/neutron-org/neutron/v9/x/globalfee/keeper"
-	gmpmiddleware "github.com/neutron-org/neutron/v9/x/gmp"
+	globalfeekeeper "github.com/neutron-org/neutron/v10/x/globalfee/keeper"
+	gmpmiddleware "github.com/neutron-org/neutron/v10/x/gmp"
 
 	// Block-sdk imports
 	blocksdkabci "github.com/skip-mev/block-sdk/v2/abci"
@@ -230,8 +230,8 @@ import (
 	oraclekeeper "github.com/skip-mev/slinky/x/oracle/keeper"
 	oracletypes "github.com/skip-mev/slinky/x/oracle/types"
 
-	harpoonkeeper "github.com/neutron-org/neutron/v9/x/harpoon/keeper"
-	harpoontypes "github.com/neutron-org/neutron/v9/x/harpoon/types"
+	harpoonkeeper "github.com/neutron-org/neutron/v10/x/harpoon/keeper"
+	harpoontypes "github.com/neutron-org/neutron/v10/x/harpoon/types"
 
 	runtimeservices "github.com/cosmos/cosmos-sdk/runtime/services"
 )
@@ -250,7 +250,7 @@ var (
 		v820.Upgrade,
 		v900.Upgrade,
 		v910.Upgrade,
-		nextupgrade.Upgrade,
+		v10_0_0.Upgrade,
 	}
 
 	// DefaultNodeHome default home directories for the application daemon

app/encoding.go

@@ -3,9 +3,9 @@ package app
 import (
 	"github.com/cosmos/cosmos-sdk/std"
 
-	ethcryptocodec "github.com/neutron-org/neutron/v9/x/crypto/codec"
+	ethcryptocodec "github.com/neutron-org/neutron/v10/x/crypto/codec"
 
-	"github.com/neutron-org/neutron/v9/app/params"
+	"github.com/neutron-org/neutron/v10/app/params"
 )
 
 // MakeEncodingConfig creates an EncodingConfig for testing

app/params/encoding.go

@@ -11,7 +11,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth/tx"
 	"github.com/cosmos/gogoproto/proto"
 
-	neutrontx "github.com/neutron-org/neutron/v9/tx"
+	neutrontx "github.com/neutron-org/neutron/v10/tx"
 )
 
 // EncodingConfig specifies the concrete encoding types to use for a given app.

app/proposals_allowlisting.go

@@ -18,23 +18,23 @@ import (
 	feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types"
 	marketmaptypes "github.com/skip-mev/slinky/x/marketmap/types"
 
-	coinfactorytypes "github.com/neutron-org/neutron/v9/x/coinfactory/types"
-	revenuetypes "github.com/neutron-org/neutron/v9/x/revenue/types"
+	coinfactorytypes "github.com/neutron-org/neutron/v10/x/coinfactory/types"
+	revenuetypes "github.com/neutron-org/neutron/v10/x/revenue/types"
 
-	harpoontypes "github.com/neutron-org/neutron/v9/x/harpoon/types"
-	ibcratelimittypes "github.com/neutron-org/neutron/v9/x/ibc-rate-limit/types"
+	harpoontypes "github.com/neutron-org/neutron/v10/x/harpoon/types"
+	ibcratelimittypes "github.com/neutron-org/neutron/v10/x/ibc-rate-limit/types"
 
-	dynamicfeestypes "github.com/neutron-org/neutron/v9/x/dynamicfees/types"
-	globalfeetypes "github.com/neutron-org/neutron/v9/x/globalfee/types"
+	dynamicfeestypes "github.com/neutron-org/neutron/v10/x/dynamicfees/types"
+	globalfeetypes "github.com/neutron-org/neutron/v10/x/globalfee/types"
 
-	contractmanagertypes "github.com/neutron-org/neutron/v9/x/contractmanager/types"
-	crontypes "github.com/neutron-org/neutron/v9/x/cron/types"
-	dextypes "github.com/neutron-org/neutron/v9/x/dex/types"
-	feeburnertypes "github.com/neutron-org/neutron/v9/x/feeburner/types"
-	feerefundertypes "github.com/neutron-org/neutron/v9/x/feerefunder/types"
-	interchainqueriestypes "github.com/neutron-org/neutron/v9/x/interchainqueries/types"
-	interchaintxstypes "github.com/neutron-org/neutron/v9/x/interchaintxs/types"
-	tokenfactorytypes "github.com/neutron-org/neutron/v9/x/tokenfactory/types"
+	contractmanagertypes "github.com/neutron-org/neutron/v10/x/contractmanager/types"
+	crontypes "github.com/neutron-org/neutron/v10/x/cron/types"
+	dextypes "github.com/neutron-org/neutron/v10/x/dex/types"
+	feeburnertypes "github.com/neutron-org/neutron/v10/x/feeburner/types"
+	feerefundertypes "github.com/neutron-org/neutron/v10/x/feerefunder/types"
+	interchainqueriestypes "github.com/neutron-org/neutron/v10/x/interchainqueries/types"
+	interchaintxstypes "github.com/neutron-org/neutron/v10/x/interchaintxs/types"
+	tokenfactorytypes "github.com/neutron-org/neutron/v10/x/tokenfactory/types"
 )
 
 func IsConsumerProposalAllowlisted(content govtypes.Content) bool {

app/sigverify.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
 
-	"github.com/neutron-org/neutron/v9/x/crypto/ethsecp256k1"
+	"github.com/neutron-org/neutron/v10/x/crypto/ethsecp256k1"
 
 	"google.golang.org/protobuf/types/known/anypb"
 

app/upgrades/types.go

@@ -17,21 +17,21 @@ import (
 	feemarketkeeper "github.com/skip-mev/feemarket/x/feemarket/keeper"
 	marketmapkeeper "github.com/skip-mev/slinky/x/marketmap/keeper"
 
-	feerefunderkeeper "github.com/neutron-org/neutron/v9/x/feerefunder/keeper"
+	feerefunderkeeper "github.com/neutron-org/neutron/v10/x/feerefunder/keeper"
 
-	harpoonkeeper "github.com/neutron-org/neutron/v9/x/harpoon/keeper"
-	revenuekeeper "github.com/neutron-org/neutron/v9/x/revenue/keeper"
+	harpoonkeeper "github.com/neutron-org/neutron/v10/x/harpoon/keeper"
+	revenuekeeper "github.com/neutron-org/neutron/v10/x/revenue/keeper"
 
-	dexkeeper "github.com/neutron-org/neutron/v9/x/dex/keeper"
-	ibcratelimitkeeper "github.com/neutron-org/neutron/v9/x/ibc-rate-limit/keeper"
+	dexkeeper "github.com/neutron-org/neutron/v10/x/dex/keeper"
+	ibcratelimitkeeper "github.com/neutron-org/neutron/v10/x/ibc-rate-limit/keeper"
 
-	dynamicfeeskeeper "github.com/neutron-org/neutron/v9/x/dynamicfees/keeper"
+	dynamicfeeskeeper "github.com/neutron-org/neutron/v10/x/dynamicfees/keeper"
 
-	contractmanagerkeeper "github.com/neutron-org/neutron/v9/x/contractmanager/keeper"
-	cronkeeper "github.com/neutron-org/neutron/v9/x/cron/keeper"
-	feeburnerkeeper "github.com/neutron-org/neutron/v9/x/feeburner/keeper"
-	icqkeeper "github.com/neutron-org/neutron/v9/x/interchainqueries/keeper"
-	tokenfactorykeeper "github.com/neutron-org/neutron/v9/x/tokenfactory/keeper"
+	contractmanagerkeeper "github.com/neutron-org/neutron/v10/x/contractmanager/keeper"
+	cronkeeper "github.com/neutron-org/neutron/v10/x/cron/keeper"
+	feeburnerkeeper "github.com/neutron-org/neutron/v10/x/feeburner/keeper"
+	icqkeeper "github.com/neutron-org/neutron/v10/x/interchainqueries/keeper"
+	tokenfactorykeeper "github.com/neutron-org/neutron/v10/x/tokenfactory/keeper"
 
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	transferkeeper "github.com/cosmos/ibc-go/v10/modules/apps/transfer/keeper"

app/upgrades/nextupgrade/constants.go app/upgrades/v10.0.0/constants.goapp/upgrades/nextupgrade/constants.go renamed to app/upgrades/v10.0.0/constants.go

@@ -1,14 +1,14 @@
-package nextupgrade
+package v10_0_0
 
 import (
 	storetypes "cosmossdk.io/store/types"
 
-	"github.com/neutron-org/neutron/v9/app/upgrades"
+	"github.com/neutron-org/neutron/v10/app/upgrades"
 )
 
 const (
 	// UpgradeName defines the on-chain upgrade name.
-	UpgradeName = "nextupgrade"
+	UpgradeName = "v10.0.0"
 )
 
 var Upgrade = upgrades.Upgrade{