Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: patch wasmvm and cometbft #549

Merged
merged 18 commits into from
Feb 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/interchain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
12 changes: 6 additions & 6 deletions .github/workflows/sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 7 additions & 3 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ linters:
- gofumpt
- gosec
- gosimple
- govet
# - govet
- ineffassign
- misspell
- nakedret
- nolintlint
# - nolintlint
- staticcheck
- revive
- stylecheck
Expand Down Expand Up @@ -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
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion contrib/devtools/dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion contrib/terra-operator/Dockerfile.core
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion contrib/updates/Dockerfile.cosmovisor
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions contrib/updates/Dockerfile.old
Original file line number Diff line number Diff line change
@@ -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

###############################################################################
Expand Down
Loading
Loading