Merge remote-tracking branch 'origin/main' into feat/dex-state-testin…

…g-all-tests

.github/workflows/ci.yml

@@ -40,7 +40,7 @@ jobs:
 
       - name: Install Go
         run: |
-          GO_VERSION=1.22.4
+          GO_VERSION=1.23.4
           curl -LO https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz
           sudo tar -C /usr/local -xzf go${GO_VERSION}.linux-amd64.tar.gz
           echo "export PATH=$PATH:/usr/local/go/bin" >> $HOME/.profile

.github/workflows/lint.yml

@@ -18,14 +18,14 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: '~1.22'
+          go-version: '~1.23'
           cache: false
       - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: 'v1.55.2'
+          version: 'v1.63.4'
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
 

.github/workflows/push.yml

@@ -7,10 +7,10 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.22
+      - name: Set up Go 1.23
         uses: actions/setup-go@v4
         with:
-          go-version: ~1.22
+          go-version: ~1.23
         id: go
 
       - name: Check out code into the Go module directory

.golangci.yml

@@ -1,14 +1,14 @@
 run:
   tests: true
   # timeout for analysis, e.g. 30s, 5m, default is 1m
-  timeout: 5m
+  timeout: 10m
 
 linters:
   disable-all: true
   enable:
     - dogsled
     - errcheck
-    - exportloopref
+    - copyloopvar
     - goconst
     - gocritic
     - gofumpt
@@ -38,6 +38,5 @@ linters-settings:
     extra-rules: true
   nolintlint:
     allow-unused: true
-    allow-leading-space: true
     require-explanation: false
     require-specific: false

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM golang:1.22-bullseye
+FROM golang:1.23-bullseye
 RUN apt-get update && apt-get install -y jq xxd
 EXPOSE 26656 26657 1317 9090
 COPY --from=app . /opt/neutron

Dockerfile.builder

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG GO_VERSION="1.22"
+ARG GO_VERSION="1.23"
 ARG RUNNER_IMAGE="gcr.io/distroless/static"
 
 # --------------------------------------------------------
@@ -14,7 +14,7 @@ ARG GIT_COMMIT
 ARG BUILD_TAGS
 ARG ENABLED_PROPOSALS
 
-ENV GOTOOLCHAIN go1.22.6
+ENV GOTOOLCHAIN go1.23.4
 
 RUN apk add --no-cache \
     ca-certificates \

Makefile

@@ -7,8 +7,8 @@ LEDGER_ENABLED ?= true
 SDK_PACK := $(shell go list -m github.com/cosmos/cosmos-sdk | sed  's/ /\@/g')
 BINDIR ?= $(GOPATH)/bin
 SIMAPP = ./app
-GO_VERSION=1.22
-GOLANGCI_LINT_VERSION=v1.55.2
+GO_VERSION=1.23
+GOLANGCI_LINT_VERSION=v1.63.4
 BUILDDIR ?= $(CURDIR)/build
 
 # for dockerized protobuf tools
@@ -202,14 +202,14 @@ test-sim-multi-seed-short: runsim
 ###############################################################################
 
 lint:
-	golangci-lint run --skip-files ".*.pb.go"
+	golangci-lint run --exclude-files ".*.pb.go"
 	find . -name '*.go' -not -name "*.pb.go" -type f -not -path "./vendor*" -not -path "*.git*" -not -path "*_test.go" | xargs gofmt -d -s
 
 format:
 	@go install mvdan.cc/gofumpt@latest
 	@go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
 	find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" -not -path "./tests/mocks/*" -not -name "*.pb.go" -not -name "*.pb.gw.go" -not -name "*.pulsar.go" -not -path "./crypto/keys/secp256k1/*" | xargs -I % sh -c 'gofumpt -w -l % && goimports -w -local github.com/neutron-org %'
-	golangci-lint run --fix --skip-files ".*.pb.go"
+	golangci-lint run --fix --exclude-files ".*.pb.go"
 
 .PHONY: format
 

app/app.go

@@ -10,6 +10,11 @@ import (
 	"path/filepath"
 	"time"
 
+	v502 "github.com/neutron-org/neutron/v5/app/upgrades/v5.0.2"
+	v504 "github.com/neutron-org/neutron/v5/app/upgrades/v5.0.4"
+	v505 "github.com/neutron-org/neutron/v5/app/upgrades/v5.0.5"
+	v510 "github.com/neutron-org/neutron/v5/app/upgrades/v5.1.0"
+	v513 "github.com/neutron-org/neutron/v5/app/upgrades/v5.1.3"
 	dynamicfeestypes "github.com/neutron-org/neutron/v5/x/dynamicfees/types"
 
 	"github.com/skip-mev/feemarket/x/feemarket"
@@ -228,6 +233,11 @@ const (
 var (
 	Upgrades = []upgrades.Upgrade{
 		v500.Upgrade,
+		v502.Upgrade,
+		v504.Upgrade,
+		v505.Upgrade,
+		v510.Upgrade,
+		v513.Upgrade,
 	}
 
 	// DefaultNodeHome default home directories for the application daemon
@@ -471,6 +481,7 @@ func New(
 	overrideWasmVariables()
 
 	appCodec := encodingConfig.Marshaler
+
 	legacyAmino := encodingConfig.Amino
 	interfaceRegistry := encodingConfig.InterfaceRegistry
 
@@ -619,6 +630,17 @@ func New(
 		authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(),
 	)
 
+	tokenFactoryKeeper := tokenfactorykeeper.NewKeeper(
+		appCodec,
+		app.keys[tokenfactorytypes.StoreKey],
+		maccPerms,
+		app.AccountKeeper,
+		&app.BankKeeper,
+		&app.WasmKeeper,
+		authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(),
+	)
+	app.TokenFactoryKeeper = &tokenFactoryKeeper
+
 	app.WireICS20PreWasmKeeper(appCodec)
 	app.PFMModule = packetforward.NewAppModule(app.PFMKeeper, app.GetSubspace(pfmtypes.ModuleName))
 
@@ -682,17 +704,6 @@ func New(
 	app.ConsumerKeeper = *app.ConsumerKeeper.SetHooks(app.SlashingKeeper.Hooks())
 	consumerModule := ccvconsumer.NewAppModule(app.ConsumerKeeper, app.GetSubspace(ccvconsumertypes.ModuleName))
 
-	tokenFactoryKeeper := tokenfactorykeeper.NewKeeper(
-		appCodec,
-		app.keys[tokenfactorytypes.StoreKey],
-		maccPerms,
-		app.AccountKeeper,
-		&app.BankKeeper,
-		&app.WasmKeeper,
-		authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(),
-	)
-	app.TokenFactoryKeeper = &tokenFactoryKeeper
-
 	app.BankKeeper.BaseSendKeeper = app.BankKeeper.BaseSendKeeper.SetHooks(
 		banktypes.NewMultiBankHooks(
 			app.TokenFactoryKeeper.Hooks(),
@@ -1336,7 +1347,6 @@ func (app *App) setupUpgradeStoreLoaders() {
 	}
 
 	for _, upgrd := range Upgrades {
-		upgrd := upgrd
 		if upgradeInfo.Name == upgrd.UpgradeName {
 			app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &upgrd.StoreUpgrades))
 		}
@@ -1369,6 +1379,8 @@ func (app *App) setupUpgradeHandlers() {
 					DynamicfeesKeeper:   app.DynamicFeesKeeper,
 					DexKeeper:           &app.DexKeeper,
 					IbcRateLimitKeeper:  app.RateLimitingICS4Wrapper.IbcratelimitKeeper,
+					ChannelKeeper:       &app.IBCKeeper.ChannelKeeper,
+					TransferKeeper:      app.TransferKeeper.Keeper,
 					GlobalFeeSubspace:   app.GetSubspace(globalfee.ModuleName),
 					CcvConsumerSubspace: app.GetSubspace(ccvconsumertypes.ModuleName),
 				},
@@ -1575,8 +1587,6 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 	paramsKeeper.Subspace(icacontrollertypes.SubModuleName).WithKeyTable(icacontrollertypes.ParamKeyTable())
 	paramsKeeper.Subspace(icahosttypes.SubModuleName).WithKeyTable(icahosttypes.ParamKeyTable())
 
-	paramsKeeper.Subspace(pfmtypes.ModuleName).WithKeyTable(pfmtypes.ParamKeyTable())
-
 	paramsKeeper.Subspace(globalfee.ModuleName).WithKeyTable(globalfeetypes.ParamKeyTable())
 
 	paramsKeeper.Subspace(ccvconsumertypes.ModuleName).WithKeyTable(ccv.ParamKeyTable())
@@ -1668,7 +1678,6 @@ func (app *App) WireICS20PreWasmKeeper(
 		app.keys[pfmtypes.StoreKey],
 		app.TransferKeeper.Keeper, // set later
 		app.IBCKeeper.ChannelKeeper,
-		app.FeeBurnerKeeper,
 		&app.BankKeeper,
 		app.IBCKeeper.ChannelKeeper,
 		authtypes.NewModuleAddress(adminmoduletypes.ModuleName).String(),
@@ -1718,11 +1727,11 @@ func (app *App) WireICS20PreWasmKeeper(
 		transferSudo.NewIBCModule(
 			app.TransferKeeper,
 			contractmanager.NewSudoLimitWrapper(app.ContractManagerKeeper, &app.WasmKeeper),
+			app.TokenFactoryKeeper,
 		),
 		app.PFMKeeper,
 		0,
 		pfmkeeper.DefaultForwardTransferPacketTimeoutTimestamp,
-		pfmkeeper.DefaultRefundTransferPacketTimeoutTimestamp,
 	)
 
 	ibcStack = gmpmiddleware.NewIBCMiddleware(ibcStack)

app/genesis.go

@@ -13,7 +13,7 @@ import (
 var FeeDenom = "untrn"
 
 // GenesisState is the genesis state of the blockchain represented here as a map of raw json
-// messages key'd by a identifier string.
+// messages key'd by an identifier string.
 // The identifier is used to determine which module genesis information belongs
 // to so it may be appropriately routed during init chain.
 // Within this application default genesis information is retrieved from

app/params/encoding.go

@@ -20,7 +20,7 @@ type EncodingConfig struct {
 	Amino             *codec.LegacyAmino
 }
 
-// makeEncodingConfig creates an EncodingConfig for an amino based test configuration.
+// MakeEncodingConfig creates an EncodingConfig for an amino based test configuration.
 func MakeEncodingConfig() EncodingConfig {
 	amino := codec.NewLegacyAmino()
 	reg, err := types.NewInterfaceRegistryWithOptions(types.InterfaceRegistryOptions{

app/proposals_allowlisting.go

@@ -11,7 +11,6 @@ import (
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 	"github.com/cosmos/cosmos-sdk/x/params/types/proposal"
-	pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types"
 	icahosttypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/types"
 	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
@@ -84,7 +83,6 @@ func isSdkMessageWhitelisted(msg sdk.Msg) bool {
 		*banktypes.MsgUpdateParams,
 		*crisistypes.MsgUpdateParams,
 		*minttypes.MsgUpdateParams,
-		*pfmtypes.MsgUpdateParams,
 		*marketmaptypes.MsgCreateMarkets,
 		*marketmaptypes.MsgUpdateMarkets,
 		*marketmaptypes.MsgRemoveMarketAuthorities,

app/upgrades/types.go

@@ -12,6 +12,7 @@ import (
 	paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
 	slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
 	capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
+	channelkeeper "github.com/cosmos/ibc-go/v8/modules/core/04-channel/keeper"
 	ccvconsumerkeeper "github.com/cosmos/interchain-security/v5/x/ccv/consumer/keeper"
 	auctionkeeper "github.com/skip-mev/block-sdk/v2/x/auction/keeper"
 	feemarketkeeper "github.com/skip-mev/feemarket/x/feemarket/keeper"
@@ -69,6 +70,7 @@ type UpgradeKeepers struct {
 	DynamicfeesKeeper  *dynamicfeeskeeper.Keeper
 	DexKeeper          *dexkeeper.Keeper
 	IbcRateLimitKeeper *ibcratelimitkeeper.Keeper
+	ChannelKeeper      *channelkeeper.Keeper
 	// subspaces
 	GlobalFeeSubspace   paramtypes.Subspace
 	CcvConsumerSubspace paramtypes.Subspace

app/upgrades/v5.0.2/constants.go

@@ -0,0 +1,18 @@
+package v502
+
+import (
+	storetypes "cosmossdk.io/store/types"
+
+	"github.com/neutron-org/neutron/v5/app/upgrades"
+)
+
+const (
+	// UpgradeName defines the on-chain upgrade name.
+	UpgradeName = "v5.0.2"
+)
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:          UpgradeName,
+	CreateUpgradeHandler: CreateUpgradeHandler,
+	StoreUpgrades:        storetypes.StoreUpgrades{},
+}

app/upgrades/v5.0.2/upgrades.go

@@ -0,0 +1,35 @@
+package v502
+
+import (
+	"context"
+	"fmt"
+
+	upgradetypes "cosmossdk.io/x/upgrade/types"
+	"github.com/cosmos/cosmos-sdk/codec"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+
+	"github.com/neutron-org/neutron/v5/app/upgrades"
+)
+
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+	_ *upgrades.UpgradeKeepers,
+	_ upgrades.StoreKeys,
+	_ codec.Codec,
+) upgradetypes.UpgradeHandler {
+	return func(c context.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		ctx := sdk.UnwrapSDKContext(c)
+
+		ctx.Logger().Info("Starting module migrations...")
+
+		vm, err := mm.RunMigrations(ctx, configurator, vm)
+		if err != nil {
+			return vm, err
+		}
+
+		ctx.Logger().Info(fmt.Sprintf("Migration {%s} applied", UpgradeName))
+		return vm, nil
+	}
+}

app/upgrades/v5.0.2/upgrades_test.go

@@ -0,0 +1,37 @@
+package v502_test
+
+import (
+	"testing"
+
+	upgradetypes "cosmossdk.io/x/upgrade/types"
+	"github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/suite"
+
+	v502 "github.com/neutron-org/neutron/v5/app/upgrades/v5.0.2"
+	"github.com/neutron-org/neutron/v5/testutil"
+)
+
+type UpgradeTestSuite struct {
+	testutil.IBCConnectionTestSuite
+}
+
+func TestKeeperTestSuite(t *testing.T) {
+	suite.Run(t, new(UpgradeTestSuite))
+}
+
+func (suite *UpgradeTestSuite) SetupTest() {
+	suite.IBCConnectionTestSuite.SetupTest()
+}
+
+func (suite *UpgradeTestSuite) TestOracleUpgrade() {
+	app := suite.GetNeutronZoneApp(suite.ChainA)
+	ctx := suite.ChainA.GetContext().WithChainID("neutron-1")
+	t := suite.T()
+
+	upgrade := upgradetypes.Plan{
+		Name:   v502.UpgradeName,
+		Info:   "some text here",
+		Height: 100,
+	}
+	require.NoError(t, app.UpgradeKeeper.ApplyUpgrade(ctx, upgrade))
+}

app/upgrades/v5.0.4/constants.go

@@ -0,0 +1,18 @@
+package v504
+
+import (
+	storetypes "cosmossdk.io/store/types"
+
+	"github.com/neutron-org/neutron/v5/app/upgrades"
+)
+
+const (
+	// UpgradeName defines the on-chain upgrade name.
+	UpgradeName = "v5.0.4"
+)
+
+var Upgrade = upgrades.Upgrade{
+	UpgradeName:          UpgradeName,
+	CreateUpgradeHandler: CreateUpgradeHandler,
+	StoreUpgrades:        storetypes.StoreUpgrades{},
+}