From 143f285c42c4c0c7ef07f6eed3927cfa809687bf Mon Sep 17 00:00:00 2001 From: HuangYi Date: Wed, 9 Nov 2022 23:10:10 +0800 Subject: [PATCH 1/2] Problem: different result from eth_getProof comparing with Ethereum Solution: - cherry-pick solution from ethermint, thanks @mmsqe --- 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 8689dc773c..dbfa9b38d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - [#761](https://github.com/crypto-org-chain/cronos/pull/761) Fix non-deterministic evm execution result when there are concurrent grpc queries. - [#762](https://github.com/crypto-org-chain/cronos/pull/762) Add `v1.0.0` upgrade plan for dry-run and mainnet upgrade, which clears the `extra_eips` parameter. - [#763](https://github.com/crypto-org-chain/cronos/pull/763) Add error log for iavl set error. +- [#]() Make `eth_getProof` result compatible with ethereum. *Nov 4, 2022* diff --git a/go.mod b/go.mod index 68571a743f..cf6a228069 100644 --- a/go.mod +++ b/go.mod @@ -193,7 +193,7 @@ replace ( github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.46.5-0.20221109093801-2899dcf82f16 github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.13-0.20221108065429-afacc02b8738 - github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.20.0-cronos.0.20221103084125-b5b09806f538 + github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.20.1-cronos // Fix upstream GHSA-h395-qcrw-5vmq vulnerability. // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409 diff --git a/go.sum b/go.sum index 34fc9be3e5..f58669f43d 100644 --- a/go.sum +++ b/go.sum @@ -668,8 +668,8 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cristalhq/acmd v0.7.0/go.mod h1:LG5oa43pE/BbxtfMoImHCQN++0Su7dzipdgBjMCBVDQ= -github.com/crypto-org-chain/ethermint v0.20.0-cronos.0.20221103084125-b5b09806f538 h1:keFso/wkVMhH6doC6iXLowlzv49ZzMaRfgMmfuhn2J4= -github.com/crypto-org-chain/ethermint v0.20.0-cronos.0.20221103084125-b5b09806f538/go.mod h1:slhuvGjkZaRJCapuHaKVIraxRgI7C70yEznP2YokfkA= +github.com/crypto-org-chain/ethermint v0.20.1-cronos h1:tZpuLhdW40Ue/Gb5yz3wGn2jRIZrwO82bJQWqL2kRP4= +github.com/crypto-org-chain/ethermint v0.20.1-cronos/go.mod h1:slhuvGjkZaRJCapuHaKVIraxRgI7C70yEznP2YokfkA= github.com/crypto-org-chain/go-ethereum v1.10.13-0.20221108065429-afacc02b8738 h1:rgiJSNCPxtUfpFAnQhOTVJDusuXlyJ6D37NGDzvq0C8= github.com/crypto-org-chain/go-ethereum v1.10.13-0.20221108065429-afacc02b8738/go.mod h1:IJBNMtzKcNHPtllYihy6BL2IgK1u+32JriaTbdt4v+w= github.com/crypto-org-chain/gravity-bridge/module/v2 v2.0.1-0.20220815102151-48275db7e1ee h1:qzkim8QAf6AdRKlAPgLU5nI7S9JoefLDI76PmJeOTgk= diff --git a/gomod2nix.toml b/gomod2nix.toml index 06f56f2f2b..42c8658d92 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -167,8 +167,8 @@ schema = 3 hash = "sha256-GIvH3oux/2dxNnFbZDE6Qr+Wnt9FiOATXRDXXVxPvWw=" replaced = "github.com/crypto-org-chain/go-ethereum" [mod."github.com/evmos/ethermint"] - version = "v0.20.0-cronos.0.20221103084125-b5b09806f538" - hash = "sha256-tWDakuEH+B9sZnZbxlWoeJqZq4TRFWwxo4m+4ZmgMas=" + version = "v0.20.1-cronos" + hash = "sha256-RiLFMtsFI8HosauqQh7Je//pfQG/J9A2wV5hLt+3uGg=" replaced = "github.com/crypto-org-chain/ethermint" [mod."github.com/felixge/httpsnoop"] version = "v1.0.2" From d5a2ce30966c028ce33cf8e21fbe144448222fe5 Mon Sep 17 00:00:00 2001 From: yihuang Date: Wed, 9 Nov 2022 23:11:59 +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 dbfa9b38d5..1d1256a72b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ - [#761](https://github.com/crypto-org-chain/cronos/pull/761) Fix non-deterministic evm execution result when there are concurrent grpc queries. - [#762](https://github.com/crypto-org-chain/cronos/pull/762) Add `v1.0.0` upgrade plan for dry-run and mainnet upgrade, which clears the `extra_eips` parameter. - [#763](https://github.com/crypto-org-chain/cronos/pull/763) Add error log for iavl set error. -- [#]() Make `eth_getProof` result compatible with ethereum. +- [#764](https://github.com/crypto-org-chain/cronos/pull/764) Make `eth_getProof` result compatible with ethereum. *Nov 4, 2022*