From 0ffcbe713879cf800096f9e31b4eba0b8abc6059 Mon Sep 17 00:00:00 2001
From: dreamer <dreamer.x.cn@gmail.com>
Date: Wed, 14 Aug 2024 11:59:08 +0800
Subject: [PATCH 1/3] fix panic

---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 6a60c3ecc..8ad6ef6c6 100644
--- a/go.mod
+++ b/go.mod
@@ -232,6 +232,6 @@ require (
 replace github.com/zondax/hid => github.com/zondax/hid v0.9.0
 
 // use bianjieai fork of ethermint
-replace github.com/evmos/ethermint => github.com/bianjieai/ethermint v0.22.0-irishub-20240512
+replace github.com/evmos/ethermint => github.com/bianjieai/ethermint v0.22.1-irishub
 
 replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
diff --git a/go.sum b/go.sum
index 4d092d2b1..9f247af3a 100644
--- a/go.sum
+++ b/go.sum
@@ -295,8 +295,8 @@ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s=
 github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/bianjieai/ethermint v0.22.0-irishub-20240512 h1:s7xvTNh4GlUlTjYfeGNvMCpKbfkBw2d/C8lvJXygFiQ=
-github.com/bianjieai/ethermint v0.22.0-irishub-20240512/go.mod h1:x9BFez6AUL9Yksv4zZd3QLmSazwOkyNd3h2zFV2B4RU=
+github.com/bianjieai/ethermint v0.22.1-irishub h1:bwNZYpA4fugoMp6HeFLl6NFfUCC185NC2LsmIl+8tvE=
+github.com/bianjieai/ethermint v0.22.1-irishub/go.mod h1:x9BFez6AUL9Yksv4zZd3QLmSazwOkyNd3h2zFV2B4RU=
 github.com/bianjieai/nft-transfer v1.1.3-ibc-v7.3.0 h1:399lErsTpI+faTerw5Q4OuVlXAmAQSuibVvxHR3C6OY=
 github.com/bianjieai/nft-transfer v1.1.3-ibc-v7.3.0/go.mod h1:u2PNH4v8CD4AWU4Rf7yt8/qqQtrrwwHiw03qQSKERhg=
 github.com/bianjieai/tibc-go v0.5.0 h1:/J1OQe4gwUUkS3Q6+nm0EsTY7MNAOPNzfnpvgIWlvKM=

From 8a66bcb4f00d58a139bf03409a7d21e568d0591a Mon Sep 17 00:00:00 2001
From: dreamer <dreamer.x.cn@gmail.com>
Date: Wed, 14 Aug 2024 12:06:01 +0800
Subject: [PATCH 2/3] merge

---
 go.mod | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/go.mod b/go.mod
index 2d7e3f25b..b1acd885a 100644
--- a/go.mod
+++ b/go.mod
@@ -237,11 +237,14 @@ require (
 )
 
 replace (
+	// use bianjieai fork of ethermint
+	github.com/evmos/ethermint => github.com/bianjieai/ethermint v0.22.1-irishub
 
-  replace github.com/zondax/hid => github.com/zondax/hid v0.9.0
+	// following versions might cause unexpected behavior
+	github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
+	github.com/zondax/hid => github.com/zondax/hid v0.9.0
 
-  // use bianjieai fork of ethermint
-  replace github.com/evmos/ethermint => github.com/bianjieai/ethermint v0.22.1-irishub
-
-  replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
+	// stick with compatible version or x/exp in v0.47.x line
+	// x/exp had a breaking change in further commits
+	golang.org/x/exp => golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb
 )

From 8f269e0b9e20f259e7b1e71ec276518a56ce5a7d Mon Sep 17 00:00:00 2001
From: dreamer <dreamer.x.cn@gmail.com>
Date: Wed, 14 Aug 2024 13:13:47 +0800
Subject: [PATCH 3/3] add release

---
 RELEASE.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/RELEASE.md b/RELEASE.md
index 1333ed77b..69c766ec2 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1 +1,13 @@
-TODO
+# v3.1.1
+
+## Release Notes
+
+This is a compatibility version that does not affect network consensus. It fixes a node exit problem caused by ethermint api panic. It is recommended to upgrade the node.
+
+## ChangeLog
+
+### Bug Fixes
+
+(IRISHub) [2951](https://github.com/irisnet/irishub/issues/2951) Fix panic,ethermint API panic causes node exit.
+
+Full Changelog: [v3.1.0...v3.1.1](https://github.com/irisnet/irishub/compare/v3.1.0...v3.1.1).