From 3abe7b1a937db896c6f060d441bccc933ead5c2c Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 4 Jul 2023 09:03:52 -0400 Subject: [PATCH 1/2] Problem: cometbft dependency is not updated (backport #1635) (#1637) * Problem: cometbft dependency is not updated (#1635) * Problem: cometbft dependency is not updated * Update CHANGELOG.md (cherry picked from commit 3dc45119f7c0ba5b6f0981697ef32113f1637a8b) # Conflicts: # CHANGELOG.md # go.mod * fix merge conflicts * fix merge conflicts in go.mod --------- Co-authored-by: mmsqe Co-authored-by: MalteHerrmann --- CHANGELOG.md | 6 ++++++ go.mod | 6 +++--- go.sum | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 361f7961a5..f4c435ef8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,12 @@ Ref: https://keepachangelog.com/en/1.0.0/ # Changelog +## Unreleased + +### Improvement + +- (deps) [#1635](https://github.com/evmos/evmos/pull/1635) Update cometbft `v0.34.29` with several minor bug fixes and low-severity security-fixes.s + ## [v12.1.5] - 2023-06-08 ### Bug Fixes diff --git a/go.mod b/go.mod index 30cd215356..0d90fbca35 100644 --- a/go.mod +++ b/go.mod @@ -229,8 +229,8 @@ replace ( github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.7 // use cosmos flavored protobufs github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 - // Informal Tendermint fork - github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.28 + // replace broken goleveldb github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 + // use cometbft + github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.29 ) - diff --git a/go.sum b/go.sum index 78c5c6cb01..a210b51840 100644 --- a/go.sum +++ b/go.sum @@ -357,8 +357,8 @@ 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/cometbft/cometbft v0.34.28 h1:gwryf55P1SWMUP4nOXpRVI2D0yPoYEzN+IBqmRBOsDc= -github.com/cometbft/cometbft v0.34.28/go.mod h1:L9shMfbkZ8B+7JlwANEr+NZbBcn+hBpwdbeYvA5rLCw= +github.com/cometbft/cometbft v0.34.29 h1:Q4FqMevP9du2pOgryZJHpDV2eA6jg/kMYxBj9ZTY6VQ= +github.com/cometbft/cometbft v0.34.29/go.mod h1:L9shMfbkZ8B+7JlwANEr+NZbBcn+hBpwdbeYvA5rLCw= github.com/cometbft/cometbft-db v0.7.0 h1:uBjbrBx4QzU0zOEnU8KxoDl18dMNgDh+zZRUE0ucsbo= github.com/cometbft/cometbft-db v0.7.0/go.mod h1:yiKJIm2WKrt6x8Cyxtq9YTEcIMPcEe4XPxhgX59Fzf0= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= From b43ee16a10b61e06431ef5b3ae3f6b75015e42e0 Mon Sep 17 00:00:00 2001 From: MalteHerrmann <42640438+MalteHerrmann@users.noreply.github.com> Date: Tue, 4 Jul 2023 15:24:07 +0200 Subject: [PATCH 2/2] chore(release): prepare v12.1.6 changelog (#1638) prepare v12.1.6 changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4c435ef8b..f0c7d0559b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,11 +35,11 @@ Ref: https://keepachangelog.com/en/1.0.0/ # Changelog -## Unreleased +## [v12.1.6] - 2023-07-04 ### Improvement -- (deps) [#1635](https://github.com/evmos/evmos/pull/1635) Update cometbft `v0.34.29` with several minor bug fixes and low-severity security-fixes.s +- (deps) [#1635](https://github.com/evmos/evmos/pull/1635) Update cometbft `v0.34.29` with several minor bug fixes and low-severity security-fixes ## [v12.1.5] - 2023-06-08