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

…metbft-db-0.12.0

.github/workflows/debug.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
           cache: true
 
       - uses: actions/checkout@v4

.github/workflows/govulncheck.yml

@@ -26,5 +26,5 @@ jobs:
         id: govulncheck
         if: env.GIT_DIFF
         with:
-          go-version-input: 1.21
+          go-version-input: 1.22
           go-package: ./...

.github/workflows/lint.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: "1.21"
+          go-version: "1.22"
           cache: true
 
       - name: golangci-lint main

.github/workflows/release-umee.yml

@@ -22,18 +22,18 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
           cache: true
 
       - name: Set Env
         run: echo "TM_VERSION=$(go list -m github.com/cometbft/cometbft | sed 's:.* ::')" >> $GITHUB_ENV
 
       # useful to test builds. However will require to add "push" rule to the "on" section
-      - name: generate and update swagger docs 
+      - name: generate and update swagger docs
         run: |
           make proto-swagger-gen
           make proto-update-swagger-docs
-      
+
       - name: goreleaser test-build
         uses: goreleaser/goreleaser-action@v5
         if: github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'Enable:ReleaseBuild')

.github/workflows/simulations.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
 
       - name: Install runsim
         run: export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/[email protected]
@@ -40,7 +40,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: "1.21"
+          go-version: "1.22"
           cache: true
       - name: Test application non-determinism
         if: env.GIT_DIFF
@@ -65,7 +65,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: "1.21"
+          go-version: "1.22"
           cache: true
       - uses: actions/cache@v4
         if: env.GIT_DIFF
@@ -95,7 +95,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: "1.21"
+          go-version: "1.22"
           cache: true
       - uses: actions/cache@v4
         if: env.GIT_DIFF
@@ -124,7 +124,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: "1.21"
+          go-version: "1.22"
           cache: true
       - uses: actions/cache@v4
         if: env.GIT_DIFF

.github/workflows/tests.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
       - uses: actions/cache@v4
         id: cache-go-tparse
         with:
@@ -52,7 +52,7 @@ jobs:
         if: steps.cache-binaries.outputs.cache-hit != 'true' && env.GIT_DIFF
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.22"
           cache: true
         env:
           GOOS: ${{ matrix.targetos }}
@@ -78,7 +78,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: "1.21"
+          go-version: "1.22"
           cache: true
       - name: Test and Create Coverage Report
         if: env.GIT_DIFF
@@ -110,7 +110,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: "1.21"
+          go-version: "1.22"
           cache: true
 
       - name: Test E2E

CHANGELOG.md

@@ -53,6 +53,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Improvements
 
 - [2474](https://github.com/umee-network/umee/pull/2474) (proto) add `gogo.messagename_all` option to all messages.
+- [2494](https://github.com/umee-network/umee/pull/2494) Use go 1.22
 
 ### Bug Fixes
 

contrib/images/umee.e2e-static.dockerfile

@@ -2,7 +2,7 @@
 # Creates static binaries, by building from the latest version of:
 # umeed, price-feeder.
 
-FROM golang:1.21-alpine3.18 AS builder
+FROM golang:1.22-alpine3.19 AS builder
 ENV PACKAGES make git gcc linux-headers build-base curl
 RUN apk add --no-cache $PACKAGES
 
@@ -25,7 +25,7 @@ RUN LEDGER_ENABLED=false BUILD_TAGS=muslc LINK_STATICALLY=true make install && \
 
 
 ## Prepare the final clear binary
-FROM alpine:3.18
+FROM alpine:3.19
 EXPOSE 26656 26657 1317 9090 7171
 ENTRYPOINT ["umeed", "start"]
 

contrib/images/umee.e2e.dockerfile

@@ -1,7 +1,7 @@
 # Docker for e2e testing
 # Creates dynamic binaries, by building from the latest version of umeed
 
-FROM golang:1.21-bookworm AS builder
+FROM golang:1.22-bookworm AS builder
 ARG EXPERIMENTAL=true
 
 ## Download go module dependencies for umeed

contrib/images/umeed.dockerfile

@@ -1,7 +1,7 @@
 # Stage-1: build
 # We use Debian Bullseye rather then Alpine because Alpine has problem building libwasmvm
 # - requires to download libwasmvm_muslc from external source. Build with glibc is straightforward.
-FROM golang:1.21-bookworm AS builder
+FROM golang:1.22-bookworm AS builder
 
 WORKDIR /src/
 # optimization: if go.sum didn't change, docker will use cached image

contrib/scripts/go-mod-tidy-all.sh

@@ -4,6 +4,6 @@ set -euo pipefail
 
 for modfile in $(find . -name go.mod); do
  echo "Updating $modfile"
- DIR=$(dirname $modfile)
- (cd $DIR; go mod tidy --compat=1.21)
+ DIR=$(dirname "$modfile")
+ (cd "$DIR"; go mod tidy --compat=1.22)
 done

go.mod

@@ -1,6 +1,7 @@
 module github.com/umee-network/umee/v6
 
-go 1.21
+go 1.22
+
 require (
 	cosmossdk.io/api v0.3.1
 	cosmossdk.io/errors v1.0.1

util/store/store.go

@@ -74,7 +74,7 @@ func SetBinValue[T BinMarshalable](store sdk.KVStore, key []byte, value T, errFi
 // instead of GetValue.
 // Returns a boolean indicating whether any data was found. If the return is false, the object
 // is not changed by this function.
-func GetValueCdc(store sdk.KVStore, cdc codec.Codec, key []byte, object codec.ProtoMarshaler, errField string) bool {
+func GetValueCdc(store sdk.KVStore, cdc codec.BinaryCodec, key []byte, object codec.ProtoMarshaler, errField string) bool {
 	if bz := store.Get(key); len(bz) > 0 {
 		err := cdc.Unmarshal(bz, object)
 		if err != nil {
@@ -88,7 +88,7 @@ func GetValueCdc(store sdk.KVStore, cdc codec.Codec, key []byte, object codec.Pr
 // SetValueCdc is similar to the SetValue, but uses codec for marshaling. For Protobuf objects the
 // result is the same, unless codec.Any is used. In the latter case this function MUST be used,
 // instead of SetValue.
-func SetValueCdc(store sdk.KVStore, cdc codec.Codec, key []byte, object codec.ProtoMarshaler, errField string) error {
+func SetValueCdc(store sdk.KVStore, cdc codec.BinaryCodec, key []byte, object codec.ProtoMarshaler, errField string) error {
 	bz, err := cdc.Marshal(object)
 	if err != nil {
 		return fmt.Errorf("failed to encode %s, %s", errField, err.Error())

x/auction/codec.go

@@ -5,7 +5,7 @@ import (
 	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	// "github.com/cosmos/cosmos-sdk/types/msgservice"
+	"github.com/cosmos/cosmos-sdk/types/msgservice"
 )
 
 // Amino codecs
@@ -33,10 +33,9 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
 func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 	registry.RegisterImplementations(
 		(*sdk.Msg)(nil),
-		// &MsgGovSetRewardsParams{},
-		// &MsgRewardsBid{},
+		&MsgGovSetRewardsParams{},
+		&MsgRewardsBid{},
 	)
 
-	// TODO
-	// msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)
+	msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)
 }

x/incentive/keeper/keeper.go

@@ -13,14 +13,14 @@ import (
 )
 
 type Keeper struct {
-	cdc            codec.Codec
+	cdc            codec.BinaryCodec
 	storeKey       storetypes.StoreKey
 	bankKeeper     incentive.BankKeeper
 	leverageKeeper incentive.LeverageKeeper
 }
 
 func NewKeeper(
-	cdc codec.Codec,
+	cdc codec.BinaryCodec,
 	storeKey storetypes.StoreKey,
 	bk incentive.BankKeeper,
 	lk incentive.LeverageKeeper,

x/leverage/keeper/keeper.go

@@ -15,7 +15,7 @@ import (
 )
 
 type Keeper struct {
-	cdc                    codec.Codec
+	cdc                    codec.BinaryCodec
 	storeKey               storetypes.StoreKey
 	bankKeeper             types.BankKeeper
 	oracleKeeper           types.OracleKeeper
@@ -28,7 +28,7 @@ type Keeper struct {
 }
 
 func NewKeeper(
-	cdc codec.Codec,
+	cdc codec.BinaryCodec,
 	storeKey storetypes.StoreKey,
 	b types.BankKeeper,
 	o types.OracleKeeper,

x/metoken/keeper/keeper.go

@@ -12,7 +12,7 @@ import (
 
 // Builder constructs Keeper by preparing all related dependencies (notably the store).
 type Builder struct {
-	cdc            codec.Codec
+	cdc            codec.BinaryCodec
 	storeKey       storetypes.StoreKey
 	bankKeeper     metoken.BankKeeper
 	leverageKeeper metoken.LeverageKeeper
@@ -22,7 +22,7 @@ type Builder struct {
 
 // NewBuilder returns Builder object.
 func NewBuilder(
-	cdc codec.Codec,
+	cdc codec.BinaryCodec,
 	storeKey storetypes.StoreKey,
 	bankKeeper metoken.BankKeeper,
 	leverageKeeper metoken.LeverageKeeper,
@@ -40,7 +40,7 @@ func NewBuilder(
 }
 
 type Keeper struct {
-	cdc            codec.Codec
+	cdc            codec.BinaryCodec
 	store          sdk.KVStore
 	bankKeeper     metoken.BankKeeper
 	leverageKeeper metoken.LeverageKeeper