Merge pull request #1008 from neutron-org/feat/cosmos-sdk-53

feat: cosmos sdk 53

Author: pr0n00gler

.github/workflows/lint.yml

@@ -16,16 +16,16 @@ jobs:
     name: lint
     runs-on: ubicloud-standard-2
     steps:
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v6
         with:
-          go-version: '~1.23'
+          go-version: '1.24.10'
           cache: false
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v9
         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.63.4'
+          version: 'v2.7.1'
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
 

.github/workflows/push.yml

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

.golangci.yml

@@ -1,42 +1,35 @@
+version: "2"
 run:
   tests: true
-  # timeout for analysis, e.g. 30s, 5m, default is 1m
-  timeout: 10m
-
 linters:
-  disable-all: true
+  default: none
   enable:
+    - copyloopvar
     - dogsled
     - errcheck
-    - copyloopvar
     - goconst
     - gocritic
-    - gofumpt
     - gosec
-    - gosimple
     - govet
     - ineffassign
     - misspell
     - nakedret
     - nolintlint
-    - revive
     - staticcheck
-    - stylecheck
-    - typecheck
     - unconvert
     - unparam
     - unused
-
-issues:
-  max-issues-per-linter: 10000
-  max-same-issues: 10000
-
-linters-settings:
-  gofumpt:
-    # Choose whether to use the extra rules.
-    # Default: false
-    extra-rules: true
-  nolintlint:
-    allow-unused: true
-    require-explanation: false
-    require-specific: false
+  settings:
+    nolintlint:
+      require-explanation: false
+      require-specific: false
+      allow-unused: true
+  exclusions:
+    paths:
+      - '.*.pb.go'
+formatters:
+  enable:
+    - gofumpt
+  settings:
+    gofumpt:
+      extra-rules: true

.tool-versions

@@ -0,0 +1 @@
+golang 1.24.10

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM golang:1.23-bullseye
+FROM golang:1.24-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.23"
+ARG GO_VERSION="1.24"
 ARG RUNNER_IMAGE="gcr.io/distroless/static"
 
 # --------------------------------------------------------
@@ -14,7 +14,7 @@ ARG GIT_COMMIT
 ARG BUILD_TAGS
 ARG ENABLED_PROPOSALS
 
-ENV GOTOOLCHAIN go1.23.4
+ENV GOTOOLCHAIN go1.24.10
 
 RUN apk add --no-cache \
     ca-certificates \
@@ -29,7 +29,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
     go mod download
 
 # Cosmwasm - Download correct libwasmvm version
-RUN WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm/v2 | cut -d ' ' -f 2) && \
+RUN WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm/v3 | cut -d ' ' -f 2) && \
     wget https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION/libwasmvm_muslc.$(uname -m).a \
       -O /lib/libwasmvm_muslc.$(uname -m).a && \
     # verify checksum

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.23
-GOLANGCI_LINT_VERSION=v1.63.4
+GO_VERSION=1.24
+GOLANGCI_LINT_VERSION=v2.7.1
 BUILDDIR ?= $(CURDIR)/build
 
 # for dockerized protobuf tools
@@ -203,14 +203,13 @@ test-sim-multi-seed-short: runsim
 ###############################################################################
 
 lint:
-	golangci-lint run --exclude-files ".*.pb.go"
+	golangci-lint run --fix --config .golangci.yml
 	find . -name '*.go' -not -name "*.pb.go" -type f -not -path "./vendor*" -not -path "*.git*" -not -path "*_test.go" | xargs gofmt -d -s
 
-format:
+format: lint
 	@go install mvdan.cc/gofumpt@latest
-	@go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
+	@go install github.com/golangci/golangci-lint/v2/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 --exclude-files ".*.pb.go"
 
 .PHONY: format
 

app/ante_handler.go

@@ -10,12 +10,12 @@ import (
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
-	ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
-	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
+	ibcante "github.com/cosmos/ibc-go/v10/modules/core/ante"
+	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
@@ -27,7 +27,7 @@ type HandlerOptions struct {
 	AccountKeeper         feemarketante.AccountKeeper
 	IBCKeeper             *ibckeeper.Keeper
 	GlobalFeeKeeper       globalfeekeeper.Keeper
-	WasmConfig            *wasmTypes.NodeConfig
+	NodeConfig            *wasmTypes.NodeConfig
 	TXCounterStoreService corestoretypes.KVStoreService
 	FeeMarketKeeper       feemarketante.FeeMarketKeeper
 }
@@ -42,7 +42,7 @@ func NewAnteHandler(options HandlerOptions, _ log.Logger) (sdk.AnteHandler, erro
 	if options.SignModeHandler == nil {
 		return nil, errors.Wrap(sdkerrors.ErrLogic, "sign mode handler is required for ante builder")
 	}
-	if options.WasmConfig == nil {
+	if options.NodeConfig == nil {
 		return nil, errors.Wrap(sdkerrors.ErrLogic, "wasm config is required for ante builder")
 	}
 	if options.TXCounterStoreService == nil {
@@ -60,7 +60,7 @@ func NewAnteHandler(options HandlerOptions, _ log.Logger) (sdk.AnteHandler, erro
 
 	anteDecorators := []sdk.AnteDecorator{
 		ante.NewSetUpContextDecorator(),
-		wasmkeeper.NewLimitSimulationGasDecorator(options.WasmConfig.SimulationGasLimit), // after setup context to enforce limits early
+		wasmkeeper.NewLimitSimulationGasDecorator(options.NodeConfig.SimulationGasLimit), // after setup context to enforce limits early
 		wasmkeeper.NewCountTXDecorator(options.TXCounterStoreService),
 		ante.NewExtensionOptionsDecorator(options.ExtensionOptionChecker),
 		ante.NewValidateBasicDecorator(),