deps: bump ethermint to v0.17.2 (#803)

* deps: bump ethermint to v0.17.2

* backport label

* c++

(cherry picked from commit d01d167)

# Conflicts:
#	CHANGELOG.md

.mergify.yml

@@ -16,6 +16,14 @@ pull_request_rules:
         commit_message_template: |
           {{ title }} (#{{ number }})
           {{ body }}
+  - name: backport patches to v6.0.x branch
+    conditions:
+      - base=main
+      - label=backport/6.0.x
+    actions:
+      backport:
+        branches:
+          - release/v6.0.x
   - name: backport patches to v5.0.x branch
     conditions:
       - base=main

CHANGELOG.md

@@ -43,7 +43,13 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Improvements
 
+<<<<<<< HEAD
 - (ci) [\#729](https://github.com/evmos/evmos/pull/729) Remove unshallow action in goreleaser.
+=======
+- (deps) [\#803](https://github.com/evmos/evmos/pull/803) Bump Ethermint version to [`v0.17.2`](https://github.com/evmos/ethermint/releases/tag/v0.17.2)
+- (inflation) [\#748](https://github.com/evmos/evmos/pull/748) Remove overcounted epochs from `skippedEpochs` value in store
+- (app) [\#760](https://github.com/evmos/evmos/pull/760) Migrate inaccessible balance of testnet faucet account to new address
+>>>>>>> d01d167 (deps: bump ethermint to v0.17.2 (#803))
 
 ## [v6.0.0] - 2022-06-28
 

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/cosmos/go-bip39 v1.0.0
 	github.com/cosmos/ibc-go/v3 v3.1.0
 	github.com/ethereum/go-ethereum v1.10.16
-	github.com/evmos/ethermint v0.17.1
+	github.com/evmos/ethermint v0.17.2
 	github.com/gogo/protobuf v1.3.3
 	github.com/golang/protobuf v1.5.2
 	github.com/gorilla/mux v1.8.0

go.sum

@@ -333,8 +333,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/ethereum/go-ethereum v1.9.25/go.mod h1:vMkFiYLHI4tgPw4k2j4MHKoovchFE8plZ0M9VMk4/oM=
 github.com/ethereum/go-ethereum v1.10.16 h1:3oPrumn0bCW/idjcxMn5YYVCdK7VzJYIvwGZUGLEaoc=
 github.com/ethereum/go-ethereum v1.10.16/go.mod h1:Anj6cxczl+AHy63o4X9O8yWNHuN5wMpfb8MAnHkWn7Y=
-github.com/evmos/ethermint v0.17.1 h1:KXI4EXWQo8/PuzjBuhLRbgVhyz/Wzb0RoyZIHczZv90=
-github.com/evmos/ethermint v0.17.1/go.mod h1:BmXULZy8lbld5KgNE0zM4b7Dy1irPpL6nsDH11SMNzQ=
+github.com/evmos/ethermint v0.17.2 h1:OaXQmhKyKBw7EyR6JJaA6x9cApi3krqhYcKK1VuDOgo=
+github.com/evmos/ethermint v0.17.2/go.mod h1:BmXULZy8lbld5KgNE0zM4b7Dy1irPpL6nsDH11SMNzQ=
 github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64=
 github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0=
 github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A=