From 63e38ccbadfce05b6c03270bb2d9e65a4004310b Mon Sep 17 00:00:00 2001 From: HuangYi Date: Wed, 9 Apr 2025 12:00:59 +0800 Subject: [PATCH 1/2] Problem: ethermint bug fixes not included --- CHANGELOG.md | 1 + go.mod | 2 +- go.sum | 4 ++-- gomod2nix.toml | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad7099237c..34b3d4bb38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ ### Bug Fixes * [#1783](https://github.com/crypto-org-chain/cronos/pull/1783) Fix eth_getLogs edge case with batch transaction. +* [#]() Include ethermint bug fixes (https://github.com/crypto-org-chain/ethermint/pull/579). ### Improvements diff --git a/go.mod b/go.mod index 9eb9e21265..e2d5ad3ebd 100644 --- a/go.mod +++ b/go.mod @@ -272,7 +272,7 @@ replace ( github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.20-0.20240926023215-d2275b4afb9a // release/v1.4.x-2 - github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20250408070934-a5405dadd90d + github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20250409022716-434f46d2a46c // Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities. // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409 github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0 diff --git a/go.sum b/go.sum index fe98a8473d..9bcbcb32e3 100644 --- a/go.sum +++ b/go.sum @@ -428,8 +428,8 @@ github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20241217090828-cfbca9fe8254 github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20241217090828-cfbca9fe8254/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM= github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20241217090828-cfbca9fe8254 h1:JzLOFRiKsDtLJt5h0M0jkEIPDKvFFyja7VEp7gG6O9U= github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20241217090828-cfbca9fe8254/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w= -github.com/crypto-org-chain/ethermint v0.6.1-0.20250408070934-a5405dadd90d h1:U4M5S01fgvt9L8cCrsFoEFwG7BRoNrPygZtdzXKogpg= -github.com/crypto-org-chain/ethermint v0.6.1-0.20250408070934-a5405dadd90d/go.mod h1:b/zGbkkYhrshNpuHTk1sCA5Teyo5d3Ex3CpPdq8f+ZA= +github.com/crypto-org-chain/ethermint v0.6.1-0.20250409022716-434f46d2a46c h1:ZQvTVbnPBn5G5HGFdUQxVxtJjeEMgkH1tf6kIggzQs0= +github.com/crypto-org-chain/ethermint v0.6.1-0.20250409022716-434f46d2a46c/go.mod h1:X11RkHpz0TlJf5E30HLyvxXJCDGB0XW0CUzdG4MNSWg= github.com/crypto-org-chain/go-block-stm v0.0.0-20240919080136-6c49aef68716 h1:OvD5Rm0B6LHUJk6z858UgwdP72jU2DuUdXeclRyKpDI= github.com/crypto-org-chain/go-block-stm v0.0.0-20240919080136-6c49aef68716/go.mod h1:iwQTX9xMX8NV9k3o2BiWXA0SswpsZrDk5q3gA7nWYiE= github.com/crypto-org-chain/go-ethereum v1.10.20-0.20240926023215-d2275b4afb9a h1:IUPD+dg1YQl8cLocxQ/Mbx/ObTgAgcrZlcBhFjsLO40= diff --git a/gomod2nix.toml b/gomod2nix.toml index 1457198516..85e90218c1 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -263,8 +263,8 @@ schema = 3 hash = "sha256-ozwVS2BhAoz+OOisAyMhgg+lq8FdQjf90xoOq9cxtGw=" replaced = "github.com/crypto-org-chain/go-ethereum" [mod."github.com/evmos/ethermint"] - version = "v0.6.1-0.20250408070934-a5405dadd90d" - hash = "sha256-wrgFttsx36ncmZGfIHaD1J7S+eWJqV7CwWeAOxhjyCw=" + version = "v0.6.1-0.20250409022716-434f46d2a46c" + hash = "sha256-4dIcLX/qbcgSdXwlcWALJFM+BsnmyL3y+ybqDsT14Ls=" replaced = "github.com/crypto-org-chain/ethermint" [mod."github.com/fatih/color"] version = "v1.16.0" From 24d6b10b96a95898edea35dcdd1f70dfca74e23d Mon Sep 17 00:00:00 2001 From: yihuang Date: Wed, 9 Apr 2025 12:01:46 +0800 Subject: [PATCH 2/2] Update CHANGELOG.md Signed-off-by: yihuang --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34b3d4bb38..6f364e0c17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ ### Bug Fixes * [#1783](https://github.com/crypto-org-chain/cronos/pull/1783) Fix eth_getLogs edge case with batch transaction. -* [#]() Include ethermint bug fixes (https://github.com/crypto-org-chain/ethermint/pull/579). +* [#1785](https://github.com/crypto-org-chain/cronos/pull/1785) Include ethermint bug fixes (https://github.com/crypto-org-chain/ethermint/pull/579). ### Improvements