From ce5d6d22da267d2394b211e017d1004c26881ba3 Mon Sep 17 00:00:00 2001
From: HuangYi <huang@crypto.com>
Date: Wed, 9 Feb 2022 14:25:59 +0800
Subject: [PATCH 1/2] Problem: 0.70-rc1 testnet does not support eth_call for
blocks prior to upgrade
Closes: #327
Solution:
- fix base fee check logic in ethermint.
---
go.mod | 2 +-
go.sum | 4 ++--
gomod2nix.toml | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/go.mod b/go.mod
index 01a74ceedd..3fbce7bb76 100644
--- a/go.mod
+++ b/go.mod
@@ -164,7 +164,7 @@ replace (
// See https://github.com/tecbot/gorocksdb/pull/216
github.com/tecbot/gorocksdb => github.com/cosmos/gorocksdb v1.1.1
- github.com/tharsis/ethermint => github.com/crypto-org-chain/ethermint v0.10.0-alpha1-cronos-3
+ github.com/tharsis/ethermint => github.com/crypto-org-chain/ethermint v0.10.0-alpha1-cronos-4
google.golang.org/grpc => google.golang.org/grpc v1.33.2
)
diff --git a/go.sum b/go.sum
index 0cb3e7a81d..cfe9591b75 100644
--- a/go.sum
+++ b/go.sum
@@ -245,8 +245,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr
github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/crypto-org-chain/ethermint v0.10.0-alpha1-cronos-3 h1:O3pyvDcKjlA82J3lMzm07e06Lhi2SH6AHu8609effkM=
-github.com/crypto-org-chain/ethermint v0.10.0-alpha1-cronos-3/go.mod h1:mDIs9UkvLmjjg6cJX0dyO2GKn0GP6cuq4AfbDnFZl/4=
+github.com/crypto-org-chain/ethermint v0.10.0-alpha1-cronos-4 h1:KmP8fnsuZUKSE2f4i9osKq+KYjbqA9aJ8PX/osD47Wo=
+github.com/crypto-org-chain/ethermint v0.10.0-alpha1-cronos-4/go.mod h1:mDIs9UkvLmjjg6cJX0dyO2GKn0GP6cuq4AfbDnFZl/4=
github.com/crypto-org-chain/ibc-go/v2 v2.0.2-hooks h1:d2MOrJQE6lZQ+nUznUaSlE8/QQZ4j5rkv5hw2DnCt50=
github.com/crypto-org-chain/ibc-go/v2 v2.0.2-hooks/go.mod h1:XUmW7wmubCRhIEAGtMGS+5IjiSSmcAwihoN/yPGd6Kk=
github.com/crypto-org-chain/keyring v1.1.6-fixes h1:AUFSu56NY6XobY6XfRoDx6v3loiOrHK5MNUm32GEjwA=
diff --git a/gomod2nix.toml b/gomod2nix.toml
index 705a487919..3dc6285e02 100644
--- a/gomod2nix.toml
+++ b/gomod2nix.toml
@@ -3668,13 +3668,13 @@
sha256 = "1sgjf2vaq554ybc0cwkzn17cz2ibzph2rq0dgaw21c2hym09437x"
["github.com/tharsis/ethermint"]
- sumVersion = "v0.10.0-alpha1-cronos-3"
+ sumVersion = "v0.10.0-alpha1-cronos-4"
vendorPath = "github.com/crypto-org-chain/ethermint"
["github.com/tharsis/ethermint".fetch]
type = "git"
url = "https://github.com/crypto-org-chain/ethermint"
- rev = "1bd9ad9a6ad11381c50b162e89d60ecea4a06110"
- sha256 = "14vwv1j53y1whhwz4scrjhnasr7nr9k6axz19wcjgxnwyl516xbi"
+ rev = "caa29c298bd80e9659d427368d598e7f46d04ec3"
+ sha256 = "1gpjsfqld2w6jxcq12g57253zg1fyzw77k3niw1n18y25l80dy0k"
["github.com/tidwall/gjson"]
sumVersion = "v1.6.7"
From 298592ebcff205d0dc6acfc528a89c2f949534d0 Mon Sep 17 00:00:00 2001
From: HuangYi <huang@crypto.com>
Date: Wed, 9 Feb 2022 14:31:06 +0800
Subject: [PATCH 2/2] changelog
---
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a28a1de174..e53e484f2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
- [cronos#287](https://github.com/crypto-org-chain/cronos/pull/287) call upgrade handler before sealing app
- [cronos#323](https://github.com/crypto-org-chain/cronos/pull/323) Upgrade gravity bridge to v0.3.9 which contain a bugfix on `batchTxExecuted.`
- [cronos#324](https://github.com/crypto-org-chain/cronos/pull/324) Update to cosmos-sdk `v0.45.1`, which fixes an OOM issue.
+- [cronos#329](https://github.com/crypto-org-chain/cronos/pull/329) Fix panic of eth_call on blocks prior to upgrade.
*December 10, 2021*