feat: patch wasmvm and cometbft (#549)

Co-authored-by: Tuan Tran <[email protected]> Co-authored-by: StrathCole <[email protected]>
classic-terra · Feb 7, 2025 · 4f242ac · 4f242ac
1 parent be07738
commit 4f242ac
Show file tree

Hide file tree

Showing 21 changed files with 232 additions and 157 deletions.
diff --git a/.github/workflows/codeql.yml b/.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

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -20,7 +20,7 @@ jobs:
         name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.20.4'
+          go-version: '1.22'
       -
         name: Check out repository code
         uses: actions/checkout@v4

diff --git a/.github/workflows/interchain.yml b/.github/workflows/interchain.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.22'
       - name: Check out repository code
         uses: actions/checkout@v4
       - name: Set up Docker Buildx
@@ -36,10 +36,10 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-image
     steps:
-      - name: Set up Go 1.20
+      - name: Set up Go 1.22
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.22"
           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 1.22
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.22"
           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 1.22
         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 1.22
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.22"
           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 1.22
         uses: actions/setup-go@v4
         with:
-          go-version: "1.20"
+          go-version: "1.22"
           check-latest: true
 
       - name: checkout code

diff --git a/.github/workflows/lint.yml b/.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.60.1
           args: --timeout 10m
           github-token: ${{ secrets.github_token }}
diff --git a/.github/workflows/sims.yml b/.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

diff --git a/.github/workflows/test.yml b/.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

diff --git a/.golangci.yml b/.golangci.yml
@@ -15,11 +15,11 @@ linters:
     - gofumpt
     - gosec
     - gosimple
-    - govet
+    # - govet
     - ineffassign
     - misspell
     - nakedret
-    - nolintlint
+    # - nolintlint
     - staticcheck
     - revive
     - stylecheck
@@ -60,4 +60,8 @@ linters-settings:
     allow-unused: false
     allow-leading-space: true
     require-explanation: false
-    require-specific: false
+    require-specific: false
+  revive:
+    rules:
+      - name: unused-parameter
+        disabled: true
diff --git a/Dockerfile b/Dockerfile
@@ -1,16 +1,16 @@
 # syntax=docker/dockerfile:1
 
 ARG source=./
-ARG GO_VERSION="1.20"
+ARG GO_VERSION="1.22.12"
 ARG BUILDPLATFORM=linux/amd64
-ARG BASE_IMAGE="golang:${GO_VERSION}-alpine3.18"
-FROM --platform=${BUILDPLATFORM} ${BASE_IMAGE} as base
+ARG BASE_IMAGE="golang:${GO_VERSION}-alpine3.20"
+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
 

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ The easiest way to get started is by downloading a pre-built binary for your ope
 
 **Step 1. Install Golang**
 
-Go v1.20 is required for Terra Core.
+Go v1.22 is required for Terra Core.
 
 If you haven't already, install Golang by following the [official docs](https://golang.org/doc/install). Make sure that your `GOPATH` and `GOBIN` environment variables are properly set up.
 

diff --git a/contrib/devtools/dockerfile b/contrib/devtools/dockerfile
@@ -1,6 +1,6 @@
 FROM bufbuild/buf:latest as BUILDER
 
-FROM golang:1.22rc2-alpine3.18
+FROM golang:1.22.12-alpine3.20
 
 ENV GOLANG_PROTOBUF_VERSION=1.3.5 \
   GOGO_PROTOBUF_VERSION=1.3.2 \

diff --git a/contrib/terra-operator/Dockerfile.core b/contrib/terra-operator/Dockerfile.core
@@ -1,6 +1,6 @@
 # docker build . -t cosmwasm/wasmd:latest
 # docker run --rm -it cosmwasm/wasmd:latest /bin/sh
-FROM golang:1.20-alpine3.18 AS go-builder
+FROM golang:1.22.12-alpine3.20 AS go-builder
 ARG source=.
 
 # this comes from standard alpine nightly file

diff --git a/contrib/updates/Dockerfile.cosmovisor b/contrib/updates/Dockerfile.cosmovisor
@@ -1,4 +1,4 @@
-FROM golang:1.20-alpine3.18
+FROM golang:1.22.12-alpine3.20
 
 RUN set -eux; apk add --no-cache ca-certificates build-base;
 

diff --git a/contrib/updates/Dockerfile.old b/contrib/updates/Dockerfile.old
@@ -1,9 +1,9 @@
 # syntax=docker/dockerfile:1
 
 ARG source=./
-ARG GO_VERSION="1.20"
+ARG GO_VERSION="1.22.12"
 ARG BUILDPLATFORM=linux/amd64
-ARG BASE_IMAGE="golang:${GO_VERSION}-alpine3.18"
+ARG BASE_IMAGE="golang:${GO_VERSION}-alpine3.20"
 FROM --platform=${BUILDPLATFORM} ${BASE_IMAGE} as base
 
 ###############################################################################