build(deps): Bump ibc-go from 7.4.0 to 7.4.1

.github/workflows/codeql.yml

@@ -29,7 +29,7 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.22"
           check-latest: true
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

.github/workflows/interchain.yml

@@ -36,10 +36,10 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-image
     steps:
-      - name: Set up Go 1.20
+      - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21"
           check-latest: true
 
       - name: checkout code
@@ -51,10 +51,10 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-image
     steps:
-      - name: Set up Go 1.20
+      - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21"
           check-latest: true
 
       - name: checkout code
@@ -66,10 +66,10 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-image
     steps:
-      - name: Set up Go 1.20
+      - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.22"
           check-latest: true
 
       - name: checkout code
@@ -81,10 +81,10 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-image
     steps:
-      - name: Set up Go 1.20
+      - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.21"
           check-latest: true
 
       - name: checkout code
@@ -96,10 +96,10 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-image
     steps:
-      - name: Set up Go 1.20
+      - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.22"
           check-latest: true
 
       - name: checkout code

.github/workflows/lint.yml

@@ -14,13 +14,13 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.22"
           check-latest: true
       - uses: actions/checkout@v4
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v4
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.51.2
+          version: v1.59.1
           args: --timeout 10m
           github-token: ${{ secrets.github_token }}

.github/workflows/sims.yml

@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.22"
           check-latest: true
       - name: Display go version
         run: go version
@@ -40,7 +40,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.22"
           check-latest: true
       - name: Display go version
         run: go version
@@ -58,7 +58,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.22"
           check-latest: true
       - name: Display go version
         run: go version
@@ -85,7 +85,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.22"
           check-latest: true
       - name: Display go version
         run: go version
@@ -114,7 +114,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.22"
           check-latest: true
       - name: Display go version
         run: go version
@@ -143,7 +143,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.22"
           check-latest: true
       - name: Display go version
         run: go version

.github/workflows/test.yml

@@ -24,7 +24,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.22"
           check-latest: true
       - uses: actions/checkout@v4
       - name: build
@@ -41,7 +41,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.22"
           check-latest: true
       - uses: technote-space/get-diff-action@v6
         id: git_diff
@@ -69,7 +69,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.22"
           check-latest: true
       - uses: technote-space/get-diff-action@v6
         id: git_diff

.mergify.yml

@@ -1,26 +1,40 @@
+defaults:
+  actions:
+    backport:
+      assignees:
+        - "{{ author }}"
+
 queue_rules:
   - name: default
     conditions:
-      - "#approved-reviews-by>2"
+      - "#approved-reviews-by>1"
+    commit_message_template: |
+      {{ title }} (#{{ number }})
+      {{ body }}
 
 pull_request_rules:
-  - name: automerge to main with label automerge and branch protection passing
+  - name: Automatic merge on approval to the main branch
     conditions:
-      - "#approved-reviews-by>2"
+      - "#approved-reviews-by>=1"
       - base=main
       - label=A:automerge
     actions:
       queue:
         name: default
         method: squash
-        commit_message_template: |
-          {{ title }} (#{{ number }})
-          {{ body }}
-  - name: backport patches to v2.1.x branch
+  - name: Backport patches to release/v3.0.x branch
+    conditions:
+      - base=main
+      - label=backport/v3.0.x
+    actions:
+      backport:
+        branches:
+          - release/v3.0.x
+  - name: Backport patches to release/v3.1.x branch
     conditions:
       - base=main
-      - label=backport/v2.1.x
+      - label=backport/v3.1.x
     actions:
       backport:
         branches:
-          - release/v2.1.x
+          - release/v3.1.x

Dockerfile

@@ -1,16 +1,16 @@
 # syntax=docker/dockerfile:1
 
 ARG source=./
-ARG GO_VERSION="1.20"
+ARG GO_VERSION="1.22"
 ARG BUILDPLATFORM=linux/amd64
 ARG BASE_IMAGE="golang:${GO_VERSION}-alpine3.18"
-FROM --platform=${BUILDPLATFORM} ${BASE_IMAGE} as base
+FROM --platform=${BUILDPLATFORM} ${BASE_IMAGE} AS  base
 
 ###############################################################################
 # Builder
 ###############################################################################
 
-FROM base as builder-stage-1
+FROM base AS builder-stage-1
 
 ARG source
 ARG GIT_COMMIT
@@ -70,7 +70,7 @@ RUN set -eux &&\
 
 ###############################################################################
 
-FROM builder-stage-1 as builder-stage-2
+FROM builder-stage-1 AS builder-stage-2
 
 ARG source
 ARG GOOS=linux \
@@ -102,7 +102,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
 
 ################################################################################
 
-FROM alpine as terra-core
+FROM alpine AS terra-core
 
 RUN apk update && apk add wget lz4 aria2 curl jq gawk coreutils "zlib>1.2.12-r2" libssl3
 
@@ -122,4 +122,4 @@ EXPOSE 26657
 
 WORKDIR /app
 
-CMD ["terrad", "version"]
+CMD ["terrad", "version"]

contrib/devtools/dockerfile

@@ -1,6 +1,6 @@
+ARG GO_VERSION="1.22"
 FROM bufbuild/buf:latest as BUILDER
-
-FROM golang:1.22rc2-alpine3.18
+FROM golang:${GO_VERSION}-alpine3.18
 
 ENV GOLANG_PROTOBUF_VERSION=1.3.5 \
   GOGO_PROTOBUF_VERSION=1.3.2 \

contrib/terra-operator/Dockerfile.core

@@ -1,6 +1,7 @@
 # docker build . -t cosmwasm/wasmd:latest
 # docker run --rm -it cosmwasm/wasmd:latest /bin/sh
-FROM golang:1.20-alpine3.18 AS go-builder
+ARG GO_VERSION="1.22"
+FROM golang:${GO_VERSION}-alpine3.18 AS go-builder
 ARG source=.
 
 # this comes from standard alpine nightly file

contrib/updates/Dockerfile.cosmovisor

@@ -1,4 +1,5 @@
-FROM golang:1.20-alpine3.18
+ARG GO_VERSION="1.22"
+FROM golang:${GO_VERSION}-alpine3.18
 
 RUN set -eux; apk add --no-cache ca-certificates build-base;
 

contrib/updates/Dockerfile.old

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 ARG source=./
-ARG GO_VERSION="1.20"
+ARG GO_VERSION="1.22"
 ARG BUILDPLATFORM=linux/amd64
 ARG BASE_IMAGE="golang:${GO_VERSION}-alpine3.18"
 FROM --platform=${BUILDPLATFORM} ${BASE_IMAGE} as base

custom/wasm/simulation/operations.go

@@ -172,7 +172,7 @@ func SimulateMsgExecuteContract(
 		app *baseapp.BaseApp,
 		ctx sdk.Context,
 		accs []simtypes.Account,
-		chainID string,
+		_ string,
 	) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
 		contractAddr := contractSelector(ctx, wasmKeeper)
 		if contractAddr == nil {

go.mod

@@ -1,4 +1,4 @@
-go 1.20
+go 1.22
 
 module github.com/classic-terra/core/v3
 
@@ -13,7 +13,7 @@ require (
 	github.com/cosmos/cosmos-sdk v0.47.10
 	github.com/cosmos/gogoproto v1.4.10
 	github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20240321032823-2733d24a1b99
-	github.com/cosmos/ibc-go/v7 v7.4.0
+	github.com/cosmos/ibc-go/v7 v7.4.1
 	github.com/gogo/protobuf v1.3.3
 	github.com/golang/protobuf v1.5.4
 	github.com/google/gofuzz v1.2.0
@@ -230,7 +230,7 @@ replace (
 	github.com/cometbft/cometbft => github.com/classic-terra/cometbft v0.37.4-terra1
 	github.com/cometbft/cometbft-db => github.com/cometbft/cometbft-db v0.8.0
 	github.com/cosmos/cosmos-sdk => github.com/classic-terra/cosmos-sdk v0.47.10-terra.1
-	github.com/cosmos/ibc-go/v7 => github.com/classic-terra/ibc-go/v7 v7.4.0-terra
+	github.com/cosmos/ibc-go/v7 => github.com/classic-terra/ibc-go/v7 v7.4.1-terra
 	github.com/cosmos/ledger-cosmos-go => github.com/terra-money/ledger-terra-go v0.11.2
 	// replace goleveldb to optimized one
 	github.com/syndtr/goleveldb => github.com/classic-terra/goleveldb v0.0.0-20230914223247-2b28f6655121