From 87f70c3b4e03d7d0949d55b01874e2146dfb6523 Mon Sep 17 00:00:00 2001 From: Daniel Burckhardt Date: Mon, 31 Oct 2022 17:46:48 +0100 Subject: [PATCH] deps: bump go to v1.19 (#1416) * deps: bump go to v1.19 * deps: add dragonberry patch repalce in go.mod * deps: add ival bump to v0.19.4 * deps: remove unrelated version bumps to adress in differnet PR * go mod tidy * add changelog * fix typo in changelog --- .github/workflows/build.yml | 2 +- .github/workflows/goreleaser.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 20 ++++++++++---------- .golangci.yml | 2 +- CHANGELOG.md | 1 + Makefile | 2 +- README.md | 2 +- go.mod | 5 +++-- networks/local/ethermintnode/Dockerfile | 2 +- 10 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index beba3c2f35..47a3a6190a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 check-latest: true - uses: technote-space/get-diff-action@v6.1.1 id: git_diff diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index 1bda08f33d..a71039bd4e 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -15,7 +15,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 check-latest: true - name: release dry run run: make release-dry-run diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 36c7721dc5..5032112a2e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - uses: actions/checkout@v3 - uses: technote-space/get-diff-action@v6.1.1 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 810799015c..f4cac262a9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 check-latest: true - uses: actions/checkout@v3 - uses: technote-space/get-diff-action@v6.1.1 @@ -45,7 +45,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 check-latest: true - uses: actions/checkout@v3 - uses: technote-space/get-diff-action@v6.1.1 @@ -59,14 +59,14 @@ jobs: run: | make test-import if: env.GIT_DIFF - + test-rpc: runs-on: ubuntu-latest timeout-minutes: 15 steps: - uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 check-latest: true - uses: actions/checkout@v3 - uses: technote-space/get-diff-action@v6.1.1 @@ -87,7 +87,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 check-latest: true - uses: actions/checkout@v3 - uses: technote-space/get-diff-action@v6.1.1 @@ -155,7 +155,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 check-latest: true - uses: actions/checkout@v3 - uses: technote-space/get-diff-action@v6.1.1 @@ -175,7 +175,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 check-latest: true - uses: actions/checkout@v3 - uses: technote-space/get-diff-action@v6.1.1 @@ -184,7 +184,7 @@ jobs: **/**.go go.mod go.sum - - name: Test simulation with random genesis + - name: Test simulation with random genesis run: | make test-sim-random-genesis-fast if: env.GIT_DIFF @@ -195,7 +195,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 check-latest: true - uses: actions/checkout@v3 - uses: technote-space/get-diff-action@v6.1.1 @@ -215,7 +215,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 check-latest: true - uses: actions/checkout@v3 - uses: technote-space/get-diff-action@v6.1.1 diff --git a/.golangci.yml b/.golangci.yml index f740ede69c..c83bcb01a5 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -65,7 +65,7 @@ linters-settings: require-explanation: false require-specific: false gofumpt: - lang-version: "1.18" + lang-version: "1.19" gomodguard: blocked: versions: # List of blocked module version constraints diff --git a/CHANGELOG.md b/CHANGELOG.md index a7ec000b2e..4616194189 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -65,6 +65,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (rpc) [#1378](https://github.com/evmos/ethermint/pull/1378) Add support for EVM RPC metrics * (ante) [#1390](https://github.com/evmos/ethermint/pull/1390) Added multisig tx support. * (test) [#1396](https://github.com/evmos/ethermint/pull/1396) Increase test coverage for the EVM module `keeper` +* (deps) [#1416](https://github.com/evmos/ethermint/pull/1416) Bump Go version to `1.19` ### Bug Fixes diff --git a/Makefile b/Makefile index 763fcf96f3..82bb582398 100755 --- a/Makefile +++ b/Makefile @@ -165,7 +165,7 @@ build-all: tools build lint test ############################################################################### PACKAGE_NAME:=github.com/evmos/ethermint -GOLANG_CROSS_VERSION = v1.18 +GOLANG_CROSS_VERSION = v1.19 GOPATH ?= '$(HOME)/go' release-dry-run: docker run \ diff --git a/README.md b/README.md index 83587e8261..2af515158b 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ parent: Ethermint is a scalable and interoperable Ethereum library, built on Proof-of-Stake with fast-finality using the [Cosmos SDK](https://github.com/cosmos/cosmos-sdk/) which runs on top of [Tendermint Core](https://github.com/tendermint/tendermint) consensus engine. -**Note**: Requires [Go 1.18+](https://golang.org/dl/) +**Note**: Requires [Go 1.19+](https://golang.org/dl/) ## Installation diff --git a/go.mod b/go.mod index c4bb52cf23..60f209c782 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/evmos/ethermint -go 1.18 +go 1.19 require ( cosmossdk.io/math v1.0.0-beta.3 @@ -190,10 +190,11 @@ require ( ) replace ( + // use cosmos keyring github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 - // Fix upstream GHSA-h395-qcrw-5vmq vulnerability. // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409 github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0 + // use cosmos flavored protobufs github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 ) diff --git a/networks/local/ethermintnode/Dockerfile b/networks/local/ethermintnode/Dockerfile index a275b75124..15e72bebaa 100644 --- a/networks/local/ethermintnode/Dockerfile +++ b/networks/local/ethermintnode/Dockerfile @@ -15,7 +15,7 @@ COPY . . RUN make build-linux # Final image -FROM golang:1.18 as final +FROM golang:1.19 as final WORKDIR /