From 59f3e8eb35734841ba68dee8ad3a98a4edafd8aa Mon Sep 17 00:00:00 2001 From: Daniel Burckhardt Date: Mon, 31 Oct 2022 17:20:28 +0100 Subject: [PATCH 1/5] backport: v0.19.3 dragonberry changes and iavl bump --- go.mod | 7 +++++-- go.sum | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index c4bb52cf23..56946e6e23 100644 --- a/go.mod +++ b/go.mod @@ -70,7 +70,7 @@ require ( github.com/cosmos/btcutil v1.0.4 // indirect github.com/cosmos/cosmos-proto v1.0.0-alpha7 // indirect github.com/cosmos/gorocksdb v1.2.0 // indirect - github.com/cosmos/iavl v0.19.3 // indirect + github.com/cosmos/iavl v0.19.4 // indirect github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect github.com/cosmos/ledger-go v0.9.2 // indirect github.com/creachadair/taskgroup v0.3.2 // indirect @@ -190,10 +190,13 @@ require ( ) replace ( + // use cosmos keyring github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 - + // ics23 patch for dragonberry + github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 // 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/go.sum b/go.sum index 5dd569fc32..5f28c5fc61 100644 --- a/go.sum +++ b/go.sum @@ -235,8 +235,6 @@ github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE github.com/coinbase/kryptology v1.8.0/go.mod h1:RYXOAPdzOGUe3qlSFkMGn58i3xUA8hmxYHksuq+8ciI= github.com/coinbase/rosetta-sdk-go v0.7.9 h1:lqllBjMnazTjIqYrOGv8h8jxjg9+hJazIGZr9ZvoCcA= github.com/coinbase/rosetta-sdk-go v0.7.9/go.mod h1:0/knutI7XGVqXmmH4OQD8OckFrbQ8yMsUZTG7FXCR2M= -github.com/confio/ics23/go v0.7.0 h1:00d2kukk7sPoHWL4zZBZwzxnpA2pec1NPdwbSokJ5w8= -github.com/confio/ics23/go v0.7.0/go.mod h1:E45NqnlpxGnpfTWL/xauN7MRwEE28T4Dd4uraToOaKg= github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ= github.com/consensys/bavard v0.1.8-0.20210915155054-088da2f7f54a/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q= @@ -254,13 +252,15 @@ github.com/cosmos/cosmos-proto v1.0.0-alpha7 h1:yqYUOHF2jopwZh4dVQp3xgqwftE5/2hk github.com/cosmos/cosmos-proto v1.0.0-alpha7/go.mod h1:dosO4pSAbJF8zWCzCoTWP7nNsjcvSUBQmniFxDg5daw= github.com/cosmos/cosmos-sdk v0.46.3 h1:2jdJYcSwh4AtFJKGoNGvmEy2mKDWtGaVZphGpvedljQ= github.com/cosmos/cosmos-sdk v0.46.3/go.mod h1:AynIAjXwtS3T/ApdhNCz/7/KGMbZSUBbKRTcbukb2ic= +github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 h1:iKclrn3YEOwk4jQHT2ulgzuXyxmzmPczUalMwW4XH9k= +github.com/cosmos/cosmos-sdk/ics23/go v0.8.0/go.mod h1:2a4dBq88TUoqoWAU5eu0lGvpFP3wWDPgdHPargtyw30= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y= github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= -github.com/cosmos/iavl v0.19.3 h1:cESO0OwTTxQm5rmyESKW+zESheDUYI7CcZDWWDwnuxg= -github.com/cosmos/iavl v0.19.3/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= +github.com/cosmos/iavl v0.19.4 h1:t82sN+Y0WeqxDLJRSpNd8YFX5URIrT+p8n6oJbJ2Dok= +github.com/cosmos/iavl v0.19.4/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= github.com/cosmos/ibc-go/v5 v5.0.1 h1:ZI5xCi6RDOL+hyu6Wx/w6JoAYFlOoK5hijsRTVWo+RA= github.com/cosmos/ibc-go/v5 v5.0.1/go.mod h1:LX0DHLW3dfi/1e4BJzi8MGLWmQ4DSraPEgVjyo3VzAo= github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 h1:DdzS1m6o/pCqeZ8VOAit/gyATedRgjvkVI+UCrLpyuU= From a19b30947688ca5b98a4ba112095147b17253993 Mon Sep 17 00:00:00 2001 From: Daniel Burckhardt Date: Mon, 31 Oct 2022 17:26:58 +0100 Subject: [PATCH 2/5] add v0.19.3 changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7ec000b2e..8512b0e8cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -76,6 +76,10 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (state) [#1320](https://github.com/evmos/ethermint/pull/1320) Fix codehash check mismatch when the code has been deleted in the evm state. * (rpc) [#1392](https://github.com/evmos/ethermint/pull/1392) Allow fill the proposer address in json-rpc through tendermint api, and pass explicitly to grpc query handler. +## [v0.19.3] - 2022-10-14 + +* (deps) [1381](https://github.com/evmos/ethermint/pull/1381) Bump sdk to `v0.45.9` + ## [v0.19.2] - 2022-08-29 ### Improvements From a93a980dcc45074f4ff9c4c77542853d8c88329b Mon Sep 17 00:00:00 2001 From: Freddy Caceres Date: Mon, 31 Oct 2022 12:53:05 -0400 Subject: [PATCH 3/5] update gomod2nix --- gomod2nix.toml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gomod2nix.toml b/gomod2nix.toml index f224af3f8f..72da5d025f 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -84,8 +84,9 @@ schema = 3 version = "v0.7.9" hash = "sha256-ZWIXIXcHGjeCNgMrpXymry8/8esDDauGFfF/+gEoO1Y=" [mod."github.com/confio/ics23/go"] - version = "v0.7.0" - hash = "sha256-FjUQfDKtX+/13+UjJzbYPAkgM4GPZ0vk+dKz7/iRetw=" + version = "v0.8.0" + hash = "sha256-mFKxFHp7RaE1L5NdtH9H9px2Cy6I5uOZVnFOgE8Nrew=" + replaced = "github.com/cosmos/cosmos-sdk/ics23/go" [mod."github.com/cosmos/btcutil"] version = "v1.0.4" hash = "sha256-JvcBXBdjdmnaW/nyf/tw/uaOAGn1b78yxrtl2/Rs3kA=" @@ -102,8 +103,8 @@ schema = 3 version = "v1.2.0" hash = "sha256-209TcVuXc5s/TcOvNlaQ1HEJAUDTEK3nxPhs+d8TEcY=" [mod."github.com/cosmos/iavl"] - version = "v0.19.3" - hash = "sha256-rmW2KoKmm4YXmYIYE1vXMOCaDyP1ym0qsW224PYc9rg=" + version = "v0.19.4" + hash = "sha256-EmpRZ48pjPFq/fIHneut9Vyo5QJATfb3ZO7KzWnqs9g=" [mod."github.com/cosmos/ibc-go/v5"] version = "v5.0.1" hash = "sha256-44Vyj9i4gh6U0BGNsEFqRsHAYdxfuJmLGdtPWxcBfWQ=" From 1cb07ac234dc8b680979f20c38c63b351eb4c04a Mon Sep 17 00:00:00 2001 From: Daniel Burckhardt Date: Mon, 31 Oct 2022 19:51:08 +0100 Subject: [PATCH 4/5] fix linter --- .golangci.yml | 2 -- x/feemarket/types/keys.go | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index c83bcb01a5..1d0df1c383 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -6,7 +6,6 @@ run: linters: enable: - bodyclose - - deadcode - depguard - dogsled - dupl @@ -30,7 +29,6 @@ linters: - unconvert - unparam - unused - - varcheck - nolintlint - asciicheck - exportloopref diff --git a/x/feemarket/types/keys.go b/x/feemarket/types/keys.go index 9e55260115..055fc5138d 100644 --- a/x/feemarket/types/keys.go +++ b/x/feemarket/types/keys.go @@ -19,7 +19,7 @@ const ( // prefix bytes for the feemarket persistent store const ( prefixBlockGasWanted = iota + 1 - deprecatedPrefixBaseFee //nolint + deprecatedPrefixBaseFee // unused ) const ( From f3f2c31475f353f644357fe1dfd021328bb3973e Mon Sep 17 00:00:00 2001 From: Daniel Burckhardt Date: Mon, 31 Oct 2022 20:00:37 +0100 Subject: [PATCH 5/5] use latest for golangci github workflow --- .github/workflows/lint.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e413b673c9..9bb6074607 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -17,6 +17,7 @@ jobs: - uses: actions/setup-go@v3 with: go-version: 1.19 + check-latest: true - uses: actions/checkout@v3 - uses: technote-space/get-diff-action@v6.1.1 with: @@ -27,7 +28,7 @@ jobs: - uses: golangci/golangci-lint-action@v3.3.0 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.46.2 + version: latest args: --timeout 10m github-token: ${{ secrets.github_token }} # Check only if there are differences in the source code